Merge pull request softlayer#384 from wnagele/master

sudorandom · sudorandom · commit d21a6cd54e6b · 2014-09-18T10:58:06.000-05:00
Fix for issue softlayer#383 & Support for immediate cancellation of servers
diff --git a/SoftLayer/CLI/modules/server.py b/SoftLayer/CLI/modules/server.py
@@ -252,6 +252,8 @@ class CancelServer(environment.CLIRunnable):
 Cancel a dedicated server
 
 Options:
+  --immediate        Cancels the server immediately (instead of on the billing
+                       anniversary)
   --comment=COMMENT  An optional comment to add to the cancellation ticket
   --reason=REASON    An optional cancellation reason. See cancel-reasons for a
                        list of available options
@@ -271,9 +273,10 @@ def execute(self, args):
             comment = self.env.input("(Optional) Add a cancellation comment:")
 
         reason = args.get('--reason')
+        immediate = args.get('--immediate')
 
         if args['--really'] or formatting.no_going_back(hw_id):
-            mgr.cancel_hardware(hw_id, reason, comment)
+            mgr.cancel_hardware(hw_id, reason, comment, immediate)
         else:
             raise exceptions.CLIAbort('Aborted')
 
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -33,7 +33,8 @@ def __init__(self, client, ordering_manager=None):
         else:
             self.ordering_manager = ordering_manager
 
-    def cancel_hardware(self, hardware_id, reason='unneeded', comment=''):
+    def cancel_hardware(self, hardware_id, reason='unneeded', comment='',
+                        immediate=False):
         """ Cancels the specified dedicated server.
 
         :param int hardware_id: The ID of the hardware to be cancelled.
@@ -48,7 +49,7 @@ def cancel_hardware(self, hardware_id, reason='unneeded', comment=''):
                                    mask='id,bareMetalInstanceFlag')
 
         if server.get('bareMetalInstanceFlag'):
-            return self.cancel_metal(hardware_id)
+            return self.cancel_metal(hardware_id, immediate)
 
         reasons = self.get_cancellation_reasons()
         cancel_reason = reasons['unneeded']
@@ -224,7 +225,7 @@ def get_available_dedicated_server_packages(self):
 
         for package in packages:
             available_packages.append((package['id'], package['name'],
-                                       package['description']))
+                                       package.get('description', None)))
 
         return available_packages
 
diff --git a/SoftLayer/managers/ordering.py b/SoftLayer/managers/ordering.py
@@ -63,8 +63,8 @@ def filter_outlet_packages(packages):
         non_outlet_packages = []
 
         for package in packages:
-            if all(['OUTLET' not in package['description'].upper(),
-                    'OUTLET' not in package['name'].upper()]):
+            if all(['OUTLET' not in package.get('description', '').upper(),
+                    'OUTLET' not in package.get('name', '').upper()]):
                 non_outlet_packages.append(package)
 
         return non_outlet_packages
diff --git a/SoftLayer/tests/CLI/modules/server_tests.py b/SoftLayer/tests/CLI/modules/server_tests.py
@@ -329,7 +329,7 @@ def test_cancel_server(self, resolve_mock, cancel_mock, ngb_mock):
         args = {'--really': True, '--reason': 'Test'}
         runnable.execute(args)
 
-        cancel_mock.assert_called_with(hw_id, args['--reason'], None)
+        cancel_mock.assert_called_with(hw_id, args['--reason'], None, None)
 
         # Now check to make sure we properly call CLIAbort in the negative case
         env_mock = mock.Mock()
