Merge pull request softlayer#447 from Neetuj/issue420

sudorandom · sudorandom · commit e68b5b876918 · 2014-12-09T15:54:47.000-06:00
adding import image
diff --git a/SoftLayer/CLI/image/import.py b/SoftLayer/CLI/image/import.py
@@ -0,0 +1,54 @@
+"""Import an image."""
+# :license: MIT, see LICENSE for more details.
+
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import exceptions
+from SoftLayer.CLI import formatting
+
+
+import click
+
+
+@click.command()
+@click.argument('name')
+@click.argument('uri')
+@click.option('--note', default="",
+              help="The note to be applied to the imported template")
+@click.option('--osrefcode', default="",
+              help="The referenceCode of the operating system software"
+                   " description for the imported VHD")
+@environment.pass_env
+def cli(env, name, note, osrefcode, uri):
+    """Import an image."""
+
+    image_mgr = SoftLayer.ImageManager(env.client)
+    data = {}
+    output = []
+    if name:
+        data['name'] = name
+    if note:
+        data['note'] = note
+    if osrefcode:
+        data['operatingSystemReferenceCode'] = osrefcode
+    if uri:
+        data['uri'] = uri
+
+    # not sure if u should validate here or not
+    # if uri.endswith(".vhd") and osrefcode == "":
+    #    raise exceptions.CLIAbort("Please specify osrefcode for .vhdImage")
+
+    result = image_mgr.import_image_from_uri(data)
+
+    if not result:
+        raise exceptions.CLIAbort("Failed to import Image")
+
+    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
diff --git a/SoftLayer/CLI/routes.py b/SoftLayer/CLI/routes.py
@@ -73,6 +73,7 @@
     ('image:detail', 'SoftLayer.CLI.image.detail:cli'),
     ('image:edit', 'SoftLayer.CLI.image.edit:cli'),
     ('image:list', 'SoftLayer.CLI.image.list:cli'),
+    ('image:import', 'SoftLayer.CLI.image.import:cli'),
 
     ('iscsi', 'SoftLayer.CLI.iscsi'),
     ('iscsi:cancel', 'SoftLayer.CLI.iscsi.cancel:cli'),
diff --git a/SoftLayer/managers/image.py b/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.
@@ -118,3 +118,8 @@ def edit(self, image_id, name=None, note=None, tag=None):
             return True
         else:
             return False
+
+    def import_image_from_uri(self, data):
+        """Import images which match the given uri."""
+        result = self.vgbdtg.createFromExternalSource(data)
+        return result
diff --git a/SoftLayer/testing/fixtures/SoftLayer_Virtual_Guest_Block_Device_Template_Group.py b/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',
+}]
diff --git a/SoftLayer/tests/managers/image_tests.py b/SoftLayer/tests/managers/image_tests.py
@@ -130,3 +130,14 @@ def test_edit_full(self):
         self.assert_called_with(IMAGE_SERVICE, 'editObject',
                                 identifier=1,
                                 args=({'name': 'abc', 'note': 'xyz'},))
+
+    def test_import_image(self):
+        # Test import image
+        self.image.import_image_from_uri({'name': 'test_image',
+                                          'note': 'testimage',
+                                          'uri': 'invaliduri'})
+
+        self.assert_called_with(IMAGE_SERVICE, 'createFromExternalSource',
+                                args=({'name': 'test_image',
+                                       'note': 'testimage',
+                                       'uri': 'invaliduri'},))
