Removed the migrate filter for guests since it doesn't seem to work, now manually checking 'pendingMIgrationFlag'. Also added an 'id' orderBy to the guest_list manager

Author: allmightyspiff

SoftLayer/CLI/virt/migrate.py

@@ -19,7 +19,6 @@ def cli(env, guest, migrate_all, host):
     """Manage VSIs that require migration. Can migrate Dedicated Host VSIs as well."""
 
     vsi = SoftLayer.VSManager(env.client)
-    pending_filter = {'virtualGuests': {'pendingMigrationFlag': {'operation': 1}}}
     dedicated_filter = {'virtualGuests': {'dedicatedHost': {'id': {'operation': 'not null'}}}}
     mask = """mask[
                 id, hostname, domain, datacenter, pendingMigrationFlag, powerState,
@@ -28,21 +27,22 @@ def cli(env, guest, migrate_all, host):
 
     # No options, just print out a list of guests that can be migrated
     if not (guest or migrate_all):
-        require_migration = vsi.list_instances(filter=pending_filter, mask=mask)
+        require_migration = vsi.list_instances(mask=mask)
         require_table = formatting.Table(['id', 'hostname', 'domain', 'datacenter'], title="Require Migration")
 
         for vsi_object in require_migration:
-            require_table.add_row([
-                vsi_object.get('id'),
-                vsi_object.get('hostname'),
-                vsi_object.get('domain'),
-                utils.lookup(vsi_object, 'datacenter', 'name')
-            ])
+            if vsi_object['pendingMigrationFlag']:
+                require_table.add_row([
+                    vsi_object.get('id'),
+                    vsi_object.get('hostname'),
+                    vsi_object.get('domain'),
+                    utils.lookup(vsi_object, 'datacenter', 'name')
+                ])
 
-        if require_migration:
+        if len(require_table.rows) > 0:
             env.fout(require_table)
         else:
-            click.secho("No guests require migration at this time", fg='green')
+            click.secho("No guests require migration at this time.", fg='green')
 
         migrateable = vsi.list_instances(filter=dedicated_filter, mask=mask)
         migrateable_table = formatting.Table(['id', 'hostname', 'domain', 'datacenter', 'Host Name', 'Host Id'],
@@ -56,14 +56,20 @@ def cli(env, guest, migrate_all, host):
                 utils.lookup(vsi_object, 'dedicatedHost', 'name'),
                 utils.lookup(vsi_object, 'dedicatedHost', 'id')
             ])
-        env.fout(migrateable_table)
+        if len(migrateable_table.rows) > 0:
+            env.fout(migrateable_table)
+        else:
+            click.secho("No dedicated guests to migrate.", fg='green')
     # Migrate all guests with pendingMigrationFlag=True
     elif migrate_all:
-        require_migration = vsi.list_instances(filter=pending_filter, mask="mask[id]")
-        if not require_migration:
-            click.secho("No guests require migration at this time", fg='green')
+        require_migration = vsi.list_instances(mask="mask[id,pendingMigrationFlag]")
+        migrated = 0
         for vsi_object in require_migration:
-            migrate(vsi, vsi_object['id'])
+            if vsi_object['pendingMigrationFlag']:
+                migrated = migrated + 1
+                migrate(vsi, vsi_object['id'])
+        if migrated == 0:
+            click.secho("No guests require migration at this time", fg='green')
     # Just migrate based on the options
     else:
         migrate(vsi, guest, host)

SoftLayer/managers/vs.py

@@ -131,6 +131,7 @@ def list_instances(self, hourly=True, monthly=True, tags=None, cpus=None,
                 call = 'getMonthlyVirtualGuests'
 
         _filter = utils.NestedDict(kwargs.get('filter') or {})
+        _filter['virtualGuests']['id'] = utils.query_filter_orderby()
         if tags:
             _filter['virtualGuests']['tagReferences']['tag']['name'] = {
                 'operation': 'in',