Use configuration_name instead of cos_id

Author: bassel-zeidan

python/ibmos2spark/osconfig.py

@@ -176,7 +176,7 @@ def url(self, container_name, object_name):
 
 class CloudObjectStorage(object):
 
-    def __init__(self, sparkcontext, credentials, cos_id='', bucket_name=''):
+    def __init__(self, sparkcontext, credentials, configuration_name='', bucket_name=''):
 
         '''
         sparkcontext:  a SparkContext object.
@@ -208,7 +208,7 @@ def __init__(self, sparkcontext, credentials, cos_id='', bucket_name=''):
 
         '''
         self.bucket_name = bucket_name
-        self.cos_id = cos_id
+        self.conf_name = configuration_name
 
         # check if all required values are availble
         credential_key_list = ["endpoint", "access_key", "secret_key"]
@@ -221,8 +221,8 @@ def __init__(self, sparkcontext, credentials, cos_id='', bucket_name=''):
         # setup config
         prefix = "fs.cos"
 
-        if (cos_id):
-            prefix = "{}.{}".format(prefix, cos_id)
+        if (configuration_name):
+            prefix = "{}.{}".format(prefix, configuration_name)
         else:
             prefix = prefix + "." + DEFAULT_SERVICE_NAME
 
@@ -231,9 +231,6 @@ def __init__(self, sparkcontext, credentials, cos_id='', bucket_name=''):
         hconf.set(prefix + ".access.key", credentials['access_key'])
         hconf.set(prefix + ".secret.key", credentials['secret_key'])
 
-    def get_os_id(self):
-        return self.cos_id
-
     def url(self, object_name, bucket_name=''):
         bucket_name_var = ''
         service_name = DEFAULT_SERVICE_NAME
@@ -247,7 +244,7 @@ def url(self, object_name, bucket_name=''):
             raise ValueError("Invalid input: bucket_name is required!")
 
         # use service name that we set up hadoop config for
-        if (self.cos_id):
-            service_name = self.cos_id
+        if (self.conf_name):
+            service_name = self.conf_name
 
         return "cos://{}.{}/{}".format(bucket_name_var, service_name, object_name)