Rename Result.Resp to Result.Body.
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
}