change test case and user response

Author: Neetuj

SoftLayer/CLI/image/import.py

@@ -4,6 +4,7 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
 
 
 import click
@@ -23,6 +24,7 @@ def cli(env, name, note, osrefcode, uri):
 
     image_mgr = SoftLayer.ImageManager(env.client)
     data = {}
+    output = []
     if name:
         data['name'] = name
     if note:
@@ -36,8 +38,17 @@ def cli(env, name, note, osrefcode, uri):
     # if uri.endswith(".vhd") and osrefcode == "":
     #    raise exceptions.CLIAbort("Please specify osrefcode for .vhdImage")
 
-    newimage = image_mgr.import_image_from_uri(data)
-    if not newimage:
+    result = image_mgr.import_image_from_uri(data)
+
+    if not result:
         raise exceptions.CLIAbort("Failed to import Image")
 
-    return 'Image %s was imported succesfully!' % newimage
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+    table.add_row(['name', result['name']])
+    table.add_row(['id', result['id']])
+    table.add_row(['created', result['createDate']])
+    table.add_row(['guid', result['globalIdentifier']])
+    output.append(table)
+    return output

SoftLayer/managers/image.py

@@ -38,7 +38,7 @@ def get_image(self, image_id, **kwargs):
     def delete_image(self, image_id):
         """Deletes the specified image.
 
-        :param int image: The ID of the image.
+        :param int image_id: The ID of the image.
         """
         self.vgbdtg.deleteObject(id=image_id)
 
@@ -100,7 +100,7 @@ def _get_ids_from_name_private(self, name):
     def edit(self, image_id, name=None, note=None, tag=None):
         """Edit image related details.
 
-        :param int image: The ID of the image
+        :param int image_id: The ID of the image
         :param string name: Name of the Image.
         :param string note: Note of the image.
         :param string tag: Tags of the image to be updated to.
@@ -122,4 +122,4 @@ def edit(self, image_id, name=None, note=None, tag=None):
     def import_image_from_uri(self, data):
         """Import images which match the given uri."""
         result = self.vgbdtg.createFromExternalSource(data)
-        return result['name']
+        return result

SoftLayer/testing/fixtures/SoftLayer_Virtual_Guest_Block_Device_Template_Group.py

@@ -21,3 +21,9 @@
 deleteObject = {}
 editObject = True
 setTags = True
+createFromExternalSource = [{
+    'createDate': '2013-12-05T21:53:03-06:00',
+    'globalIdentifier': '0B5DEAF4-643D-46CA-A695-CECBE8832C9D',
+    'id': 100,
+    'name': 'test_image',
+}]

SoftLayer/tests/managers/image_tests.py

@@ -131,10 +131,13 @@ def test_edit_full(self):
                                 identifier=1,
                                 args=({'name': 'abc', 'note': 'xyz'},))
 
-    def test_import_invalid_image(self):
+    def test_import_image(self):
         # Test updating tags
-        self.image.import_image_from_uri(1, {'name':'test', 'note':'testimage', 'uri':'invaliduri'})
+        self.image.import_image_from_uri({'name': 'test_image',
+                                          'note': 'testimage',
+                                          'uri': 'invaliduri'})
 
         self.assert_called_with(IMAGE_SERVICE, 'createFromExternalSource',
-                                identifier=1,
-                                args=({'name':'test', 'note':'testimage', 'uri':'invaliduri'},))
+                                args=({'name': 'test_image',
+                                       'note': 'testimage',
+                                       'uri': 'invaliduri'},))