ContainerInfra: extract ID from cluster resize result

tghartland · tghartland · commit 5e406007e3c6 · 2019-12-09T10:24:16.000+01:00
diff --git a/openstack/containerinfra/v1/clusters/results.go b/openstack/containerinfra/v1/clusters/results.go
@@ -60,6 +60,14 @@ func (r UpdateResult) Extract() (string, error) {
 	return s.UUID, err
 }
 
+func (r ResizeResult) Extract() (string, error) {
+	var s struct {
+		UUID string
+	}
+	err := r.ExtractInto(&s)
+	return s.UUID, err
+}
+
 type Cluster struct {
 	APIAddress        string             `json:"api_address"`
 	COEVersion        string             `json:"coe_version"`
diff --git a/openstack/containerinfra/v1/clusters/testing/fixtures.go b/openstack/containerinfra/v1/clusters/testing/fixtures.go
@@ -289,8 +289,7 @@ func HandleDeleteClusterSuccessfully(t *testing.T) {
 
 var ResizeResponse = fmt.Sprintf(`
 {
-	"uuid": "%s",
-	"node_count": 2
+	"uuid": "%s"
 }`, clusterUUID)
 
 func HandleResizeClusterSuccessfully(t *testing.T) {
diff --git a/openstack/containerinfra/v1/clusters/testing/requests_test.go b/openstack/containerinfra/v1/clusters/testing/requests_test.go
@@ -201,5 +201,5 @@ func TestResizeCluster(t *testing.T) {
 	actual, err := res.Extract()
 	th.AssertNoErr(t, err)
 
-	th.AssertEquals(t, nodeCount, actual.NodeCount)
+	th.AssertDeepEquals(t, clusterUUID, actual)
 }

Original file line number	Diff line number	Diff line change
`@@ -289,8 +289,7 @@ func HandleDeleteClusterSuccessfully(t *testing.T) {`
`289`	`289`
`290`	`290`	var ResizeResponse = fmt.Sprintf(`
`291`	`291`	`{`
`292`		`- "uuid": "%s",`
`293`		`- "node_count": 2`
	`292`	`+ "uuid": "%s"`
`294`	`293`	}`, clusterUUID)
`295`	`294`
`296`	`295`	`func HandleResizeClusterSuccessfully(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -201,5 +201,5 @@ func TestResizeCluster(t *testing.T) {`
`201`	`201`	`actual, err := res.Extract()`
`202`	`202`	`th.AssertNoErr(t, err)`
`203`	`203`
`204`		`- th.AssertEquals(t, nodeCount, actual.NodeCount)`
	`204`	`+ th.AssertDeepEquals(t, clusterUUID, actual)`
`205`	`205`	`}`