X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;h=7afb9660e12a6a5a1f912cd5af0595ed398e3966;hp=337a1bd94de61ac6fa91a15d8a3f284c44274e06;hb=d746523f28c7de4feabfd2d9ac56554d37884adc;hpb=8bc264d30294b15639c37ab446aa081ff09e41f0

diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py
index 337a1bd..7afb966 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():
@@ -38,10 +38,21 @@ def getHeadersKeys(response):
 
 # trim out 'HTTP_' prefix part and replace "_" wiht "-".
 def originHeaders(request):
-    regex = re.compile('^HTTP_')
-    return dict((regex.sub('', header).replace("_", "-"), value)
-                for (header, value) in request.META.items()
-                if header.startswith('HTTP_'))
+    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
+        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
 
 
 def findMultivimDriver(vim=None):
@@ -59,22 +70,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
+    # 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