Merge pull request #2946 from gophercloud/bp-v2-8602cd4

[v2] Use volumeID, not attachmentID, to detach volume
gophercloud · Feb 26, 2024 · 6aa4888 · 6aa4888
2 parents 2444539 + 5e203ec
commit 6aa4888
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/openstack/compute/v2/extensions/volumeattach/doc.go b/openstack/compute/v2/extensions/volumeattach/doc.go
@@ -20,9 +20,9 @@ Example to Attach a Volume
 Example to Detach a Volume
 
 	serverID := "7ac8686c-de71-4acb-9600-ec18b1a1ed6d"
-	attachmentID := "ed081613-1c9b-4231-aa5e-ebfd4d87f983"
+	volumeID := "ed081613-1c9b-4231-aa5e-ebfd4d87f983"
 
-	err := volumeattach.Delete(computeClient, serverID, attachmentID).ExtractErr()
+	err := volumeattach.Delete(computeClient, serverID, volumeID).ExtractErr()
 	if err != nil {
 		panic(err)
 	}

diff --git a/openstack/compute/v2/extensions/volumeattach/requests.go b/openstack/compute/v2/extensions/volumeattach/requests.go
@@ -58,16 +58,16 @@ func Create(ctx context.Context, client *gophercloud.ServiceClient, serverID str
 }
 
 // Get returns public data about a previously created VolumeAttachment.
-func Get(ctx context.Context, client *gophercloud.ServiceClient, serverID, attachmentID string) (r GetResult) {
-	resp, err := client.Get(ctx, getURL(client, serverID, attachmentID), &r.Body, nil)
+func Get(ctx context.Context, client *gophercloud.ServiceClient, serverID, volumeID string) (r GetResult) {
+	resp, err := client.Get(ctx, getURL(client, serverID, volumeID), &r.Body, nil)
 	_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
 	return
 }
 
 // Delete requests the deletion of a previous stored VolumeAttachment from
 // the server.
-func Delete(ctx context.Context, client *gophercloud.ServiceClient, serverID, attachmentID string) (r DeleteResult) {
-	resp, err := client.Delete(ctx, deleteURL(client, serverID, attachmentID), nil)
+func Delete(ctx context.Context, client *gophercloud.ServiceClient, serverID, volumeID string) (r DeleteResult) {
+	resp, err := client.Delete(ctx, deleteURL(client, serverID, volumeID), nil)
 	_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
 	return
 }