Revert "chore(service_url): Update url to service url"

This reverts commit f7f4647.

Author: ehdsouza

ibm_cloud_sdk_core/base_service.py

@@ -66,8 +66,8 @@ def __init__(self,
         if display_name:
             service_name = display_name.replace(' ', '_').lower()
             config = read_from_env_variables(service_name)
-            if config.get('service_url'):
-                self.service_url = config.get('service_url')
+            if config.get('url'):
+                self.url = config.get('url')
             if config.get('disable_ssl'):
                 self.disable_ssl_verification = config.get('disable_ssl')
 

test/test_base_service.py

@@ -139,12 +139,12 @@ def test_iam():
     file_path = os.path.join(
         os.path.dirname(__file__), '../resources/ibm-credentials-iam.env')
     os.environ['IBM_CREDENTIALS_FILE'] = file_path
-    os.environ['WATSON_SERVICE_URL'] = 'https://gateway-s.watsonplatform.net/watson/api'
+    os.environ['WATSON_URL'] = 'https://gateway-s.watsonplatform.net/watson/api'
     os.environ['WATSON_DISABLE_SSL'] = 'False'
     service = AnyServiceV1('2017-07-07', authenticator=iam_authenticator)
-    assert service.service_url == 'https://gateway-s.watsonplatform.net/watson/api'
+    assert service.url == 'https://gateway-s.watsonplatform.net/watson/api'
     del os.environ['IBM_CREDENTIALS_FILE']
-    del os.environ['WATSON_SERVICE_URL']
+    del os.environ['WATSON_URL']
     del os.environ['WATSON_DISABLE_SSL']
     assert service.authenticator is not None
 
@@ -162,7 +162,7 @@ def test_iam():
         status=200)
     responses.add(
         responses.GET,
-        url='https://gateway-s.watsonplatform.net/watson/api',
+        url='https://gateway.watsonplatform.net/test/api',
         body=json.dumps({
             "foobar": "baz"
         }),