Merge pull request #2875 from gophercloud/bp-v1-74052e2

EmilienM · web-flow · commit 51831d9ee643 · 2024-01-19T16:09:33.000-05:00
[v1] [db/v1/instance]: adding support for availability_zone for a db instance
diff --git a/openstack/db/v1/instances/requests.go b/openstack/db/v1/instances/requests.go
@@ -47,6 +47,8 @@ func (opts NetworkOpts) ToMap() (map[string]interface{}, error) {
 
 // CreateOpts is the struct responsible for configuring a new database instance.
 type CreateOpts struct {
+	// The availability zone of the instance.
+	AvailabilityZone string `json:"availability_zone,omitempty"`
 	// Either the integer UUID (in string form) of the flavor, or its URI
 	// reference as specified in the response from the List() call. Required.
 	FlavorRef string
@@ -87,6 +89,10 @@ func (opts CreateOpts) ToInstanceCreateMap() (map[string]interface{}, error) {
 		"flavorRef": opts.FlavorRef,
 	}
 
+	if opts.AvailabilityZone != "" {
+		instance["availability_zone"] = opts.AvailabilityZone
+	}
+
 	if opts.Name != "" {
 		instance["name"] = opts.Name
 	}
diff --git a/openstack/db/v1/instances/testing/fixtures_test.go b/openstack/db/v1/instances/testing/fixtures_test.go
@@ -104,6 +104,7 @@ var instanceGet = `
 var createReq = `
 {
 	"instance": {
+		"availability_zone": "us-east1",
 		"databases": [
 			{
 				"character_set": "utf8",
diff --git a/openstack/db/v1/instances/testing/requests_test.go b/openstack/db/v1/instances/testing/requests_test.go
@@ -17,8 +17,9 @@ func TestCreate(t *testing.T) {
 	HandleCreate(t)
 
 	opts := instances.CreateOpts{
-		Name:      "json_rack_instance",
-		FlavorRef: "1",
+		AvailabilityZone: "us-east1",
+		Name:             "json_rack_instance",
+		FlavorRef:        "1",
 		Databases: db.BatchCreateOpts{
 			{CharSet: "utf8", Collate: "utf8_general_ci", Name: "sampledb"},
 			{Name: "nextround"},
@@ -48,8 +49,9 @@ func TestCreateWithFault(t *testing.T) {
 	HandleCreateWithFault(t)
 
 	opts := instances.CreateOpts{
-		Name:      "json_rack_instance",
-		FlavorRef: "1",
+		AvailabilityZone: "us-east1",
+		Name:             "json_rack_instance",
+		FlavorRef:        "1",
 		Databases: db.BatchCreateOpts{
 			{CharSet: "utf8", Collate: "utf8_general_ci", Name: "sampledb"},
 			{Name: "nextround"},

Original file line number	Diff line number	Diff line change
@@ -104,6 +104,7 @@ var instanceGet = `
`104`	`104`	var createReq = `
`105`	`105`	`{`
`106`	`106`	`"instance": {`
	`107`	`+ "availability_zone": "us-east1",`
`107`	`108`	`"databases": [`
`108`	`109`	`{`
`109`	`110`	`"character_set": "utf8",`