rackspace reponse header structs
diff --git a/acceptance/rackspace/objectstorage/v1/accounts_test.go b/acceptance/rackspace/objectstorage/v1/accounts_test.go
index cde534b..8b3cde4 100644
--- a/acceptance/rackspace/objectstorage/v1/accounts_test.go
+++ b/acceptance/rackspace/objectstorage/v1/accounts_test.go
@@ -13,12 +13,11 @@
c, err := createClient(t, false)
th.AssertNoErr(t, err)
- updateres := raxAccounts.Update(c, raxAccounts.UpdateOpts{Metadata: map[string]string{"white": "mountains"}})
- updateHeaders, err := updateres.Extract()
+ updateHeaders, err := raxAccounts.Update(c, raxAccounts.UpdateOpts{Metadata: map[string]string{"white": "mountains"}}).Extract()
th.AssertNoErr(t, err)
t.Logf("Update Account Response Headers: %+v\n", updateHeaders)
defer func() {
- updateres = raxAccounts.Update(c, raxAccounts.UpdateOpts{Metadata: map[string]string{"white": ""}})
+ updateres := raxAccounts.Update(c, raxAccounts.UpdateOpts{Metadata: map[string]string{"white": ""}})
th.AssertNoErr(t, updateres.Err)
metadata, err := raxAccounts.Get(c).ExtractMetadata()
th.AssertNoErr(t, err)
@@ -26,8 +25,13 @@
th.CheckEquals(t, metadata["White"], "")
}()
- metadata, err := raxAccounts.Get(c).ExtractMetadata()
- th.AssertNoErr(t, err)
+ getResp := raxAccounts.Get(c)
+ th.AssertNoErr(t, getResp.Err)
+
+ getHeaders, _ := getResp.Extract()
+ t.Logf("Get Account Response Headers: %+v\n", getHeaders)
+
+ metadata, _ := getResp.ExtractMetadata()
t.Logf("Metadata from Get Account request (after update): %+v\n", metadata)
th.CheckEquals(t, metadata["White"], "mountains")
diff --git a/acceptance/rackspace/objectstorage/v1/cdncontainers_test.go b/acceptance/rackspace/objectstorage/v1/cdncontainers_test.go
index e1bf38b..0f56f49 100644
--- a/acceptance/rackspace/objectstorage/v1/cdncontainers_test.go
+++ b/acceptance/rackspace/objectstorage/v1/cdncontainers_test.go
@@ -26,10 +26,11 @@
raxCDNClient, err := createClient(t, true)
th.AssertNoErr(t, err)
-
- r := raxCDNContainers.Enable(raxCDNClient, "gophercloud-test", raxCDNContainers.EnableOpts{CDNEnabled: true, TTL: 900})
- th.AssertNoErr(t, r.Err)
- t.Logf("Headers from Enable CDN Container request: %+v\n", r.Header)
+ enableRes := raxCDNContainers.Enable(raxCDNClient, "gophercloud-test", raxCDNContainers.EnableOpts{CDNEnabled: true, TTL: 900})
+ t.Logf("Header map from Enable CDN Container request: %+v\n", enableRes.Header)
+ enableHeader, err := enableRes.Extract()
+ th.AssertNoErr(t, err)
+ t.Logf("Headers from Enable CDN Container request: %+v\n", enableHeader)
t.Logf("Container Names available to the currently issued token:")
count := 0
@@ -51,11 +52,15 @@
t.Errorf("No CDN containers listed for your current token.")
}
- updateres := raxCDNContainers.Update(raxCDNClient, "gophercloud-test", raxCDNContainers.UpdateOpts{CDNEnabled: false})
- th.AssertNoErr(t, updateres.Err)
- t.Logf("Headers from Update CDN Container request: %+v\n", updateres.Header)
-
- metadata, err := raxCDNContainers.Get(raxCDNClient, "gophercloud-test").ExtractMetadata()
+ updateOpts := raxCDNContainers.UpdateOpts{XCDNEnabled: raxCDNContainers.Disabled, XLogRetention: raxCDNContainers.Enabled}
+ updateHeader, err := raxCDNContainers.Update(raxCDNClient, "gophercloud-test", updateOpts).Extract()
th.AssertNoErr(t, err)
- t.Logf("Headers from Get CDN Container request (after update): %+v\n", metadata)
+ t.Logf("Headers from Update CDN Container request: %+v\n", updateHeader)
+
+ getRes := raxCDNContainers.Get(raxCDNClient, "gophercloud-test")
+ getHeader, err := getRes.Extract()
+ th.AssertNoErr(t, err)
+ t.Logf("Headers from Get CDN Container request (after update): %+v\n", getHeader)
+ metadata, err := getRes.ExtractMetadata()
+ t.Logf("Metadata from Get CDN Container request (after update): %+v\n", metadata)
}
diff --git a/acceptance/rackspace/objectstorage/v1/containers_test.go b/acceptance/rackspace/objectstorage/v1/containers_test.go
index a7339cf..c895513 100644
--- a/acceptance/rackspace/objectstorage/v1/containers_test.go
+++ b/acceptance/rackspace/objectstorage/v1/containers_test.go
@@ -57,29 +57,34 @@
t.Errorf("No containers listed for your current token.")
}
- createres := raxContainers.Create(c, "gophercloud-test", nil)
- th.AssertNoErr(t, createres.Err)
+ createHeader, err := raxContainers.Create(c, "gophercloud-test", nil).Extract()
+ th.AssertNoErr(t, err)
+ t.Logf("Headers from Create Container request: %+v\n", createHeader)
defer func() {
- res := raxContainers.Delete(c, "gophercloud-test")
- th.AssertNoErr(t, res.Err)
+ deleteres := raxContainers.Delete(c, "gophercloud-test")
+ deleteHeader, err := deleteres.Extract()
+ th.AssertNoErr(t, err)
+ t.Logf("Headers from Delete Container request: %+v\n", deleteres.Header)
+ t.Logf("Headers from Delete Container request: %+v\n", deleteHeader)
}()
- updateres := raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": "mountains"}})
- th.AssertNoErr(t, updateres.Err)
- t.Logf("Headers from Update Account request: %+v\n", updateres.Header)
+ updateHeader, err := raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": "mountains"}}).Extract()
+ th.AssertNoErr(t, err)
+ t.Logf("Headers from Update Container request: %+v\n", updateHeader)
defer func() {
res := raxContainers.Update(c, "gophercloud-test", raxContainers.UpdateOpts{Metadata: map[string]string{"white": ""}})
th.AssertNoErr(t, res.Err)
metadata, err := raxContainers.Get(c, "gophercloud-test").ExtractMetadata()
th.AssertNoErr(t, err)
- t.Logf("Metadata from Get Account request (after update reverted): %+v\n", metadata)
+ t.Logf("Metadata from Get Container request (after update reverted): %+v\n", metadata)
th.CheckEquals(t, metadata["White"], "")
}()
getres := raxContainers.Get(c, "gophercloud-test")
- t.Logf("Headers from Get Account request (after update): %+v\n", getres.Header)
- metadata, err := getres.ExtractMetadata()
+ getHeader, err := getres.Extract()
th.AssertNoErr(t, err)
- t.Logf("Metadata from Get Account request (after update): %+v\n", metadata)
+ t.Logf("Headers from Get Container request (after update): %+v\n", getHeader)
+ metadata, err := getres.ExtractMetadata()
+ t.Logf("Metadata from Get Container request (after update): %+v\n", metadata)
th.CheckEquals(t, metadata["White"], "mountains")
}