X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO%2Ftest%2Ftest_RO.py;h=b325dc4f6caff602bf9fcafac995ec6a19bb64a8;hb=refs%2Fchanges%2F33%2F8333%2F1;hp=030dfe0446fe606ff01ff9096ab62f93da3bb528;hpb=57dadcfd0fcf3c8e933602e2fb57f32658d9c845;p=osm%2FRO.git

diff --git a/RO/test/test_RO.py b/RO/test/test_RO.py
index 030dfe04..b325dc4f 100755
--- a/RO/test/test_RO.py
+++ b/RO/test/test_RO.py
@@ -518,7 +518,7 @@ class test_vimconn_new_network(test_base):
         #unknown_net_id = "/subscriptions/ca3d18ab-d373-4afb-a5d6-7c44f098d16a/resourceGroups/osmRG/providers/Microsoft.Network/virtualNetworks/osm_vnet/subnets/unnkown_net"
 
         net_dict = test_config["vim_conn"].refresh_nets_status([unknown_net_id])
-        if test_config['vimtype'] in ('openstack', 'azure'):
+        if test_config['vimtype'] in ('openstack', 'azure', 'vmware'):
             self.assertEqual(net_dict[unknown_net_id]['status'], 'DELETED')
         else:
             # TODO : Fix vmware connector to return status DELETED as per vimconn.py
@@ -2220,7 +2220,7 @@ def _get_random_string(maxLength):
     if maxLength < min_string: maxLength = min_string
     maxLength -= len(prefix)
     length = random.randint(minLength,maxLength)
-    return 'testing_'+"".join([random.choice(string.letters+string.digits) for i in xrange(length)])
+    return 'testing_'+"".join([random.choice(string.ascii_letters+string.digits) for i in range(length)])
 
 
 def test_vimconnector(args):
@@ -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"