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

better pool and changed schema

Browse source
This commit is contained in:
ston1th 2020-06-03 23:10:22 +02:00
commit 249d7c6844
4 changed files with 82 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
node.go
View file

@ -9,7 +9,6 @@ import (
)
var (
ErrServerNotFound = errors.New("server not found")
ErrNodesOffline = errors.New("one or more nodes are offline")
ErrNodesNotSearched = errors.New("one or more nodes could not be searched")
)
@ -29,8 +28,6 @@ type Node struct {
type NodeList []*Node
type ServerList []*Server
type NodeClient struct {
client *Client
}
@ -106,5 +103,5 @@ func (c *NodeClient) FindServerByURL(ctx context.Context, url string) (s *Server
if err != nil {
return
}
return c.FindServer(ctx, "", id)
return c.FindServerByID(ctx, id)
}

47
pool.go
View file

@ -72,3 +72,50 @@ func (c *PoolClient) Delete(ctx context.Context, name string) (err error) {
_, err = c.client.Do(req, nil)
return
}
type pool struct {
members ServerList `json:"members"`
}
func (c *PoolClient) List(ctx context.Context, name string) (sl ServerList, err error) {
var p pool
req, err := c.client.NewRequest(ctx, "GET", fmt.Sprintf("/pools/%s", name), nil)
if err != nil {
return
}
_, err = c.client.Do(req, &p)
sl = p.members
return
}
func (c *PoolClient) FindServer(ctx context.Context, poolname, servername, id string) (s *Server, err error) {
sl, err := c.List(ctx, poolname)
if err != nil {
return
}
for _, srv := range sl {
if id != "" && srv.ID == id {
return srv, nil
}
if servername != "" && srv.Name == servername {
return srv, nil
}
}
return nil, ErrServerNotFound
}
func (c *PoolClient) FindServerByName(ctx context.Context, poolname, servername string) (s *Server, err error) {
return c.FindServer(ctx, poolname, servername, "")
}
func (c *PoolClient) FindServerByID(ctx context.Context, poolname, id string) (s *Server, err error) {
return c.FindServer(ctx, poolname, "", id)
}
func (c *PoolClient) FindServerByURL(ctx context.Context, url string) (s *Server, err error) {
pool, id, err := ParseURL(url)
if err != nil {
return
}
return c.FindServerByID(ctx, pool, id)
}

6
scheme.go
View file

@ -13,7 +13,7 @@ const PVEScheme = "pve"
var ErrInvalidPVEURL = errors.New("invalid pve url scheme")
func ParseURL(s string) (node, id string, err error) {
func ParseURL(s string) (pool, id string, err error) {
u, err := url.Parse(s)
if err != nil {
return
@ -25,6 +25,6 @@ func ParseURL(s string) (node, id string, err error) {
return u.Host, strings.TrimPrefix(u.Path, "/"), nil
}
func NewURL(node, id string) string {
return fmt.Sprintf("%s://%s/%s", PVEScheme, node, id)
func NewURL(pool, id string) string {
return fmt.Sprintf("%s://%s/%s", PVEScheme, pool, id)
}

45
server.go
View file

@ -10,6 +10,10 @@ import (
"strings"
)
var ErrServerNotFound = errors.New("server not found")
type ServerList []*Server
type Server struct {
ID string `json:"vmid"`
Name string `json:"name"`
@ -180,11 +184,26 @@ func (c *ServerClient) getServer(ctx context.Context, node, id string) (s *Serve
}
func (c *ServerClient) GetByURL(ctx context.Context, url string) (s *Server, err error) {
node, id, err := ParseURL(url)
pool, id, err := ParseURL(url)
if err != nil {
return
}
s, cfg, err := c.getServer(ctx, node, id)
var srv *Server
if pool != "" {
srv, err = c.client.Pool.FindServerByID(ctx, pool, id)
if err == ErrServerNotFound {
return
}
}
srv, err = c.client.Node.FindServerByID(ctx, id)
if err != nil {
return
}
if srv == nil {
err = ErrServerNotFound
return
}
s, cfg, err := c.getServer(ctx, srv.Node, srv.ID)
if err != nil {
return
}
@ -200,7 +219,8 @@ func (c *ServerClient) GetByURL(ctx context.Context, url string) (s *Server, err
type ServerTemplateOpts struct {
Name string
TemplateURL string
TemplateID string
TemplateNode string
Pool string
TargetStorage string
TargetNode string
@ -210,8 +230,11 @@ func (o ServerTemplateOpts) Validate() error {
if o.Name == "" {
return errors.New("missing name")
}
if o.TemplateURL == "" {
return errors.New("missing template url")
if o.TemplateID == "" {
return errors.New("missing template id")
}
if o.TemplateNode == "" {
return errors.New("missing template node")
}
return nil
}
@ -233,23 +256,17 @@ func (c *ServerClient) CreateFromTemplate(ctx context.Context, opts ServerTempla
if err != nil {
return
}
tempnode, id, err := ParseURL(opts.TemplateURL)
if err != nil {
return
}
nextid, err := c.NextID(ctx)
if err != nil {
return
}
body := opts.body()
body["newid"] = nextid
if opts.TargetNode != "" && tempnode != opts.TargetNode {
if opts.TargetNode != "" && opts.TemplateNode != opts.TargetNode {
body["target"] = opts.TargetNode
url = NewURL(opts.TargetNode, nextid)
} else {
url = NewURL(tempnode, nextid)
}
req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("/nodes/%s/qemu/%s/clone", tempnode, id), body.Reader())
url = NewURL(opts.Pool, nextid)
req, err := c.client.NewRequest(ctx, "POST", fmt.Sprintf("/nodes/%s/qemu/%s/clone", opts.TemplateNode, opts.TemplateID), body.Reader())
if err != nil {
return
}