Refactored Code.

Author: Fernando Ojeda

SoftLayer/CLI/hardware/guests.py

@@ -1,4 +1,4 @@
-"""List the Hardware server associated virtual guests."""
+"""Lists the Virtual Guests running on this server."""
 # :license: MIT, see LICENSE for more details.
 
 import click
@@ -15,14 +15,14 @@
 @click.argument('identifier')
 @environment.pass_env
 def cli(env, identifier):
-    """List the Hardware server associated virtual guests."""
+    """Lists the Virtual Guests running on this server."""
 
     mgr = SoftLayer.HardwareManager(env.client)
     hw_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'hardware')
     hw_guests = mgr.get_hardware_guests(hw_id)
 
     if not hw_guests:
-        raise exceptions.CLIAbort("The hardware server does not has associated virtual guests.")
+        raise exceptions.CLIAbort("No Virtual Guests found.")
 
     table = formatting.Table(['id', 'hostname', 'CPU', 'Memory', 'Start Date', 'Status', 'powerState'])
     table.sortby = 'hostname'

SoftLayer/CLI/virt/list.py

@@ -96,11 +96,10 @@ def cli(env, sortby, cpu, domain, datacenter, hostname, memory, network,
 
     hardware_guests = vsi.get_hardware_guests()
     for hardware in hardware_guests:
-        if 'virtualHost' in hardware and hardware['virtualHost']['guests']:
+        if hardware['virtualHost']['guests']:
+            title = "Hardware(id = {hardwareId}) guests associated".format(hardwareId=hardware['id'])
             table_hardware_guest = formatting.Table(['id', 'hostname', 'CPU', 'Memory', 'Start Date', 'Status',
-                                                     'powerState'], title="Hardware(id = {hardwareId}) guests "
-                                                                          "associated".format(hardwareId=hardware['id'])
-                                                    )
+                                                     'powerState'], title=title)
             table_hardware_guest.sortby = 'hostname'
             for guest in hardware['virtualHost']['guests']:
                 table_hardware_guest.add_row([

SoftLayer/managers/vs.py

@@ -1160,10 +1160,10 @@ def get_local_disks(self, instance_id):
         return self.guest.getBlockDevices(mask=mask, id=instance_id)
 
     def get_hardware_guests(self):
-        """Returns the hardware server vs associated.
+        """Returns all virtualHost capable hardware objects and their guests.
 
         :return SoftLayer_Hardware[].
         """
-        object_filter = {"hardware": {"networkGatewayMemberFlag": {"operation": 0}}}
-        mask = "mask[networkGatewayMemberFlag,virtualHost[guests[powerState]]]"
+        object_filter = {"hardware": {"virtualHost": {"id": {"operation": "not null"}}}}
+        mask = "mask[virtualHost[guests[powerState]]]"
         return self.client.call('SoftLayer_Account', 'getHardware', mask=mask, filter=object_filter)

tests/managers/hardware_tests.py

@@ -656,23 +656,7 @@ def test_get_hardware_guests(self):
 
         result = self.hardware.get_hardware_guests(1234)
 
-        self.assertEqual([
-            {
-                "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.assertEqual("NSX-T Manager", result[0]['hostname'])
 
 
 class HardwareHelperTests(testing.TestCase):

tests/managers/vs/vs_tests.py

@@ -1164,29 +1164,4 @@ def test_get_hardware_guests(self):
 
         result = self.vs.get_hardware_guests()
 
-        self.assertEqual([{
-            "accountId": 11111,
-            "domain": "vmware.chechu.com",
-            "hostname": "host14",
-            "id": 22222,
-            "virtualHost": {
-                "accountId": 11111,
-                "id": 33333,
-                "name": "host14.vmware.chechu.com",
-                "guests": [
-                    {
-                        "accountId": 11111,
-                        "hostname": "NSX-T Manager",
-                        "id": 44444,
-                        "maxCpu": 16,
-                        "maxCpuUnits": "CORE",
-                        "maxMemory": 49152,
-                        "powerState": {
-                            "keyName": "RUNNING",
-                            "name": "Running"
-                        },
-                        "status": {
-                            "keyName": "ACTIVE",
-                            "name": "Active"
-                        }
-                    }]}}], result)
+        self.assertEqual("NSX-T Manager", result[0]['virtualHost']['guests'][0]['hostname'])