Skip to content

Commit 47f236c

Browse files
added message for empty migrations
1 parent 2e15494 commit 47f236c

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

SoftLayer/CLI/virt/migrate.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ def cli(env, guest, migrate_all, host):
6060
# Migrate all guests with pendingMigrationFlag=True
6161
elif migrate_all:
6262
require_migration = vsi.list_instances(filter=pending_filter, mask="mask[id]")
63+
if not require_migration:
64+
click.secho("No guests require migration at this time", fg='green')
6365
for vsi_object in require_migration:
6466
migrate(vsi, vsi_object['id'])
6567
# Just migrate based on the options

tests/CLI/modules/vs/vs_tests.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -836,6 +836,16 @@ def test_vs_migrate_all(self):
836836
self.assert_called_with('SoftLayer_Virtual_Guest', 'migrate', identifier=104)
837837
self.assert_not_called_with('SoftLayer_Virtual_Guest', 'migrateDedicatedHost')
838838

839+
def test_vs_migrate_all_empty(self):
840+
mock = self.set_mock('SoftLayer_Account', 'getVirtualGuests')
841+
mock.return_value = []
842+
result = self.run_command(['vs', 'migrate', '-a'])
843+
self.assert_no_fail(result)
844+
self.assertIn('No guests require migration at this time', result.output)
845+
self.assert_called_with('SoftLayer_Virtual_Guest', 'migrate', identifier=100)
846+
self.assert_called_with('SoftLayer_Virtual_Guest', 'migrate', identifier=104)
847+
self.assert_not_called_with('SoftLayer_Virtual_Guest', 'migrateDedicatedHost')
848+
839849
def test_vs_migrate_dedicated(self):
840850
result = self.run_command(['vs', 'migrate', '-g', '100', '-h', '999'])
841851
self.assert_no_fail(result)

0 commit comments

Comments
 (0)