slcli virtual list now lists users/passwords for all known software (softlayer#719)

sudorandom · sudorandom · commit e35107a2a79b · 2016-04-22T12:51:22.000-05:00
diff --git a/SoftLayer/CLI/virt/detail.py b/SoftLayer/CLI/virt/detail.py
@@ -90,9 +90,19 @@ def cli(env, identifier, passwords=False, price=False):
                        result['billingItem']['recurringFee']])
 
     if passwords:
-        pass_table = formatting.Table(['username', 'password'])
-        for item in result['operatingSystem']['passwords']:
-            pass_table.add_row([item['username'], item['password']])
+        pass_table = formatting.Table(['software', 'username', 'password'])
+
+        for component in result['softwareComponents']:
+            for item in component['passwords']:
+                pass_table.add_row([
+                    utils.lookup(component,
+                                 'softwareLicense',
+                                 'softwareDescription',
+                                 'name'),
+                    item['username'],
+                    item['password'],
+                ])
+
         table.add_row(['users', pass_table])
 
     table.add_row(['tags', formatting.tags(result['tagReferences'])])
diff --git a/SoftLayer/fixtures/SoftLayer_Virtual_Guest.py b/SoftLayer/fixtures/SoftLayer_Virtual_Guest.py
@@ -40,6 +40,11 @@
             'softwareDescription': {'version': '12.04-64 Minimal for VSI',
                                     'name': 'Ubuntu'}}
     },
+    'softwareComponents': [{
+        'passwords': [{'username': 'user', 'password': 'pass'}],
+        'softwareLicense': {
+            'softwareDescription': {'name': 'Ubuntu'}}
+    }],
     'tagReferences': [{'tag': {'name': 'production'}}],
 }
 
diff --git a/SoftLayer/managers/vs.py b/SoftLayer/managers/vs.py
@@ -200,6 +200,9 @@ def get_instance(self, instance_id, **kwargs):
                 'blockDevices',
                 'blockDeviceTemplateGroup[id, name, globalIdentifier]',
                 'postInstallScriptUri',
+                '''softwareComponents[
+                    passwords[username,password,notes],
+                    softwareLicense[softwareDescription[name]]]''',
                 '''operatingSystem[passwords[username,password],
                                    softwareLicense.softwareDescription[
                                        manufacturer,name,version,
diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py
@@ -61,7 +61,9 @@ def test_detail_vs(self):
                           'public_ip': '172.16.240.2',
                           'state': 'RUNNING',
                           'status': 'ACTIVE',
-                          'users': [{'password': 'pass', 'username': 'user'}],
+                          'users': [{'software': 'Ubuntu',
+                                     'password': 'pass',
+                                     'username': 'user'}],
                           'vlans': [{'type': 'PUBLIC',
                                      'number': 23,
                                      'id': 1}],
