#828 full unit test coverage

Author: allmightyspiff

SoftLayer/CLI/hardware/create.py

@@ -12,38 +12,25 @@
 
 
 @click.command(epilog="See 'slcli server create-options' for valid options.")
-@click.option('--hostname', '-H', required=True, prompt=True,
-              help="Host portion of the FQDN")
-@click.option('--domain', '-D', required=True, prompt=True,
-              help="Domain portion of the FQDN")
-@click.option('--size', '-s', required=True, prompt=True,
-              help="Hardware size")
-@click.option('--os', '-o', required=True, prompt=True,
-              help="OS Key value")
-@click.option('--datacenter', '-d', required=True, prompt=True,
-              help="Datacenter shortname")
-@click.option('--port-speed', type=click.INT, required=True, prompt=True,
-              help="Port speeds. DEPRECATED, use --network")
-@click.option('--no-public', is_flag=True,
-              help="Private network only. DEPRECATED, use --network.")
-@click.option('--network',
-              help="Network Option Key.")
-@click.option('--billing', default='hourly', show_default=True,
-              type=click.Choice(['hourly', 'monthly']),
+@click.option('--hostname', '-H', required=True, prompt=True, help="Host portion of the FQDN")
+@click.option('--domain', '-D', required=True, prompt=True, help="Domain portion of the FQDN")
+@click.option('--size', '-s', required=True, prompt=True, help="Hardware size")
+@click.option('--os', '-o', required=True, prompt=True, help="OS Key value")
+@click.option('--datacenter', '-d', required=True, prompt=True, help="Datacenter shortname")
+@click.option('--port-speed', type=click.INT, help="Port speeds. DEPRECATED, use --network")
+@click.option('--no-public', is_flag=True, help="Private network only. DEPRECATED, use --network.")
+@click.option('--network', help="Network Option Key. Use instead of port-speed option")
+@click.option('--billing', default='hourly', show_default=True, type=click.Choice(['hourly', 'monthly']),
               help="Billing rate")
-@click.option('--postinstall', '-i',
-              help="Post-install script. Should be a HTTPS URL.")
-@click.option('--test', is_flag=True,
-              help="Do not actually create the server")
-@click.option('--template', '-t', is_eager=True,
+@click.option('--postinstall', '-i', help="Post-install script. Should be a HTTPS URL.")
+@click.option('--test', is_flag=True, help="Do not actually create the server")
+@click.option('--template', '-t', is_eager=True, type=click.Path(exists=True, readable=True, resolve_path=True),
               callback=template.TemplateCallback(list_args=['key']),
-              help="A template file that defaults the command-line options",
-              type=click.Path(exists=True, readable=True, resolve_path=True))
+              help="A template file that defaults the command-line options")
 @click.option('--export', type=click.Path(writable=True, resolve_path=True),
               help="Exports options to a template file")
 @click.option('--wait', type=click.INT,
-              help="Wait until the server is finished provisioning for up to "
-                   "X seconds before returning")
+              help="Wait until the server is finished provisioning for up to X seconds before returning")
 @helpers.multi_option('--key', '-k', help="SSH keys to add to the root user")
 @helpers.multi_option('--extra', '-e', help="Extra option Key Names")
 @environment.pass_env
@@ -101,15 +88,13 @@ def cli(env, **args):
 
     if args['export']:
         export_file = args.pop('export')
-        template.export_to_template(export_file, args,
-                                    exclude=['wait', 'test'])
+        template.export_to_template(export_file, args, exclude=['wait', 'test'])
         env.fout('Successfully exported options to a template file.')
         return
 
     if do_create:
         if not (env.skip_confirmations or formatting.confirm(
-                "This action will incur charges on your account. "
-                "Continue?")):
+                "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort('Aborting dedicated server order.')
 
         result = mgr.place_order(**order)

SoftLayer/managers/hardware.py

@@ -729,23 +729,23 @@ def get_hard_drives(self, instance_id):
         return self.hardware.getHardDrives(id=instance_id)
 
 
-def _get_extra_price_id(items, key_name, hourly, location):
-    """Returns a price id attached to item with the given key_name."""
+# def _get_extra_price_id(items, key_name, hourly, location):
+#     """Returns a price id attached to item with the given key_name."""
 
-    for item in items:
-        if utils.lookup(item, 'keyName') != key_name:
-            continue
+#     for item in items:
+#         if utils.lookup(item, 'keyName') != key_name:
+#             continue
 
-        for price in item['prices']:
-            if not _matches_billing(price, hourly):
-                continue
+#         for price in item['prices']:
+#             if not _matches_billing(price, hourly):
+#                 continue
 
-            if not _matches_location(price, location):
-                continue
+#             if not _matches_location(price, location):
+#                 continue
 
-            return price['id']
+#             return price['id']
 
-    raise SoftLayerError("Could not find valid price for extra option, '%s'" % key_name)
+#     raise SoftLayerError("Could not find valid price for extra option, '%s'" % key_name)
 
 
 def _get_bandwidth_key(items, hourly=True, no_public=False, location=None):
@@ -793,8 +793,7 @@ def _get_port_speed_key(items, port_speed, no_public, location):
 
             return keyName
 
-    raise SoftLayerError(
-        "Could not find valid price for port speed: '%s'" % port_speed)
+    raise SoftLayerError("Could not find valid price for port speed: '%s'" % port_speed)
 
 
 def _matches_billing(price, hourly):

tests/CLI/modules/server_tests.py

@@ -359,7 +359,6 @@ def test_create_options(self):
         self.assertEqual(output[0][0]['Value'], 'wdc01')
         self.assert_called_with('SoftLayer_Product_Package', 'getAllObjects')
 
-
     @mock.patch('SoftLayer.HardwareManager.place_order')
     def test_create_server(self, order_mock):
         order_mock.return_value = {
@@ -860,3 +859,27 @@ def test_billing(self):
         }
         self.assert_no_fail(result)
         self.assertEqual(json.loads(result.output), billing_json)
+
+    def test_create_hw_export(self):
+        if(sys.platform.startswith("win")):
+            self.skipTest("Temp files do not work properly in Windows.")
+        with tempfile.NamedTemporaryFile() as config_file:
+            result = self.run_command(['hw', 'create', '--hostname=test', '--export', config_file.name,
+                                       '--domain=example.com', '--datacenter=TEST00',
+                                       '--network=TEST_NETWORK', '--os=UBUNTU_12_64',
+                                       '--size=S1270_8GB_2X1TBSATA_NORAID'])
+            self.assert_no_fail(result)
+            self.assertTrue('Successfully exported options to a template file.' in result.output)
+            contents = config_file.read().decode("utf-8")
+            self.assertIn('hostname=TEST', contents)
+            self.assertIn('size=S1270_8GB_2X1TBSATA_NORAID', contents)
+
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_create_hw_no_confirm(self, confirm_mock):
+        confirm_mock.return_value = False
+
+        result = self.run_command(['hw', 'create', '--hostname=test', '--size=S1270_8GB_2X1TBSATA_NORAID',
+                                   '--domain=example.com', '--datacenter=TEST00',
+                                   '--network=TEST_NETWORK', '--os=UBUNTU_12_64'])
+
+        self.assertEqual(result.exit_code, 2)

tests/managers/hardware_tests.py

@@ -7,7 +7,6 @@
 import copy
 
 import mock
-from pprint import pprint as pp 
 
 import SoftLayer
 from SoftLayer import fixtures
@@ -118,7 +117,7 @@ def test_reload(self):
     def test_get_create_options(self):
         options = self.hardware.get_create_options()
 
-        extras =  {'key': '1_IPV6_ADDRESS', 'name': '1 IPv6 Address'}
+        extras = {'key': '1_IPV6_ADDRESS', 'name': '1 IPv6 Address'}
         locations = {'key': 'wdc01', 'name': 'Washington 1'}
         operating_systems = {
             'key': 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT',
@@ -141,7 +140,6 @@ def test_get_create_options(self):
         self.assertEqual(options['port_speeds'][0]['name'], port_speeds['name'])
         self.assertEqual(options['sizes'][0], sizes)
 
-
     def test_get_create_options_package_missing(self):
         packages = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
         packages.return_value = []
@@ -174,7 +172,7 @@ def test_generate_create_dict(self):
             'post_uri': 'http://example.com/script.php',
             'ssh_keys': [10],
         }
-        
+
         package = 'BARE_METAL_SERVER'
         location = 'wdc01'
         item_keynames = [
@@ -194,7 +192,7 @@ def test_generate_create_dict(self):
                 'hostname': 'unicorn',
             }],
             'provisionScripts': ['http://example.com/script.php'],
-            'sshKeys' : [{'sshKeyIds': [10]}]
+            'sshKeys': [{'sshKeyIds': [10]}]
         }
 
         data = self.hardware._generate_create_dict(**args)
@@ -204,7 +202,25 @@ def test_generate_create_dict(self):
         for keyname in item_keynames:
             self.assertIn(keyname, data['item_keynames'])
         self.assertEqual(extras, data['extras'])
+        self.assertEqual(preset_keyname, data['preset_keyname'])
+        self.assertEqual(hourly, data['hourly'])
 
+    def test_generate_create_dict_network_key(self):
+        args = {
+            'size': 'S1270_8GB_2X1TBSATA_NORAID',
+            'hostname': 'test1',
+            'domain': 'test.com',
+            'location': 'wdc01',
+            'os': 'OS_UBUNTU_14_04_LTS_TRUSTY_TAHR_64_BIT',
+            'network': 'NETWORKING',
+            'hourly': True,
+            'extras': ['1_IPV6_ADDRESS'],
+            'post_uri': 'http://example.com/script.php',
+            'ssh_keys': [10],
+        }
+
+        data = self.hardware._generate_create_dict(**args)
+        self.assertIn('NETWORKING', data['item_keynames'])
 
     @mock.patch('SoftLayer.managers.ordering.OrderingManager.verify_order')
     @mock.patch('SoftLayer.managers.hardware.HardwareManager._generate_create_dict')
@@ -613,17 +629,99 @@ def test_get_hard_drive_empty(self):
 
 class HardwareHelperTests(testing.TestCase):
 
+    def set_up(self):
+        self.items = [
+            {
+                "itemCategory": {"categoryCode": "port_speed"},
+                "capacity": 100,
+                "attributes": [
+                    {'attributeTypeKeyName': 'NON_LACP'},
+                    {'attributeTypeKeyName': 'IS_PRIVATE_NETWORK_ONLY'}
+                ],
+                "keyName": "ITEM_1",
+                "prices": [{"id": 1, "locationGroupId": 100}]
+            },
+            {
+                "itemCategory": {"categoryCode": "port_speed"},
+                "capacity": 200,
+                "attributes": [
+                    {'attributeTypeKeyName': 'YES_LACP'},
+                    {'attributeTypeKeyName': 'IS_PRIVATE_NETWORK_ONLY'}
+                ],
+                "keyName": "ITEM_2",
+                "prices": [{"id": 1, "locationGroupId": 151}]
+            },
+            {
+                "itemCategory": {"categoryCode": "port_speed"},
+                "capacity": 200,
+                "attributes": [
+                    {'attributeTypeKeyName': 'YES_LACP'},
+                    {'attributeTypeKeyName': 'IS_PRIVATE_NETWORK_ONLY'}
+                ],
+                "keyName": "ITEM_3",
+                "prices": [{"id": 1, "locationGroupId": 51}]
+            },
+            {
+                "itemCategory": {"categoryCode": "bandwidth"},
+                "capacity": 0.0,
+                "attributes": [],
+                "keyName": "HOURLY_BANDWIDTH_1",
+                "prices": [{"id": 1, "locationGroupId": 51, "hourlyRecurringFee": 1.0, "recurringFee": 1.0}]
+            },
+            {
+                "itemCategory": {"categoryCode": "bandwidth"},
+                "capacity": 10.0,
+                "attributes": [],
+                "keyName": "MONTHLY_BANDWIDTH_1",
+                "prices": [{"id": 1, "locationGroupId": 151, "recurringFee": 1.0}]
+            },
+            {
+                "itemCategory": {"categoryCode": "bandwidth"},
+                "capacity": 10.0,
+                "attributes": [],
+                "keyName": "MONTHLY_BANDWIDTH_2",
+                "prices": [{"id": 1, "locationGroupId": 51, "recurringFee": 1.0}]
+            },
+        ]
+        self.location = {'location': {'location': {'priceGroups': [{'id': 50}, {'id': 51}]}}}
+
+    def test_bandwidth_key(self):
+        result = managers.hardware._get_bandwidth_key(self.items, True, False, self.location)
+        self.assertEqual('HOURLY_BANDWIDTH_1', result)
+        result = managers.hardware._get_bandwidth_key(self.items, False, True, self.location)
+        self.assertEqual('HOURLY_BANDWIDTH_1', result)
+        result = managers.hardware._get_bandwidth_key(self.items, False, False, self.location)
+        self.assertEqual('MONTHLY_BANDWIDTH_2', result)
+        ex = self.assertRaises(SoftLayer.SoftLayerError,
+                               managers.hardware._get_bandwidth_key, [], True, False, self.location)
+        self.assertEqual("Could not find valid price for bandwidth option", str(ex))
+
+    def test_port_speed_key(self):
+        result = managers.hardware._get_port_speed_key(self.items, 200, True, self.location)
+        self.assertEqual("ITEM_3", result)
+
+    def test_port_speed_key_exception(self):
+        items = []
+        location = {}
+        ex = self.assertRaises(SoftLayer.SoftLayerError,
+                               managers.hardware._get_port_speed_key, items, 999, False, location)
+        self.assertEqual("Could not find valid price for port speed: '999'", str(ex))
+
     def test_matches_location(self):
         price = {'id': 1, 'locationGroupId': 51, 'recurringFee': 99}
-        location = {
-            'location': {
-                'location': {
-                    'priceGroups': [
-                        {'id': 50},
-                        {'id': 51}
-                    ]
-                }
-            }
-        }
-        result = managers.hardware._matches_location(price, location)
-        self.assertTrue(result)
+
+        self.assertTrue(managers.hardware._matches_location(price, self.location))
+        price['locationGroupId'] = 99999
+        self.assertFalse(managers.hardware._matches_location(price, self.location))
+
+    def test_is_bonded(self):
+        item_non_lacp = {'attributes': [{'attributeTypeKeyName': 'NON_LACP'}]}
+        item_lacp = {'attributes': [{'attributeTypeKeyName': 'YES_LACP'}]}
+        self.assertFalse(managers.hardware._is_bonded(item_non_lacp))
+        self.assertTrue(managers.hardware._is_bonded(item_lacp))
+
+    def test_is_private(self):
+        item_private = {'attributes': [{'attributeTypeKeyName': 'IS_PRIVATE_NETWORK_ONLY'}]}
+        item_public = {'attributes': [{'attributeTypeKeyName': 'NOT_PRIVATE_NETWORK_ONLY'}]}
+        self.assertTrue(managers.hardware._is_private_port_speed_item(item_private))
+        self.assertFalse(managers.hardware._is_private_port_speed_item(item_public))