Adds new test, organizes options a bit better

sudorandom · sudorandom · commit 407a3078f26e · 2015-03-26T16:02:11.000-05:00
diff --git a/SoftLayer/CLI/server/create.py b/SoftLayer/CLI/server/create.py
@@ -17,17 +17,11 @@
 @click.option('--size', '-s', help="Hardware size")
 @click.option('--os', '-o', help="OS install code")
 @click.option('--datacenter', '-d', help="Datacenter shortname")
+@click.option('--port-speed', type=click.INT, help="Port speeds")
 @click.option('--billing',
               type=click.Choice(['hourly', 'monthly']),
               default='hourly',
               help="Billing rate")
-@click.option('--port-speed', type=click.INT, help="Port speeds")
-@click.option('--test',
-              is_flag=True,
-              help="Do not actually create the virtual server")
-@click.option('--export',
-              type=click.Path(writable=True, resolve_path=True),
-              help="Exports options to a template file")
 @click.option('--postinstall', '-i', help="Post-install script to download")
 @helpers.multi_option('--key', '-k',
                       help="SSH keys to add to the root user")
@@ -40,6 +34,12 @@
                    "server placed",
               type=click.INT)
 @helpers.multi_option('--extra', '-e', help="Extra options")
+@click.option('--test',
+              is_flag=True,
+              help="Do not actually create the virtual server")
+@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 "
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -398,18 +398,6 @@ def _generate_create_dict(self,
 
         extras = extras or []
 
-        hardware = {
-            'hostname': hostname,
-            'domain': domain,
-        }
-
-        if public_vlan:
-            hardware['primaryNetworkComponent'] = {
-                "networkVlan": {"id": int(public_vlan)}}
-        if private_vlan:
-            hardware['primaryBackendNetworkComponent'] = {
-                "networkVlan": {"id": int(private_vlan)}}
-
         package = self._get_package()
 
         prices = []
@@ -432,6 +420,18 @@ def _generate_create_dict(self,
         for extra in extras:
             prices.append(_get_extra_price_id(package['items'], extra, hourly))
 
+        hardware = {
+            'hostname': hostname,
+            'domain': domain,
+        }
+
+        if public_vlan:
+            hardware['primaryNetworkComponent'] = {
+                "networkVlan": {"id": int(public_vlan)}}
+        if private_vlan:
+            hardware['primaryBackendNetworkComponent'] = {
+                "networkVlan": {"id": int(private_vlan)}}
+
         order = {
             'hardware': [hardware],
             'location': _get_location_key(package, location),
diff --git a/SoftLayer/tests/managers/hardware_tests.py b/SoftLayer/tests/managers/hardware_tests.py
@@ -362,6 +362,22 @@ def test_get_extra_price_id_no_items(self):
         self.assertEqual("Could not find valid price for extra option, 'test'",
                          str(ex))
 
+    def test_get_default_price_id_item_not_first(self):
+        items = [{
+            'itemCategory': {'categoryCode': 'unknown', 'id': 325},
+            'keyName': 'UNKNOWN',
+            'prices': [{'accountRestrictions': [],
+                        'currentPriceFlag': '',
+                        'hourlyRecurringFee': '10.0',
+                        'id': 1245172,
+                        'recurringFee': '1.0'}],
+        }]
+        ex = self.assertRaises(SoftLayer.SoftLayerError,
+                               managers.hardware._get_default_price_id,
+                               items, 'unknown', True)
+        self.assertEqual("Could not find valid price for 'unknown' option",
+                         str(ex))
+
     def test_get_default_price_id_no_items(self):
         ex = self.assertRaises(SoftLayer.SoftLayerError,
                                managers.hardware._get_default_price_id,
