X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;h=9e96d2eaa38480a5f031718fd80e6dc609eb1375;hb=03056c2a987eb89129d5f2533fc78dffc73c2481;hp=0b2b557ebc2c1037f714df48dc7235dcc97bd5d9;hpb=2906f8863e3af3559a5ba288cbc2363f31c9f507;p=multicloud%2Fframework.git diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py index 0b2b557..9e96d2e 100644 --- a/multivimbroker/multivimbroker/pub/utils/syscomm.py +++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py @@ -16,7 +16,7 @@ import os import re import multivimbroker.pub.exceptions as exceptions -from multivimbroker.pub.msapi.extsys import get_vim_by_id +from multivimbroker.pub.msapi import extsys def fun_name(): @@ -36,6 +36,17 @@ def getHeadersKeys(response): return [header for header in response.keys() if header not in hopbyhop] +# trim out 'HTTP_' prefix part and replace "_" wiht "-". +def originHeaders(request): + headers = {} + for key, value in request.META.items(): + if key.startswith('HTTP_') and key != 'HTTP_HOST': + headers[key[5:].replace('_', '-')] = value + elif key in ('CONTENT_TYPE', 'CONTENT_LENGTH'): + headers[key.replace('_', '-')] = value + return headers + + def findMultivimDriver(vim=None): json_file = os.path.join(os.path.dirname(__file__), '../config/provider-plugin.json') @@ -51,6 +62,22 @@ def findMultivimDriver(vim=None): def getMultivimDriver(vimid, full_path=""): multcloud = "multicloud" - vim = get_vim_by_id(vimid) + vim = extsys.get_vim_by_id(vimid) multclouddriver = findMultivimDriver(vim=vim) return re.sub(multcloud, multclouddriver, 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