Merge f2e21f0 into 0d85999

rackspace · Aug 9, 2016 · 9faf0ef · 9faf0ef
2 parents 0d85999 + f2e21f0
commit 9faf0ef
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/openstack/networking/v2/extensions/lbaas/pools/requests.go b/openstack/networking/v2/extensions/lbaas/pools/requests.go
@@ -86,7 +86,7 @@ func Create(c *gophercloud.ServiceClient, opts CreateOpts) CreateResult {
 		Name     string `json:"name"`
 		TenantID string `json:"tenant_id,omitempty"`
 		Protocol string `json:"protocol"`
-		SubnetID string `json:"subnet_id"`
+		SubnetID string `json:"subnet_id,omitempty"`
 		LBMethod string `json:"lb_method"`
 		Provider string `json:"provider,omitempty"`
 	}

diff --git a/openstack/networking/v2/extensions/lbaas/vips/requests.go b/openstack/networking/v2/extensions/lbaas/vips/requests.go
@@ -126,10 +126,6 @@ func Create(c *gophercloud.ServiceClient, opts CreateOpts) CreateResult {
 		res.Err = errNameRequired
 		return res
 	}
-	if opts.SubnetID == "" {
-		res.Err = errSubnetIDRequried
-		return res
-	}
 	if opts.Protocol == "" {
 		res.Err = errProtocolRequired
 		return res
@@ -145,7 +141,7 @@ func Create(c *gophercloud.ServiceClient, opts CreateOpts) CreateResult {
 
 	type vip struct {
 		Name         string              `json:"name"`
-		SubnetID     string              `json:"subnet_id"`
+		SubnetID     string              `json:"subnet_id,omitempty"`
 		Protocol     string              `json:"protocol"`
 		ProtocolPort int                 `json:"protocol_port"`
 		PoolID       string              `json:"pool_id"`

diff --git a/openstack/networking/v2/extensions/lbaas_v2/loadbalancers/requests.go b/openstack/networking/v2/extensions/lbaas_v2/loadbalancers/requests.go
@@ -131,8 +131,6 @@ func (opts CreateOpts) ToLoadbalancerCreateMap() (map[string]interface{}, error)
 
 	if opts.VipSubnetID != "" {
 		l["vip_subnet_id"] = opts.VipSubnetID
-	} else {
-		return nil, errVipSubnetIDRequried
 	}
 	if opts.AdminStateUp != nil {
 		l["admin_state_up"] = &opts.AdminStateUp