Merge pull request #1 from softlayer/master

update from original repo

Author: ATGE

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://<objectStorageAccount>@<cluster>/<container>/<objectPath>
-    or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+    or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
     Object Storage
     """
 

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://<objectStorageAccount>@<cluster>/<container>/<objectPath>
-    or cos://<clusterName>/<bucketName>/<objectPath> if using IBM Cloud
+    or cos://<regionName>/<bucketName>/<objectPath> if using IBM Cloud
     Object Storage
     """
 

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://<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
@@ -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({

setup.py

@@ -14,7 +14,7 @@
 
 setup(
     name='SoftLayer',
-    version='5.6.0',
+    version='5.6.1',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     author='SoftLayer Technologies, Inc.',
@@ -33,12 +33,12 @@
         'six >= 1.7.0',
         'ptable >= 0.9.2',
         'click >= 7',
-        'requests == 2.19.1',
+        'requests >= 2.20.0',
         'prompt_toolkit >= 0.53',
         'pygments >= 2.0.0',
-        'urllib3 == 1.22'
+        'urllib3 >= 1.24'
     ],
-    keywords=['softlayer', 'cloud'],
+    keywords=['softlayer', 'cloud', 'slcli'],
     classifiers=[
         'Environment :: Console',
         'Environment :: Web Environment',

tools/requirements.txt

@@ -1,6 +1,7 @@
-requests == 2.19.1
-click >= 5, < 7
-prettytable >= 0.7.0
 six >= 1.7.0
-prompt_toolkit
-urllib3 == 1.22
+ptable >= 0.9.2
+click >= 7
+requests >= 2.20.0
+prompt_toolkit >= 0.53
+pygments >= 2.0.0
+urllib3 >= 1.24

tools/test-requirements.txt

@@ -4,5 +4,10 @@ pytest-cov
 mock
 sphinx
 testtools
-urllib3 == 1.22
-requests == 2.19.1
+six >= 1.7.0
+ptable >= 0.9.2
+click >= 7
+requests >= 2.20.0
+prompt_toolkit >= 0.53
+pygments >= 2.0.0
+urllib3 >= 1.24