Skip to content

Commit 3863aaf

Browse files
author
Fernando Ojeda
committed
Refactored Code.
1 parent 69c90ad commit 3863aaf

File tree

5 files changed

+11
-53
lines changed

5 files changed

+11
-53
lines changed

SoftLayer/CLI/hardware/guests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""List the Hardware server associated virtual guests."""
1+
"""Lists the Virtual Guests running on this server."""
22
# :license: MIT, see LICENSE for more details.
33

44
import click
@@ -15,14 +15,14 @@
1515
@click.argument('identifier')
1616
@environment.pass_env
1717
def cli(env, identifier):
18-
"""List the Hardware server associated virtual guests."""
18+
"""Lists the Virtual Guests running on this server."""
1919

2020
mgr = SoftLayer.HardwareManager(env.client)
2121
hw_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'hardware')
2222
hw_guests = mgr.get_hardware_guests(hw_id)
2323

2424
if not hw_guests:
25-
raise exceptions.CLIAbort("The hardware server does not has associated virtual guests.")
25+
raise exceptions.CLIAbort("No Virtual Guests found.")
2626

2727
table = formatting.Table(['id', 'hostname', 'CPU', 'Memory', 'Start Date', 'Status', 'powerState'])
2828
table.sortby = 'hostname'

SoftLayer/CLI/virt/list.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,10 @@ def cli(env, sortby, cpu, domain, datacenter, hostname, memory, network,
9696

9797
hardware_guests = vsi.get_hardware_guests()
9898
for hardware in hardware_guests:
99-
if 'virtualHost' in hardware and hardware['virtualHost']['guests']:
99+
if hardware['virtualHost']['guests']:
100+
title = "Hardware(id = {hardwareId}) guests associated".format(hardwareId=hardware['id'])
100101
table_hardware_guest = formatting.Table(['id', 'hostname', 'CPU', 'Memory', 'Start Date', 'Status',
101-
'powerState'], title="Hardware(id = {hardwareId}) guests "
102-
"associated".format(hardwareId=hardware['id'])
103-
)
102+
'powerState'], title=title)
104103
table_hardware_guest.sortby = 'hostname'
105104
for guest in hardware['virtualHost']['guests']:
106105
table_hardware_guest.add_row([

SoftLayer/managers/vs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1160,10 +1160,10 @@ def get_local_disks(self, instance_id):
11601160
return self.guest.getBlockDevices(mask=mask, id=instance_id)
11611161

11621162
def get_hardware_guests(self):
1163-
"""Returns the hardware server vs associated.
1163+
"""Returns all virtualHost capable hardware objects and their guests.
11641164
11651165
:return SoftLayer_Hardware[].
11661166
"""
1167-
object_filter = {"hardware": {"networkGatewayMemberFlag": {"operation": 0}}}
1168-
mask = "mask[networkGatewayMemberFlag,virtualHost[guests[powerState]]]"
1167+
object_filter = {"hardware": {"virtualHost": {"id": {"operation": "not null"}}}}
1168+
mask = "mask[virtualHost[guests[powerState]]]"
11691169
return self.client.call('SoftLayer_Account', 'getHardware', mask=mask, filter=object_filter)

tests/managers/hardware_tests.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -656,23 +656,7 @@ def test_get_hardware_guests(self):
656656

657657
result = self.hardware.get_hardware_guests(1234)
658658

659-
self.assertEqual([
660-
{
661-
"accountId": 11111,
662-
"hostname": "NSX-T Manager",
663-
"id": 22222,
664-
"maxCpu": 16,
665-
"maxCpuUnits": "CORE",
666-
"maxMemory": 49152,
667-
"powerState": {
668-
"keyName": "RUNNING",
669-
"name": "Running"
670-
},
671-
"status": {
672-
"keyName": "ACTIVE",
673-
"name": "Active"
674-
}
675-
}], result)
659+
self.assertEqual("NSX-T Manager", result[0]['hostname'])
676660

677661

678662
class HardwareHelperTests(testing.TestCase):

tests/managers/vs/vs_tests.py

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,29 +1164,4 @@ def test_get_hardware_guests(self):
11641164

11651165
result = self.vs.get_hardware_guests()
11661166

1167-
self.assertEqual([{
1168-
"accountId": 11111,
1169-
"domain": "vmware.chechu.com",
1170-
"hostname": "host14",
1171-
"id": 22222,
1172-
"virtualHost": {
1173-
"accountId": 11111,
1174-
"id": 33333,
1175-
"name": "host14.vmware.chechu.com",
1176-
"guests": [
1177-
{
1178-
"accountId": 11111,
1179-
"hostname": "NSX-T Manager",
1180-
"id": 44444,
1181-
"maxCpu": 16,
1182-
"maxCpuUnits": "CORE",
1183-
"maxMemory": 49152,
1184-
"powerState": {
1185-
"keyName": "RUNNING",
1186-
"name": "Running"
1187-
},
1188-
"status": {
1189-
"keyName": "ACTIVE",
1190-
"name": "Active"
1191-
}
1192-
}]}}], result)
1167+
self.assertEqual("NSX-T Manager", result[0]['virtualHost']['guests'][0]['hostname'])

0 commit comments

Comments
 (0)