fix the merge conflicts

Author: caberos

SoftLayer/CLI/block/options.py

@@ -24,13 +24,28 @@ def cli(env, prices, location=None):
     items = order_manager.get_items(PACKAGE_STORAGE)
     datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
 
+    network = SoftLayer.NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+
+    iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
+    snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
+    storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
     tables = []
     datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
 
     for datacenter in datacenters:
+        closure = []
+        for pod in pods:
+            if datacenter['location']['location']['name'] in str(pod['name']):
+                closure.append(pod['name'])
+
+        notes = '-'
+        if len(closure) > 0:
+            notes = 'closed soon: %s' % (', '.join(closure))
         datacenter_table.add_row([datacenter['location']['locationId'],
                                   datacenter.get('description'),
-                                  datacenter['keyname']])
+                                  datacenter['keyname'], notes])
 
     tables.append(datacenter_table)
     tables.append(_block_ios_get_table(items, prices))

SoftLayer/CLI/file/options.py

@@ -25,12 +25,27 @@ def cli(env, prices, location=None):
     datacenters = order_manager.get_regions(PACKAGE_STORAGE, location)
 
     tables = []
+    network = SoftLayer.NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+
+    iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
+    snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
+    file_storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
     datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
 
     for datacenter in datacenters:
+        closure = []
+        for pod in pods:
+            if datacenter['location']['location']['name'] in str(pod['name']):
+                closure.append(pod['name'])
+
+        notes = '-'
+        if len(closure) > 0:
+            notes = 'closed soon: %s' % (', '.join(closure))
         datacenter_table.add_row([datacenter['location']['locationId'],
                                   datacenter.get('description'),
-                                  datacenter['keyname']])
+                                  datacenter['keyname'], notes])
 
     tables.append(datacenter_table)
     tables.append(_file_ios_get_table(items, prices))