fix the team code review comments

Author: caberos

SoftLayer/CLI/order/package_locations.py

@@ -4,9 +4,10 @@
 
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.managers import network
 from SoftLayer.managers import ordering
 
-COLUMNS = ['id', 'dc', 'description', 'keyName']
+COLUMNS = ['id', 'dc', 'description', 'keyName', 'note']
 
 
 @click.command()
@@ -18,15 +19,26 @@ def cli(env, package_keyname):
     Use the location Key Name to place orders
     """
     manager = ordering.OrderingManager(env.client)
+    network_manager = network.NetworkManager(env.client)
+
+    pods = network_manager.get_closed_pods()
     table = formatting.Table(COLUMNS)
 
     locations = manager.package_locations(package_keyname)
     for region in locations:
         for datacenter in region['locations']:
+            closure = []
+            for pod in pods:
+                if datacenter['location']['name'] in str(pod['name']):
+                    closure.append(pod['name'])
+
+            notes = '-'
+            if len(closure) > 0:
+                notes = 'closed soon: %s' % (', '.join(closure))
             table.add_row([
                 datacenter['location']['id'],
                 datacenter['location']['name'],
                 region['description'],
-                region['keyname']
+                region['keyname'], notes
             ])
     env.fout(table)

tests/CLI/modules/order_tests.py

@@ -309,7 +309,8 @@ def test_location_list(self):
         result = self.run_command(['order', 'package-locations', 'package'])
         self.assert_no_fail(result)
         expected_results = [
-            {'id': 2017603, 'dc': 'wdc07', 'description': 'WDC07 - Washington, DC', 'keyName': 'WASHINGTON07'}
+            {'id': 2017603, 'dc': 'wdc07', 'description': 'WDC07 - Washington, DC',
+             'keyName': 'WASHINGTON07','note': 'closed soon: wdc07.pod01'}
         ]
         print("FUCK")
         print(result.output)