Fixed vs migrate unit tests. Fixed #2123

softlayer · Oct 7, 2024 · b41158b · b41158b
1 parent 4e81748
commit b41158b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-10-04T22:18:14Z",
+  "generated_at": "2024-10-07T21:05:06Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -112,15 +112,15 @@
         "hashed_secret": "6367c48dd193d56ea7b0baad25b19455e529f5ee",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 121,
+        "line_number": 122,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "df51e37c269aa94d38f93e537bf6e2020b21406c",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 1035,
+        "line_number": 1036,
         "type": "Secret Keyword",
         "verified_result": null
       }

diff --git a/SoftLayer/CLI/virt/migrate.py b/SoftLayer/CLI/virt/migrate.py
@@ -31,7 +31,7 @@ def cli(env, guest, migrate_all, host):
         require_table = formatting.Table(['id', 'hostname', 'domain', 'datacenter'], title="Require Migration")
 
         for vsi_object in require_migration:
-            if vsi_object['pendingMigrationFlag']:
+            if vsi_object.get('pendingMigrationFlag', False):
                 require_table.add_row([
                     vsi_object.get('id'),
                     vsi_object.get('hostname'),
@@ -65,7 +65,7 @@ def cli(env, guest, migrate_all, host):
         require_migration = vsi.list_instances(mask="mask[id,pendingMigrationFlag]")
         migrated = 0
         for vsi_object in require_migration:
-            if vsi_object['pendingMigrationFlag']:
+            if vsi_object.get('pendingMigrationFlag', False):
                 migrated = migrated + 1
                 migrate(vsi, vsi_object['id'])
         if migrated == 0:

diff --git a/SoftLayer/fixtures/SoftLayer_Account.py b/SoftLayer/fixtures/SoftLayer_Account.py
@@ -35,7 +35,7 @@
     'globalIdentifier': '1a2b3c-1701',
     'primaryBackendIpAddress': '10.45.19.37',
     'hourlyBillingFlag': False,
-
+    'pendingMigrationFlag': True,
     'billingItem': {
         'id': 6327,
         'recurringFee': 1.54,
@@ -63,6 +63,7 @@
     'globalIdentifier': '05a8ac-6abf0',
     'primaryBackendIpAddress': '10.45.19.35',
     'hourlyBillingFlag': True,
+    'pendingMigrationFlag': True,
     'billingItem': {
         'id': 6327,
         'recurringFee': 1.54,

diff --git a/tests/managers/vs/vs_tests.py b/tests/managers/vs/vs_tests.py
@@ -65,6 +65,7 @@ def test_list_instances_with_filters(self):
 
         _filter = {
             'virtualGuests': {
+                'id': {'operation': 'orderBy', 'options': [{'name': 'sort', 'value': ['ASC']}]},
                 'datacenter': {
                     'name': {'operation': '_= dal05'}},
                 'domain': {'operation': '_= example.com'},
@@ -83,8 +84,7 @@ def test_list_instances_with_filters(self):
                 'transientGuestFlag': {'operation': False},
             }
         }
-        self.assert_called_with('SoftLayer_Account', 'getVirtualGuests',
-                                filter=_filter)
+        self.assert_called_with('SoftLayer_Account', 'getVirtualGuests', filter=_filter)
 
     def test_resolve_ids_ip(self):
         _id = self.vs._get_ids_from_ip('172.16.240.2')