From 2804baafe864486e52eb6ca758d65de20f784098 Mon Sep 17 00:00:00 2001 From: Michael Wurtz Date: Tue, 30 Oct 2018 15:41:03 -0500 Subject: [PATCH] Fixed doc formatting and some comments --- SoftLayer/CLI/image/export.py | 2 +- SoftLayer/CLI/image/import.py | 2 +- SoftLayer/managers/image.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SoftLayer/CLI/image/export.py b/SoftLayer/CLI/image/export.py index 375de7842..eb9081ac7 100644 --- a/SoftLayer/CLI/image/export.py +++ b/SoftLayer/CLI/image/export.py @@ -24,7 +24,7 @@ def cli(env, identifier, uri, ibm_api_key): The URI for an object storage object (.vhd/.iso file) of the format: swift://@// - or cos://// if using IBM Cloud + or cos://// if using IBM Cloud Object Storage """ diff --git a/SoftLayer/CLI/image/import.py b/SoftLayer/CLI/image/import.py index 525564416..7f1b1e83e 100644 --- a/SoftLayer/CLI/image/import.py +++ b/SoftLayer/CLI/image/import.py @@ -52,7 +52,7 @@ def cli(env, name, note, os_code, uri, ibm_api_key, root_key_id, wrapped_dek, The URI for an object storage object (.vhd/.iso file) of the format: swift://@// - or cos://// if using IBM Cloud + or cos://// if using IBM Cloud Object Storage """ diff --git a/SoftLayer/managers/image.py b/SoftLayer/managers/image.py index abd60ba8a..35f7c60c5 100644 --- a/SoftLayer/managers/image.py +++ b/SoftLayer/managers/image.py @@ -131,15 +131,15 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None, (.vhd/.iso file) of the format: swift://@// or (.vhd/.iso/.raw file) of the format: - cos://// if using IBM Cloud + cos://// if using IBM Cloud Object Storage :param string os_code: The reference code of the operating system :param string note: Note to add to the image :param string ibm_api_key: Ibm Api Key needed to communicate with ICOS - and Key Protect + and Key Protect :param string root_key_id: ID of the root key in Key Protect :param string wrapped_dek: Wrapped Data Encryption Key provided by - IBM KeyProtect + 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 byol: Specifies if image is bring your own license @@ -173,10 +173,10 @@ def export_image_to_uri(self, image_id, uri, ibm_api_key=None): :param int image_id: The ID of the image :param string uri: The URI for object storage of the format swift://@// - or cos://// if using IBM Cloud + or cos://// if using IBM Cloud Object Storage :param string ibm_api_key: Ibm Api Key needed to communicate with IBM - Cloud Object Storage + Cloud Object Storage """ if 'cos://' in uri: return self.vgbdtg.copyToIcos({