Identity v3 region delete

dklyle · dklyle · commit f2b387e9629a · 2017-11-01T15:04:35.000-06:00
diff --git a/acceptance/openstack/identity/v3/identity.go b/acceptance/openstack/identity/v3/identity.go
@@ -235,6 +235,18 @@ func DeleteRole(t *testing.T, client *gophercloud.ServiceClient, roleID string)
 	t.Logf("Deleted role: %s", roleID)
 }
 
+// DeleteRegion will delete a reg by ID. A fatal error will occur if
+// the role failed to be deleted. This works best when using it as
+// a deferred function.
+func DeleteRegion(t *testing.T, client *gophercloud.ServiceClient, regionID string) {
+	err := regions.Delete(client, regionID).ExtractErr()
+	if err != nil {
+		t.Fatalf("Unable to delete region %s: %v", regionID, err)
+	}
+
+	t.Logf("Deleted region: %s", regionID)
+}
+
 // UnassignRole will delete a role assigned to a user/group on a project/domain
 // A fatal error will occur if it fails to delete the assignment.
 // This works best when using it as a deferred function.
diff --git a/acceptance/openstack/identity/v3/regions_test.go b/acceptance/openstack/identity/v3/regions_test.go
@@ -79,6 +79,7 @@ func TestRegionsCRUD(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unable to create region: %v", err)
 	}
+	defer DeleteRegion(t, client, region.ID)
 
 	tools.PrintResource(t, region)
 	tools.PrintResource(t, region.Extra)
diff --git a/openstack/identity/v3/regions/doc.go b/openstack/identity/v3/regions/doc.go
@@ -34,6 +34,12 @@ Example to Create a Region
 	region, err := regions.Create(identityClient, createOpts).Extract()
 	if err != nil {
 		panic(err)
+
+Example to Delete a Region
+
+	regionID := "TestRegion"
+	err := regions.Delete(identityClient, regionID).ExtractErr()
+	if err != nil {
 	}
 */
 package regions
diff --git a/openstack/identity/v3/regions/requests.go b/openstack/identity/v3/regions/requests.go
@@ -95,3 +95,9 @@ func Create(client *gophercloud.ServiceClient, opts CreateOptsBuilder) (r Create
 	})
 	return
 }
+
+// Delete deletes a region.
+func Delete(client *gophercloud.ServiceClient, regionID string) (r DeleteResult) {
+	_, r.Err = client.Delete(deleteURL(client, regionID), nil)
+	return
+}
diff --git a/openstack/identity/v3/regions/results.go b/openstack/identity/v3/regions/results.go
@@ -72,6 +72,12 @@ type CreateResult struct {
 	regionResult
 }
 
+// DeleteResult is the response from a Delete operation. Call its ExtractErr to
+// determine if the request succeeded or failed.
+type DeleteResult struct {
+	gophercloud.ErrResult
+}
+
 // RegionPage is a single page of Region results.
 type RegionPage struct {
 	pagination.LinkedPageBase
diff --git a/openstack/identity/v3/regions/testing/fixtures.go b/openstack/identity/v3/regions/testing/fixtures.go
@@ -139,3 +139,14 @@ func HandleCreateRegionSuccessfully(t *testing.T) {
 		fmt.Fprintf(w, GetOutput)
 	})
 }
+
+// HandleDeleteRegionSuccessfully creates an HTTP handler at `/regions` on the
+// test handler mux that tests region deletion.
+func HandleDeleteRegionSuccessfully(t *testing.T) {
+	th.Mux.HandleFunc("/regions/RegionOne-West", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+
+		w.WriteHeader(http.StatusNoContent)
+	})
+}
diff --git a/openstack/identity/v3/regions/testing/requests_test.go b/openstack/identity/v3/regions/testing/requests_test.go
@@ -71,3 +71,12 @@ func TestCreateRegion(t *testing.T) {
 	th.AssertNoErr(t, err)
 	th.CheckDeepEquals(t, SecondRegion, *actual)
 }
+
+func TestDeleteRegion(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+	HandleDeleteRegionSuccessfully(t)
+
+	res := regions.Delete(client.ServiceClient(), "RegionOne-West")
+	th.AssertNoErr(t, res.Err)
+}
diff --git a/openstack/identity/v3/regions/urls.go b/openstack/identity/v3/regions/urls.go
@@ -13,3 +13,7 @@ func getURL(client *gophercloud.ServiceClient, regionID string) string {
 func createURL(client *gophercloud.ServiceClient) string {
 	return client.ServiceURL("regions")
 }
+
+func deleteURL(client *gophercloud.ServiceClient, regionID string) string {
+	return client.ServiceURL("regions", regionID)
+}

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ func TestRegionsCRUD(t *testing.T) {`
`79`	`79`	`if err != nil {`
`80`	`80`	`t.Fatalf("Unable to create region: %v", err)`
`81`	`81`	`}`
	`82`	`+ defer DeleteRegion(t, client, region.ID)`
`82`	`83`
`83`	`84`	`tools.PrintResource(t, region)`
`84`	`85`	`tools.PrintResource(t, region.Extra)`
Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,7 @@ func getURL(client *gophercloud.ServiceClient, regionID string) string {`
`13`	`13`	`func createURL(client *gophercloud.ServiceClient) string {`
`14`	`14`	`return client.ServiceURL("regions")`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+func deleteURL(client *gophercloud.ServiceClient, regionID string) string {`
	`18`	`+ return client.ServiceURL("regions", regionID)`
	`19`	`+}`