X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;h=7afb9660e12a6a5a1f912cd5af0595ed398e3966;hb=d746523f28c7de4feabfd2d9ac56554d37884adc;hp=9e96d2eaa38480a5f031718fd80e6dc609eb1375;hpb=03056c2a987eb89129d5f2533fc78dffc73c2481;p=multicloud%2Fframework.git diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py index 9e96d2e..7afb966 100644 --- a/multivimbroker/multivimbroker/pub/utils/syscomm.py +++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py @@ -44,6 +44,14 @@ def originHeaders(request): headers[key[5:].replace('_', '-')] = value elif key in ('CONTENT_TYPE', 'CONTENT_LENGTH'): headers[key.replace('_', '-')] = value + elif key.lower() in ('project', 'project_id', 'project_name', + 'tenant', 'tenant_id', 'tenant_name'): + # support API to specify project other than the default one + headers[key] = value + # elif key.lower() in ('x-auth-token', + # 'http_x_auth_token', 'x_auth_token'): + # # pass the token to plugins + # headers["X-Auth-Token"] = value return headers @@ -68,16 +76,16 @@ def getMultivimDriver(vimid, full_path=""): def getVIMTypes(): - # Fix here unless we have plugin registry - json_file = os.path.join(os.path.dirname(__file__), - '../config/provider-plugin.json') - with open(json_file, "r") as f: - plugins = json.load(f) - ret = [] - for k, v in plugins.items(): - item = {} - item["vim_type"] = v.get("vim_type") - item["versions"] = [k for k in v.get('versions', {})] - ret.append(item) - - return ret + # Fix here unless we have plugin registry + json_file = os.path.join(os.path.dirname(__file__), + '../config/provider-plugin.json') + with open(json_file, "r") as f: + plugins = json.load(f) + ret = [] + for k, v in plugins.items(): + item = {} + item["vim_type"] = v.get("vim_type") + item["versions"] = [k for k in v.get('versions', {})] + ret.append(item) + + return ret