refactor: change volumeactions ImageMetadata action to SetImageMetadata

psinghal20 · psinghal20 · commit 1e0d7f18c9f2 · 2019-06-14T10:57:17.000+05:30
Signed-off-by: Pratyush singhal &lt;psinghal20@gmail.com&gt;
diff --git a/acceptance/openstack/blockstorage/extensions/extensions.go b/acceptance/openstack/blockstorage/extensions/extensions.go
@@ -174,8 +174,8 @@ func ExtendVolumeSize(t *testing.T, client *gophercloud.ServiceClient, volume *v
 	return nil
 }
 
-// ImageMetadata will apply the metadata to a volume.
-func ImageMetadata(t *testing.T, client *gophercloud.ServiceClient, volume *volumes.Volume) error {
+// SetImageMetadata will apply the metadata to a volume.
+func SetImageMetadata(t *testing.T, client *gophercloud.ServiceClient, volume *volumes.Volume) error {
 	t.Logf("Attempting to apply image metadata to volume %s", volume.ID)
 
 	imageMetadataOpts := volumeactions.ImageMetadataOpts{
@@ -184,7 +184,7 @@ func ImageMetadata(t *testing.T, client *gophercloud.ServiceClient, volume *volu
 		},
 	}
 
-	err := volumeactions.ImageMetadata(client, volume.ID, imageMetadataOpts).ExtractErr()
+	err := volumeactions.SetImageMetadata(client, volume.ID, imageMetadataOpts).ExtractErr()
 	if err != nil {
 		return err
 	}
diff --git a/acceptance/openstack/blockstorage/extensions/volumeactions_test.go b/acceptance/openstack/blockstorage/extensions/volumeactions_test.go
@@ -99,7 +99,7 @@ func TestVolumeActionsImageMetadata(t *testing.T) {
 	th.AssertNoErr(t, err)
 	defer blockstorage.DeleteVolume(t, blockClient, volume)
 
-	err = ImageMetadata(t, blockClient, volume)
+	err = SetImageMetadata(t, blockClient, volume)
 	th.AssertNoErr(t, err)
 }
 
diff --git a/openstack/blockstorage/extensions/volumeactions/requests.go b/openstack/blockstorage/extensions/volumeactions/requests.go
@@ -286,8 +286,8 @@ func (opts ImageMetadataOpts) ToImageMetadataMap() (map[string]interface{}, erro
 	return gophercloud.BuildRequestBody(opts, "os-set_image_metadata")
 }
 
-// ImageMetadata will set image metadata on a volume based on the values in ImageMetadataOptsBuilder.
-func ImageMetadata(client *gophercloud.ServiceClient, id string, opts ImageMetadataOptsBuilder) (r ImageMetadataResult) {
+// SetImageMetadata will set image metadata on a volume based on the values in ImageMetadataOptsBuilder.
+func SetImageMetadata(client *gophercloud.ServiceClient, id string, opts ImageMetadataOptsBuilder) (r SetImageMetadataResult) {
 	b, err := opts.ToImageMetadataMap()
 	if err != nil {
 		r.Err = err
diff --git a/openstack/blockstorage/extensions/volumeactions/results.go b/openstack/blockstorage/extensions/volumeactions/results.go
@@ -29,9 +29,9 @@ type UploadImageResult struct {
 	gophercloud.Result
 }
 
-// ImageMetadataResult contains the response body and error from an SetImageMetadata
+// SetImageMetadataResult contains the response body and error from an SetImageMetadata
 // request.
-type ImageMetadataResult struct {
+type SetImageMetadataResult struct {
 	gophercloud.ErrResult
 }
 
diff --git a/openstack/blockstorage/extensions/volumeactions/testing/fixtures.go b/openstack/blockstorage/extensions/volumeactions/testing/fixtures.go
@@ -286,7 +286,7 @@ func MockForceDeleteResponse(t *testing.T) {
 	})
 }
 
-func MockImageMetadataResponse(t *testing.T) {
+func MockSetImageMetadataResponse(t *testing.T) {
 	th.Mux.HandleFunc("/volumes/cd281d77-8217-4830-be95-9528227c105c/action", func(w http.ResponseWriter, r *http.Request) {
 		th.TestMethod(t, r, "POST")
 		th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)
diff --git a/openstack/blockstorage/extensions/volumeactions/testing/requests_test.go b/openstack/blockstorage/extensions/volumeactions/testing/requests_test.go
@@ -165,18 +165,18 @@ func TestForceDelete(t *testing.T) {
 	th.AssertNoErr(t, res.Err)
 }
 
-func TestImageMetadata(t *testing.T) {
+func TestSetImageMetadata(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
 
-	MockImageMetadataResponse(t)
+	MockSetImageMetadataResponse(t)
 
 	options := &volumeactions.ImageMetadataOpts{
 		Metadata: map[string]string{
 			"label": "test",
 		},
 	}
 
-	err := volumeactions.ImageMetadata(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()
+	err := volumeactions.SetImageMetadata(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()
 	th.AssertNoErr(t, err)
 }

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ func ExtendVolumeSize(t testing.T, client gophercloud.ServiceClient, volume *v`
`174`	`174`	`return nil`
`175`	`175`	`}`
`176`	`176`
`177`		`-// ImageMetadata will apply the metadata to a volume.`
`178`		`-func ImageMetadata(t testing.T, client gophercloud.ServiceClient, volume *volumes.Volume) error {`
	`177`	`+// SetImageMetadata will apply the metadata to a volume.`
	`178`	`+func SetImageMetadata(t testing.T, client gophercloud.ServiceClient, volume *volumes.Volume) error {`
`179`	`179`	`t.Logf("Attempting to apply image metadata to volume %s", volume.ID)`
`180`	`180`
`181`	`181`	`imageMetadataOpts := volumeactions.ImageMetadataOpts{`
`@@ -184,7 +184,7 @@ func ImageMetadata(t testing.T, client gophercloud.ServiceClient, volume *volu`
`184`	`184`	`},`
`185`	`185`	`}`
`186`	`186`
`187`		`- err := volumeactions.ImageMetadata(client, volume.ID, imageMetadataOpts).ExtractErr()`
	`187`	`+ err := volumeactions.SetImageMetadata(client, volume.ID, imageMetadataOpts).ExtractErr()`
`188`	`188`	`if err != nil {`
`189`	`189`	`return err`
`190`	`190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ func TestVolumeActionsImageMetadata(t *testing.T) {`
`99`	`99`	`th.AssertNoErr(t, err)`
`100`	`100`	`defer blockstorage.DeleteVolume(t, blockClient, volume)`
`101`	`101`
`102`		`- err = ImageMetadata(t, blockClient, volume)`
	`102`	`+ err = SetImageMetadata(t, blockClient, volume)`
`103`	`103`	`th.AssertNoErr(t, err)`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ type UploadImageResult struct {`
`29`	`29`	`gophercloud.Result`
`30`	`30`	`}`
`31`	`31`
`32`		`-// ImageMetadataResult contains the response body and error from an SetImageMetadata`
	`32`	`+// SetImageMetadataResult contains the response body and error from an SetImageMetadata`
`33`	`33`	`// request.`
`34`		`-type ImageMetadataResult struct {`
	`34`	`+type SetImageMetadataResult struct {`
`35`	`35`	`gophercloud.ErrResult`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ func MockForceDeleteResponse(t *testing.T) {`
`286`	`286`	`})`
`287`	`287`	`}`
`288`	`288`
`289`		`-func MockImageMetadataResponse(t *testing.T) {`
	`289`	`+func MockSetImageMetadataResponse(t *testing.T) {`
`290`	`290`	`th.Mux.HandleFunc("/volumes/cd281d77-8217-4830-be95-9528227c105c/action", func(w http.ResponseWriter, r *http.Request) {`
`291`	`291`	`th.TestMethod(t, r, "POST")`
`292`	`292`	`th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)`
Original file line number	Diff line number	Diff line change
`@@ -165,18 +165,18 @@ func TestForceDelete(t *testing.T) {`
`165`	`165`	`th.AssertNoErr(t, res.Err)`
`166`	`166`	`}`
`167`	`167`
`168`		`-func TestImageMetadata(t *testing.T) {`
	`168`	`+func TestSetImageMetadata(t *testing.T) {`
`169`	`169`	`th.SetupHTTP()`
`170`	`170`	`defer th.TeardownHTTP()`
`171`	`171`
`172`		`- MockImageMetadataResponse(t)`
	`172`	`+ MockSetImageMetadataResponse(t)`
`173`	`173`
`174`	`174`	`options := &volumeactions.ImageMetadataOpts{`
`175`	`175`	`Metadata: map[string]string{`
`176`	`176`	`"label": "test",`
`177`	`177`	`},`
`178`	`178`	`}`
`179`	`179`
`180`		`- err := volumeactions.ImageMetadata(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()`
	`180`	`+ err := volumeactions.SetImageMetadata(client.ServiceClient(), "cd281d77-8217-4830-be95-9528227c105c", options).ExtractErr()`
`181`	`181`	`th.AssertNoErr(t, err)`
`182`	`182`	`}`