rename directory from 'storage' to 'objectStorage'; add fix for handling 'text/html' content-type response from 'ListNames'
diff --git a/acceptance/openstack/storage/v1/accounts_test.go b/acceptance/openstack/objectStorage/v1/accounts_test.go
similarity index 93%
rename from acceptance/openstack/storage/v1/accounts_test.go
rename to acceptance/openstack/objectStorage/v1/accounts_test.go
index 64cd165..7a3b046 100644
--- a/acceptance/openstack/storage/v1/accounts_test.go
+++ b/acceptance/openstack/objectStorage/v1/accounts_test.go
@@ -6,7 +6,7 @@
"strings"
"testing"
- "github.com/rackspace/gophercloud/openstack/storage/v1/accounts"
+ "github.com/rackspace/gophercloud/openstack/objectStorage/v1/accounts"
)
func TestAccounts(t *testing.T) {
diff --git a/acceptance/openstack/storage/v1/common.go b/acceptance/openstack/objectStorage/v1/common.go
similarity index 100%
rename from acceptance/openstack/storage/v1/common.go
rename to acceptance/openstack/objectStorage/v1/common.go
diff --git a/acceptance/openstack/storage/v1/containers_test.go b/acceptance/openstack/objectStorage/v1/containers_test.go
similarity index 95%
rename from acceptance/openstack/storage/v1/containers_test.go
rename to acceptance/openstack/objectStorage/v1/containers_test.go
index 3cc367b..1c6393f 100644
--- a/acceptance/openstack/storage/v1/containers_test.go
+++ b/acceptance/openstack/objectStorage/v1/containers_test.go
@@ -7,7 +7,7 @@
"testing"
"github.com/rackspace/gophercloud/acceptance/tools"
- "github.com/rackspace/gophercloud/openstack/storage/v1/containers"
+ "github.com/rackspace/gophercloud/openstack/objectStorage/v1/containers"
"github.com/rackspace/gophercloud/pagination"
)
@@ -58,7 +58,7 @@
}
for _, n := range containerList {
t.Logf("Container: Name [%s] Count [%d] Bytes [%d]",
- n["name"], int(n["count"].(float64)), int(n["bytes"].(float64)))
+ n.Name, n.Count, n.Bytes)
}
return true, nil
diff --git a/acceptance/openstack/storage/v1/objects_test.go b/acceptance/openstack/objectStorage/v1/objects_test.go
similarity index 92%
rename from acceptance/openstack/storage/v1/objects_test.go
rename to acceptance/openstack/objectStorage/v1/objects_test.go
index 239b4d5..5eae02e 100644
--- a/acceptance/openstack/storage/v1/objects_test.go
+++ b/acceptance/openstack/objectStorage/v1/objects_test.go
@@ -8,8 +8,8 @@
"testing"
"github.com/rackspace/gophercloud/acceptance/tools"
- "github.com/rackspace/gophercloud/openstack/storage/v1/containers"
- "github.com/rackspace/gophercloud/openstack/storage/v1/objects"
+ "github.com/rackspace/gophercloud/openstack/objectStorage/v1/containers"
+ "github.com/rackspace/gophercloud/openstack/objectStorage/v1/objects"
"github.com/rackspace/gophercloud/pagination"
)
@@ -64,7 +64,10 @@
}
}()
- pager := objects.List(client, cName, objects.ListOpts{Full: false})
+ pager := objects.List(client, cName, objects.ListOpts{Full: false, Prefix: "test-object-"})
+ if pager.Err != nil {
+ t.Fatalf("Pager error: %v", pager.Err)
+ }
ons := make([]string, 0, len(oNames))
err = pager.EachPage(func(page pagination.Page) (bool, error) {
names, err := objects.ExtractNames(page)
@@ -84,7 +87,10 @@
return
}
- pager = objects.List(client, cName, objects.ListOpts{Full: true})
+ pager = objects.List(client, cName, objects.ListOpts{Full: true, Prefix: "test-object-"})
+ if pager.Err != nil {
+ t.Fatalf("Pager error: %v", pager.Err)
+ }
ois := make([]objects.Object, 0, len(oNames))
err = pager.EachPage(func(page pagination.Page) (bool, error) {
info, err := objects.ExtractInfo(page)