Merge branch 'master' of github.com:IBM/python-sdk-core

Author: ehdsouza

ibm_cloud_sdk_core/base_service.py

@@ -128,7 +128,7 @@ def __init__(self, vcap_services_name, url, username=None, password=None,
         if (self.username is None or self.password is None) and self.token_manager is None:
             raise ValueError(
                 'You must specify your IAM api key or username and password service '
-                'credentials (Note: these are different from your Bluemix id)')
+                'credentials (Note: these are different from your IBM Cloud id)')
 
     def _load_from_credential_file(self, service_name, separator='='):
         """

test/test_base_service.py

@@ -141,7 +141,7 @@ def test_no_auth():
         service = AnyServiceV1('2017-07-07')
         service.request('GET', url='')
     except ValueError as err:
-        assert str(err) == 'You must specify your IAM api key or username and password service credentials (Note: these are different from your Bluemix id)'
+        assert str(err) == 'You must specify your IAM api key or username and password service credentials (Note: these are different from your IBM Cloud id)'
 
 def test_when_apikey_is_username():
     service1 = AnyServiceV1('2017-07-07', username='apikey', password='xxxxx')

test/test_iam_token_manager.py

@@ -4,7 +4,7 @@
 
 @responses.activate
 def test_request_token():
-    iam_url = "https://iam.bluemix.net/identity/token"
+    iam_url = "https://iam.cloud.ibm.com/identity/token"
     response = """{
         "access_token": "oAeisG8yqPY7sFR_x66Z15",
         "token_type": "Bearer",
@@ -23,7 +23,7 @@ def test_request_token():
 
 @responses.activate
 def test_refresh_token():
-    iam_url = "https://iam.bluemix.net/identity/token"
+    iam_url = "https://iam.cloud.ibm.com/identity/token"
     response = """{
         "access_token": "oAeisG8yqPY7sFR_x66Z15",
         "token_type": "Bearer",
@@ -70,7 +70,7 @@ def test_is_refresh_token_expired():
 
 @responses.activate
 def test_get_token():
-    iam_url = "https://iam.bluemix.net/identity/token"
+    iam_url = "https://iam.cloud.ibm.com/identity/token"
     token_manager = IAMTokenManager("iam_apikey", iam_url=iam_url)
     token_manager.user_access_token = 'user_access_token'
 
@@ -154,7 +154,7 @@ def test_request_token_auth_in_ctor():
 
 @responses.activate
 def test_request_token_auth_in_ctor_client_id_only():
-    iam_url = "https://iam.bluemix.net/identity/token"
+    iam_url = "https://iam.cloud.ibm.com/identity/token"
     response = """{
         "access_token": "oAeisG8yqPY7sFR_x66Z15",
         "token_type": "Bearer",
@@ -175,7 +175,7 @@ def test_request_token_auth_in_ctor_client_id_only():
 
 @responses.activate
 def test_request_token_auth_in_ctor_secret_only():
-    iam_url = "https://iam.bluemix.net/identity/token"
+    iam_url = "https://iam.cloud.ibm.com/identity/token"
     response = """{
         "access_token": "oAeisG8yqPY7sFR_x66Z15",
         "token_type": "Bearer",