added unit tests for vlan-add

Author: allmightyspiff

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-10-03T22:08:00Z",
+  "generated_at": "2023-10-12T20:19:44Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -238,7 +238,7 @@
         "hashed_secret": "fb5f2f1b65d1f2bc130ce9d5729b38d12f2b444e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 260,
+        "line_number": 273,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -544,7 +544,7 @@
         "hashed_secret": "6367c48dd193d56ea7b0baad25b19455e529f5ee",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 57,
+        "line_number": 58,
         "type": "Secret Keyword",
         "verified_result": null
       }

SoftLayer/CLI/hardware/detail.py

@@ -86,8 +86,8 @@ def cli(env, identifier, passwords, price, components):
     for component in result.get('networkComponents', []):
         # These are the Primary network components
         if component.get('primaryIpAddress', False):
-            uplink = component.get('uplinkComponent')
-            for trunk in uplink.get('networkVlanTrunks'):
+            uplink = component.get('uplinkComponent', {})
+            for trunk in uplink.get('networkVlanTrunks', []):
                 trunk_vlan = trunk.get('networkVlan')
                 vlan_table.add_row([
                     trunk_vlan.get('networkSpace'),

SoftLayer/fixtures/SoftLayer_Hardware_Server.py

@@ -130,38 +130,51 @@
 getReverseDomainRecords = [
     {'resourceRecords': [{'data': '2.0.1.10.in-addr.arpa'}]}]
 bootToRescueLayer = True
-getFrontendNetworkComponents = [
+
+getNetworkComponents = [
     {'maxSpeed': 100},
     {
         'maxSpeed': 1000,
         'networkComponentGroup': {
             'groupTypeId': 2,
             'networkComponents': [{'maxSpeed': 1000}, {'maxSpeed': 1000}]
-        }
+        },
+        'primaryIpAddress': '192.168.1.1',
+        'id': 998877,
+        'uplinkComponent': {}
     },
     {
         'maxSpeed': 1000,
         'networkComponentGroup': {
             'groupTypeId': 2,
             'networkComponents': [{'maxSpeed': 1000}, {'maxSpeed': 1000}]
-        }
+        },
+        'id': 665544,
+        'uplinkComponent': {}
     },
     {
         'maxSpeed': 1000,
         'networkComponentGroup': {
             'groupTypeId': 2,
             'networkComponents': [{'maxSpeed': 1000}, {'maxSpeed': 1000}]
-        }
+        },
+        'id': 112233,
+        'uplinkComponent': {}
     },
     {
         'maxSpeed': 1000,
         'networkComponentGroup': {
             'groupTypeId': 2,
             'networkComponents': [{'maxSpeed': 1000}, {'maxSpeed': 1000}]
-        }
+        },
+        'primaryIpAddress': '10.0.0.1',
+        'id': 123456,
+        'uplinkComponent': {}
     }
 ]
-getNetworkComponents = getFrontendNetworkComponents
+# This splits out the network components into 2 sections so they are different enough for tests
+getFrontendNetworkComponents = getNetworkComponents[0::1]
+getBackendNetworkComponents = getNetworkComponents[2::3]
 
 getBandwidthAllotmentDetail = {
     'allocationId': 25465663,

SoftLayer/fixtures/SoftLayer_Network_Component.py

@@ -0,0 +1,3 @@
+addNetworkVlanTrunks = True
+clearNetworkVlanTrunks = True
+removeNetworkVlanTrunks = True

SoftLayer/fixtures/SoftLayer_Search.py

@@ -49,3 +49,37 @@
                            "type": "string"
                        }]
                    }]
+
+
+advancedSearchVlan = [
+    {
+        "matchedTerms": [
+            "name:|IBMPrivate|",
+            "name.sort:|IBMPrivate|"
+        ],
+        "relevanceScore": "9.05",
+        "resource": {
+            "fullyQualifiedName": "dal10.bcr03.0000",
+            "id": 11111,
+            "name": "IBMPrivate",
+            "vlanNumber": 0000,
+            "networkSpace": "PRIVATE"
+        },
+        "resourceType": "SoftLayer_Network_Vlan"
+    },
+    {
+        "matchedTerms": [
+            "name:|IBMPublic|",
+            "name.sort:|IBMPublic|"
+        ],
+        "relevanceScore": "9.01",
+        "resource": {
+            "fullyQualifiedName": "dal10.bcr03.11111",
+            "id": 999999,
+            "name": "IBMPublic",
+            "vlanNumber": 11111,
+            "networkSpace": "PUBLIC"
+        },
+        "resourceType": "SoftLayer_Network_Vlan"
+    }
+]

tests/CLI/modules/server_tests.py

@@ -15,6 +15,7 @@
 
 from SoftLayer.CLI import exceptions
 from SoftLayer.fixtures import SoftLayer_Product_Order
+from SoftLayer.fixtures import SoftLayer_Search
 from SoftLayer import SoftLayerError
 from SoftLayer import testing
 from SoftLayer import utils
@@ -1030,3 +1031,15 @@ def test_hardware_cancel_no_force(self, confirm_mock):
 
         self.assertEqual(2, result.exit_code)
         self.assertEqual('Aborted', result.exception.message)
+
+    def test_hardware_vlan_add(self):
+        mock = self.set_mock('SoftLayer_Search', 'advancedSearch')
+        mock.return_value = SoftLayer_Search.advancedSearchVlan
+        result = self.run_command(['hardware', 'vlan-add', '12345', '5555'])
+        self.assert_no_fail(result)
+        search_args = '_objectType:SoftLayer_Network_Vlan "5555"'
+        self.assert_called_with('SoftLayer_Search', 'advancedSearch', args=(search_args,))
+        self.assert_called_with('SoftLayer_Hardware_Server', 'getFrontendNetworkComponents', identifier=12345)
+        self.assert_called_with('SoftLayer_Hardware_Server', 'getBackendNetworkComponents', identifier=12345)
+        self.assert_called_with('SoftLayer_Network_Component', 'addNetworkVlanTrunks', identifier=998877)
+        self.assert_called_with('SoftLayer_Network_Component', 'addNetworkVlanTrunks', identifier=123456)