From afb8bb27e8cc4d2b205523b7d311de086b4dad13 Mon Sep 17 00:00:00 2001
From: Gavin Williams <fatmcgav@gmail.com>
Date: Fri, 7 Apr 2017 13:15:31 +0100
Subject: [PATCH] provider/openstack: Add support for 'value_specs' options to
 (#13380)

`openstack_compute_servergroup_v2`
Refactor to use common `types.go` and `MapValueSpecs function`.
Added supporting website documentation.
---
 .../resource_openstack_compute_servergroup_v2.go  | 15 ++++++++++++---
 builtin/providers/openstack/types.go              | 13 +++++++++++++
 .../r/compute_servergroup_v2.html.markdown        |  2 ++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/builtin/providers/openstack/resource_openstack_compute_servergroup_v2.go b/builtin/providers/openstack/resource_openstack_compute_servergroup_v2.go
index 5616ef9a9..70b31eec6 100644
--- a/builtin/providers/openstack/resource_openstack_compute_servergroup_v2.go
+++ b/builtin/providers/openstack/resource_openstack_compute_servergroup_v2.go
@@ -41,6 +41,11 @@ func resourceComputeServerGroupV2() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"value_specs": &schema.Schema{
+				Type:     schema.TypeMap,
+				Optional: true,
+				ForceNew: true,
+			},
 		},
 	}
 }
@@ -52,10 +57,14 @@ func resourceComputeServerGroupV2Create(d *schema.ResourceData, meta interface{}
 		return fmt.Errorf("Error creating OpenStack compute client: %s", err)
 	}
 
-	createOpts := &servergroups.CreateOpts{
-		Name:     d.Get("name").(string),
-		Policies: resourceServerGroupPoliciesV2(d),
+	createOpts := ServerGroupCreateOpts{
+		servergroups.CreateOpts{
+			Name:     d.Get("name").(string),
+			Policies: resourceServerGroupPoliciesV2(d),
+		},
+		MapValueSpecs(d),
 	}
+
 	log.Printf("[DEBUG] Create Options: %#v", createOpts)
 	newSG, err := servergroups.Create(computeClient, createOpts).Extract()
 	if err != nil {
diff --git a/builtin/providers/openstack/types.go b/builtin/providers/openstack/types.go
index e2d19304c..9c6a4f67e 100644
--- a/builtin/providers/openstack/types.go
+++ b/builtin/providers/openstack/types.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
+	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/servergroups"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/fwaas/firewalls"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/fwaas/policies"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/fwaas/rules"
@@ -250,6 +251,18 @@ func (opts RuleCreateOpts) ToRuleCreateMap() (map[string]interface{}, error) {
 	return b, nil
 }
 
+// ServerGroupCreateOpts represents the attributes used when creating a new router.
+type ServerGroupCreateOpts struct {
+	servergroups.CreateOpts
+	ValueSpecs map[string]string `json:"value_specs,omitempty"`
+}
+
+// ToServerGroupCreateMap casts a CreateOpts struct to a map.
+// It overrides routers.ToServerGroupCreateMap to add the ValueSpecs field.
+func (opts ServerGroupCreateOpts) ToServerGroupCreateMap() (map[string]interface{}, error) {
+	return BuildRequest(opts, "server_group")
+}
+
 // SubnetCreateOpts represents the attributes used when creating a new subnet.
 type SubnetCreateOpts struct {
 	subnets.CreateOpts
diff --git a/website/source/docs/providers/openstack/r/compute_servergroup_v2.html.markdown b/website/source/docs/providers/openstack/r/compute_servergroup_v2.html.markdown
index a3d714a3b..340d5ed48 100644
--- a/website/source/docs/providers/openstack/r/compute_servergroup_v2.html.markdown
+++ b/website/source/docs/providers/openstack/r/compute_servergroup_v2.html.markdown
@@ -35,6 +35,8 @@ The following arguments are supported:
     the Policies section for more information. Changing this creates a new
     server group.
 
+* `value_specs` - (Optional) Map of additional options.
+
 ## Policies
 
 * `affinity` - All instances/servers launched in this group will be hosted on