unit tests for vlan trunk commands

allmightyspiff · allmightyspiff · commit 96b36f9fa1eb · 2023-10-13T15:28:22.000-05:00
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-10-12T23:00:01Z",
+  "generated_at": "2023-10-13T20:28:05Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -238,7 +238,7 @@
         "hashed_secret": "fb5f2f1b65d1f2bc130ce9d5729b38d12f2b444e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 273,
+        "line_number": 274,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -593,7 +593,7 @@
         "hashed_secret": "fb5f2f1b65d1f2bc130ce9d5729b38d12f2b444e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 737,
+        "line_number": 673,
         "type": "Secret Keyword",
         "verified_result": null
       }
diff --git a/SoftLayer/fixtures/SoftLayer_Hardware_Server.py b/SoftLayer/fixtures/SoftLayer_Hardware_Server.py
@@ -112,6 +112,7 @@
         }
     ]
 }
+
 editObject = True
 setTags = True
 setPrivateNetworkInterfaceSpeed = True
@@ -485,3 +486,12 @@
 getTagReferences = getObject['tagReferences']
 getNetworkVlans = getObject['networkVlans']
 getRemoteManagementAccounts = getObject['remoteManagementAccounts']
+
+
+# Setup for hardwareManager.clear_vlan related tests
+getObjectVlanClear = {
+    'backendNetworkComponent': getBackendNetworkComponents,
+    'frontendNetworkComponent': getFrontendNetworkComponents
+}
+getObjectVlanClear['backendNetworkComponent'][1]['networkVlanTrunks'] = [{'id': 99}]
+getObjectVlanClear['frontendNetworkComponent'][1]['networkVlanTrunks'] = [{'id': 11}]
diff --git a/tests/CLI/modules/hardware/hardware_vlan_tests.py b/tests/CLI/modules/hardware/hardware_vlan_tests.py
@@ -93,13 +93,7 @@ def test_hardware_vlan_remove_all_vlans(self):
         mock = self.set_mock('SoftLayer_Search', 'advancedSearch')
         mock.return_value = SoftLayer_Search.advancedSearchVlan
         hardware_mock = self.set_mock('SoftLayer_Hardware_Server', 'getObject')
-        hardware_return = {
-            'backendNetworkComponent': SoftLayer_Hardware_Server.getBackendNetworkComponents,
-            'frontendNetworkComponent': SoftLayer_Hardware_Server.getFrontendNetworkComponents
-        }
-        hardware_return['backendNetworkComponent'][1]['networkVlanTrunks'] = [{'id': 99}]
-        hardware_return['frontendNetworkComponent'][1]['networkVlanTrunks'] = [{'id': 11}]
-        hardware_mock.return_value = hardware_return
+        hardware_mock.return_value = SoftLayer_Hardware_Server.getObjectVlanClear
         result = self.run_command(['hardware', 'vlan-remove', '12345', '--all'])
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Network_Component', 'clearNetworkVlanTrunks', identifier=998877)
diff --git a/tests/managers/hardware_tests.py b/tests/managers/hardware_tests.py
