Updating cancel_hardware() so it can cancel BMC as well. This makes the "sl server cancel" command work for all types of bare metal servers.

Nathan Beittenmiller · Nathan Beittenmiller · commit fd58dfada6a0 · 2014-04-08T10:01:13.000-05:00
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -34,6 +34,14 @@ def cancel_hardware(self, hardware_id, reason='unneeded', comment=''):
                                cancellation.
         """
 
+        # Check to see if this is actually a pre-configured server (BMC). They
+        # require a different cancellation call.
+        server = self.get_hardware(hardware_id,
+                                   mask='id,bareMetalInstanceFlag')
+
+        if server.get('bareMetalInstanceFlag'):
+            return self.cancel_metal(hardware_id)
+
         reasons = self.get_cancellation_reasons()
         cancel_reason = reasons['unneeded']
 
diff --git a/SoftLayer/tests/fixtures/Hardware_Server.py b/SoftLayer/tests/fixtures/Hardware_Server.py
@@ -6,6 +6,7 @@
     'primaryIpAddress': '172.16.1.100',
     'hostname': 'hardware-test1',
     'domain': 'test.sftlyr.ws',
+    'bareMetalInstanceFlag': True,
     'fullyQualifiedDomainName': 'hardware-test1.test.sftlyr.ws',
     'processorPhysicalCoreAmount': 2,
     'memoryCapacity': 2,
diff --git a/SoftLayer/tests/managers/hardware_tests.py b/SoftLayer/tests/managers/hardware_tests.py
@@ -237,6 +237,10 @@ def test_cancel_metal_on_anniversary(self):
 
     def test_cancel_hardware_without_reason(self):
         hw_id = 987
+        self.client['Hardware_Server'].getObject.return_value = {
+            'id': hw_id,
+            'bareMetalInstanceFlag': False,
+        }
         result = self.hardware.cancel_hardware(hw_id)
 
         reasons = self.hardware.get_cancellation_reasons()
@@ -247,6 +251,10 @@ def test_cancel_hardware_without_reason(self):
 
     def test_cancel_hardware_with_reason_and_comment(self):
         hw_id = 987
+        self.client['Hardware_Server'].getObject.return_value = {
+            'id': hw_id,
+            'bareMetalInstanceFlag': False,
+        }
         reason = 'sales'
         comment = 'Test Comment'
 
@@ -258,6 +266,14 @@ def test_cancel_hardware_with_reason_and_comment(self):
         f.assert_called_once_with(hw_id, reasons[reason], comment, True,
                                   'HARDWARE')
 
+    def test_cancel_hardware_on_bmc(self):
+        hw_id = 6327
+
+        result = self.hardware.cancel_hardware(hw_id)
+        f = self.client['Billing_Item'].cancelServiceOnAnniversaryDate
+        f.assert_called_once_with(id=hw_id)
+        self.assertEqual(result, Billing_Item.cancelServiceOnAnniversaryDate)
+
     def test_change_port_speed_public(self):
         hw_id = 1
         speed = 100
