Adjust regexps and do another pass.
diff --git a/openstack/identity/v3/services/requests.go b/openstack/identity/v3/services/requests.go
index a3534e5..c6820c7 100644
--- a/openstack/identity/v3/services/requests.go
+++ b/openstack/identity/v3/services/requests.go
@@ -1,7 +1,6 @@
package services
import (
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -52,10 +51,9 @@
// Get returns additional information about a service, given its ID.
func Get(client *gophercloud.ServiceClient, serviceID string) GetResult {
var result GetResult
- _, result.Err = perigee.Request("GET", serviceURL(client, serviceID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- Results: &result.Body,
- OkCodes: []int{200},
+ _, result.Err = client.Request("GET", serviceURL(client, serviceID), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ OkCodes: []int{200},
})
return result
}
@@ -69,11 +67,10 @@
req := request{Type: serviceType}
var result UpdateResult
- _, result.Err = perigee.Request("PATCH", serviceURL(client, serviceID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- ReqBody: &req,
- Results: &result.Body,
- OkCodes: []int{200},
+ _, result.Err = client.Request("PATCH", serviceURL(client, serviceID), gophercloud.RequestOpts{
+ JSONBody: &req,
+ JSONResponse: &result.Body,
+ OkCodes: []int{200},
})
return result
}
@@ -82,9 +79,8 @@
// It either deletes all associated endpoints, or fails until all endpoints are deleted.
func Delete(client *gophercloud.ServiceClient, serviceID string) DeleteResult {
var res DeleteResult
- _, res.Err = perigee.Request("DELETE", serviceURL(client, serviceID), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, res.Err = client.Request("DELETE", serviceURL(client, serviceID), gophercloud.RequestOpts{
+ OkCodes: []int{204},
})
return res
}