Fix bugs

Author: bassel-zeidan

python/ibmos2spark/osconfig.py

@@ -226,24 +226,29 @@ def __init__(self, sparkcontext, credentials, configuration_name='', cos_type='c
         hconf = sparkcontext._jsc.hadoopConfiguration()
         hconf.set(prefix + ".endpoint", credentials['endpoint'])
 
+        # softlayer cos case
         if (cos_type == "classic_cos"):
             hconf.set(prefix + ".access.key", credentials['access_key'])
             hconf.set(prefix + ".secret.key", credentials['secret_key'])
 
+        # bluemix cos case
         elif (cos_type == "bluemix_cos"):
             hconf.set(prefix + ".iam.service.id", credentials['service_id'])
             if (auth_method == "api_key"):
                 hconf.set(prefix + ".iam.api.key", credentials['api_key'])
             elif (auth_method == "iam_token"):
                 hconf.set(prefix + ".iam.token", credentials['iam_token'])
 
+            if (credentials.get('iam_service_endpoint')):
+                hconf.set(prefix + ".iam.endpoint", credentials['iam_service_endpoint'])
+
             if (credentials.get('v2_signer_type')):
                 hconf.set(prefix + ".v2.signer.type", credentials['v2_signer_type'])
 
     def _validate_input(self, credentials, cos_type, auth_method):
         required_key_classic_cos = ["endpoint", "access_key", "secret_key"]
         required_key_list_iam_api_key = ["endpoint", "api_key", "service_id"]
-        required_key_list_iam_token = ["endpoint", "token", "service_id"]
+        required_key_list_iam_token = ["endpoint", "iam_token", "service_id"]
 
         def _get_required_keys(cos_type, auth_method):
             if (cos_type == "bluemix_cos"):