Fix manager and add CLI support

Author: mikewurtz

SoftLayer/CLI/image/export.py

@@ -12,17 +12,23 @@
 @click.command()
 @click.argument('identifier')
 @click.argument('uri')
+@click.option('--ibm_api_key',
+              default="",
+              help="The IBM Cloud API Key with access to IBM Cloud Object "
+                   "Storage instance.")
 @environment.pass_env
-def cli(env, identifier, uri):
+def cli(env, identifier, uri, ibm_api_key):
     """Export an image to object storage.
 
     The URI for an object storage object (.vhd/.iso file) of the format:
     swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
+    or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+    Object Storage
     """
 
     image_mgr = SoftLayer.ImageManager(env.client)
     image_id = helpers.resolve_id(image_mgr.resolve_ids, identifier, 'image')
-    result = image_mgr.export_image_to_uri(image_id, uri)
+    result = image_mgr.export_image_to_uri(image_id, uri, ibm_api_key)
 
     if not result:
         raise exceptions.CLIAbort("Failed to export Image")

SoftLayer/CLI/image/import.py

@@ -18,13 +18,38 @@
 @click.option('--os-code',
               default="",
               help="The referenceCode of the operating system software"
-                   " description for the imported VHD")
+                   " description for the imported VHD, ISO, or RAW image")
+@click.option('--ibm-api-key',
+              default="",
+              help="The IBM Cloud API Key with access to IBM Cloud Object "
+                   "Storage instance.")
+@click.option('--root-key-id',
+              default="",
+              help="ID of the root key in Key Protect")
+@click.option('--wrapped-dek',
+              default="",
+              help="Wrapped Decryption Key provided by IBM KeyProtect")
+@click.option('--kp-id',
+              default="",
+              help="ID of the IBM Key Protect Instance")
+@click.option('--cloud-init',
+              default="",
+              help="Specifies if image is cloud init")
+@click.option('--byol',
+              default="",
+              help="Specifies if image is bring your own license")
+@click.option('--is-encrypted',
+              default="",
+              help="Specifies if image is encrypted")
 @environment.pass_env
-def cli(env, name, note, os_code, uri):
+def cli(env, name, note, os_code, uri, ibm_api_key, root_key_id, wrapped_dek,
+        kp_id, cloud_init, byol, is_encrypted):
     """Import an image.
 
     The URI for an object storage object (.vhd/.iso file) of the format:
     swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
+    or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+    Object Storage
     """
 
     image_mgr = SoftLayer.ImageManager(env.client)
@@ -33,6 +58,13 @@ def cli(env, name, note, os_code, uri):
         note=note,
         os_code=os_code,
         uri=uri,
+        ibm_api_key=ibm_api_key,
+        root_key_id=root_key_id,
+        wrapped_dek=wrapped_dek,
+        kp_id=kp_id,
+        cloud_init=cloud_init,
+        byol=byol,
+        is_encrypted=is_encrypted
     )
 
     if not result:

SoftLayer/managers/image.py

@@ -141,9 +141,9 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None,
         :param string wrapped_dek: Wrapped Decryption Key provided by IBM
          KeyProtect
         :param string kp_id: ID of the IBM Key Protect Instance
-        :param bool cloud_init: Specifies if image is cloud init
-        :param bool byol: Specifies if image is bring your own license
-        :param bool is_encrypted: Specifies if image is encrypted
+        :param boolean cloud_init: Specifies if image is cloud init
+        :param boolean byol: Specifies if image is bring your own license
+        :param boolean is_encrypted: Specifies if image is encrypted
         """
         if 'cos://' in uri:
             return self.vgbdtg.createFromIcos({
@@ -152,7 +152,7 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None,
                 'operatingSystemReferenceCode': os_code,
                 'uri': uri,
                 'ibmApiKey': ibm_api_key,
-                'rootKeyid': root_key_id,
+                'rootKeyId': root_key_id,
                 'wrappedDek': wrapped_dek,
                 'keyProtectId': kp_id,
                 'cloudInit': cloud_init,