fix(url): Change url to service_url

Author: ehdsouza

ibm_cloud_sdk_core/base_service.py

@@ -37,7 +37,7 @@ class BaseService(object):
     SDK_NAME = 'ibm-python-sdk-core'
 
     def __init__(self,
-                 url,
+                 service_url,
                  authenticator=None,
                  disable_ssl_verification=False,
                  display_name=None):
@@ -47,7 +47,7 @@ def __init__(self,
         :attr bool disable_ssl_verification: enables/ disables ssl verification
         :attr str display_name the name used for mapping services in environment file
         """
-        self.url = url
+        self.service_url = service_url
         self.http_config = {}
         self.jar = CookieJar()
         self.authenticator = authenticator
@@ -100,16 +100,16 @@ def set_disable_ssl_verification(self, status=False):
         """
         self.disable_ssl_verification = status
 
-    def set_url(self, url):
+    def set_service_url(self, service_url):
         """
-        Sets the url
+        Sets the service url
         """
-        if has_bad_first_or_last_char(url):
+        if has_bad_first_or_last_char(service_url):
             raise ValueError(
-                'The url shouldn\'t start or end with curly brackets or quotes. '
-                'Be sure to remove any {} and \" characters surrounding your url'
+                'The service url shouldn\'t start or end with curly brackets or quotes. '
+                'Be sure to remove any {} and \" characters surrounding your service url'
             )
-        self.url = url
+        self.service_url = service_url
 
     def get_authenticator(self):
         """
@@ -164,7 +164,7 @@ def prepare_request(self, method, url, headers=None,
                         params=None, data=None, files=None, **kwargs):
         request = {'method': method}
 
-        request['url'] = self.url + url
+        request['url'] = self.service_url + url
 
         headers = remove_null_values(headers) if headers else {}
         headers = cleanup_values(headers)

test/test_base_service.py

@@ -16,12 +16,12 @@ class AnyServiceV1(BaseService):
 
     def __init__(self,
                  version,
-                 url=default_url,
+                 service_url=default_url,
                  authenticator=None,
                  disable_ssl_verification=False):
         BaseService.__init__(
             self,
-            url=url,
+            service_url=service_url,
             authenticator=authenticator,
             disable_ssl_verification=disable_ssl_verification,
             display_name='Watson')
@@ -162,7 +162,7 @@ def test_iam():
         status=200)
     responses.add(
         responses.GET,
-        'https://gateway-s.watsonplatform.net/watson/api',
+        url='https://gateway.watsonplatform.net/test/api',
         body=json.dumps({
             "foobar": "baz"
         }),
@@ -358,13 +358,13 @@ def test_default_headers():
     with pytest.raises(TypeError):
         service.set_default_headers('xxx')
 
-def test_set_url():
+def test_set_service_url():
     service = AnyServiceV1('2018-11-20', authenticator=NoAuthAuthenticator())
     with pytest.raises(ValueError) as err:
-        service.set_url('{url}')
-    assert str(err.value) == 'The url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your url'
+        service.set_service_url('{url}')
+    assert str(err.value) == 'The service url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your service url'
 
-    service.set_url('my_url')
+    service.set_service_url('my_url')
 
 def test_get_authenticator():
     auth = BasicAuthenticator('my_username', 'my_password')