fix(ICP): changes when username/password are set

Author: ehdsouza

appveyor.yml

@@ -31,3 +31,4 @@ deploy: off
 
 matrix:
   fast_finish: true
+

test/unit/test_watson_service.py

@@ -150,8 +150,16 @@ def test_when_apikey_is_username():
 
 @responses.activate
 def test_for_icp():
-    service1 = AnyServiceV1('2017-07-07', api_key='icp-xxxx')
+    service1 = AnyServiceV1('2017-07-07', api_key='icp-xxxx', url='service_url')
     assert service1.token_manager is None
     assert service1.iam_apikey is None
     assert service1.username is not None
     assert service1.password is not None
+    assert service1.url is 'service_url'
+
+    service2 = AnyServiceV1('2017-07-07', username='apikey', password='icp-xxx', url='service_url')
+    assert service2.token_manager is None
+    assert service2.iam_apikey is None
+    assert service2.username is not None
+    assert service2.password is not None
+    assert service2.url is 'service_url'

watson_developer_cloud/watson_service.py

@@ -241,12 +241,9 @@ def __init__(self, vcap_services_name, url, username=None, password=None,
         self.user_agent_header = {'user-agent': user_agent_string}
 
         if api_key is not None:
-            if api_key.startswith(ICP_PREFIX):
-                self.set_username_and_password(APIKEY, api_key)
-            else:
-                self.set_api_key(api_key)
+            self.set_api_key(api_key)
         elif username is not None and password is not None:
-            if username is APIKEY:
+            if username is APIKEY and not password.startswith(ICP_PREFIX):
                 self.set_token_manager(password, iam_access_token, iam_url)
             else:
                 self.set_username_and_password(username, password)
@@ -295,6 +292,7 @@ def set_api_key(self, api_key):
             api_key = None
         if api_key.startswith(ICP_PREFIX):
             self.set_username_and_password(APIKEY, api_key)
+            return
 
         self.api_key = api_key