Merge pull request #1487 from allmightyspiff/issues1486

#1486 fixed newly failing unit tests

Author: allmightyspiff

SoftLayer/CLI/virt/create.py

@@ -177,7 +177,7 @@ def _parse_create_args(client, args):
               help="Forces the VS to only have access the private network")
 @click.option('--like', is_eager=True, callback=_update_with_like_args,
               help="Use the configuration from an existing VS")
-@click.option('--network', '-n', help="Network port speed in Mbps")
+@click.option('--network', '-n', help="Network port speed in Mbps", type=click.INT)
 @helpers.multi_option('--tag', '-g', help="Tags to add to the instance")
 @click.option('--template', '-t', is_eager=True,
               callback=template.TemplateCallback(list_args=['disk', 'key', 'tag']),

tests/CLI/modules/vs/vs_create_tests.py

@@ -42,7 +42,7 @@ def test_create(self, confirm_mock):
                  'hostname': 'host',
                  'startCpus': 2,
                  'operatingSystemReferenceCode': 'UBUNTU_LATEST',
-                 'networkComponents': [{'maxSpeed': '100'}],
+                 'networkComponents': [{'maxSpeed': 100}],
                  'supplementalCreateObjectOptions': {'bootMode': None}},)
         self.assert_called_with('SoftLayer_Virtual_Guest', 'generateOrderTemplate', args=args)
 
@@ -225,7 +225,7 @@ def test_create_with_integer_image_guid(self, confirm_mock):
             'supplementalCreateObjectOptions': {'bootMode': None},
             'blockDeviceTemplateGroup': {'globalIdentifier': 'aaaa1111bbbb2222'},
             'datacenter': {'name': 'dal05'},
-            'networkComponents': [{'maxSpeed': '100'}]
+            'networkComponents': [{'maxSpeed': 100}]
         },)
 
         self.assert_called_with('SoftLayer_Virtual_Guest', 'generateOrderTemplate', args=args)
@@ -257,7 +257,7 @@ def test_create_with_flavor(self, confirm_mock):
                      'bootMode': None,
                      'flavorKeyName': 'B1_1X2X25'},
                  'operatingSystemReferenceCode': 'UBUNTU_LATEST',
-                 'networkComponents': [{'maxSpeed': '100'}]},)
+                 'networkComponents': [{'maxSpeed': 100}]},)
 
         self.assert_called_with('SoftLayer_Virtual_Guest', 'generateOrderTemplate', args=args)
 
@@ -351,21 +351,11 @@ def test_create_with_host_id(self, confirm_mock):
             'domain': 'example.com',
             'localDiskFlag': True,
             'hourlyBillingFlag': True,
-            'supplementalCreateObjectOptions': {
-                'bootMode': None
-            },
-            'dedicatedHost': {
-                'id': 123
-            },
+            'supplementalCreateObjectOptions': {'bootMode': None},
+            'dedicatedHost': {'id': 123},
             'operatingSystemReferenceCode': 'UBUNTU_LATEST',
-            'datacenter': {
-                'name': 'dal05'
-            },
-            'networkComponents': [
-                {
-                    'maxSpeed': '100'
-                }
-            ]
+            'datacenter': {'name': 'dal05'},
+            'networkComponents': [{'maxSpeed': 100}]
         },)
 
         self.assert_called_with('SoftLayer_Virtual_Guest', 'generateOrderTemplate', args=template_args)

tests/api_tests.py

@@ -96,6 +96,18 @@ def test_simple_call(self):
                                 offset=None,
                                 )
 
+    def test_simple_call_2(self):
+        mock = self.set_mock('SoftLayer_SERVICE', 'METHOD')
+        mock.return_value = {"test": "result"}
+
+        resp = self.client.call('SERVICE', 'METHOD', {'networkComponents': [{'maxSpeed': 100}]})
+
+        self.assertEqual(resp, {"test": "result"})
+        self.assert_called_with('SoftLayer_SERVICE', 'METHOD',
+                                mask=None, filter=None, identifier=None,
+                                args=({'networkComponents': [{'maxSpeed': 100}]},), limit=None, offset=None,
+                                )
+
     def test_verify_request_false(self):
         client = SoftLayer.BaseClient(transport=self.mocks)
         mock = self.set_mock('SoftLayer_SERVICE', 'METHOD')