Merge pull request #1600 from caberos/issue1587

Add a warning if user orders in a POD that is being closed

Author: allmightyspiff

SoftLayer/CLI/hardware/create.py

@@ -41,6 +41,10 @@
 def cli(env, **args):
     """Order/create a dedicated server."""
     mgr = SoftLayer.HardwareManager(env.client)
+    network = SoftLayer.NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+    closure = []
 
     # Get the SSH keys
     ssh_keys = []
@@ -99,6 +103,10 @@ def cli(env, **args):
         return
 
     if do_create:
+        for pod in pods:
+            if args.get('datacenter') in str(pod['name']):
+                closure.append(pod['name'])
+        click.secho(click.style('Warning: Closed soon: %s' % (', '.join(closure)), fg='yellow'))
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort('Aborting dedicated server order.')

SoftLayer/CLI/order/place.py

@@ -8,6 +8,7 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
+from SoftLayer.managers import NetworkManager
 from SoftLayer.managers import ordering
 
 COLUMNS = ['keyName',
@@ -64,6 +65,10 @@ def cli(env, package_keyname, location, preset, verify, billing, complex_type,
 
     """
     manager = ordering.OrderingManager(env.client)
+    network = NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+    closure = []
 
     if extras:
         try:
@@ -90,6 +95,9 @@ def cli(env, package_keyname, location, preset, verify, billing, complex_type,
             ])
 
     else:
+        for pod in pods:
+            closure.append(pod['name'])
+        click.secho(click.style('Warning: Closed soon: %s' % (', '.join(closure)), fg='yellow'))
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort("Aborting order.")

SoftLayer/CLI/virt/create.py

@@ -218,8 +218,16 @@ def cli(env, **args):
     create_args = _parse_create_args(env.client, args)
     test = args.get('test', False)
     do_create = not (args.get('export') or test)
+    network = SoftLayer.NetworkManager(env.client)
+
+    pods = network.get_closed_pods()
+    closure = []
 
     if do_create:
+        for pod in pods:
+            if args.get('datacenter') in str(pod['name']):
+                closure.append(pod['name'])
+        click.secho(click.style('Warning: Closed soon: %s' % (', '.join(closure)), fg='yellow'))
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort('Aborting virtual server order.')

tests/CLI/modules/order_tests.py

@@ -141,10 +141,9 @@ def test_place(self):
 
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Product_Order', 'placeOrder')
-        self.assertEqual({'id': 1234,
-                          'created': order_date,
-                          'status': 'APPROVED'},
-                         json.loads(result.output))
+        self.assertEqual('Warning: Closed soon: ams01.pod01, wdc07.pod01, TEST00.pod2\n'
+                         '{\n    "id": 1234,\n    "created": "2017-04-04 07:39:20",\n    "status": "APPROVED"\n}\n',
+                         str(result.output))
 
     def test_place_with_quantity(self):
         order_date = '2017-04-04 07:39:20'
@@ -162,10 +161,9 @@ def test_place_with_quantity(self):
 
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Product_Order', 'placeOrder')
-        self.assertEqual({'id': 1234,
-                          'created': order_date,
-                          'status': 'APPROVED'},
-                         json.loads(result.output))
+        self.assertEqual('Warning: Closed soon: ams01.pod01, wdc07.pod01, TEST00.pod2\n'
+                         '{\n    "id": 1234,\n    "created": "2017-04-04 07:39:20",\n    "status": "APPROVED"\n}\n',
+                         str(result.output))
 
     def test_place_extras_parameter_fail(self):
         result = self.run_command(['-y', 'order', 'place', 'package', 'DALLAS13', 'ITEM1',

tests/CLI/modules/server_tests.py

@@ -397,8 +397,9 @@ def test_create_server(self, order_mock):
                                    ])
 
         self.assert_no_fail(result)
-        self.assertEqual(json.loads(result.output),
-                         {'id': 98765, 'created': '2013-08-02 15:23:47'})
+        self.assertEqual(
+            str(result.output),
+            'Warning: Closed soon: TEST00.pod2\n{\n    "id": 98765,\n    "created": "2013-08-02 15:23:47"\n}\n')
 
     @mock.patch('SoftLayer.CLI.template.export_to_template')
     def test_create_server_with_export(self, export_mock):