Merge pull request #1736 from caberos/issue1730

Deprecate slcli hw guests

Author: allmightyspiff

SoftLayer/CLI/hardware/guests.py

@@ -273,7 +273,6 @@
     ('hardware:detail', 'SoftLayer.CLI.hardware.detail:cli'),
     ('hardware:billing', 'SoftLayer.CLI.hardware.billing:cli'),
     ('hardware:edit', 'SoftLayer.CLI.hardware.edit:cli'),
-    ('hardware:guests', 'SoftLayer.CLI.hardware.guests:cli'),
     ('hardware:list', 'SoftLayer.CLI.hardware.list:cli'),
     ('hardware:power-cycle', 'SoftLayer.CLI.hardware.power:power_cycle'),
     ('hardware:power-off', 'SoftLayer.CLI.hardware.power:power_off'),

SoftLayer/CLI/routes.py

@@ -278,26 +278,6 @@
     }
 ]
 
-getVirtualHost = {
-    "accountId": 11111,
-    "createDate": "2018-10-08T10:54:48-06:00",
-    "description": "host16.vmware.chechu.com",
-    "hardwareId": 22222,
-    "id": 33333,
-    "name": "host16.vmware.chechu.com",
-    "uuid": "00000000-0000-0000-0000-0cc11111",
-    "hardware": {
-        "accountId": 11111,
-        "domain": "chechu.com",
-        "hostname": "host16.vmware",
-        "id": 22222,
-        "hardwareStatus": {
-            "id": 5,
-            "status": "ACTIVE"
-        }
-    }
-}
-
 getUpgradeItemPrices = [
     {
         "id": 21525,

SoftLayer/fixtures/SoftLayer_Hardware_Server.py

@@ -769,18 +769,6 @@ def get_hard_drives(self, instance_id):
         """
         return self.hardware.getHardDrives(id=instance_id)
 
-    def get_hardware_guests(self, instance_id):
-        """Returns the hardware server guests.
-
-        :param int instance_id: Id of the hardware server.
-        """
-        mask = "mask[id]"
-        virtual_host = self.hardware.getVirtualHost(mask=mask, id=instance_id)
-        if virtual_host:
-            return self.client.call('SoftLayer_Virtual_Host', 'getGuests', mask='mask[powerState]',
-                                    id=virtual_host['id'])
-        return virtual_host
-
     def get_hardware_item_prices(self, location):
         """Returns the hardware server item prices by location.
 

SoftLayer/managers/hardware.py

@@ -120,10 +120,6 @@ This function updates the firmware of a server. If already at the latest version
    :prog: hardware storage
    :show-nested:
 
-.. click:: SoftLayer.CLI.hardware.guests:cli
-   :prog: hardware guests
-   :show-nested:
-
 .. click:: SoftLayer.CLI.hardware.authorize_storage:cli
    :prog: hardware authorize-storage
    :show-nested:

docs/cli/hardware.rst

@@ -910,18 +910,6 @@ def test_create_hw_no_confirm(self, confirm_mock):
 
         self.assertEqual(result.exit_code, 2)
 
-    def test_get_hardware_guests(self):
-        result = self.run_command(['hw', 'guests', '123456'])
-        self.assert_no_fail(result)
-
-    def test_hardware_guests_empty(self):
-        mock = self.set_mock('SoftLayer_Virtual_Host', 'getGuests')
-        mock.return_value = None
-
-        result = self.run_command(['hw', 'guests', '123456'])
-        self.assertEqual(result.exit_code, 2)
-        self.assertIsInstance(result.exception, exceptions.CLIAbort)
-
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_authorize_hw_no_confirm(self, confirm_mock):
         confirm_mock.return_value = False

tests/CLI/modules/server_tests.py

@@ -809,38 +809,6 @@ def test_get_hard_drive_empty(self):
 
         self.assertEqual([], result)
 
-    def test_get_hardware_guests_empty_virtualHost(self):
-        mock = self.set_mock('SoftLayer_Hardware_Server', 'getVirtualHost')
-        mock.return_value = None
-
-        result = self.hardware.get_hardware_guests(1234)
-
-        self.assertEqual(None, result)
-
-    def test_get_hardware_guests(self):
-        mock = self.set_mock('SoftLayer_Virtual_Host', 'getGuests')
-        mock.return_value = [
-            {
-                "accountId": 11111,
-                "hostname": "NSX-T Manager",
-                "id": 22222,
-                "maxCpu": 16,
-                "maxCpuUnits": "CORE",
-                "maxMemory": 49152,
-                "powerState": {
-                    "keyName": "RUNNING",
-                    "name": "Running"
-                },
-                "status": {
-                    "keyName": "ACTIVE",
-                    "name": "Active"
-                }
-            }]
-
-        result = self.hardware.get_hardware_guests(1234)
-
-        self.assertEqual("NSX-T Manager", result[0]['hostname'])
-
     def test_authorize_storage(self):
         options = self.hardware.authorize_storage(1234, "SL01SEL301234-11")