DeleteResult consistency

acceptance/openstack/blockstorage/v1/snapshots_test.go

@@ -47,8 +47,8 @@ func TestSnapshots(t *testing.T) {
 
 	t.Logf("Created snapshot: %+v\n", ss)
 
-	err = snapshots.Delete(client, ss.ID)
-	if err != nil {
+	res = snapshots.Delete(client, ss.ID)
+	if res.Err != nil {
 		t.Fatalf("Failed to delete snapshot: %v", err)
 	}
 
@@ -66,8 +66,8 @@ func TestSnapshots(t *testing.T) {
 
 	t.Log("Deleted snapshot\n")
 
-	err = volumes.Delete(client, v.ID)
-	if err != nil {
+	res = volumes.Delete(client, v.ID)
+	if res.Err != nil {
 		t.Errorf("Failed to delete volume: %v", err)
 	}
 

acceptance/openstack/blockstorage/v1/volumes_test.go

@@ -47,8 +47,8 @@ func TestVolumes(t *testing.T) {
 		if err != nil {
 			t.Error(err)
 		}
-		err = volumes.Delete(client, cv.ID)
-		if err != nil {
+		res = volumes.Delete(client, cv.ID)
+		if res.Err != nil {
 			t.Error(err)
 			return
 		}

acceptance/rackspace/blockstorage/v1/snapshot_test.go

@@ -76,7 +76,7 @@ func testSnapshotUpdate(t *testing.T, client *gophercloud.ServiceClient, id stri
 }
 
 func testSnapshotDelete(t *testing.T, client *gophercloud.ServiceClient, id string) {
-	err := snapshots.Delete(client, id)
-	th.AssertNoErr(t, err)
+	res := snapshots.Delete(client, id)
+	th.AssertNoErr(t, res.Err)
 	t.Logf("Deleted snapshot %s", id)
 }

acceptance/rackspace/blockstorage/v1/volume_test.go

@@ -65,7 +65,7 @@ func testVolumeUpdate(t *testing.T, client *gophercloud.ServiceClient, id string
 }
 
 func testVolumeDelete(t *testing.T, client *gophercloud.ServiceClient, id string) {
-	err := volumes.Delete(client, id)
-	th.AssertNoErr(t, err)
+	res := volumes.Delete(client, id)
+	th.AssertNoErr(t, res.Err)
 	t.Logf("Deleted volume %s", id)
 }

acceptance/rackspace/compute/v2/servers_test.go

@@ -166,8 +166,8 @@ func rebuildServer(t *testing.T, client *gophercloud.ServiceClient, server *os.S
 func deleteServer(t *testing.T, client *gophercloud.ServiceClient, server *os.Server) {
 	t.Logf("> servers.Delete")
 
-	err := servers.Delete(client, server.ID)
-	th.AssertNoErr(t, err)
+	res := servers.Delete(client, server.ID)
+	th.AssertNoErr(t, res.Err)
 
 	t.Logf("Server deleted successfully.")
 }

openstack/blockstorage/v1/snapshots/requests.go

@@ -79,12 +79,13 @@ func Create(client *gophercloud.ServiceClient, opts CreateOptsBuilder) CreateRes
 }
 
 // Delete will delete the existing Snapshot with the provided ID.
-func Delete(client *gophercloud.ServiceClient, id string) error {
-	_, err := perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
+func Delete(client *gophercloud.ServiceClient, id string) DeleteResult {
+	var res DeleteResult
+	_, res.Err = perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
 		MoreHeaders: client.AuthenticatedHeaders(),
 		OkCodes:     []int{202, 204},
 	})
-	return err
+	return res
 }
 
 // Get retrieves the Snapshot with the provided ID. To extract the Snapshot

openstack/blockstorage/v1/snapshots/requests_test.go

@@ -99,6 +99,6 @@ func TestDelete(t *testing.T) {
 
 	MockDeleteResponse(t)
 
-	err := Delete(client.ServiceClient(), "d32019d3-bc6e-4319-9c1d-6722fc136a22")
-	th.AssertNoErr(t, err)
+	res := Delete(client.ServiceClient(), "d32019d3-bc6e-4319-9c1d-6722fc136a22")
+	th.AssertNoErr(t, res.Err)
 }

openstack/blockstorage/v1/snapshots/results.go

@@ -59,6 +59,11 @@ type GetResult struct {
 	commonResult
 }
 
+// DeleteResult contains the response body and error from a Delete request.
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
+
 // ListResult is a pagination.Pager that is returned from a call to the List function.
 type ListResult struct {
 	pagination.SinglePageBase

openstack/blockstorage/v1/volumes/requests.go

@@ -95,12 +95,13 @@ func Create(client *gophercloud.ServiceClient, opts CreateOptsBuilder) CreateRes
 }
 
 // Delete will delete the existing Volume with the provided ID.
-func Delete(client *gophercloud.ServiceClient, id string) error {
-	_, err := perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
+func Delete(client *gophercloud.ServiceClient, id string) DeleteResult {
+	var res DeleteResult
+	_, res.Err = perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
 		MoreHeaders: client.AuthenticatedHeaders(),
 		OkCodes:     []int{202, 204},
 	})
-	return err
+	return res
 }
 
 // Get retrieves the Volume with the provided ID. To extract the Volume object

openstack/blockstorage/v1/volumes/requests_test.go

@@ -78,8 +78,8 @@ func TestDelete(t *testing.T) {
 
 	MockDeleteResponse(t)
 
-	err := Delete(client.ServiceClient(), "d32019d3-bc6e-4319-9c1d-6722fc136a22")
-	th.AssertNoErr(t, err)
+	res := Delete(client.ServiceClient(), "d32019d3-bc6e-4319-9c1d-6722fc136a22")
+	th.AssertNoErr(t, res.Err)
 }
 
 func TestUpdate(t *testing.T) {

openstack/blockstorage/v1/volumes/results.go

@@ -59,6 +59,11 @@ type GetResult struct {
 	commonResult
 }
 
+// DeleteResult contains the response body and error from a Delete request.
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
+
 // ListResult is a pagination.pager that is returned from a call to the List function.
 type ListResult struct {
 	pagination.SinglePageBase

openstack/compute/v2/extensions/keypairs/requests.go

@@ -82,7 +82,6 @@ func Delete(client *gophercloud.ServiceClient, name string) DeleteResult {
 	var res DeleteResult
 	_, res.Err = perigee.Request("DELETE", deleteURL(client, name), perigee.Options{
 		MoreHeaders: client.AuthenticatedHeaders(),
-		Results:     &res.Body,
 		OkCodes:     []int{202},
 	})
 	return res

openstack/compute/v2/extensions/keypairs/results.go

@@ -90,10 +90,5 @@ type GetResult struct {
 // DeleteResult is the response from a Delete operation. Call its Extract method to determine if
 // the call succeeded or failed.
 type DeleteResult struct {
-	gophercloud.Result
-}
-
-// Extract determines whether or not a deletion request was accepted.
-func (r DeleteResult) Extract() error {
-	return r.Err
+	gophercloud.ExtractErrResult
 }

openstack/compute/v2/servers/requests.go

@@ -206,12 +206,13 @@ func Create(client *gophercloud.ServiceClient, opts CreateOptsBuilder) CreateRes
 }
 
 // Delete requests that a server previously provisioned be removed from your account.
-func Delete(client *gophercloud.ServiceClient, id string) error {
-	_, err := perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
+func Delete(client *gophercloud.ServiceClient, id string) DeleteResult {
+	var res DeleteResult
+	_, res.Err = perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
 		MoreHeaders: client.AuthenticatedHeaders(),
 		OkCodes:     []int{204},
 	})
-	return err
+	return res
 }
 
 // Get requests details on a single server, by ID.
@@ -283,7 +284,6 @@ func ChangeAdminPassword(client *gophercloud.ServiceClient, id, newPassword stri
 
 	_, res.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
 		ReqBody:     req,
-		Results:     &res.Body,
 		MoreHeaders: client.AuthenticatedHeaders(),
 		OkCodes:     []int{202},
 	})

openstack/compute/v2/servers/requests_test.go

@@ -59,8 +59,8 @@ func TestDeleteServer(t *testing.T) {
 	defer th.TeardownHTTP()
 	HandleServerDeletionSuccessfully(t)
 
-	err := Delete(client.ServiceClient(), "asdfasdfasdf")
-	th.AssertNoErr(t, err)
+	res := Delete(client.ServiceClient(), "asdfasdfasdf")
+	th.AssertNoErr(t, res.Err)
 }
 
 func TestGetServer(t *testing.T) {

openstack/compute/v2/servers/results.go

@@ -39,19 +39,19 @@ type UpdateResult struct {
 	serverResult
 }
 
+// DeleteResult temporarily contains the response from an Delete call.
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
+
 // RebuildResult temporarily contains the response from a Rebuild call.
 type RebuildResult struct {
 	serverResult
 }
 
 // ActionResult represents the result of server action operations, like reboot
 type ActionResult struct {
-	gophercloud.Result
-}
-
-// Extract is a function that extracts error information from a result
-func (r ActionResult) Extract() error {
-	return r.Err
+	gophercloud.ExtractErrResult
 }
 
 // Server exposes only the standard OpenStack fields corresponding to a given server on the user's account.
@@ -82,8 +82,7 @@ type Server struct {
 	Progress int
 
 	// AccessIPv4 and AccessIPv6 contain the IP addresses of the server, suitable for remote access for administration.
-	AccessIPv4 string
-	AccessIPv6 string
+	AccessIPv4, AccessIPv6 string
 
 	// Image refers to a JSON object, which itself indicates the OS image used to deploy the server.
 	Image map[string]interface{}

openstack/identity/v3/endpoints/requests.go

@@ -134,10 +134,11 @@ func Update(client *gophercloud.ServiceClient, endpointID string, opts EndpointO
 }
 
 // Delete removes an endpoint from the service catalog.
-func Delete(client *gophercloud.ServiceClient, endpointID string) error {
-	_, err := perigee.Request("DELETE", endpointURL(client, endpointID), perigee.Options{
+func Delete(client *gophercloud.ServiceClient, endpointID string) DeleteResult {
+	var res DeleteResult
+	_, res.Err = perigee.Request("DELETE", endpointURL(client, endpointID), perigee.Options{
 		MoreHeaders: client.AuthenticatedHeaders(),
 		OkCodes:     []int{204},
 	})
-	return err
+	return res
 }

openstack/identity/v3/endpoints/requests_test.go

@@ -221,8 +221,6 @@ func TestDeleteEndpoint(t *testing.T) {
 		w.WriteHeader(http.StatusNoContent)
 	})
 
-	err := Delete(client.ServiceClient(), "34")
-	if err != nil {
-		t.Fatalf("Unexpected error from Delete: %v", err)
-	}
+	res := Delete(client.ServiceClient(), "34")
+	testhelper.AssertNoErr(t, res.Err)
 }

openstack/identity/v3/endpoints/results.go

@@ -41,6 +41,11 @@ type UpdateResult struct {
 	commonResult
 }
 
+// DeleteResult is the deferred result of an Delete call.
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
+
 // Endpoint describes the entry point for another service's API.
 type Endpoint struct {
 	ID           string                   `mapstructure:"id" json:"id"`

openstack/identity/v3/services/requests.go

@@ -89,10 +89,11 @@ func Update(client *gophercloud.ServiceClient, serviceID string, serviceType str
 
 // Delete removes an existing service.
 // It either deletes all associated endpoints, or fails until all endpoints are deleted.
-func Delete(client *gophercloud.ServiceClient, serviceID string) error {
-	_, err := perigee.Request("DELETE", serviceURL(client, serviceID), perigee.Options{
+func Delete(client *gophercloud.ServiceClient, serviceID string) DeleteResult {
+	var res DeleteResult
+	_, res.Err = perigee.Request("DELETE", serviceURL(client, serviceID), perigee.Options{
 		MoreHeaders: client.AuthenticatedHeaders(),
 		OkCodes:     []int{204},
 	})
-	return err
+	return res
 }

openstack/identity/v3/services/requests_test.go

@@ -204,8 +204,6 @@ func TestDeleteSuccessful(t *testing.T) {
 		w.WriteHeader(http.StatusNoContent)
 	})
 
-	err := Delete(client.ServiceClient(), "12345")
-	if err != nil {
-		t.Fatalf("Unable to delete service: %v", err)
-	}
+	res := Delete(client.ServiceClient(), "12345")
+	testhelper.AssertNoErr(t, res.Err)
 }

openstack/identity/v3/services/results.go

@@ -42,6 +42,11 @@ type UpdateResult struct {
 	commonResult
 }
 
+// DeleteResult is the deferred result of an Delete call.
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
+
 // Service is the result of a list or information query.
 type Service struct {
 	Description *string `json:"description,omitempty"`

openstack/identity/v3/tokens/requests.go

@@ -276,10 +276,11 @@ func Validate(c *gophercloud.ServiceClient, token string) (bool, error) {
 }
 
 // Revoke immediately makes specified token invalid.
-func Revoke(c *gophercloud.ServiceClient, token string) error {
-	_, err := perigee.Request("DELETE", tokenURL(c), perigee.Options{
+func Revoke(c *gophercloud.ServiceClient, token string) RevokeResult {
+	var res RevokeResult
+	_, res.Err = perigee.Request("DELETE", tokenURL(c), perigee.Options{
 		MoreHeaders: subjectTokenHeaders(c, token),
 		OkCodes:     []int{204},
 	})
-	return err
+	return res
 }

openstack/identity/v3/tokens/requests_test.go

@@ -498,19 +498,17 @@ func TestRevokeRequestSuccessful(t *testing.T) {
 	defer testhelper.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "DELETE", http.StatusNoContent)
 
-	err := Revoke(&client, "abcdef12345")
-	if err != nil {
-		t.Errorf("Unexpected error from Revoke: %v", err)
-	}
+	res := Revoke(&client, "abcdef12345")
+	testhelper.AssertNoErr(t, res.Err)
 }
 
 func TestRevokeRequestError(t *testing.T) {
 	testhelper.SetupHTTP()
 	defer testhelper.TeardownHTTP()
 	client := prepareAuthTokenHandler(t, "DELETE", http.StatusNotFound)
 
-	err := Revoke(&client, "abcdef12345")
-	if err == nil {
+	res := Revoke(&client, "abcdef12345")
+	if res.Err == nil {
 		t.Errorf("Missing expected error from Revoke")
 	}
 }

openstack/identity/v3/tokens/results.go

@@ -57,6 +57,11 @@ type GetResult struct {
 	commonResult
 }
 
+// RevokeResult is the deferred response from a Revoke call.
+type RevokeResult struct {
+	commonResult
+}
+
 // Token is a string that grants a user access to a controlled set of services in an OpenStack provider.
 // Each Token is valid for a set length of time.
 type Token struct {

openstack/networking/v2/extensions/layer3/floatingips/results.go

@@ -77,7 +77,9 @@ type UpdateResult struct {
 }
 
 // DeleteResult represents the result of an update operation.
-type DeleteResult commonResult
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
 
 // FloatingIPPage is the page returned by a pager when traversing over a
 // collection of floating IPs.

openstack/networking/v2/extensions/layer3/routers/results.go

@@ -121,7 +121,9 @@ type UpdateResult struct {
 }
 
 // DeleteResult represents the result of a delete operation.
-type DeleteResult commonResult
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}
 
 // InterfaceInfo represents information about a particular router interface. As
 // mentioned above, in order for a router to forward to a subnet, it needs an

openstack/networking/v2/extensions/lbaas/members/results.go

@@ -117,4 +117,6 @@ type UpdateResult struct {
 }
 
 // DeleteResult represents the result of a delete operation.
-type DeleteResult commonResult
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}

openstack/networking/v2/extensions/lbaas/monitors/results.go

@@ -142,4 +142,6 @@ type UpdateResult struct {
 }
 
 // DeleteResult represents the result of a delete operation.
-type DeleteResult commonResult
+type DeleteResult struct {
+	gophercloud.ExtractErrResult
+}