Address comments and add appropriate code

Author: mikewurtz

SoftLayer/CLI/image/export.py

@@ -15,7 +15,9 @@
 @click.option('--ibm-api-key',
               default="",
               help="The IBM Cloud API Key with access to IBM Cloud Object "
-                   "Storage instance.")
+                   "Storage instance. For help creating this key see "
+                   "https://console.bluemix.net/docs/services/cloud-object-"
+                   "storage/iam/users-serviceids.html#serviceidapikeys")
 @environment.pass_env
 def cli(env, identifier, uri, ibm_api_key):
     """Export an image to object storage.

SoftLayer/CLI/image/import.py

@@ -22,24 +22,28 @@
 @click.option('--ibm-api-key',
               default="",
               help="The IBM Cloud API Key with access to IBM Cloud Object "
-                   "Storage instance.")
+                   "Storage instance. For help creating this key see "
+                   "https://console.bluemix.net/docs/services/cloud-object-"
+                   "storage/iam/users-serviceids.html#serviceidapikeys")
 @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")
+              help="Wrapped Data Encryption Key provided by IBM KeyProtect. "
+                   "For more info see https://console.bluemix.net/docs/"
+                   "services/key-protect/wrap-keys.html#wrap-keys")
 @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")
+              is_flag=True,
+              help="Specifies if image is cloud-init")
 @click.option('--byol',
-              default="",
+              is_flag=True,
               help="Specifies if image is bring your own license")
 @click.option('--is-encrypted',
-              default="",
+              is_flag=True,
               help="Specifies if image is encrypted")
 @environment.pass_env
 def cli(env, name, note, os_code, uri, ibm_api_key, root_key_id, wrapped_dek,

SoftLayer/managers/image.py

@@ -122,8 +122,8 @@ def edit(self, image_id, name=None, note=None, tag=None):
 
     def import_image_from_uri(self, name, uri, os_code=None, note=None,
                               ibm_api_key=None, root_key_id=None,
-                              wrapped_dek=None, kp_id=None, cloud_init=None,
-                              byol=None, is_encrypted=None):
+                              wrapped_dek=None, kp_id=None, cloud_init=False,
+                              byol=False, is_encrypted=False):
         """Import a new image from object storage.
 
         :param string name: Name of the new image
@@ -138,10 +138,10 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None,
         :param string ibm_api_key: Ibm Api Key needed to communicate with ICOS
         and Key Protect
         :param string root_key_id: ID of the root key in Key Protect
-        :param string wrapped_dek: Wrapped Decryption Key provided by IBM
-         KeyProtect
+        :param string wrapped_dek: Wrapped Data Encryption Key provided by
+        IBM KeyProtect
         :param string kp_id: ID of the IBM Key Protect Instance
-        :param boolean cloud_init: Specifies if image is cloud init
+        :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
         """