Merge pull request #802 from camporter/check_network_storage_result_before_use

Check the results from getNetworkStorage before using

Author: camporter

SoftLayer/managers/object_storage.py

@@ -42,14 +42,17 @@ def list_endpoints(self):
             'hubNetworkStorage': {'vendorName': {'operation': 'Swift'}},
         }
         endpoints = []
-        for node in self.client.call('Account', 'getHubNetworkStorage',
-                                     mask=ENDPOINT_MASK,
-                                     limit=1,
-                                     filter=_filter)['storageNodes']:
-            endpoints.append({
-                'datacenter': node['datacenter'],
-                'public': node['frontendIpAddress'],
-                'private': node['backendIpAddress'],
-            })
+        network_storage = self.client.call('Account',
+                                           'getHubNetworkStorage',
+                                           mask=ENDPOINT_MASK,
+                                           limit=1,
+                                           filter=_filter)
+        if network_storage:
+            for node in network_storage['storageNodes']:
+                endpoints.append({
+                    'datacenter': node['datacenter'],
+                    'public': node['frontendIpAddress'],
+                    'private': node['backendIpAddress'],
+                })
 
         return endpoints

tests/managers/object_storage_tests.py

@@ -33,3 +33,12 @@ def test_list_endpoints(self):
                          [{'datacenter': {'name': 'dal05'},
                            'private': 'https://dal05/auth/v1.0/',
                            'public': 'https://dal05/auth/v1.0/'}])
+
+    def test_list_endpoints_no_results(self):
+        accounts = self.set_mock('SoftLayer_Account', 'getHubNetworkStorage')
+        accounts.return_value = {
+            'storageNodes': [],
+        }
+        endpoints = self.object_storage.list_endpoints()
+        self.assertEqual(endpoints,
+                         [])