Fix ToServerRebootMap() method (gophercloud#1152)

serboox · jtopjian · commit e3c477b35092 · 2018-07-26T18:35:45.000-06:00
* Fix method

* Fix tests
diff --git a/acceptance/openstack/compute/v2/servers_test.go b/acceptance/openstack/compute/v2/servers_test.go
@@ -271,7 +271,7 @@ func TestServersActionReboot(t *testing.T) {
 	th.AssertNoErr(t, err)
 	defer DeleteServer(t, client, server)
 
-	rebootOpts := &servers.RebootOpts{
+	rebootOpts := servers.RebootOpts{
 		Type: servers.SoftReboot,
 	}
 
diff --git a/docs/MIGRATING.md b/docs/MIGRATING.md
@@ -16,7 +16,7 @@
 * `servers.Reboot` now requires a `servers.RebootOpts` struct:
 
   ```golang
-  rebootOpts := &servers.RebootOpts{
+  rebootOpts := servers.RebootOpts{
           Type: servers.SoftReboot,
   }
   res := servers.Reboot(client, server.ID, rebootOpts)
diff --git a/openstack/compute/v2/servers/requests.go b/openstack/compute/v2/servers/requests.go
@@ -383,7 +383,7 @@ type RebootOpts struct {
 }
 
 // ToServerRebootMap builds a body for the reboot request.
-func (opts *RebootOpts) ToServerRebootMap() (map[string]interface{}, error) {
+func (opts RebootOpts) ToServerRebootMap() (map[string]interface{}, error) {
 	return gophercloud.BuildRequestBody(opts, "reboot")
 }
 
diff --git a/openstack/compute/v2/servers/testing/requests_test.go b/openstack/compute/v2/servers/testing/requests_test.go
@@ -311,7 +311,7 @@ func TestRebootServer(t *testing.T) {
 	defer th.TeardownHTTP()
 	HandleRebootSuccessfully(t)
 
-	res := servers.Reboot(client.ServiceClient(), "1234asdf", &servers.RebootOpts{
+	res := servers.Reboot(client.ServiceClient(), "1234asdf", servers.RebootOpts{
 		Type: servers.SoftReboot,
 	})
 	th.AssertNoErr(t, res.Err)

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ func TestServersActionReboot(t *testing.T) {`
`271`	`271`	`th.AssertNoErr(t, err)`
`272`	`272`	`defer DeleteServer(t, client, server)`
`273`	`273`
`274`		`- rebootOpts := &servers.RebootOpts{`
	`274`	`+ rebootOpts := servers.RebootOpts{`
`275`	`275`	`Type: servers.SoftReboot,`
`276`	`276`	`}`
`277`	`277`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	* `servers.Reboot` now requires a `servers.RebootOpts` struct:
`17`	`17`
`18`	`18`	```golang
`19`		`- rebootOpts := &servers.RebootOpts{`
	`19`	`+ rebootOpts := servers.RebootOpts{`
`20`	`20`	`Type: servers.SoftReboot,`
`21`	`21`	`}`
`22`	`22`	`res := servers.Reboot(client, server.ID, rebootOpts)`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ type RebootOpts struct {`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`// ToServerRebootMap builds a body for the reboot request.`
`386`		`-func (opts *RebootOpts) ToServerRebootMap() (map[string]interface{}, error) {`
	`386`	`+func (opts RebootOpts) ToServerRebootMap() (map[string]interface{}, error) {`
`387`	`387`	`return gophercloud.BuildRequestBody(opts, "reboot")`
`388`	`388`	`}`
`389`	`389`