compute: Merge '/action' extensions

These are all done at once since they are (a) very simple and (b) pretty
much all identical.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

internal/acceptance/openstack/compute/v2/compute.go

@@ -17,7 +17,6 @@ import (
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/aggregates"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/attachinterfaces"
  dsr "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/defsecrules"
- "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/rescueunrescue"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/schedulerhints"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/flavors"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/floatingips"
@@ -1169,7 +1168,7 @@ func FillUpdateOptsFromQuotaSet(src quotasets.QuotaSet, dest *quotasets.UpdateOp
 // RescueServer will place the specified server into rescue mode.
 func RescueServer(t *testing.T, client *gophercloud.ServiceClient, server *servers.Server) error {
  t.Logf("Attempting to put server %s into rescue mode", server.ID)
- _, err := rescueunrescue.Rescue(context.TODO(), client, server.ID, rescueunrescue.RescueOpts{}).Extract()
+ _, err := servers.Rescue(context.TODO(), client, server.ID, servers.RescueOpts{}).Extract()
  if err != nil {
  return err
  }
@@ -1184,7 +1183,7 @@ func RescueServer(t *testing.T, client *gophercloud.ServiceClient, server *serve
 // UnrescueServer will return server from rescue mode.
 func UnrescueServer(t *testing.T, client *gophercloud.ServiceClient, server *servers.Server) error {
  t.Logf("Attempting to return server %s from rescue mode", server.ID)
- if err := rescueunrescue.Unrescue(context.TODO(), client, server.ID).ExtractErr(); err != nil {
+ if err := servers.Unrescue(context.TODO(), client, server.ID).ExtractErr(); err != nil {
  return err
  }
 

internal/acceptance/openstack/compute/v2/migrate_test.go

@@ -8,7 +8,7 @@ import (
  "testing"
 
  "github.com/gophercloud/gophercloud/v2/internal/acceptance/clients"
- "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/migrate"
+ "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
  th "github.com/gophercloud/gophercloud/v2/testhelper"
 )
 
@@ -25,7 +25,7 @@ func TestMigrate(t *testing.T) {
 
  t.Logf("Attempting to migrate server %s", server.ID)
 
- err = migrate.Migrate(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Migrate(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 }
 
@@ -46,11 +46,11 @@ func TestLiveMigrate(t *testing.T) {
  blockMigration := false
  diskOverCommit := false
 
- liveMigrateOpts := migrate.LiveMigrateOpts{
+ liveMigrateOpts := servers.LiveMigrateOpts{
  BlockMigration: &blockMigration,
  DiskOverCommit: &diskOverCommit,
  }
 
- err = migrate.LiveMigrate(context.TODO(), client, server.ID, liveMigrateOpts).ExtractErr()
+ err = servers.LiveMigrate(context.TODO(), client, server.ID, liveMigrateOpts).ExtractErr()
  th.AssertNoErr(t, err)
 }

internal/acceptance/openstack/compute/v2/servers_test.go

@@ -13,9 +13,6 @@ import (
  networks "github.com/gophercloud/gophercloud/v2/internal/acceptance/openstack/networking/v2"
  "github.com/gophercloud/gophercloud/v2/internal/acceptance/tools"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/attachinterfaces"
- "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/lockunlock"
- "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/pauseunpause"
- "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/extensions/suspendresume"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
  "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/tags"
  th "github.com/gophercloud/gophercloud/v2/testhelper"
@@ -394,13 +391,13 @@ func TestServersActionPause(t *testing.T) {
  defer DeleteServer(t, client, server)
 
  t.Logf("Attempting to pause server %s", server.ID)
- err = pauseunpause.Pause(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Pause(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 
  err = WaitForComputeStatus(client, server, "PAUSED")
  th.AssertNoErr(t, err)
 
- err = pauseunpause.Unpause(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Unpause(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 
  err = WaitForComputeStatus(client, server, "ACTIVE")
@@ -418,13 +415,13 @@ func TestServersActionSuspend(t *testing.T) {
  defer DeleteServer(t, client, server)
 
  t.Logf("Attempting to suspend server %s", server.ID)
- err = suspendresume.Suspend(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Suspend(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 
  err = WaitForComputeStatus(client, server, "SUSPENDED")
  th.AssertNoErr(t, err)
 
- err = suspendresume.Resume(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Resume(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 
  err = WaitForComputeStatus(client, server, "ACTIVE")
@@ -443,15 +440,15 @@ func TestServersActionLock(t *testing.T) {
  defer DeleteServer(t, client, server)
 
  t.Logf("Attempting to Lock server %s", server.ID)
- err = lockunlock.Lock(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Lock(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 
  t.Logf("Attempting to delete locked server %s", server.ID)
  err = servers.Delete(context.TODO(), client, server.ID).ExtractErr()
  th.AssertEquals(t, err != nil, true)
 
  t.Logf("Attempting to unlock server %s", server.ID)
- err = lockunlock.Unlock(context.TODO(), client, server.ID).ExtractErr()
+ err = servers.Unlock(context.TODO(), client, server.ID).ExtractErr()
  th.AssertNoErr(t, err)
 
  err = WaitForComputeStatus(client, server, "ACTIVE")