Merge pull request softlayer#705 from sudorandom/issue-704

sudorandom · sudorandom · commit 893a890ed850 · 2016-03-30T15:43:35.000-05:00
Automatically convert integer image ID to GUID on virtual create command
diff --git a/SoftLayer/CLI/virt/create.py b/SoftLayer/CLI/virt/create.py
@@ -81,7 +81,13 @@ def _parse_create_args(client, args):
         data['os_code'] = args['os']
 
     if args.get('image'):
-        data['image_id'] = args['image']
+        if args.get('image').isdigit():
+            image_mgr = SoftLayer.ImageManager(client)
+            image_details = image_mgr.get_image(args.get('image'),
+                                                mask="id,globalIdentifier")
+            data['image_id'] = image_details['globalIdentifier']
+        else:
+            data['image_id'] = args['image']
 
     if args.get('datacenter'):
         data['datacenter'] = args['datacenter']
diff --git a/tests/CLI/modules/vs_tests.py b/tests/CLI/modules/vs_tests.py
@@ -134,6 +134,41 @@ def test_create(self, confirm_mock):
         self.assert_called_with('SoftLayer_Virtual_Guest', 'createObject',
                                 args=args)
 
+    @mock.patch('SoftLayer.CLI.formatting.confirm')
+    def test_create_with_integer_image_id(self, confirm_mock):
+        confirm_mock.return_value = True
+        result = self.run_command(['vs', 'create',
+                                   '--cpu=2',
+                                   '--domain=example.com',
+                                   '--hostname=host',
+                                   '--image=12345',
+                                   '--memory=1',
+                                   '--network=100',
+                                   '--billing=hourly',
+                                   '--datacenter=dal05'])
+
+        self.assertEqual(result.exit_code, 0)
+        self.assertEqual(json.loads(result.output),
+                         {'guid': '1a2b3c-1701',
+                          'id': 100,
+                          'created': '2013-08-01 15:23:45'})
+
+        args = ({
+            'datacenter': {'name': 'dal05'},
+            'domain': 'example.com',
+            'hourlyBillingFlag': True,
+            'localDiskFlag': True,
+            'maxMemory': 1024,
+            'hostname': 'host',
+            'startCpus': 2,
+            'blockDeviceTemplateGroup': {
+                'globalIdentifier': '0B5DEAF4-643D-46CA-A695-CECBE8832C9D',
+            },
+            'networkComponents': [{'maxSpeed': '100'}]
+        },)
+        self.assert_called_with('SoftLayer_Virtual_Guest', 'createObject',
+                                args=args)
+
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_dns_sync_both(self, confirm_mock):
         confirm_mock.return_value = True
