From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 4 Dec 2019 22:01:17 +0000 (+0000)
Subject: Fix 929: Fix imports at test_RO
X-Git-Tag: v7.0.0rc1~5
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=c91896052fa1dd2b68f9023a7f6400f4f5f95308

Fix 929: Fix imports at test_RO

Change-Id: Ie52d25a3f062b4d79b5e4fb85b5b8473ba623cd8
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/RO/test/test_RO.py b/RO/test/test_RO.py
index 030dfe04..85ccdc1c 100755
--- a/RO/test/test_RO.py
+++ b/RO/test/test_RO.py
@@ -2228,7 +2228,7 @@ def test_vimconnector(args):
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + "/osm_ro")
     test_config['vimtype'] = args.vimtype
     if args.vimtype == "vmware":
-        import vimconn_vmware as vim
+        from osm_rovim_vmware import vimconn_vmware as vim
 
         test_config["test_directory"] = os.path.dirname(__file__) + "/RO_tests"
 
@@ -2248,9 +2248,9 @@ def test_vimconnector(args):
                                                    passwd=org_passwd, url=vim_url, config=config_params)
 
     elif args.vimtype == "aws":
-        import vimconn_aws as vim
+        from osm_rovim_aws import vimconn_aws as vim
     elif args.vimtype == "openstack":
-        import vimconn_openstack as vim
+        from osm_rovim_openstack import vimconn_openstack as vim
 
         test_config["test_directory"] = os.path.dirname(__file__) + "/RO_tests"
 
@@ -2276,9 +2276,9 @@ def test_vimconnector(args):
         test_config['vim_conn'].debug = "true"
 
     elif args.vimtype == "openvim":
-        import vimconn_openvim as vim
+        from osm_rovim_openvim import vimconn_openvim as vim
     elif args.vimtype == "azure":
-        import vimconn_azure as vim
+        from osm_rovim_azure import vimconn_azure as vim
 
         test_config["test_directory"] = os.path.dirname(__file__) + "/RO_tests"
 
@@ -2365,7 +2365,7 @@ def test_vimconnector(args):
 def test_vim(args):
     global test_config
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + "/osm_ro")
-    import openmanoclient
+    from osm_ro import openmanoclient
     executed = 0
     failed = 0
     test_config["client"] = openmanoclient.openmanoclient(
@@ -2431,7 +2431,7 @@ def test_vim(args):
 def test_wim(args):
     global test_config
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + "/osm_ro")
-    import openmanoclient
+    from osm_ro import openmanoclient
     executed = 0
     failed = 0
     test_config["client"] = openmanoclient.openmanoclient(
@@ -2497,7 +2497,7 @@ def test_wim(args):
 def test_deploy(args):
     global test_config
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + "/osm_ro")
-    import openmanoclient
+    from osm_ro import openmanoclient
     executed = 0
     failed = 0
     test_config["test_directory"] = os.path.dirname(__file__) + "/RO_tests"