ignoring .idea, including downgrade options by default when getting upgrade item prices, adding tests for deprecated private methods

Author: kwienken

.gitignore

@@ -13,4 +13,4 @@ build/*
 dist/*
 *.egg-info
 .cache
-
+.idea

SoftLayer/managers/vs.py

@@ -816,7 +816,12 @@ def upgrade(self, instance_id, cpus=None, memory=None,
         return False
 
     def _get_package_items(self):
-        """Following Method gets all the item ids related to VS."""
+        """Following Method gets all the item ids related to VS.
+
+        Deprecated in favor of _get_upgrade_prices()
+        """
+        warnings.warn("use _get_upgrade_prices() instead",
+                      DeprecationWarning)
         mask = [
             'description',
             'capacity',
@@ -834,7 +839,7 @@ def _get_package_items(self):
         package_service = self.client['Product_Package']
         return package_service.getItems(id=package['id'], mask=mask)
 
-    def _get_upgrade_prices(self, instance_id):
+    def _get_upgrade_prices(self, instance_id, include_downgrade_options=True):
         """Following Method gets all the price ids related to upgrading a VS.
 
         :param int instance_id: Instance id of the VS to be upgraded
@@ -848,7 +853,7 @@ def _get_upgrade_prices(self, instance_id):
             'item[description,capacity,units]'
         ]
         mask = "mask[%s]" % ','.join(mask)
-        return self.guest.getUpgradeItemPrices(id=instance_id, mask=mask)
+        return self.guest.getUpgradeItemPrices(include_downgrade_options, id=instance_id, mask=mask)
 
     def _get_price_id_for_upgrade_option(self, upgrade_prices, option, value,
                                          public=True):

tests/managers/vs_tests.py

@@ -7,7 +7,6 @@
 import mock
 
 import SoftLayer
-from SoftLayer import exceptions
 from SoftLayer import fixtures
 from SoftLayer import testing
 
@@ -685,11 +684,6 @@ def test_upgrade_dedicated_host_instance(self):
         self.assertEqual(order_container['prices'], [{'id': 115566}])
         self.assertEqual(order_container['virtualGuests'], [{'id': 1}])
 
-    def test_upgrade_skips_location_based_prices(self):
-        # Test that no prices that have locationGroupId set are used
-        self.assertRaises(exceptions.SoftLayerError,
-                          self.vs.upgrade, 1, cpus=55, memory=2, public=True)
-
     def test_get_item_id_for_upgrade(self):
         item_id = 0
         package_items = self.client['Product_Package'].getItems(id=46)
@@ -700,6 +694,48 @@ def test_get_item_id_for_upgrade(self):
                 break
         self.assertEqual(1133, item_id)
 
+    def test_get_package_items(self):
+        self.vs._get_package_items()
+        self.assert_called_with('SoftLayer_Product_Package', 'getItems')
+
+    def test_get_package_items_errors(self):
+        mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
+        mock.return_value = []
+
+        self.assertRaises(ValueError, self.vs._get_package_items)
+
+    def test_get_price_id_for_upgrade(self):
+        package_items = self.vs._get_package_items()
+
+        price_id = self.vs._get_price_id_for_upgrade(package_items=package_items,
+                                                     option='cpus',
+                                                     value='4')
+        self.assertEqual(1144, price_id)
+
+    def test_get_price_id_for_upgrade_skips_location_price(self):
+        package_items = self.vs._get_package_items()
+
+        price_id = self.vs._get_price_id_for_upgrade(package_items=package_items,
+                                                     option='cpus',
+                                                     value='55')
+        self.assertEqual(None, price_id)
+
+    def test_get_price_id_for_upgrade_finds_nic_price(self):
+        package_items = self.vs._get_package_items()
+
+        price_id = self.vs._get_price_id_for_upgrade(package_items=package_items,
+                                                     option='memory',
+                                                     value='2')
+        self.assertEqual(1133, price_id)
+
+    def test_get_price_id_for_upgrade_finds_memory_price(self):
+        package_items = self.vs._get_package_items()
+
+        price_id = self.vs._get_price_id_for_upgrade(package_items=package_items,
+                                                     option='nic_speed',
+                                                     value='1000')
+        self.assertEqual(1122, price_id)
+
 
 class VSWaitReadyGoTests(testing.TestCase):