fix the team code review comments

Author: caberos

SoftLayer/CLI/hardware/create_options.py

@@ -25,24 +25,12 @@ def cli(env, prices, location=None):
     routers = account_manager.get_routers(location=location)
     network_manager = network.NetworkManager(env.client)
 
-    closing_filter = {
-        'capabilities': {
-            'operation': 'in',
-            'options': [{'name': 'data', 'value': ['CLOSURE_ANNOUNCED']}]
-        },
-        'name': {
-            'operation': 'orderBy',
-            'options': [{'name': 'sort', 'value': ['DESC']}]
-        }
-    }
-
-    pods_mask = """mask[name, datacenterLongName, frontendRouterId, capabilities, datacenterId, backendRouterId,
-        backendRouterName, frontendRouterName]"""
-    pods = network_manager.get_pods(mask=pods_mask, filter=closing_filter)
+
+    pods = network_manager.get_closed_pods()
     tables = []
 
     # Datacenters
-    dc_table = formatting.Table(['Datacenter', 'Value', 'note'], title="Datacenters")
+    dc_table = formatting.Table(['Datacenter', 'Value', 'Note'], title="Datacenters")
     dc_table.sortby = 'Value'
     dc_table.align = 'l'
     for location_info in options['locations']:
@@ -51,11 +39,10 @@ def cli(env, prices, location=None):
             if ((location_info['key'] in str(pod['name']))):
                 closure.append(pod['name'])
 
-        if len(closure) == 0:
-            closure = ''
-        else:
-            closure = 'closed soon: %s' % (str(closure))
-        dc_table.add_row([location_info['name'], location_info['key'], str(closure)])
+        notes = '-'
+        if len(closure) > 0:
+            notes = 'closed soon: %s' % (', '.join(closure))
+        dc_table.add_row([location_info['name'], location_info['key'], notes])
     tables.append(dc_table)
 
     tables.append(_preset_prices_table(options['sizes'], prices))

SoftLayer/CLI/virt/create_options.py

@@ -26,25 +26,12 @@ def cli(env, vsi_type, prices, location=None):
     network_manager = network.NetworkManager(env.client)
     options = vsi.get_create_options(vsi_type, location)
 
-    closing_filter = {
-        'capabilities': {
-            'operation': 'in',
-            'options': [{'name': 'data', 'value': ['CLOSURE_ANNOUNCED']}]
-        },
-        'name': {
-            'operation': 'orderBy',
-            'options': [{'name': 'sort', 'value': ['DESC']}]
-        }
-    }
-
-    pods_mask = """mask[name, datacenterLongName, frontendRouterId, capabilities, datacenterId, backendRouterId,
-            backendRouterName, frontendRouterName]"""
-    pods = network_manager.get_pods(mask=pods_mask, filter=closing_filter)
+    pods = network_manager.get_closed_pods()
 
     tables = []
 
     # Datacenters
-    dc_table = formatting.Table(['Datacenter', 'Value', 'note'], title="Datacenters")
+    dc_table = formatting.Table(['Datacenter', 'Value', 'Note'], title="Datacenters")
     dc_table.sortby = 'Value'
     dc_table.align = 'l'
     for location_info in options['locations']:
@@ -53,11 +40,10 @@ def cli(env, vsi_type, prices, location=None):
             if ((location_info['key'] in str(pod['name']))):
                 closure.append(pod['name'])
 
-        if len(closure) == 0:
-            closure = ''
-        else:
-            closure = 'closed soon: %s' % (str(closure))
-        dc_table.add_row([location_info['name'], location_info['key'], str(closure)])
+        notes = '-'
+        if len(closure) > 0:
+            notes = 'closed soon: %s' % (', '.join(closure))
+        dc_table.add_row([location_info['name'], location_info['key'], notes])
     tables.append(dc_table)
 
     if vsi_type == 'CLOUD_SERVER':

SoftLayer/managers/network.py

@@ -779,16 +779,17 @@ def cancel_item(self, identifier, cancel_immediately,
                                 customer_note,
                                 id=identifier)
 
-    def get_pods(self, mask=None, filter=None, datacenter=None):
+    def get_pods(self, datacenter=None):
         """Calls SoftLayer_Network_Pod::getAllObjects()
 
         returns list of all network pods and their routers.
         """
+        _filter = None
 
         if datacenter:
-            filter = {"datacenterName": {"operation": datacenter}}
+            _filter = {"datacenterName": {"operation": datacenter}}
 
-        return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', mask=mask, filter=filter)
+        return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', filter=_filter)
 
     def get_list_datacenter(self):
         """Calls SoftLayer_Location::getDatacenters()
@@ -803,3 +804,23 @@ def get_routers(self, identifier):
         returns all routers locations.
         """
         return self.client.call('SoftLayer_Location_Datacenter', 'getHardwareRouters', id=identifier)
+
+    def get_closed_pods(self):
+        """Calls SoftLayer_Network_Pod::getAllObjects()
+
+        returns list of all closing network pods.
+        """
+        closing_filter = {
+            'capabilities': {
+                'operation': 'in',
+                'options': [{'name': 'data', 'value': ['CLOSURE_ANNOUNCED']}]
+            },
+            'name': {
+                'operation': 'orderBy',
+                'options': [{'name': 'sort', 'value': ['DESC']}]
+            }
+        }
+
+        mask = """mask[name, datacenterLongName, frontendRouterId, capabilities, datacenterId, backendRouterId,
+                backendRouterName, frontendRouterName]"""
+        return self.client.call('SoftLayer_Network_Pod', 'getAllObjects', mask=mask, filter=closing_filter)