Adjust regexps and do another pass.
diff --git a/rackspace/lb/v1/ssl/requests.go b/rackspace/lb/v1/ssl/requests.go
index 84b2712..e9c6514 100644
--- a/rackspace/lb/v1/ssl/requests.go
+++ b/rackspace/lb/v1/ssl/requests.go
@@ -3,8 +3,6 @@
import (
"errors"
- "github.com/racker/perigee"
-
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -87,11 +85,10 @@
return res
}
- _, res.Err = perigee.Request("PUT", rootURL(c, lbID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- ReqBody: &reqBody,
- Results: &res.Body,
- OkCodes: []int{200},
+ _, res.Err = c.Request("PUT", rootURL(c, lbID), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &res.Body,
+ OkCodes: []int{200},
})
return res
@@ -102,10 +99,9 @@
func Get(c *gophercloud.ServiceClient, lbID int) GetResult {
var res GetResult
- _, res.Err = perigee.Request("GET", rootURL(c, lbID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- Results: &res.Body,
- OkCodes: []int{200},
+ _, res.Err = c.Request("GET", rootURL(c, lbID), gophercloud.RequestOpts{
+ JSONResponse: &res.Body,
+ OkCodes: []int{200},
})
return res
@@ -116,9 +112,8 @@
func Delete(c *gophercloud.ServiceClient, lbID int) DeleteResult {
var res DeleteResult
- _, res.Err = perigee.Request("DELETE", rootURL(c, lbID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{200},
+ _, res.Err = c.Request("DELETE", rootURL(c, lbID), gophercloud.RequestOpts{
+ OkCodes: []int{200},
})
return res
@@ -185,11 +180,10 @@
return res
}
- _, res.Err = perigee.Request("POST", certURL(c, lbID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- ReqBody: &reqBody,
- Results: &res.Body,
- OkCodes: []int{200},
+ _, res.Err = c.Request("POST", certURL(c, lbID), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &res.Body,
+ OkCodes: []int{200},
})
return res
@@ -199,10 +193,9 @@
func GetCert(c *gophercloud.ServiceClient, lbID, certID int) GetCertResult {
var res GetCertResult
- _, res.Err = perigee.Request("GET", certResourceURL(c, lbID, certID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- Results: &res.Body,
- OkCodes: []int{200},
+ _, res.Err = c.Request("GET", certResourceURL(c, lbID, certID), gophercloud.RequestOpts{
+ JSONResponse: &res.Body,
+ OkCodes: []int{200},
})
return res
@@ -254,11 +247,10 @@
return res
}
- _, res.Err = perigee.Request("PUT", certResourceURL(c, lbID, certID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- ReqBody: &reqBody,
- Results: &res.Body,
- OkCodes: []int{202},
+ _, res.Err = c.Request("PUT", certResourceURL(c, lbID, certID), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &res.Body,
+ OkCodes: []int{202},
})
return res
@@ -269,9 +261,8 @@
func DeleteCert(c *gophercloud.ServiceClient, lbID, certID int) DeleteResult {
var res DeleteResult
- _, res.Err = perigee.Request("DELETE", certResourceURL(c, lbID, certID), perigee.Options{
- MoreHeaders: c.AuthenticatedHeaders(),
- OkCodes: []int{200},
+ _, res.Err = c.Request("DELETE", certResourceURL(c, lbID, certID), gophercloud.RequestOpts{
+ OkCodes: []int{200},
})
return res