Skip to content

Fixed doc formatting and some comments #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2018
Merged

Fixed doc formatting and some comments #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SoftLayer/CLI/image/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://<objectStorageAccount>@<cluster>/<container>/<objectPath>
or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
Object Storage
"""

Expand Down
2 changes: 1 addition & 1 deletion SoftLayer/CLI/image/import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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://<objectStorageAccount>@<cluster>/<container>/<objectPath>
or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
Object Storage
"""

Expand Down
10 changes: 5 additions & 5 deletions SoftLayer/managers/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ def import_image_from_uri(self, name, uri, os_code=None, note=None,
(.vhd/.iso file) of the format:
swift://<objectStorageAccount>@<cluster>/<container>/<objectPath>
or (.vhd/.iso/.raw file) of the format:
cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
cos://<regionName>/<bucketName>/<objectPath> 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
Expand Down Expand Up @@ -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://<objectStorageAccount>@<cluster>/<container>/<objectPath>
or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
or cos://<regionName>/<bucketName>/<objectPath> 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({
Expand Down