Making cancel_hardware() work with BMC. This makes the "sl server cancel" command work for all bare metal server types. Also fixed some unit tests I broke.

Nathan Beittenmiller · Nathan Beittenmiller · commit 9c958e16f9b5 · 2014-04-11T12:45:18.000-05:00
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -33,6 +33,13 @@ def cancel_hardware(self, hardware_id, reason='unneeded', comment=''):
         :param string comment: An optional comment to include with the
                                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/CLI/modules/server_tests.py b/SoftLayer/tests/CLI/modules/server_tests.py
@@ -71,10 +71,10 @@ def test_ServerCreateOptions(self):
 
         expected = {
             'cpu': [
-                {'description': 'Dual Quad Core Pancake 200 - 1.60GHz',
-                 'id': 723},
-                {'description': 'Dual Quad Core Pancake 200 - 1.80GHz',
-                 'id': 724}],
+                {'Description': 'Dual Quad Core Pancake 200 - 1.60GHz',
+                 'ID': 723},
+                {'Description': 'Dual Quad Core Pancake 200 - 1.80GHz',
+                 'ID': 724}],
             'datacenter': ['RANDOM_LOCATION'],
             'disk': ['250_SATA_II', '500_SATA_II'],
             'disk_controllers': ['None', 'RAID0'],
@@ -112,10 +112,10 @@ def test_ServerCreateOptions_with_cpu_only(self):
 
         expected = {
             'cpu': [
-                {'description': 'Dual Quad Core Pancake 200 - 1.60GHz',
-                 'id': 723},
-                {'description': 'Dual Quad Core Pancake 200 - 1.80GHz',
-                 'id': 724}
+                {'Description': 'Dual Quad Core Pancake 200 - 1.60GHz',
+                 'ID': 723},
+                {'Description': 'Dual Quad Core Pancake 200 - 1.80GHz',
+                 'ID': 724}
             ],
         }
 
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/fixtures/Product_Package.py b/SoftLayer/tests/fixtures/Product_Package.py
@@ -1,7 +1,9 @@
 getAllObjects = [
     {'id': 13, 'name': 'Mock Testing Package', 'description': 'a thing'},
-    {'id': 27, 'name': 'An additional testing category'},
-    {'id': 50, 'name': 'Bare Metal Instance'},
+    {'id': 27, 'name': 'An additional testing category',
+     'description': 'Another thing - OUTLET'},
+    {'id': 50, 'name': 'Bare Metal Instance',
+     'description': 'Bare Metal Instance'},
 ]
 getObject = getAllObjects[0]
 
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()
@@ -250,6 +254,11 @@ def test_cancel_hardware_with_reason_and_comment(self):
         reason = 'sales'
         comment = 'Test Comment'
 
+        self.client['Hardware_Server'].getObject.return_value = {
+            'id': hw_id,
+            'bareMetalInstanceFlag': False,
+        }
+
         self.hardware.cancel_hardware(hw_id, reason, comment)
 
         reasons = self.hardware.get_cancellation_reasons()
@@ -258,6 +267,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
@@ -277,8 +294,20 @@ def test_change_port_speed_private(self):
     def test_get_available_dedicated_server_packages(self):
         self.hardware.get_available_dedicated_server_packages()
 
-        f = self.client['Product_Package'].getObject
-        f.assert_has_calls([call(id=13, mask='mask[id, name, description]')])
+        filter_mock = {
+            'type': {
+                'keyName': {
+                    'operation': 'in',
+                    'options': [{
+                        'name': 'data',
+                        'value': ['BARE_METAL_CPU']
+                    }]
+                }
+            }
+        }
+        f = self.client['Product_Package'].getAllObjects
+        f.assert_has_calls([call(mask='id,name,description,type',
+                                 filter=filter_mock)])
 
     def test_get_dedicated_server_options(self):
         package_id = 13
