Rename Result.Resp to Result.Body.
diff --git a/openstack/blockstorage/v1/apiversions/requests.go b/openstack/blockstorage/v1/apiversions/requests.go
index 79a939c..63ed76a 100644
--- a/openstack/blockstorage/v1/apiversions/requests.go
+++ b/openstack/blockstorage/v1/apiversions/requests.go
@@ -21,7 +21,7 @@
_, err := perigee.Request("GET", getURL(client, v), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200},
- Results: &res.Resp,
+ Results: &res.Body,
})
res.Err = err
return res
diff --git a/openstack/blockstorage/v1/apiversions/results.go b/openstack/blockstorage/v1/apiversions/results.go
index c2ec935..7b0df11 100644
--- a/openstack/blockstorage/v1/apiversions/results.go
+++ b/openstack/blockstorage/v1/apiversions/results.go
@@ -52,7 +52,7 @@
Version *APIVersion `mapstructure:"version"`
}
- err := mapstructure.Decode(r.Resp, &resp)
+ err := mapstructure.Decode(r.Body, &resp)
return resp.Version, err
}
diff --git a/openstack/blockstorage/v1/snapshots/requests.go b/openstack/blockstorage/v1/snapshots/requests.go
index 7fac925..792e7dd 100644
--- a/openstack/blockstorage/v1/snapshots/requests.go
+++ b/openstack/blockstorage/v1/snapshots/requests.go
@@ -73,7 +73,7 @@
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200, 201},
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
})
return res
}
@@ -92,7 +92,7 @@
func Get(client *gophercloud.ServiceClient, id string) GetResult {
var res GetResult
_, res.Err = perigee.Request("GET", getURL(client, id), perigee.Options{
- Results: &res.Resp,
+ Results: &res.Body,
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200},
})
@@ -181,7 +181,7 @@
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200},
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
})
return res
}
diff --git a/openstack/blockstorage/v1/snapshots/results.go b/openstack/blockstorage/v1/snapshots/results.go
index c5c3470..d414a7d 100644
--- a/openstack/blockstorage/v1/snapshots/results.go
+++ b/openstack/blockstorage/v1/snapshots/results.go
@@ -11,28 +11,40 @@
type Snapshot struct {
// Currect status of the Snapshot.
Status string `mapstructure:"status"`
+
// Display name.
Name string `mapstructure:"display_name"`
+
// Instances onto which the Snapshot is attached.
Attachments []string `mapstructure:"attachments"`
+
// Logical group.
AvailabilityZone string `mapstructure:"availability_zone"`
+
// Is the Snapshot bootable?
Bootable string `mapstructure:"bootable"`
+
// Date created.
CreatedAt string `mapstructure:"created_at"`
+
// Display description.
Description string `mapstructure:"display_discription"`
+
// See VolumeType object for more information.
VolumeType string `mapstructure:"volume_type"`
+
// ID of the Snapshot from which this Snapshot was created.
SnapshotID string `mapstructure:"snapshot_id"`
+
// ID of the Volume from which this Snapshot was created.
VolumeID string `mapstructure:"volume_id"`
+
// User-defined key-value pairs.
Metadata map[string]string `mapstructure:"metadata"`
+
// Unique identifier.
ID string `mapstructure:"id"`
+
// Size of the Snapshot, in GB.
Size int `mapstructure:"size"`
}
@@ -82,9 +94,8 @@
return nil, r.Err
}
- m := r.Resp["metadata"].(map[string]interface{})
-
- return m, nil
+ m := r.Body.(map[string]interface{})["metadata"]
+ return m.(map[string]interface{}), nil
}
type commonResult struct {
@@ -101,7 +112,7 @@
Snapshot *Snapshot `json:"snapshot"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Snapshot, err
}
diff --git a/openstack/blockstorage/v1/volumes/requests.go b/openstack/blockstorage/v1/volumes/requests.go
index 042a33e..ae97419 100644
--- a/openstack/blockstorage/v1/volumes/requests.go
+++ b/openstack/blockstorage/v1/volumes/requests.go
@@ -88,7 +88,7 @@
_, res.Err = perigee.Request("POST", createURL(client), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200, 201},
})
return res
@@ -108,7 +108,7 @@
func Get(client *gophercloud.ServiceClient, id string) GetResult {
var res GetResult
_, res.Err = perigee.Request("GET", getURL(client, id), perigee.Options{
- Results: &res.Resp,
+ Results: &res.Body,
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200},
})
@@ -210,7 +210,7 @@
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200},
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
})
return res
}
diff --git a/openstack/blockstorage/v1/volumes/results.go b/openstack/blockstorage/v1/volumes/results.go
index 421e4ca..7215daf 100644
--- a/openstack/blockstorage/v1/volumes/results.go
+++ b/openstack/blockstorage/v1/volumes/results.go
@@ -77,7 +77,7 @@
Volume *Volume `json:"volume"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Volume, err
}
diff --git a/openstack/blockstorage/v1/volumetypes/requests.go b/openstack/blockstorage/v1/volumetypes/requests.go
index d4f880f..7253a87 100644
--- a/openstack/blockstorage/v1/volumetypes/requests.go
+++ b/openstack/blockstorage/v1/volumetypes/requests.go
@@ -49,7 +49,7 @@
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200, 201},
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
})
return res
}
@@ -70,7 +70,7 @@
_, err := perigee.Request("GET", getURL(client, id), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{200},
- Results: &res.Resp,
+ Results: &res.Body,
})
res.Err = err
return res
diff --git a/openstack/blockstorage/v1/volumetypes/results.go b/openstack/blockstorage/v1/volumetypes/results.go
index cdd641b..a13f7c1 100644
--- a/openstack/blockstorage/v1/volumetypes/results.go
+++ b/openstack/blockstorage/v1/volumetypes/results.go
@@ -61,7 +61,7 @@
VolumeType *VolumeType `json:"volume_type" mapstructure:"volume_type"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.VolumeType, err
}
diff --git a/openstack/common/extensions/requests.go b/openstack/common/extensions/requests.go
index 000151b..79ea63d 100755
--- a/openstack/common/extensions/requests.go
+++ b/openstack/common/extensions/requests.go
@@ -11,7 +11,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", ExtensionURL(c, alias), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
diff --git a/openstack/common/extensions/results.go b/openstack/common/extensions/results.go
index 123c33f..777d083 100755
--- a/openstack/common/extensions/results.go
+++ b/openstack/common/extensions/results.go
@@ -22,7 +22,7 @@
Extension *Extension `json:"extension"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Extension, err
}
diff --git a/openstack/compute/v2/flavors/requests.go b/openstack/compute/v2/flavors/requests.go
index 7af11fc..6a2017f 100644
--- a/openstack/compute/v2/flavors/requests.go
+++ b/openstack/compute/v2/flavors/requests.go
@@ -65,7 +65,7 @@
func Get(client *gophercloud.ServiceClient, id string) GetResult {
var gr GetResult
gr.Err = perigee.Get(getURL(client, id), perigee.Options{
- Results: &gr.Resp,
+ Results: &gr.Body,
MoreHeaders: client.Provider.AuthenticatedHeaders(),
})
return gr
diff --git a/openstack/compute/v2/flavors/results.go b/openstack/compute/v2/flavors/results.go
index c96a3a7..389bd7f 100644
--- a/openstack/compute/v2/flavors/results.go
+++ b/openstack/compute/v2/flavors/results.go
@@ -35,7 +35,7 @@
if err != nil {
return nil, err
}
- err = decoder.Decode(gr.Resp)
+ err = decoder.Decode(gr.Body)
return &result.Flavor, err
}
diff --git a/openstack/compute/v2/images/requests.go b/openstack/compute/v2/images/requests.go
index 603909c..4c9bc7a 100644
--- a/openstack/compute/v2/images/requests.go
+++ b/openstack/compute/v2/images/requests.go
@@ -64,7 +64,7 @@
var result GetResult
_, result.Err = perigee.Request("GET", getURL(client, id), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{200},
})
return result
diff --git a/openstack/compute/v2/images/results.go b/openstack/compute/v2/images/results.go
index ff0ae53..493d511 100644
--- a/openstack/compute/v2/images/results.go
+++ b/openstack/compute/v2/images/results.go
@@ -21,7 +21,7 @@
Image Image `mapstructure:"image"`
}
- err := mapstructure.Decode(gr.Resp, &decoded)
+ err := mapstructure.Decode(gr.Body, &decoded)
return &decoded.Image, err
}
diff --git a/openstack/compute/v2/servers/requests.go b/openstack/compute/v2/servers/requests.go
index df622bf..490cd6b 100644
--- a/openstack/compute/v2/servers/requests.go
+++ b/openstack/compute/v2/servers/requests.go
@@ -188,7 +188,7 @@
func Create(client *gophercloud.ServiceClient, opts CreateOptsBuilder) CreateResult {
var result CreateResult
_, result.Err = perigee.Request("POST", listURL(client), perigee.Options{
- Results: &result.Resp,
+ Results: &result.Body,
ReqBody: opts.ToServerCreateMap(),
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{202},
@@ -209,7 +209,7 @@
func Get(client *gophercloud.ServiceClient, id string) GetResult {
var result GetResult
_, result.Err = perigee.Request("GET", getURL(client, id), perigee.Options{
- Results: &result.Resp,
+ Results: &result.Body,
MoreHeaders: client.Provider.AuthenticatedHeaders(),
})
return result
@@ -253,7 +253,7 @@
func Update(client *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder) UpdateResult {
var result UpdateResult
_, result.Err = perigee.Request("PUT", updateURL(client, id), perigee.Options{
- Results: &result.Resp,
+ Results: &result.Body,
ReqBody: opts.ToServerUpdateMap(),
MoreHeaders: client.Provider.AuthenticatedHeaders(),
})
@@ -438,7 +438,7 @@
_, result.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
ReqBody: &reqBody,
- Results: &result.Resp,
+ Results: &result.Body,
MoreHeaders: client.Provider.AuthenticatedHeaders(),
OkCodes: []int{202},
})
diff --git a/openstack/compute/v2/servers/results.go b/openstack/compute/v2/servers/results.go
index 15003d8..fff6203 100644
--- a/openstack/compute/v2/servers/results.go
+++ b/openstack/compute/v2/servers/results.go
@@ -20,7 +20,7 @@
Server Server `mapstructure:"server"`
}
- err := mapstructure.Decode(r.Resp, &response)
+ err := mapstructure.Decode(r.Body, &response)
return &response.Server, err
}
diff --git a/openstack/identity/v2/tokens/requests.go b/openstack/identity/v2/tokens/requests.go
index 7f71865..87c923a 100644
--- a/openstack/identity/v2/tokens/requests.go
+++ b/openstack/identity/v2/tokens/requests.go
@@ -80,7 +80,7 @@
var result CreateResult
_, result.Err = perigee.Request("POST", CreateURL(client), perigee.Options{
ReqBody: &request,
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{200, 203},
})
return result
diff --git a/openstack/identity/v2/tokens/results.go b/openstack/identity/v2/tokens/results.go
index 543907c..1eddb9d 100644
--- a/openstack/identity/v2/tokens/results.go
+++ b/openstack/identity/v2/tokens/results.go
@@ -90,7 +90,7 @@
} `mapstructure:"access"`
}
- err := mapstructure.Decode(result.Resp, &response)
+ err := mapstructure.Decode(result.Body, &response)
if err != nil {
return nil, err
}
@@ -119,7 +119,7 @@
} `mapstructure:"access"`
}
- err := mapstructure.Decode(result.Resp, &response)
+ err := mapstructure.Decode(result.Body, &response)
if err != nil {
return nil, err
}
diff --git a/openstack/identity/v3/endpoints/requests.go b/openstack/identity/v3/endpoints/requests.go
index eb52573..345ec19 100644
--- a/openstack/identity/v3/endpoints/requests.go
+++ b/openstack/identity/v3/endpoints/requests.go
@@ -63,7 +63,7 @@
_, result.Err = perigee.Request("POST", listURL(client), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{201},
})
return result
@@ -128,7 +128,7 @@
_, result.Err = perigee.Request("PATCH", endpointURL(client, endpointID), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{200},
})
return result
diff --git a/openstack/identity/v3/endpoints/results.go b/openstack/identity/v3/endpoints/results.go
index 94182b2..f559b9a 100644
--- a/openstack/identity/v3/endpoints/results.go
+++ b/openstack/identity/v3/endpoints/results.go
@@ -21,7 +21,7 @@
Endpoint `json:"endpoint"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return &res.Endpoint, err
}
diff --git a/openstack/identity/v3/services/requests.go b/openstack/identity/v3/services/requests.go
index 7816aca..5673eda 100644
--- a/openstack/identity/v3/services/requests.go
+++ b/openstack/identity/v3/services/requests.go
@@ -25,7 +25,7 @@
_, result.Err = perigee.Request("POST", listURL(client), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
ReqBody: &req,
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{201},
})
return result
@@ -64,7 +64,7 @@
var result GetResult
_, result.Err = perigee.Request("GET", serviceURL(client, serviceID), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{200},
})
return result
@@ -82,7 +82,7 @@
_, result.Err = perigee.Request("PATCH", serviceURL(client, serviceID), perigee.Options{
MoreHeaders: client.Provider.AuthenticatedHeaders(),
ReqBody: &req,
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{200},
})
return result
diff --git a/openstack/identity/v3/services/results.go b/openstack/identity/v3/services/results.go
index 2d03c32..dcd7fe2 100644
--- a/openstack/identity/v3/services/results.go
+++ b/openstack/identity/v3/services/results.go
@@ -22,7 +22,7 @@
Service `json:"service"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return &res.Service, err
}
diff --git a/openstack/identity/v3/tokens/requests.go b/openstack/identity/v3/tokens/requests.go
index db45cc5..3a21658 100644
--- a/openstack/identity/v3/tokens/requests.go
+++ b/openstack/identity/v3/tokens/requests.go
@@ -236,7 +236,7 @@
var response *perigee.Response
response, result.Err = perigee.Request("POST", tokenURL(c), perigee.Options{
ReqBody: &req,
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{201},
})
if result.Err != nil {
@@ -252,7 +252,7 @@
var response *perigee.Response
response, result.Err = perigee.Request("GET", tokenURL(c), perigee.Options{
MoreHeaders: subjectTokenHeaders(c, token),
- Results: &result.Resp,
+ Results: &result.Body,
OkCodes: []int{200, 203},
})
if result.Err != nil {
diff --git a/openstack/identity/v3/tokens/results.go b/openstack/identity/v3/tokens/results.go
index 1e6538d..0b6a55b 100644
--- a/openstack/identity/v3/tokens/results.go
+++ b/openstack/identity/v3/tokens/results.go
@@ -29,7 +29,7 @@
// Parse the token itself from the stored headers.
token.ID = r.Headers.Get("X-Subject-Token")
- err := mapstructure.Decode(r.Resp, &response)
+ err := mapstructure.Decode(r.Body, &response)
if err != nil {
return nil, err
}
diff --git a/openstack/networking/v2/extensions/external/results.go b/openstack/networking/v2/extensions/external/results.go
index 47f7258..1c173c0 100644
--- a/openstack/networking/v2/extensions/external/results.go
+++ b/openstack/networking/v2/extensions/external/results.go
@@ -35,7 +35,7 @@
External bool `mapstructure:"router:external" json:"router:external"`
}
-func commonExtract(e error, response map[string]interface{}) (*NetworkExternal, error) {
+func commonExtract(e error, response interface{}) (*NetworkExternal, error) {
if e != nil {
return nil, e
}
@@ -52,19 +52,19 @@
// ExtractGet decorates a GetResult struct returned from a networks.Get()
// function with extended attributes.
func ExtractGet(r networks.GetResult) (*NetworkExternal, error) {
- return commonExtract(r.Err, r.Resp)
+ return commonExtract(r.Err, r.Body)
}
// ExtractCreate decorates a CreateResult struct returned from a networks.Create()
// function with extended attributes.
func ExtractCreate(r networks.CreateResult) (*NetworkExternal, error) {
- return commonExtract(r.Err, r.Resp)
+ return commonExtract(r.Err, r.Body)
}
// ExtractUpdate decorates a UpdateResult struct returned from a
// networks.Update() function with extended attributes.
func ExtractUpdate(r networks.UpdateResult) (*NetworkExternal, error) {
- return commonExtract(r.Err, r.Resp)
+ return commonExtract(r.Err, r.Body)
}
// ExtractList accepts a Page struct, specifically a NetworkPage struct, and
diff --git a/openstack/networking/v2/extensions/layer3/floatingips/requests.go b/openstack/networking/v2/extensions/layer3/floatingips/requests.go
index 22a6cae..feb23b3 100644
--- a/openstack/networking/v2/extensions/layer3/floatingips/requests.go
+++ b/openstack/networking/v2/extensions/layer3/floatingips/requests.go
@@ -117,7 +117,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
@@ -129,7 +129,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -170,7 +170,7 @@
_, res.Err = perigee.Request("PUT", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
diff --git a/openstack/networking/v2/extensions/layer3/floatingips/results.go b/openstack/networking/v2/extensions/layer3/floatingips/results.go
index cdb6803..df3a63f 100644
--- a/openstack/networking/v2/extensions/layer3/floatingips/results.go
+++ b/openstack/networking/v2/extensions/layer3/floatingips/results.go
@@ -53,7 +53,7 @@
FloatingIP *FloatingIP `json:"floatingip"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
if err != nil {
return nil, fmt.Errorf("Error decoding Neutron floating IP: %v", err)
}
diff --git a/openstack/networking/v2/extensions/layer3/routers/requests.go b/openstack/networking/v2/extensions/layer3/routers/requests.go
index dbfd36b..dfdd606 100755
--- a/openstack/networking/v2/extensions/layer3/routers/requests.go
+++ b/openstack/networking/v2/extensions/layer3/routers/requests.go
@@ -85,7 +85,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
return res
@@ -96,7 +96,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -139,7 +139,7 @@
_, res.Err = perigee.Request("PUT", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
@@ -205,7 +205,7 @@
_, res.Err = perigee.Request("PUT", addInterfaceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &body,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
@@ -238,7 +238,7 @@
_, res.Err = perigee.Request("PUT", removeInterfaceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &body,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
diff --git a/openstack/networking/v2/extensions/layer3/routers/results.go b/openstack/networking/v2/extensions/layer3/routers/results.go
index 0ef1795..ba2f757 100755
--- a/openstack/networking/v2/extensions/layer3/routers/results.go
+++ b/openstack/networking/v2/extensions/layer3/routers/results.go
@@ -100,7 +100,7 @@
Router *Router `json:"router"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Router, err
}
@@ -153,7 +153,7 @@
}
var res *InterfaceInfo
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res, err
}
diff --git a/openstack/networking/v2/extensions/lbaas/members/requests.go b/openstack/networking/v2/extensions/lbaas/members/requests.go
index d095706..bb4da36 100644
--- a/openstack/networking/v2/extensions/lbaas/members/requests.go
+++ b/openstack/networking/v2/extensions/lbaas/members/requests.go
@@ -83,7 +83,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
return res
@@ -94,7 +94,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -122,7 +122,7 @@
_, res.Err = perigee.Request("PUT", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
diff --git a/openstack/networking/v2/extensions/lbaas/members/results.go b/openstack/networking/v2/extensions/lbaas/members/results.go
index 1db37ae..a4408e1 100644
--- a/openstack/networking/v2/extensions/lbaas/members/results.go
+++ b/openstack/networking/v2/extensions/lbaas/members/results.go
@@ -96,7 +96,7 @@
Member *Member `json:"member"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Member, err
}
diff --git a/openstack/networking/v2/extensions/lbaas/monitors/requests.go b/openstack/networking/v2/extensions/lbaas/monitors/requests.go
index fca7199..5d4c696 100644
--- a/openstack/networking/v2/extensions/lbaas/monitors/requests.go
+++ b/openstack/networking/v2/extensions/lbaas/monitors/requests.go
@@ -176,7 +176,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
@@ -188,7 +188,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -256,7 +256,7 @@
_, res.Err = perigee.Request("PUT", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200, 202},
})
diff --git a/openstack/networking/v2/extensions/lbaas/monitors/results.go b/openstack/networking/v2/extensions/lbaas/monitors/results.go
index b35b4c6..bd711f7 100644
--- a/openstack/networking/v2/extensions/lbaas/monitors/results.go
+++ b/openstack/networking/v2/extensions/lbaas/monitors/results.go
@@ -121,7 +121,7 @@
Monitor *Monitor `json:"health_monitor" mapstructure:"health_monitor"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Monitor, err
}
diff --git a/openstack/networking/v2/extensions/lbaas/pools/requests.go b/openstack/networking/v2/extensions/lbaas/pools/requests.go
index 2688350..42be1fd 100644
--- a/openstack/networking/v2/extensions/lbaas/pools/requests.go
+++ b/openstack/networking/v2/extensions/lbaas/pools/requests.go
@@ -103,7 +103,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
return res
@@ -114,7 +114,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -151,7 +151,7 @@
_, res.Err = perigee.Request("PUT", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -186,7 +186,7 @@
_, res.Err = perigee.Request("POST", associateURL(c, poolID), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
return res
diff --git a/openstack/networking/v2/extensions/lbaas/pools/results.go b/openstack/networking/v2/extensions/lbaas/pools/results.go
index d326e0b..3b1c66c 100644
--- a/openstack/networking/v2/extensions/lbaas/pools/results.go
+++ b/openstack/networking/v2/extensions/lbaas/pools/results.go
@@ -115,7 +115,7 @@
Pool *Pool `json:"pool"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Pool, err
}
diff --git a/openstack/networking/v2/extensions/lbaas/vips/requests.go b/openstack/networking/v2/extensions/lbaas/vips/requests.go
index ce4d9e4..606bcc5 100644
--- a/openstack/networking/v2/extensions/lbaas/vips/requests.go
+++ b/openstack/networking/v2/extensions/lbaas/vips/requests.go
@@ -182,7 +182,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
@@ -194,7 +194,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -255,7 +255,7 @@
_, res.Err = perigee.Request("PUT", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200, 202},
})
diff --git a/openstack/networking/v2/extensions/lbaas/vips/results.go b/openstack/networking/v2/extensions/lbaas/vips/results.go
index c2bbc1c..731edef 100644
--- a/openstack/networking/v2/extensions/lbaas/vips/results.go
+++ b/openstack/networking/v2/extensions/lbaas/vips/results.go
@@ -140,7 +140,7 @@
VirtualIP *VirtualIP `mapstructure:"vip" json:"vip"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.VirtualIP, err
}
diff --git a/openstack/networking/v2/extensions/provider/results.go b/openstack/networking/v2/extensions/provider/results.go
index 8fc21b4..3453584 100755
--- a/openstack/networking/v2/extensions/provider/results.go
+++ b/openstack/networking/v2/extensions/provider/results.go
@@ -73,7 +73,7 @@
Network *NetworkExtAttrs `json:"network"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Network, err
}
@@ -89,7 +89,7 @@
Network *NetworkExtAttrs `json:"network"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Network, err
}
@@ -105,7 +105,7 @@
Network *NetworkExtAttrs `json:"network"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Network, err
}
diff --git a/openstack/networking/v2/extensions/security/groups/requests.go b/openstack/networking/v2/extensions/security/groups/requests.go
index 6e9fe33..67e95ca 100644
--- a/openstack/networking/v2/extensions/security/groups/requests.go
+++ b/openstack/networking/v2/extensions/security/groups/requests.go
@@ -78,7 +78,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
@@ -90,7 +90,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
diff --git a/openstack/networking/v2/extensions/security/groups/results.go b/openstack/networking/v2/extensions/security/groups/results.go
index 54ad6f0..3b256ef 100644
--- a/openstack/networking/v2/extensions/security/groups/results.go
+++ b/openstack/networking/v2/extensions/security/groups/results.go
@@ -87,7 +87,7 @@
SecGroup *SecGroup `mapstructure:"security_group" json:"security_group"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.SecGroup, err
}
diff --git a/openstack/networking/v2/extensions/security/rules/requests.go b/openstack/networking/v2/extensions/security/rules/requests.go
index ea0f37d..34c9466 100644
--- a/openstack/networking/v2/extensions/security/rules/requests.go
+++ b/openstack/networking/v2/extensions/security/rules/requests.go
@@ -154,7 +154,7 @@
_, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
@@ -166,7 +166,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", resourceURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
diff --git a/openstack/networking/v2/extensions/security/rules/results.go b/openstack/networking/v2/extensions/security/rules/results.go
index a1a8f7b..29e8676 100644
--- a/openstack/networking/v2/extensions/security/rules/results.go
+++ b/openstack/networking/v2/extensions/security/rules/results.go
@@ -112,7 +112,7 @@
SecGroupRule *SecGroupRule `mapstructure:"security_group_rule" json:"security_group_rule"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.SecGroupRule, err
}
diff --git a/openstack/networking/v2/networks/requests.go b/openstack/networking/v2/networks/requests.go
index 8cfe4e0..51c294f 100644
--- a/openstack/networking/v2/networks/requests.go
+++ b/openstack/networking/v2/networks/requests.go
@@ -83,7 +83,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", getURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -141,7 +141,7 @@
_, res.Err = perigee.Request("POST", createURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
return res
@@ -191,7 +191,7 @@
_, res.Err = perigee.Request("PUT", getURL(c, networkID), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200, 201},
})
diff --git a/openstack/networking/v2/networks/results.go b/openstack/networking/v2/networks/results.go
index eefdc7c..6c32ebe 100644
--- a/openstack/networking/v2/networks/results.go
+++ b/openstack/networking/v2/networks/results.go
@@ -20,7 +20,7 @@
Network *Network `json:"network"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Network, err
}
diff --git a/openstack/networking/v2/ports/requests.go b/openstack/networking/v2/ports/requests.go
index c846de9..4e477d3 100644
--- a/openstack/networking/v2/ports/requests.go
+++ b/openstack/networking/v2/ports/requests.go
@@ -83,7 +83,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", getURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -162,7 +162,7 @@
_, res.Err = perigee.Request("POST", createURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
DumpReqJson: true,
})
@@ -228,7 +228,7 @@
_, res.Err = perigee.Request("PUT", updateURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200, 201},
})
return res
diff --git a/openstack/networking/v2/ports/results.go b/openstack/networking/v2/ports/results.go
index 4ead2eb..6681123 100644
--- a/openstack/networking/v2/ports/results.go
+++ b/openstack/networking/v2/ports/results.go
@@ -20,7 +20,7 @@
Port *Port `json:"port"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Port, err
}
diff --git a/openstack/networking/v2/subnets/requests.go b/openstack/networking/v2/subnets/requests.go
index 8eed269..e913e61 100644
--- a/openstack/networking/v2/subnets/requests.go
+++ b/openstack/networking/v2/subnets/requests.go
@@ -82,7 +82,7 @@
var res GetResult
_, res.Err = perigee.Request("GET", getURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200},
})
return res
@@ -177,7 +177,7 @@
_, res.Err = perigee.Request("POST", createURL(c), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{201},
})
@@ -236,7 +236,7 @@
_, res.Err = perigee.Request("PUT", updateURL(c, id), perigee.Options{
MoreHeaders: c.Provider.AuthenticatedHeaders(),
ReqBody: &reqBody,
- Results: &res.Resp,
+ Results: &res.Body,
OkCodes: []int{200, 201},
})
diff --git a/openstack/networking/v2/subnets/results.go b/openstack/networking/v2/subnets/results.go
index 3b4976a..c87504c 100644
--- a/openstack/networking/v2/subnets/results.go
+++ b/openstack/networking/v2/subnets/results.go
@@ -20,7 +20,7 @@
Subnet *Subnet `json:"subnet"`
}
- err := mapstructure.Decode(r.Resp, &res)
+ err := mapstructure.Decode(r.Body, &res)
return res.Subnet, err
}
diff --git a/openstack/objectstorage/v1/objects/requests.go b/openstack/objectstorage/v1/objects/requests.go
index c97b4fe..be4d107 100644
--- a/openstack/objectstorage/v1/objects/requests.go
+++ b/openstack/objectstorage/v1/objects/requests.go
@@ -131,9 +131,7 @@
})
defer resp.HttpResponse.Body.Close()
body, err := ioutil.ReadAll(resp.HttpResponse.Body)
- res.Resp = map[string]interface{}{
- "body": body,
- }
+ res.Body = body
res.Err = err
res.Headers = resp.HttpResponse.Header
return res
diff --git a/openstack/objectstorage/v1/objects/results.go b/openstack/objectstorage/v1/objects/results.go
index cc3a8ed..7bd2861 100644
--- a/openstack/objectstorage/v1/objects/results.go
+++ b/openstack/objectstorage/v1/objects/results.go
@@ -107,7 +107,7 @@
if dr.Err != nil {
return nil, dr.Err
}
- return dr.Resp["body"].([]byte), nil
+ return dr.Body.([]byte), nil
}
// GetResult is a *http.Response that is returned from a call to the Get function.
diff --git a/results.go b/results.go
index 902260a..c7b8914 100644
--- a/results.go
+++ b/results.go
@@ -4,8 +4,9 @@
// Result acts as a base struct that other results can embed.
type Result struct {
- // Resp is the deserialized JSON structure returned from the server.
- Resp map[string]interface{}
+ // Body is the payload of the HTTP response from the server. In most cases, this will be the
+ // deserialized JSON structure.
+ Body interface{}
// Headers contains the HTTP header structure from the original response.
Headers http.Header