Add VSRX support (#6)

Add support for vSRX

ecl/client.go

@@ -294,6 +294,13 @@ func NewImageServiceV2(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts
 	return sc, err
 }
 
+// NewVNAV1 creates a ServiceClient that may be used with the v1 virtual network appliance management package.
+func NewVNAV1(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (*eclcloud.ServiceClient, error) {
+	sc, err := initClientOpts(client, eo, "virtual-network-appliance")
+	sc.ResourceBase = sc.Endpoint + "v1.0/"
+	return sc, err
+}
+
 // NewLoadBalancerV2 creates a ServiceClient that may be used to access the v2
 // load balancer service.
 func NewLoadBalancerV2(client *eclcloud.ProviderClient, eo eclcloud.EndpointOpts) (*eclcloud.ServiceClient, error) {

ecl/vna/v1/appliances/doc.go

@@ -0,0 +1,57 @@
+/*
+Package appliances contains functionality for working with
+ECL Commnon Function Gateway resources.
+
+Example to List VirtualNetworkAppliances
+
+	listOpts := virtual_network_appliances.ListOpts{
+		TenantID: "a99e9b4e620e4db09a2dfb6e42a01e66",
+	}
+
+	allPages, err := virtual_network_appliances.List(networkClient, listOpts).AllPages()
+	if err != nil {
+		panic(err)
+	}
+
+	allVirtualNetworkAppliances, err := virtual_network_appliances.ExtractVirtualNetworkAppliances(allPages)
+	if err != nil {
+		panic(err)
+	}
+
+	for _, virtual_network_appliances := range allVirtualNetworkAppliances {
+		fmt.Printf("%+v", virtual_network_appliances)
+	}
+
+Example to Create a virtual_network_appliances
+
+	createOpts := virtual_network_appliances.CreateOpts{
+		Name:         "network_1",
+	}
+
+	virtual_network_appliances, err := virtual_network_appliances.Create(networkClient, createOpts).Extract()
+	if err != nil {
+		panic(err)
+	}
+
+Example to Update a virtual_network_appliances
+
+	virtualNetworkApplianceID := "484cda0e-106f-4f4b-bb3f-d413710bbe78"
+
+	updateOpts := virtual_network_appliances.UpdateOpts{
+		Name: "new_name",
+	}
+
+	virtual_network_appliances, err := virtual_network_appliances.Update(networkClient, virtualNetworkApplianceID, updateOpts).Extract()
+	if err != nil {
+		panic(err)
+	}
+
+Example to Delete a virtual_network_appliances
+
+	virtualNetworkApplianceID := "484cda0e-106f-4f4b-bb3f-d413710bbe78"
+	err := virtual_network_appliances.Delete(networkClient, virtualNetworkApplianceID).ExtractErr()
+	if err != nil {
+		panic(err)
+	}
+*/
+package appliances

ecl/vna/v1/appliances/requests.go

@@ -0,0 +1,319 @@
+package appliances
+
+import (
+	"github.com/nttcom/eclcloud"
+	"github.com/nttcom/eclcloud/pagination"
+)
+
+// ListOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type ListOptsBuilder interface {
+	ToVirtualNetworkApplianceListQuery() (string, error)
+}
+
+// ListOpts allows the filtering and sorting of paginated collections through
+// the API. Filtering is achieved by passing in struct field values that map to
+// the virtual network appliance attributes you want to see returned.
+type ListOpts struct {
+	Name                          string `q:"name"`
+	ID                            string `q:"id"`
+	ApplianceType                 string `q:"appliance_type`
+	Description                   string `q:"description"`
+	AvailabilityZone              string `q:"availability_zone"`
+	OSMonitoringStatus            string `q:"os_monitoring_status"`
+	OSLoginStatus                 string `q:"os_login_status"`
+	VMStatus                      string `q:"vm_status"`
+	OperationStatus               string `q:"operation_status"`
+	VirtualNetworkAppliancePlanID string `q:"virtual_network_appliance_plan_id"`
+	TenantID                      string `q:"tenant_id"`
+}
+
+// ToVirtualNetworkApplianceListQuery formats a ListOpts into a query string.
+func (opts ListOpts) ToVirtualNetworkApplianceListQuery() (string, error) {
+	q, err := eclcloud.BuildQueryString(opts)
+	return q.String(), err
+}
+
+// List returns a Pager which allows you to iterate over a collection of
+// virtual network appliances.
+// It accepts a ListOpts struct, which allows you to filter and sort
+// the returned collection for greater efficiency.
+func List(c *eclcloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+	url := listURL(c)
+	if opts != nil {
+		query, err := opts.ToVirtualNetworkApplianceListQuery()
+		if err != nil {
+			return pagination.Pager{Err: err}
+		}
+		url += query
+	}
+	return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+		return AppliancePage{pagination.LinkedPageBase{PageResult: r}}
+	})
+}
+
+// Get retrieves a specific virtual network appliance based on its unique ID.
+func Get(c *eclcloud.ServiceClient, id string) (r GetResult) {
+	_, r.Err = c.Get(getURL(c, id), &r.Body, nil)
+	return
+}
+
+// CreateOptsBuilder allows extensions to add additional parameters to the
+// Create request.
+type CreateOptsBuilder interface {
+	ToApplianceCreateMap() (map[string]interface{}, error)
+}
+
+/*
+Parameters for Create
+*/
+
+// CreateOptsFixedIP represents fixed ip information in virtual network appliance creation.
+type CreateOptsFixedIP struct {
+	IPAddress string `json:"ip_address" required:"true"`
+}
+
+// CreateOptsInterface represents each parameters in virtual network appliance creation.
+type CreateOptsInterface struct {
+	Name        string               `json:"name,omitempty"`
+	Description string               `json:"description,omitempty"`
+	NetworkID   string               `json:"network_id" required:"true"`
+	Tags        map[string]string    `json:"tags,omitempty"`
+	FixedIPs    [1]CreateOptsFixedIP `json:"fixed_ips" required:"true"`
+}
+
+// CreateOptsInterfaces represents 1st interface in virtual network appliance creation.
+type CreateOptsInterfaces struct {
+	Interface1 CreateOptsInterface `json:"interface_1" required:"true"`
+}
+
+// CreateOpts represents options used to create a virtual network appliance.
+type CreateOpts struct {
+	Name                          string               `json:"name,omitempty"`
+	Description                   string               `json:"description,omitempty"`
+	DefaultGateway                string               `json:"default_gateway,omitempty"`
+	AvailabilityZone              string               `json:"availability_zone,omitempty"`
+	VirtualNetworkAppliancePlanID string               `json:"virtual_network_appliance_plan_id" required:"true"`
+	TenantID                      string               `json:"tenant_id,omitempty"`
+	Tags                          map[string]string    `json:"tags,omitempty"`
+	Interfaces                    CreateOptsInterfaces `json:"interfaces" required:"true"`
+}
+
+// ToApplianceCreateMap builds a request body from CreateOpts.
+func (opts CreateOpts) ToApplianceCreateMap() (map[string]interface{}, error) {
+	return eclcloud.BuildRequestBody(opts, "virtual_network_appliance")
+}
+
+// Create accepts a CreateOpts struct and creates a new virtual network appliance
+// using the values provided.
+// This operation does not actually require a request body, i.e. the
+// CreateOpts struct argument can be empty.
+func Create(c *eclcloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
+	b, err := opts.ToApplianceCreateMap()
+	if err != nil {
+		r.Err = err
+		return
+	}
+	_, r.Err = c.Post(createURL(c), b, &r.Body, &eclcloud.RequestOpts{
+		OkCodes: []int{200},
+	})
+	return
+}
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+	ToApplianceUpdateMap() (map[string]interface{}, error)
+}
+
+/*
+Update for Allowed Address Pairs
+*/
+
+// UpdateAllowedAddressPairAddressInfo represents options used to
+// update virtual network appliance allowed address pairs.
+type UpdateAllowedAddressPairAddressInfo struct {
+	IPAddress  string       `json:"ip_address" required:"true"`
+	MACAddress *string      `json:"mac_address" required:"true"`
+	Type       *string      `json:"type" required:"true"`
+	VRID       *interface{} `json:"vrid" required:"true"`
+}
+
+// UpdateAllowedAddressPairInterface represents
+// allowed address pairs list in update options used to
+// update virtual network appliance allowed address pairs.
+type UpdateAllowedAddressPairInterface struct {
+	AllowedAddressPairs *[]UpdateAllowedAddressPairAddressInfo `json:"allowed_address_pairs,omitempty"`
+}
+
+// UpdateAllowedAddressPairInterfaces represents
+// interface list of update options used to
+// update virtual network appliance allowed address pairs.
+type UpdateAllowedAddressPairInterfaces struct {
+	Interface1 *UpdateAllowedAddressPairInterface `json:"interface_1,omitempty"`
+	Interface2 *UpdateAllowedAddressPairInterface `json:"interface_2,omitempty"`
+	Interface3 *UpdateAllowedAddressPairInterface `json:"interface_3,omitempty"`
+	Interface4 *UpdateAllowedAddressPairInterface `json:"interface_4,omitempty"`
+	Interface5 *UpdateAllowedAddressPairInterface `json:"interface_5,omitempty"`
+	Interface6 *UpdateAllowedAddressPairInterface `json:"interface_6,omitempty"`
+	Interface7 *UpdateAllowedAddressPairInterface `json:"interface_7,omitempty"`
+	Interface8 *UpdateAllowedAddressPairInterface `json:"interface_8,omitempty"`
+}
+
+// UpdateAllowedAddressPairOpts represents
+// parent element of interfaces in update options used to
+// update virtual network appliance allowed address pairs.
+type UpdateAllowedAddressPairOpts struct {
+	Interfaces *UpdateAllowedAddressPairInterfaces `json:"interfaces,omitempty"`
+}
+
+// ToApplianceUpdateMap builds a request body from UpdateAllowedAddressPairOpts.
+func (opts UpdateAllowedAddressPairOpts) ToApplianceUpdateMap() (map[string]interface{}, error) {
+	return eclcloud.BuildRequestBody(opts, "virtual_network_appliance")
+}
+
+/*
+Update for FixedIP (includes network_id)
+*/
+
+// UpdateFixedIPAddressInfo represents ip address part
+// of virtual network appliance update.
+type UpdateFixedIPAddressInfo struct {
+	IPAddress string `json:"ip_address" required:"true"`
+}
+
+// UpdateFixedIPInterface represents each interface information
+// in updating network connection and fixed ip address
+// of virtual network appliance.
+type UpdateFixedIPInterface struct {
+	NetworkID *string                     `json:"network_id,omitempty"`
+	FixedIPs  *[]UpdateFixedIPAddressInfo `json:"fixed_ips,omitempty"`
+}
+
+// UpdateFixedIPInterfaces represents
+// interface list of update options used to
+// update virtual network appliance network connection and fixed ips.
+type UpdateFixedIPInterfaces struct {
+	Interface1 *UpdateFixedIPInterface `json:"interface_1,omitempty"`
+	Interface2 *UpdateFixedIPInterface `json:"interface_2,omitempty"`
+	Interface3 *UpdateFixedIPInterface `json:"interface_3,omitempty"`
+	Interface4 *UpdateFixedIPInterface `json:"interface_4,omitempty"`
+	Interface5 *UpdateFixedIPInterface `json:"interface_5,omitempty"`
+	Interface6 *UpdateFixedIPInterface `json:"interface_6,omitempty"`
+	Interface7 *UpdateFixedIPInterface `json:"interface_7,omitempty"`
+	Interface8 *UpdateFixedIPInterface `json:"interface_8,omitempty"`
+}
+
+// UpdateFixedIPOpts represents
+// parent element of interfaces in update options used to
+// update virtual network appliance network connection and fixed ips.
+type UpdateFixedIPOpts struct {
+	Interfaces *UpdateFixedIPInterfaces `json:"interfaces,omitempty"`
+}
+
+// ToApplianceUpdateMap builds a request body from UpdateFixedIPOpts.
+func (opts UpdateFixedIPOpts) ToApplianceUpdateMap() (map[string]interface{}, error) {
+	return eclcloud.BuildRequestBody(opts, "virtual_network_appliance")
+}
+
+/*
+Update for Metadata
+*/
+
+// UpdateMetadataInterface represents options used to
+// update virtual network appliance metadata of interface.
+type UpdateMetadataInterface struct {
+	Name        *string            `json:"name,omitempty"`
+	Description *string            `json:"description,omitempty"`
+	Tags        *map[string]string `json:"tags,omitempty"`
+}
+
+// UpdateMetadataInterfaces represents
+// list of interfaces for updating virtual network appliance metadata.
+type UpdateMetadataInterfaces struct {
+	Interface1 *UpdateMetadataInterface `json:"interface_1,omitempty"`
+	Interface2 *UpdateMetadataInterface `json:"interface_2,omitempty"`
+	Interface3 *UpdateMetadataInterface `json:"interface_3,omitempty"`
+	Interface4 *UpdateMetadataInterface `json:"interface_4,omitempty"`
+	Interface5 *UpdateMetadataInterface `json:"interface_5,omitempty"`
+	Interface6 *UpdateMetadataInterface `json:"interface_6,omitempty"`
+	Interface7 *UpdateMetadataInterface `json:"interface_7,omitempty"`
+	Interface8 *UpdateMetadataInterface `json:"interface_8,omitempty"`
+}
+
+// UpdateMetadataOpts represents
+// metadata of virtual network appliance itself and
+// pararent element for list of interfaces
+// which are used by virtual network appliance metadata update.
+type UpdateMetadataOpts struct {
+	Name        *string                   `json:"name,omitempty"`
+	Description *string                   `json:"description,omitempty"`
+	Tags        *map[string]string        `json:"tags,omitempty"`
+	Interfaces  *UpdateMetadataInterfaces `json:"interfaces,omitempty"`
+}
+
+// ToApplianceUpdateMap builds a request body from UpdateOpts.
+func (opts UpdateMetadataOpts) ToApplianceUpdateMap() (map[string]interface{}, error) {
+	return eclcloud.BuildRequestBody(opts, "virtual_network_appliance")
+}
+
+/*
+Update Common
+*/
+
+// Update accepts a UpdateOpts struct and updates an existing virtual network appliance
+// using the values provided. For more information, see the Create function.
+func Update(c *eclcloud.ServiceClient, virtualNetworkApplianceID string, opts UpdateOptsBuilder) (r UpdateResult) {
+	b, err := opts.ToApplianceUpdateMap()
+	if err != nil {
+		r.Err = err
+		return
+	}
+	_, r.Err = c.Patch(updateURL(c, virtualNetworkApplianceID), b, &r.Body, &eclcloud.RequestOpts{
+		OkCodes: []int{200},
+	})
+	return
+}
+
+// Delete accepts a unique ID and deletes the virtual network appliance associated with it.
+func Delete(c *eclcloud.ServiceClient, virtualNetworkApplianceID string) (r DeleteResult) {
+	_, r.Err = c.Delete(deleteURL(c, virtualNetworkApplianceID), nil)
+	return
+}
+
+// IDFromName is a convenience function that returns a virtual network appliance's
+// ID, given its name.
+func IDFromName(client *eclcloud.ServiceClient, name string) (string, error) {
+	count := 0
+	id := ""
+
+	listOpts := ListOpts{
+		Name: name,
+	}
+
+	pages, err := List(client, listOpts).AllPages()
+	if err != nil {
+		return "", err
+	}
+
+	all, err := ExtractAppliances(pages)
+	if err != nil {
+		return "", err
+	}
+
+	for _, s := range all {
+		if s.Name == name {
+			count++
+			id = s.ID
+		}
+	}
+
+	switch count {
+	case 0:
+		return "", eclcloud.ErrResourceNotFound{Name: name, ResourceType: "virtual_network_appliance"}
+	case 1:
+		return id, nil
+	default:
+		return "", eclcloud.ErrMultipleResourcesFound{Name: name, Count: count, ResourceType: "virtual_network_appliance"}
+	}
+}