Add Update support in V3 volume type

TommyLike · TommyLike · commit 862dab93f638 · 2017-12-20T12:46:32.000+08:00
diff --git a/acceptance/openstack/blockstorage/v3/volumetypes_test.go b/acceptance/openstack/blockstorage/v3/volumetypes_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/gophercloud/gophercloud/acceptance/clients"
 	"github.com/gophercloud/gophercloud/acceptance/tools"
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumetypes"
+	th "github.com/gophercloud/gophercloud/testhelper"
 )
 
 func TestVolumeTypesList(t *testing.T) {
@@ -36,7 +37,7 @@ func TestVolumeTypesList(t *testing.T) {
 	}
 
 	if len(allVolumeTypes) > 0 {
-		vt, err := volumetypes.Get(client, allVolumes[0].ID).Extract()
+		vt, err := volumetypes.Get(client, allVolumeTypes[0].ID).Extract()
 		if err != nil {
 			t.Fatalf("Error retrieving volume type: %v", err)
 		}
@@ -65,3 +66,30 @@ func TestVolumeTypesCreate(t *testing.T) {
 
 	tools.PrintResource(t, vt)
 }
+
+func TestVolumeTypesUpdate(t *testing.T) {
+	client, err := clients.NewBlockStorageV3Client()
+	if err != nil {
+		t.Fatalf("Unable to create a blockstorage client: %v", err)
+	}
+
+	createOpts := volumetypes.CreateOpts{
+		Name:         "create_for_update",
+		PublicAccess: true,
+		ExtraSpecs:   map[string]string{"volume_backend_name": "fake_backend_name"},
+		Description:  "create_for_update",
+	}
+
+	vt, err := volumetypes.Create(client, createOpts).Extract()
+	if err != nil {
+		t.Fatalf("Unable to create volumetype: %v", err)
+	}
+
+	newVT, err := volumetypes.Update(client, vt.ID, volumetypes.UpdateOpts{Name: "updated_volume_type"}).Extract()
+	if err != nil {
+		t.Fatalf("Unable to update volumetype: %v", err)
+	}
+	th.AssertEquals(t, "updated_volume_type", newVT.Name)
+
+	tools.PrintResource(t, vt)
+}
diff --git a/openstack/blockstorage/v3/volumetypes/requests.go b/openstack/blockstorage/v3/volumetypes/requests.go
@@ -95,3 +95,38 @@ func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pa
 		return VolumeTypePage{pagination.LinkedPageBase{PageResult: r}}
 	})
 }
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+	ToVolumeTypeUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateOpts contain options for updating an existing Volume Type. This object is passed
+// to the volumetypes.Update function. For more information about the parameters, see
+// the Volume Type object.
+type UpdateOpts struct {
+	Name        string `json:"name,omitempty"`
+	Description string `json:"description,omitempty"`
+	IsPublic    bool   `json:"is_public"`
+}
+
+// ToVolumeUpdateMap assembles a request body based on the contents of an
+// UpdateOpts.
+func (opts UpdateOpts) ToVolumeTypeUpdateMap() (map[string]interface{}, error) {
+	return gophercloud.BuildRequestBody(opts, "volume_type")
+}
+
+// Update will update the Volume Type with provided information. To extract the updated
+// Volume Type from the response, call the Extract method on the UpdateResult.
+func Update(client *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder) (r UpdateResult) {
+	b, err := opts.ToVolumeTypeUpdateMap()
+	if err != nil {
+		r.Err = err
+		return
+	}
+	_, r.Err = client.Put(updateURL(client, id), b, &r.Body, &gophercloud.RequestOpts{
+		OkCodes: []int{200},
+	})
+	return
+}
diff --git a/openstack/blockstorage/v3/volumetypes/results.go b/openstack/blockstorage/v3/volumetypes/results.go
@@ -87,4 +87,3 @@ type CreateResult struct {
 type UpdateResult struct {
 	commonResult
 }
-
diff --git a/openstack/blockstorage/v3/volumetypes/testing/fixtures.go b/openstack/blockstorage/v3/volumetypes/testing/fixtures.go
@@ -144,4 +144,3 @@ func MockUpdateResponse(t *testing.T) {
 }`)
 	})
 }
-
diff --git a/openstack/blockstorage/v3/volumetypes/urls.go b/openstack/blockstorage/v3/volumetypes/urls.go
@@ -15,5 +15,5 @@ func createURL(c *gophercloud.ServiceClient) string {
 }
 
 func updateURL(c *gophercloud.ServiceClient, id string) string {
-	return c.ServiceURL("types")
+	return c.ServiceURL("types", id)
 }

Original file line number	Diff line number	Diff line change
`@@ -87,4 +87,3 @@ type CreateResult struct {`
`87`	`87`	`type UpdateResult struct {`
`88`	`88`	`commonResult`
`89`	`89`	`}`
`90`		`-`
Original file line number	Diff line number	Diff line change
`@@ -144,4 +144,3 @@ func MockUpdateResponse(t *testing.T) {`
`144`	`144`	}`)
`145`	`145`	`})`
`146`	`146`	`}`
`147`		`-`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ func createURL(c *gophercloud.ServiceClient) string {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`func updateURL(c *gophercloud.ServiceClient, id string) string {`
`18`		`- return c.ServiceURL("types")`
	`18`	`+ return c.ServiceURL("types", id)`
`19`	`19`	`}`