From: fujinhua Date: Thu, 26 Oct 2017 10:13:16 +0000 (+0800) Subject: Remove vimtype check logic X-Git-Tag: v1.0.1~31 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=08a5d16bb375df8e16f8d14418bb2e3d372b1dd8;p=vfc%2Fnfvo%2Flcm.git Remove vimtype check logic Change-Id: I52c10dcd6dbc881c520331e4154595f33f323c2e Issue-Id: VFC-558 Signed-off-by: fujinhua --- diff --git a/lcm/pub/nfvi/vim/vimadaptor.py b/lcm/pub/nfvi/vim/vimadaptor.py index 6f63a48c..65944b5e 100644 --- a/lcm/pub/nfvi/vim/vimadaptor.py +++ b/lcm/pub/nfvi/vim/vimadaptor.py @@ -19,7 +19,6 @@ import traceback from requests import RequestException from lcm.pub.nfvi.vim.lib.syscomm import fun_name -from lcm.pub.nfvi.vim import const from lcm.pub.nfvi.vim.lib.vimexception import VimException logger = logging.getLogger(__name__) @@ -35,11 +34,8 @@ class VimAdaptor: def create_api(self, connectInfo): vimtype = connectInfo['vimtype'] if 'vimtype' in connectInfo else None logger.info("call %s, vimtype=%s" % (fun_name(), vimtype)) - if vimtype in (const.VIM_OPENSTACK, const.VIM_VMWARE): - from lcm.pub.nfvi.vim.api.multivim.api import MultiVimApi - self.apiImpl = MultiVimApi() - else: - self.authInfo = [1, "Unsupported vimtype(%s)" % vimtype] + from lcm.pub.nfvi.vim.api.multivim.api import MultiVimApi + self.apiImpl = MultiVimApi() def api_call(self, funname, fun, *args): logger.info("call %s%s" % (funname, str(args)))