X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;h=0b2b557ebc2c1037f714df48dc7235dcc97bd5d9;hp=07606bfd200a60ae11f01a1e705f5c555c657c8c;hb=2906f8863e3af3559a5ba288cbc2363f31c9f507;hpb=300a7e4839621acfb006cd8baadee0c4ed2c8bba

diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py
index 07606bf..0b2b557 100644
--- a/multivimbroker/multivimbroker/pub/utils/syscomm.py
+++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py
@@ -1,4 +1,5 @@
 # Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 VMware, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -10,49 +11,46 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
 import inspect
+import json
+import os
 import re
 
-import multivimbroker.pub.exceptions as  exceptions
+import multivimbroker.pub.exceptions as exceptions
 from multivimbroker.pub.msapi.extsys import get_vim_by_id
+
+
 def fun_name():
     return inspect.stack()[1][3]
 
 
+# Which headers are hop-by-hop headers by default
+HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate',
+              'proxy-authorization', 'te', 'trailers',
+              'transfer-encoding', 'upgrade']
 
 
-# Which headers are hop-by-hop headers by default
-HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
 def getHeadersKeys(response):
     hopbyhop = HOP_BY_HOP
-    hopbyhop.extend([x.strip() for x in response.get('connection', '').split(',')])
+    hopbyhop.extend([x.strip()
+                     for x in response.get('connection', '').split(',')])
     return [header for header in response.keys() if header not in hopbyhop]
 
 
-
 def findMultivimDriver(vim=None):
-
-    if vim and vim["type"] == "openstack":
-        if vim["version"] == "kilo":
-            multivimdriver = "multivim-kilo"
-        elif vim["version"] == "newton":
-            multivimdriver = "multivim-newton"
-        else:
-            # if vim type is openstack, use latest "newton" version as default
-            multivimdriver = "multivim-newton"
-    elif vim and vim["type"] == "vmware":
-        multivimdriver = "multivim-vio"
-    else:
-        raise  exceptions.NotFound("Not support VIM type")
-    return  multivimdriver
-
-
-
-def  getMultivimDriver(vimid,full_path=""):
-
-    multivim = "multivim"
+    json_file = os.path.join(os.path.dirname(__file__),
+                             '../config/provider-plugin.json')
+    with open(json_file, "r") as f:
+        plugins = json.load(f)
+    if not vim or vim.get("type") not in plugins.keys():
+        raise exceptions.NotFound("Not support VIM type")
+    plugin = plugins[vim["type"]]
+    if vim.get("version") in plugin["versions"].keys():
+        return plugin["versions"][vim["version"]]["provider_plugin"]
+    return plugin["provider_plugin"]
+
+
+def getMultivimDriver(vimid, full_path=""):
+    multcloud = "multicloud"
     vim = get_vim_by_id(vimid)
-    if vim["type"] and vim["version"]:
-        pass
-
-    multivimdriver = findMultivimDriver(vim=vim)
-    return re.sub(multivim, multivimdriver, full_path)
+    multclouddriver = findMultivimDriver(vim=vim)
+    return re.sub(multcloud, multclouddriver, full_path)