fixed unit tests

Author: allmightyspiff

SoftLayer/CLI/virt/capacity/create.py

@@ -7,7 +7,7 @@
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.vs_capacity import CapacityManager as CapacityManager
 
-from pprint import pprint as pp
+
 @click.command(epilog=click.style("""WARNING: Reserved Capacity is on a yearly contract"""
                                   """ and not cancelable until the contract is expired.""", fg='red'))
 @click.option('--name', '-n', required=True, prompt=True,
@@ -34,7 +34,6 @@ def cli(env, name, backend_router_id, flavor, instances, test=False):
         flavor=flavor,
         instances=instances,
         test=test)
-
     if test:
         table = formatting.Table(['Name', 'Value'], "Test Order")
         container = result['orderContainers'][0]
@@ -48,7 +47,5 @@ def cli(env, name, backend_router_id, flavor, instances, test=False):
         table.add_row(['Order Date', result['orderDate']])
         table.add_row(['Order ID', result['orderId']])
         table.add_row(['status', result['placedOrder']['status']])
-        for item in result['placedOrder']['items']:
-            table.add_row([item['categoryCode'], item['description']])
         table.add_row(['Hourly Total', result['orderDetails']['postTaxRecurring']])
     env.fout(table)

SoftLayer/CLI/virt/capacity/create_options.py

@@ -16,7 +16,7 @@ def cli(env):
     items = manager.get_create_options()
     # pp(items)
     items.sort(key=lambda term: int(term['capacity']))
-    table = formatting.Table(["KeyName", "Description", "Term", "Default Hourly Price Per Instance"], 
+    table = formatting.Table(["KeyName", "Description", "Term", "Default Hourly Price Per Instance"],
                              title="Reserved Capacity Options")
     table.align["Hourly Price"] = "l"
     table.align["Description"] = "l"
@@ -27,7 +27,6 @@ def cli(env):
         ])
     env.fout(table)
 
-
     regions = manager.get_available_routers()
     location_table = formatting.Table(['Location', 'POD', 'BackendRouterId'], 'Orderable Locations')
     for region in regions:

tests/CLI/modules/vs_capacity_tests.py

@@ -41,18 +41,17 @@ def test_create_test(self):
         item_mock.return_value = SoftLayer_Product_Package.getItems_RESERVED_CAPACITY
         order_mock = self.set_mock('SoftLayer_Product_Order', 'verifyOrder')
         order_mock.return_value = SoftLayer_Product_Order.rsc_verifyOrder
-        result = self.run_command(['vs', 'capacity', 'create', '--name=TEST', '--datacenter=dal13',
-                                   '--backend_router_id=1234', '--capacity=B1_1X2_1_YEAR_TERM', '--quantity=10',
-                                   '--test'])
+        result = self.run_command(['vs', 'capacity', 'create', '--name=TEST', '--test',
+                                   '--backend_router_id=1234', '--flavor=B1_1X2_1_YEAR_TERM', '--instances=10'])
         self.assert_no_fail(result)
 
     def test_create(self):
         item_mock = self.set_mock('SoftLayer_Product_Package', 'getItems')
         item_mock.return_value = SoftLayer_Product_Package.getItems_RESERVED_CAPACITY
         order_mock = self.set_mock('SoftLayer_Product_Order', 'placeOrder')
         order_mock.return_value = SoftLayer_Product_Order.rsc_placeOrder
-        result = self.run_command(['vs', 'capacity', 'create', '--name=TEST', '--datacenter=dal13',
-                                   '--backend_router_id=1234', '--capacity=B1_1X2_1_YEAR_TERM', '--quantity=10'])
+        result = self.run_command(['vs', 'capacity', 'create', '--name=TEST', '--instances=10',
+                                   '--backend_router_id=1234', '--flavor=B1_1X2_1_YEAR_TERM'])
         self.assert_no_fail(result)
 
     def test_create_options(self):

tests/managers/vs_capacity_tests.py

@@ -50,15 +50,15 @@ def test_create(self):
         item_mock = self.set_mock('SoftLayer_Product_Package', 'getItems')
         item_mock.return_value = SoftLayer_Product_Package.getItems_RESERVED_CAPACITY
         self.manager.create(
-            name='TEST', datacenter='dal13', backend_router_id=1, capacity='B1_1X2_1_YEAR_TERM', quantity=5)
+            name='TEST', backend_router_id=1, flavor='B1_1X2_1_YEAR_TERM', instances=5)
 
         expected_args = {
             'orderContainers': [
                 {
                     'backendRouterId': 1,
                     'name': 'TEST',
                     'packageId': 1059,
-                    'location': 1854895,
+                    'location': 0,
                     'quantity': 5,
                     'useHourlyPricing': True,
                     'complexType': 'SoftLayer_Container_Product_Order_Virtual_ReservedCapacity',
@@ -69,34 +69,32 @@ def test_create(self):
         }
 
         self.assert_called_with('SoftLayer_Product_Package', 'getAllObjects')
-        self.assert_called_with('SoftLayer_Location', 'getDatacenters')
         self.assert_called_with('SoftLayer_Product_Package', 'getItems', identifier=1059)
         self.assert_called_with('SoftLayer_Product_Order', 'placeOrder', args=(expected_args,))
 
     def test_create_test(self):
         item_mock = self.set_mock('SoftLayer_Product_Package', 'getItems')
         item_mock.return_value = SoftLayer_Product_Package.getItems_RESERVED_CAPACITY
         self.manager.create(
-            name='TEST', datacenter='dal13', backend_router_id=1, capacity='B1_1X2_1_YEAR_TERM', quantity=5, test=True)
+            name='TEST', backend_router_id=1, flavor='B1_1X2_1_YEAR_TERM', instances=5, test=True)
 
         expected_args = {
             'orderContainers': [
                 {
                     'backendRouterId': 1,
                     'name': 'TEST',
                     'packageId': 1059,
-                    'location': 1854895,
+                    'location': 0,
                     'quantity': 5,
                     'useHourlyPricing': True,
                     'complexType': 'SoftLayer_Container_Product_Order_Virtual_ReservedCapacity',
-                    'prices': [{'id': 217561}
-                               ]
+                    'prices': [{'id': 217561}],
+
                 }
             ]
         }
 
         self.assert_called_with('SoftLayer_Product_Package', 'getAllObjects')
-        self.assert_called_with('SoftLayer_Location', 'getDatacenters')
         self.assert_called_with('SoftLayer_Product_Package', 'getItems', identifier=1059)
         self.assert_called_with('SoftLayer_Product_Order', 'verifyOrder', args=(expected_args,))
 
@@ -131,14 +129,9 @@ def test_create_guest(self):
                 'flavorKeyName': 'B1_1X2X25'
             },
             'operatingSystemReferenceCode': 'UBUNTU_LATEST_64',
-            'datacenter': {
-                'name': 'dal13'
-            },
-            'sshKeys': [
-                {
-                    'id': 1234
-                }
-            ]
+            'datacenter': {'name': 'dal13'},
+            'sshKeys': [{'id': 1234}],
+            'localDiskFlag': False
         }
 
         self.assert_called_with('SoftLayer_Virtual_ReservedCapacityGroup', 'getObject', mask=mock.ANY)