Skip to content

Commit

Permalink
provider/openstack: Add 'value_specs' option to 'openstack_fw_firewal…
Browse files Browse the repository at this point in the history
…l_v1' resource

Refactor to use common 'types.go' and 'MapValueSpecs' function.
Website docs updated to reflect changes.
  • Loading branch information
fatmcgav committed Nov 5, 2016
1 parent f9d5c72 commit 7e15b2e
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 7 deletions.
20 changes: 14 additions & 6 deletions builtin/providers/openstack/resource_openstack_fw_firewall_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ func resourceFWFirewallV1() *schema.Resource {
ForceNew: true,
Computed: true,
},
"value_specs": &schema.Schema{
Type: schema.TypeMap,
Optional: true,
ForceNew: true,
},
},
}
}
Expand All @@ -65,12 +70,15 @@ func resourceFWFirewallV1Create(d *schema.ResourceData, meta interface{}) error

adminStateUp := d.Get("admin_state_up").(bool)

firewallConfiguration := firewalls.CreateOpts{
Name: d.Get("name").(string),
Description: d.Get("description").(string),
PolicyID: d.Get("policy_id").(string),
AdminStateUp: &adminStateUp,
TenantID: d.Get("tenant_id").(string),
firewallConfiguration := FirewallCrateOpts{
firewalls.CreateOpts{
Name: d.Get("name").(string),
Description: d.Get("description").(string),
PolicyID: d.Get("policy_id").(string),
AdminStateUp: &adminStateUp,
TenantID: d.Get("tenant_id").(string),
},
MapValueSpecs(d),
}

log.Printf("[DEBUG] Create firewall: %#v", firewallConfiguration)
Expand Down
14 changes: 13 additions & 1 deletion builtin/providers/openstack/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,19 @@ import (
"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
)

// FloatingIPCreateOpts represents the attributes used when creating a new port.
// FirewallCreateOpts represents the attributes used when creating a new firewall.
type FirewallCreateOpts struct {
firewalls.CreateOpts
ValueSpecs map[string]string `json:"value_specs,omitempty"`
}

// ToFirewallCreateMap casts a CreateOpts struct to a map.
// It overrides firewalls.ToFirewallCreateMap to add the ValueSpecs field.
func (opts FirewallCreateOpts) ToFirewallCreateMap() (map[string]interface{}, error) {
return BuildRequest(opts, "firewall")
}

// FloatingIPCreateOpts represents the attributes used when creating a new floating ip.
type FloatingIPCreateOpts struct {
floatingips.CreateOpts
ValueSpecs map[string]string `json:"value_specs,omitempty"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ The following arguments are supported:
to create a firewall for another tenant. Changing this creates a new
firewall.

* `value_specs` - (Optional) Map of additional options.

## Attributes Reference

The following attributes are exported:
Expand Down

0 comments on commit 7e15b2e

Please sign in to comment.