Merge pull request softlayer#375 from Neetuj/newissue341

sudorandom · sudorandom · commit 5b448fe7e9e5 · 2014-08-23T17:38:26.000-05:00
Resolves issue341 of parsing argument value
diff --git a/SoftLayer/CLI/helpers.py b/SoftLayer/CLI/helpers.py
@@ -30,3 +30,13 @@ def resolve_id(resolver, identifier, name='object'):
             (name, identifier, ', '.join([str(_id) for _id in ids])))
 
     return ids[0]
+
+
+def sanitize_args(args):
+    """ sanitize input (remove = sign from argument values)
+    :returns args back
+    """
+    for key, value in args.items():
+        if isinstance(value, str) and value.startswith('='):
+            args[key] = value[1:]
+    return args
diff --git a/SoftLayer/CLI/modules/vs.py b/SoftLayer/CLI/modules/vs.py
@@ -580,6 +580,7 @@ def _parse_create_args(self, args):
 
         :param dict args: CLI arguments
         """
+        args = helpers.sanitize_args(args)
         data = {
             "hourly": args['--hourly'],
             "cpus": args['--cpu'],
diff --git a/SoftLayer/tests/CLI/helper_tests.py b/SoftLayer/tests/CLI/helper_tests.py
@@ -249,7 +249,6 @@ class ResolveIdTests(testing.TestCase):
     def test_resolve_id_one(self):
         resolver = lambda r: [12345]
         id = helpers.resolve_id(resolver, 'test')
-
         self.assertEqual(id, 12345)
 
     def test_resolve_id_none(self):
@@ -423,3 +422,19 @@ def test_export_to_template(self):
                 mock.call('datacenter=ams01\n'),
                 mock.call('disk=disk1,disk2\n'),
             ], any_order=True)  # Order isn't really guaranteed
+
+
+class TestInputSanitization(testing.TestCase):
+
+    def test_equalto_removed(self):
+        args = {
+            '--os': None,
+            '--datacenter': '=ams01',
+            '--memory': '=1g',
+            '--test': '=1344'}
+        argnew = helpers.sanitize_args(args)
+        self.assertEqual(argnew, {
+            '--os': None,
+            '--datacenter': 'ams01',
+            '--memory': '1g',
+            '--test': '1344'})
diff --git a/SoftLayer/tests/CLI/modules/vs_tests.py b/SoftLayer/tests/CLI/modules/vs_tests.py
@@ -134,3 +134,49 @@ def test_create(self, confirm_mock):
                            'id': 100,
                            'created': '2013-08-01 15:23:45'}],
                          formatting.format_output(output, 'python'))
+
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_check_create_args(self, confirm_mock):
+        confirm_mock.return_value = True
+        command = vs.CreateVS(client=self.client)
+        output = command.execute({'--cpu': '2',
+                                  '--domain': 'example.com',
+                                  '--hostname': 'host',
+                                  '--image': None,
+                                  '--os': 'UBUNTU_LATEST',
+                                  '--memory': '=1024',
+                                  '--nic': '100',
+                                  '--hourly': True,
+                                  '--monthly': False,
+                                  '--like': None,
+                                  '--datacenter': None,
+                                  '--dedicated': False,
+                                  '--san': False,
+                                  '--test': False,
+                                  '--export': None,
+                                  '--userfile': None,
+                                  '--postinstall': None,
+                                  '--key': [],
+                                  '--network': [],
+                                  '--disk': [],
+                                  '--private': False,
+                                  '--template': None,
+                                  '--userdata': None,
+                                  '--vlan_public': None,
+                                  '--vlan_private': None,
+                                  '--wait': None,
+                                  '--really': False})
+
+        self.assertEqual([{'guid': '1a2b3c-1701',
+                           'id': 100,
+                           'created': '2013-08-01 15:23:45'}],
+                         formatting.format_output(output, 'python'))
+        service = self.client['Virtual_Guest']
+        service.createObject.assert_called_with({
+            'domain': 'example.com',
+            'localDiskFlag': True,
+            'startCpus': 2,
+            'operatingSystemReferenceCode': 'UBUNTU_LATEST',
+            'maxMemory': 1024,
+            'hourlyBillingFlag': True,
+            'hostname': 'host'})
