Adjust regexps and do another pass.
diff --git a/openstack/compute/v2/servers/requests.go b/openstack/compute/v2/servers/requests.go
index dde566d..b7c1611 100644
--- a/openstack/compute/v2/servers/requests.go
+++ b/openstack/compute/v2/servers/requests.go
@@ -5,7 +5,6 @@
"errors"
"fmt"
- "github.com/racker/perigee"
"github.com/rackspace/gophercloud"
"github.com/rackspace/gophercloud/pagination"
)
@@ -228,9 +227,8 @@
// Delete requests that a server previously provisioned be removed from your account.
func Delete(client *gophercloud.ServiceClient, id string) DeleteResult {
var res DeleteResult
- _, res.Err = perigee.Request("DELETE", deleteURL(client, id), perigee.Options{
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, res.Err = client.Request("DELETE", deleteURL(client, id), gophercloud.RequestOpts{
+ OkCodes: []int{204},
})
return res
}
@@ -238,10 +236,9 @@
// Get requests details on a single server, by ID.
func Get(client *gophercloud.ServiceClient, id string) GetResult {
var result GetResult
- _, result.Err = perigee.Request("GET", getURL(client, id), perigee.Options{
- Results: &result.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{200, 203},
+ _, result.Err = client.Request("GET", getURL(client, id), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ OkCodes: []int{200, 203},
})
return result
}
@@ -283,10 +280,9 @@
// Update requests that various attributes of the indicated server be changed.
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.Body,
- ReqBody: opts.ToServerUpdateMap(),
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, result.Err = client.Request("PUT", updateURL(client, id), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ JSONBody: opts.ToServerUpdateMap(),
})
return result
}
@@ -303,10 +299,9 @@
var res ActionResult
- _, res.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- ReqBody: req,
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONBody: req,
+ OkCodes: []int{202},
})
return res
@@ -372,14 +367,13 @@
return res
}
- _, res.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- ReqBody: struct {
+ _, res.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONBody: struct {
C map[string]string `json:"reboot"`
}{
map[string]string{"type": string(how)},
},
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ OkCodes: []int{202},
})
return res
@@ -474,11 +468,10 @@
return result
}
- _, result.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- ReqBody: &reqBody,
- Results: &result.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, result.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONBody: &reqBody,
+ JSONResponse: &result.Body,
+ OkCodes: []int{202},
})
return result
@@ -521,10 +514,9 @@
return res
}
- _, res.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- ReqBody: reqBody,
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONBody: reqBody,
+ OkCodes: []int{202},
})
return res
@@ -535,10 +527,9 @@
func ConfirmResize(client *gophercloud.ServiceClient, id string) ActionResult {
var res ActionResult
- _, res.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- ReqBody: map[string]interface{}{"confirmResize": nil},
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{204},
+ _, res.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONBody: map[string]interface{}{"confirmResize": nil},
+ OkCodes: []int{204},
})
return res
@@ -549,10 +540,9 @@
func RevertResize(client *gophercloud.ServiceClient, id string) ActionResult {
var res ActionResult
- _, res.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- ReqBody: map[string]interface{}{"revertResize": nil},
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{202},
+ _, res.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONBody: map[string]interface{}{"revertResize": nil},
+ OkCodes: []int{202},
})
return res
@@ -596,11 +586,10 @@
return result
}
- _, result.Err = perigee.Request("POST", actionURL(client, id), perigee.Options{
- Results: &result.Body,
- ReqBody: &reqBody,
- MoreHeaders: client.AuthenticatedHeaders(),
- OkCodes: []int{200},
+ _, result.Err = client.Request("POST", actionURL(client, id), gophercloud.RequestOpts{
+ JSONResponse: &result.Body,
+ JSONBody: &reqBody,
+ OkCodes: []int{200},
})
return result
@@ -636,10 +625,9 @@
res.Err = err
return res
}
- _, res.Err = perigee.Request("PUT", metadataURL(client, id), perigee.Options{
- ReqBody: metadata,
- Results: &res.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, res.Err = client.Request("PUT", metadataURL(client, id), gophercloud.RequestOpts{
+ JSONBody: metadata,
+ JSONResponse: &res.Body,
})
return res
}
@@ -647,9 +635,8 @@
// Metadata requests all the metadata for the given server ID.
func Metadata(client *gophercloud.ServiceClient, id string) GetMetadataResult {
var res GetMetadataResult
- _, res.Err = perigee.Request("GET", metadataURL(client, id), perigee.Options{
- Results: &res.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, res.Err = client.Request("GET", metadataURL(client, id), gophercloud.RequestOpts{
+ JSONResponse: &res.Body,
})
return res
}
@@ -670,10 +657,9 @@
res.Err = err
return res
}
- _, res.Err = perigee.Request("POST", metadataURL(client, id), perigee.Options{
- ReqBody: metadata,
- Results: &res.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, res.Err = client.Request("POST", metadataURL(client, id), gophercloud.RequestOpts{
+ JSONBody: metadata,
+ JSONResponse: &res.Body,
})
return res
}
@@ -709,10 +695,9 @@
return res
}
- _, res.Err = perigee.Request("PUT", metadatumURL(client, id, key), perigee.Options{
- ReqBody: metadatum,
- Results: &res.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, res.Err = client.Request("PUT", metadatumURL(client, id, key), gophercloud.RequestOpts{
+ JSONBody: metadatum,
+ JSONResponse: &res.Body,
})
return res
}
@@ -720,9 +705,8 @@
// Metadatum requests the key-value pair with the given key for the given server ID.
func Metadatum(client *gophercloud.ServiceClient, id, key string) GetMetadatumResult {
var res GetMetadatumResult
- _, res.Err = perigee.Request("GET", metadatumURL(client, id, key), perigee.Options{
- Results: &res.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, res.Err = client.Request("GET", metadatumURL(client, id, key), gophercloud.RequestOpts{
+ JSONResponse: &res.Body,
})
return res
}
@@ -730,9 +714,8 @@
// DeleteMetadatum will delete the key-value pair with the given key for the given server ID.
func DeleteMetadatum(client *gophercloud.ServiceClient, id, key string) DeleteMetadatumResult {
var res DeleteMetadatumResult
- _, res.Err = perigee.Request("DELETE", metadatumURL(client, id, key), perigee.Options{
- Results: &res.Body,
- MoreHeaders: client.AuthenticatedHeaders(),
+ _, res.Err = client.Request("DELETE", metadatumURL(client, id, key), gophercloud.RequestOpts{
+ JSONResponse: &res.Body,
})
return res
}