ston1th/pve-go
0
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

more int fixes

Browse source
This commit is contained in:
ston1th 2021-11-28 12:38:37 +01:00
commit 066afb15b4
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
server.go
View file

@ -221,17 +221,22 @@ type ServerClient struct {
} }
func (c *ServerClient) NextID(ctx context.Context) (id int, err error) { func (c *ServerClient) NextID(ctx context.Context) (id int, err error) {
id = -1
req, err := c.client.NewRequest(ctx, "GET", "/cluster/nextid", nil) req, err := c.client.NewRequest(ctx, "GET", "/cluster/nextid", nil)
if err != nil { if err != nil {
return return
} }
_, err = c.client.Do(req, &id) var sid string
return _, err = c.client.Do(req, &sid)
if err != nil {
return
}
return strconv.Atoi(sid)
} }
func (c *ServerClient) getConfig(ctx context.Context, ref *ServerRef) (cfg serverConfig, err error) { func (c *ServerClient) getConfig(ctx context.Context, ref *ServerRef) (cfg serverConfig, err error) {
cfg = make(serverConfig) cfg = make(serverConfig)
req, err := c.client.NewRequest(ctx, "GET", fmt.Sprintf("/nodes/%s/qemu/%s/config?current=1", ref.Node, ref.ID), nil) req, err := c.client.NewRequest(ctx, "GET", fmt.Sprintf("/nodes/%s/qemu/%d/config?current=1", ref.Node, ref.ID), nil)
if err != nil { if err != nil {
return return
} }
@ -342,7 +347,7 @@ func (c *ServerClient) CreateFromTemplate(ctx context.Context, opts *ServerTempl
body["target"] = opts.TargetNode body["target"] = opts.TargetNode
} }
url = NewURL(opts.Pool, node, nextid) url = NewURL(opts.Pool, node, nextid)
req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("/nodes/%s/qemu/%s/clone", opts.TemplateNode, opts.TemplateID), body.Reader()) req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("/nodes/%s/qemu/%d/clone", opts.TemplateNode, opts.TemplateID), body.Reader())
if err != nil { if err != nil {
return return
} }
@ -381,7 +386,7 @@ func (c *ServerClient) Stop(ctx context.Context, ref *ServerRef) (t *Task, err e
} }
func (c *ServerClient) setStatus(ctx context.Context, ref *ServerRef, status string) (t *Task, err error) { func (c *ServerClient) setStatus(ctx context.Context, ref *ServerRef, status string) (t *Task, err error) {
req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("/nodes/%s/qemu/%s/status/%s", ref.Node, ref.ID, status), nil) req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("/nodes/%s/qemu/%d/status/%s", ref.Node, ref.ID, status), nil)
if err != nil { if err != nil {
return return
} }
@ -409,7 +414,7 @@ func (c *ServerClient) GetStatus(ctx context.Context, s *Server, lock *string) (
lockval = *lock lockval = *lock
} }
var status statusObj var status statusObj
req, err := c.client.NewRequest(ctx, "GET", fmt.Sprintf("/nodes/%s/qemu/%s/status/current", s.Node, s.ID), nil) req, err := c.client.NewRequest(ctx, "GET", fmt.Sprintf("/nodes/%s/qemu/%d/status/current", s.Node, s.ID), nil)
if err != nil { if err != nil {
s.Status = ServerStatusUnknown s.Status = ServerStatusUnknown
return return
@ -435,7 +440,7 @@ func diffBody(cur, n *Server) (b httpbody) {
} }
func (c *ServerClient) updateConfig(ctx context.Context, s *Server, body httpbody) (err error) { func (c *ServerClient) updateConfig(ctx context.Context, s *Server, body httpbody) (err error) {
req, err := c.client.NewRequest(ctx, "PUT", fmt.Sprintf("/nodes/%s/qemu/%s/config", s.Node, s.ID), body.Reader()) req, err := c.client.NewRequest(ctx, "PUT", fmt.Sprintf("/nodes/%s/qemu/%d/config", s.Node, s.ID), body.Reader())
if err != nil { if err != nil {
return err return err
} }
@ -448,7 +453,7 @@ func (c *ServerClient) resizeDisk(ctx context.Context, s *Server) (err error) {
"disk": s.Resources.Disk.Name, "disk": s.Resources.Disk.Name,
"size": s.Resources.Disk.String(), "size": s.Resources.Disk.String(),
} }
req, err := c.client.NewRequest(ctx, "PUT", fmt.Sprintf("/nodes/%s/qemu/%s/resize", s.Node, s.ID), body.Reader()) req, err := c.client.NewRequest(ctx, "PUT", fmt.Sprintf("/nodes/%s/qemu/%d/resize", s.Node, s.ID), body.Reader())
if err != nil { if err != nil {
return err return err
} }
@ -505,7 +510,7 @@ func (c *ServerClient) Delete(ctx context.Context, s *Server, f OnTaskChange) (t
return nil, err return nil, err
} }
} }
req, err := c.client.NewRequest(ctx, "DELETE", fmt.Sprintf("/nodes/%s/qemu/%s", s.Node, s.ID), nil) req, err := c.client.NewRequest(ctx, "DELETE", fmt.Sprintf("/nodes/%s/qemu/%d", s.Node, s.ID), nil)
if err != nil { if err != nil {
return return
} }