Merge pull request #1123 from FernandoOjeda/fo_object_storage_apiType

Fix object storage apiType for S3 and Swift.

Author: allmightyspiff

SoftLayer/CLI/object_storage/list_accounts.py

@@ -15,12 +15,19 @@ def cli(env):
 
     mgr = SoftLayer.ObjectStorageManager(env.client)
     accounts = mgr.list_accounts()
-    table = formatting.Table(['id', 'name'])
+    table = formatting.Table(['id', 'name', 'apiType'])
     table.sortby = 'id'
+    api_type = None
     for account in accounts:
+        if 'vendorName' in account and account['vendorName'] == 'Swift':
+            api_type = 'Swift'
+        elif 'Cleversafe' in account['serviceResource']['name']:
+            api_type = 'S3'
+
         table.add_row([
             account['id'],
             account['username'],
+            api_type,
         ])
 
     env.fout(table)

SoftLayer/fixtures/SoftLayer_Account.py

@@ -525,8 +525,8 @@
 
 getNextInvoiceTotalAmount = 2
 
-getHubNetworkStorage = [{'id': 12345, 'username': 'SLOS12345-1'},
-                        {'id': 12346, 'username': 'SLOS12345-2'}]
+getHubNetworkStorage = [{'id': 12345, 'username': 'SLOS12345-1', 'serviceResource': {'name': 'Cleversafe - US Region'}},
+                        {'id': 12346, 'username': 'SLOS12345-2', 'vendorName': 'Swift'}]
 
 getIscsiNetworkStorage = [{
     'accountId': 1234,

SoftLayer/managers/object_storage.py

@@ -6,8 +6,8 @@
     :license: MIT, see LICENSE for more details.
 """
 
-LIST_ACCOUNTS_MASK = '''mask(SoftLayer_Network_Storage_Hub_Swift)[
-    id,username,notes
+LIST_ACCOUNTS_MASK = '''mask[
+    id,username,notes,vendorName,serviceResource
 ]'''
 
 ENDPOINT_MASK = '''mask(SoftLayer_Network_Storage_Hub_Swift)[
@@ -29,12 +29,8 @@ def __init__(self, client):
 
     def list_accounts(self):
         """Lists your object storage accounts."""
-        _filter = {
-            'hubNetworkStorage': {'vendorName': {'operation': 'Swift'}},
-        }
         return self.client.call('Account', 'getHubNetworkStorage',
-                                mask=LIST_ACCOUNTS_MASK,
-                                filter=_filter)
+                                mask=LIST_ACCOUNTS_MASK)
 
     def list_endpoints(self):
         """Lists the known object storage endpoints."""

tests/CLI/modules/object_storage_tests.py

@@ -16,8 +16,9 @@ def test_list_accounts(self):
 
         self.assert_no_fail(result)
         self.assertEqual(json.loads(result.output),
-                         [{'id': 12345, 'name': 'SLOS12345-1'},
-                          {'id': 12346, 'name': 'SLOS12345-2'}])
+                         [{'apiType': 'S3', 'id': 12345, 'name': 'SLOS12345-1'},
+                          {'apiType': 'Swift', 'id': 12346, 'name': 'SLOS12345-2'}]
+                         )
 
     def test_list_endpoints(self):
         accounts = self.set_mock('SoftLayer_Account', 'getHubNetworkStorage')