rename tenantattr to volumetenants; remove commented code
diff --git a/openstack/blockstorage/extensions/tenants/results.go b/openstack/blockstorage/extensions/volumetenants/results.go
similarity index 89%
rename from openstack/blockstorage/extensions/tenants/results.go
rename to openstack/blockstorage/extensions/volumetenants/results.go
index fe5b0ab..0d4c670 100644
--- a/openstack/blockstorage/extensions/tenants/results.go
+++ b/openstack/blockstorage/extensions/volumetenants/results.go
@@ -1,4 +1,4 @@
-package tenants
+package volumetenants
// An extension to the base Volume object
type VolumeExt struct {
diff --git a/openstack/blockstorage/v2/volumes/results.go b/openstack/blockstorage/v2/volumes/results.go
index e2232fa..41fbf5c 100644
--- a/openstack/blockstorage/v2/volumes/results.go
+++ b/openstack/blockstorage/v2/volumes/results.go
@@ -57,14 +57,6 @@
Multiattach bool `json:"multiattach"`
}
-/*
-THESE BELONG IN EXTENSIONS:
-// ReplicationDriverData contains data about the replication driver.
-ReplicationDriverData string `json:"os-volume-replication:driver_data"`
-// ReplicationExtendedStatus contains extended status about replication.
-ReplicationExtendedStatus string `json:"os-volume-replication:extended_status"`
-*/
-
// VolumePage is a pagination.pager that is returned from a call to the List function.
type VolumePage struct {
pagination.SinglePageBase
diff --git a/openstack/blockstorage/v2/volumes/testing/requests_test.go b/openstack/blockstorage/v2/volumes/testing/requests_test.go
index dff7292..fd3dbcb 100644
--- a/openstack/blockstorage/v2/volumes/testing/requests_test.go
+++ b/openstack/blockstorage/v2/volumes/testing/requests_test.go
@@ -5,7 +5,7 @@
"time"
"github.com/gophercloud/gophercloud"
- "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/tenants"
+ "github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumetenants"
"github.com/gophercloud/gophercloud/openstack/blockstorage/v2/volumes"
"github.com/gophercloud/gophercloud/pagination"
th "github.com/gophercloud/gophercloud/testhelper"
@@ -103,7 +103,7 @@
type VolumeWithExt struct {
volumes.Volume
- tenants.VolumeExt
+ volumetenants.VolumeExt
}
allPages, err := volumes.List(client.ServiceClient(), &volumes.ListOpts{}).AllPages()
@@ -245,7 +245,7 @@
var s struct {
volumes.Volume
- tenants.VolumeExt
+ volumetenants.VolumeExt
}
err := volumes.Get(client.ServiceClient(), "d32019d3-bc6e-4319-9c1d-6722fc136a22").ExtractInto(&s)
th.AssertNoErr(t, err)