X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;h=65039ae080507c6e4abca80dd7169142f5e1a5f9;hb=refs%2Fchanges%2F85%2F26285%2F4;hp=7c5d94e5b601fc0ed9656666df5438b19c949498;hpb=7ef4d9292529e9a3336368430361f9a63f48c54d;p=multicloud%2Fframework.git diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py index 7c5d94e..65039ae 100644 --- a/multivimbroker/multivimbroker/pub/utils/syscomm.py +++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py @@ -10,6 +10,8 @@ # 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 @@ -34,20 +36,16 @@ def getHeadersKeys(response): def findMultivimDriver(vim=None): - - if vim and vim["type"] == "openstack": - if vim["version"] == "ocata": - multivimdriver = "multicloud-ocata" - elif vim["version"] == "titanium_cloud": - multivimdriver = "multicloud-titanium_cloud" - else: - # if vim type is openstack, use "ocata" version as default - multivimdriver = "multicloud-ocata" - elif vim and vim["type"] == "vmware": - multivimdriver = "multicloud-vio" - else: + 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") - return multivimdriver + 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=""):