rackspace :knife: perigee
diff --git a/rackspace/compute/v2/networks/requests.go b/rackspace/compute/v2/networks/requests.go
index d3c973e..1ae14e6 100644
--- a/rackspace/compute/v2/networks/requests.go
+++ b/rackspace/compute/v2/networks/requests.go
@@ -81,11 +81,10 @@
}
// Send request to API
- _, res.Err = perigee.Request("POST", createURL(c), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- ReqBody: &reqBody,
- Results: &res.Body,
- OkCodes: []int{200, 201, 202},
+ _, res.Err = c.Request("POST", createURL(c), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &res.Body,
+ OkCodes: []int{200, 201, 202},
})
return res
}
diff --git a/rackspace/lb/v1/acl/requests.go b/rackspace/lb/v1/acl/requests.go
index e1e92ac..8e88ae3 100644
--- a/rackspace/lb/v1/acl/requests.go
+++ b/rackspace/lb/v1/acl/requests.go
@@ -97,9 +97,8 @@
url := rootURL(c, loadBalancerID)
url += gophercloud.IDSliceToQueryString("id", itemIDs)
- _, res.Err = perigee.Request("DELETE", url, perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = c.Request("DELETE", url, gophercloud.RequestOpts{
+ OkCodes: []int{202},
})
return res
diff --git a/rackspace/lb/v1/lbs/requests.go b/rackspace/lb/v1/lbs/requests.go
index 342f107..0b677f2 100644
--- a/rackspace/lb/v1/lbs/requests.go
+++ b/rackspace/lb/v1/lbs/requests.go
@@ -228,11 +228,10 @@
return res
}
- _, res.Err = perigee.Request("POST", rootURL(c), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- ReqBody: &reqBody,
- Results: &res.Body,
- OkCodes: []int{202},
+ _, res.Err = c.Request("POST", rootURL(c), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &res.Body,
+ OkCodes: []int{202},
})
return res
@@ -272,9 +271,8 @@
url := rootURL(c)
url += gophercloud.IDSliceToQueryString("id", ids)
- _, res.Err = perigee.Request("DELETE", url, perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = c.Request("DELETE", url, gophercloud.RequestOpts{
+ OkCodes: []int{202},
})
return res
diff --git a/rackspace/lb/v1/nodes/requests.go b/rackspace/lb/v1/nodes/requests.go
index 1ee00a4..5c926a9 100644
--- a/rackspace/lb/v1/nodes/requests.go
+++ b/rackspace/lb/v1/nodes/requests.go
@@ -147,9 +147,8 @@
url := rootURL(c, loadBalancerID)
url += gophercloud.IDSliceToQueryString("id", nodeIDs)
- _, res.Err = perigee.Request("DELETE", url, perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = c.Request("DELETE", url, gophercloud.RequestOpts{
+ OkCodes: []int{202},
})
return res
diff --git a/rackspace/lb/v1/vips/requests.go b/rackspace/lb/v1/vips/requests.go
index 42f0c1d..f9b2d37 100644
--- a/rackspace/lb/v1/vips/requests.go
+++ b/rackspace/lb/v1/vips/requests.go
@@ -93,9 +93,8 @@
url := rootURL(c, loadBalancerID)
url += gophercloud.IDSliceToQueryString("id", vipIDs)
- _, res.Err = perigee.Request("DELETE", url, perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = c.Request("DELETE", url, gophercloud.RequestOpts{
+ OkCodes: []int{202},
})
return res
diff --git a/rackspace/objectstorage/v1/bulk/requests.go b/rackspace/objectstorage/v1/bulk/requests.go
index d252609..898b73b 100644
--- a/rackspace/objectstorage/v1/bulk/requests.go
+++ b/rackspace/objectstorage/v1/bulk/requests.go
@@ -4,7 +4,6 @@
"net/url"
"strings"
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
)
@@ -38,14 +37,13 @@
reqBody := strings.NewReader(reqString)
- resp, err := perigee.Request("DELETE", deleteURL(c), perigee.Options{
- ContentType: "text/plain",
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{200},
- ReqBody: reqBody,
- Results: &res.Body,
+ resp, err := c.Request("DELETE", deleteURL(c), gophercloud.RequestOpts{
+ MoreHeaders: map[string]string{"Content-Type": "text/plain"},
+ OkCodes: []int{200},
+ JSONBody: reqBody,
+ JSONResponse: &res.Body,
})
- res.Header = resp.HttpResponse.Header
+ res.Header = resp.Header
res.Err = err
return res
}