Change type *string to string for & fields

acceptance/openstack/networking/v2/extensions/fwaas/firewall_test.go

@@ -38,9 +38,8 @@ func TestFirewall(t *testing.T) {
 
 	listFirewalls(t)
 
-	description := "acceptance test updated"
 	updateFirewall(t, firewallID, &firewalls.UpdateOpts{
-		Description: &description,
+		Description: "acceptance test updated",
 	})
 
 	waitForFirewallToBeActive(t, firewallID)

acceptance/openstack/networking/v2/extensions/fwaas/policy_test.go

@@ -39,9 +39,8 @@ func TestFirewallPolicy(t *testing.T) {
 
 	listPolicies(t)
 
-	description := "acceptance test updated"
 	updatePolicy(t, policyID, &policies.UpdateOpts{
-		Description: &description,
+		Description: "acceptance test updated",
 	})
 
 	getPolicy(t, policyID)

openstack/networking/v2/extensions/fwaas/firewalls/requests.go

@@ -130,8 +130,8 @@ func Get(c *gophercloud.ServiceClient, id string) GetResult {
 // UpdateOpts contains the values used when updating a firewall.
 type UpdateOpts struct {
 	// Name of the firewall.
-	Name         *string
-	Description  *string
+	Name         string
+	Description  string
 	AdminStateUp *bool
 	Shared       *bool
 	PolicyID     string
@@ -141,11 +141,11 @@ type UpdateOpts struct {
 func (opts UpdateOpts) ToFirewallUpdateMap() (map[string]interface{}, error) {
 	f := make(map[string]interface{})
 
-	if opts.Name != nil {
-		f["name"] = *opts.Name
+	if opts.Name != "" {
+		f["name"] = opts.Name
 	}
-	if opts.Description != nil {
-		f["description"] = *opts.Description
+	if opts.Description != "" {
+		f["description"] = opts.Description
 	}
 	if opts.Shared != nil {
 		f["shared"] = *opts.Shared

openstack/networking/v2/extensions/fwaas/firewalls/requests_test.go

@@ -195,7 +195,7 @@ func TestUpdate(t *testing.T) {
 {
     "firewall":{
         "name": "fw",
-        "description": "",
+        "description": "updated fw",
         "admin_state_up":false,
         "firewall_policy_id": "19ab8c87-4a32-4e6a-a74e-b77fffb89a0c"
     }
@@ -220,12 +220,9 @@ func TestUpdate(t *testing.T) {
     `)
 	})
 
-	name := "fw"
-	description := ""
-
 	options := UpdateOpts{
-		Name:         &name,
-		Description:  &description,
+		Name:         "fw",
+		Description:  "updated fw",
 		AdminStateUp: Down,
 		PolicyID:     "19ab8c87-4a32-4e6a-a74e-b77fffb89a0c",
 	}

openstack/networking/v2/extensions/fwaas/policies/requests.go

@@ -119,8 +119,8 @@ func Get(c *gophercloud.ServiceClient, id string) GetResult {
 // UpdateOpts contains the values used when updating a firewall policy.
 type UpdateOpts struct {
 	// Name of the firewall policy.
-	Name        *string
-	Description *string
+	Name        string
+	Description string
 	Shared      *bool
 	Audited     *bool
 	Rules       []string
@@ -130,11 +130,11 @@ type UpdateOpts struct {
 func (opts UpdateOpts) ToPolicyUpdateMap() (map[string]interface{}, error) {
 	p := make(map[string]interface{})
 
-	if opts.Name != nil {
-		p["name"] = *opts.Name
+	if opts.Name != "" {
+		p["name"] = opts.Name
 	}
-	if opts.Description != nil {
-		p["description"] = *opts.Description
+	if opts.Description != "" {
+		p["description"] = opts.Description
 	}
 	if opts.Shared != nil {
 		p["shared"] = *opts.Shared

openstack/networking/v2/extensions/fwaas/policies/requests_test.go

@@ -251,12 +251,9 @@ func TestUpdate(t *testing.T) {
     `)
 	})
 
-	name := "policy"
-	description := "Firewall policy"
-
 	options := UpdateOpts{
-		Name:        &name,
-		Description: &description,
+		Name:        "policy",
+		Description: "Firewall policy",
 		Rules: []string{
 			"98a58c87-76be-ae7c-a74e-b77fffb88d95",
 			"11a58c87-76be-ae7c-a74e-b77fffb88a32",

openstack/networking/v2/extensions/fwaas/rules/requests.go

@@ -161,8 +161,8 @@ func Get(c *gophercloud.ServiceClient, id string) GetResult {
 type UpdateOpts struct {
 	Protocol             string
 	Action               string
-	Name                 *string
-	Description          *string
+	Name                 string
+	Description          string
 	IPVersion            int
 	SourceIPAddress      *string
 	DestinationIPAddress *string
@@ -182,11 +182,11 @@ func (opts UpdateOpts) ToRuleUpdateMap() (map[string]interface{}, error) {
 	if opts.Action != "" {
 		r["action"] = opts.Action
 	}
-	if opts.Name != nil {
-		r["name"] = *opts.Name
+	if opts.Name != "" {
+		r["name"] = opts.Name
 	}
-	if opts.Description != nil {
-		r["description"] = *opts.Description
+	if opts.Description != "" {
+		r["description"] = opts.Description
 	}
 	if opts.IPVersion != 0 {
 		r["ip_version"] = opts.IPVersion

openstack/networking/v2/extensions/fwaas/rules/requests_test.go

@@ -293,18 +293,16 @@ func TestUpdate(t *testing.T) {
 		`)
 	})
 
-	name := "ssh_form_any"
-	description := "ssh rule"
 	destinationIPAddress := "192.168.1.0/24"
 	destinationPort := "22"
 	empty := ""
 
 	options := UpdateOpts{
 		Protocol:             "tcp",
-		Description:          &description,
+		Description:          "ssh rule",
 		DestinationIPAddress: &destinationIPAddress,
 		DestinationPort:      &destinationPort,
-		Name:                 &name,
+		Name:                 "ssh_form_any",
 		SourceIPAddress:      &empty,
 		SourcePort:           &empty,
 		Action:               "allow",