X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;fp=multivimbroker%2Fmultivimbroker%2Fpub%2Futils%2Fsyscomm.py;h=cdc64804e9f8d6823bcd5abc0f33b8b577623821;hb=8d79af2d91da394044ce9a0937252856fe5a195e;hp=0d0419a9de8cfb0421c5104674a5c9e6161a0c12;hpb=0cc1fbffa4c74b917dd0f1548a1c6fca6b47afb6;p=multicloud%2Fframework.git

diff --git a/multivimbroker/multivimbroker/pub/utils/syscomm.py b/multivimbroker/multivimbroker/pub/utils/syscomm.py
index 0d0419a..cdc6480 100644
--- a/multivimbroker/multivimbroker/pub/utils/syscomm.py
+++ b/multivimbroker/multivimbroker/pub/utils/syscomm.py
@@ -37,25 +37,21 @@ def findMultivimDriver(vim=None):
 
     if vim and vim["type"] == "openstack":
         if vim["version"] == "kilo":
-            multivimdriver = "multivim-kilo"
+            multivimdriver = "multicloud-kilo"
         elif vim["version"] == "newton":
-            multivimdriver = "multivim-newton"
+            multivimdriver = "multicloud-newton"
         else:
             # if vim type is openstack, use latest "newton" version as default
-            multivimdriver = "multivim-newton"
+            multivimdriver = "multicloud-newton"
     elif vim and vim["type"] == "vmware":
-        multivimdriver = "multivim-vio"
+            multivimdriver = "multicloud-vio"
     else:
         raise exceptions.NotFound("Not support VIM type")
     return multivimdriver
 
 
 def getMultivimDriver(vimid, full_path=""):
-
-    multivim = "multivim"
+    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)