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

diff --git a/RO/test/test_RO.py b/RO/test/test_RO.py
index 030dfe04..aef8eb32 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
@@ -832,7 +832,7 @@ class test_vimconn_new_flavor(test_base):
         else:
             # create new flavor
             self.__class__.flavor_id = test_config["vim_conn"].new_flavor(flavor_data)
-            self.assertIsInstance(self.__class__.flavor_id, (str, unicode))
+            self.assertIsInstance(self.__class__.flavor_id, str)
             self.assertIsInstance(uuid.UUID(self.__class__.flavor_id), uuid.UUID)
 
     def test_010_delete_flavor(self):
@@ -986,8 +986,8 @@ class test_vimconn_get_image_list(test_base):
                 if 'name' in item:
                     self.__class__.image_name = item['name']
                     self.__class__.image_id = item['id']
-                    self.assertIsInstance(self.__class__.image_name, (str, unicode))
-                    self.assertIsInstance(self.__class__.image_id, (str, unicode))
+                    self.assertIsInstance(self.__class__.image_name, str)
+                    self.assertIsInstance(self.__class__.image_id, str)
         else:
             with self.assertRaises(Exception) as context:
                 image_list = test_config["vim_conn"].get_image_list()
@@ -1006,8 +1006,8 @@ class test_vimconn_get_image_list(test_base):
         logger.debug("{}: Result image list: {}".format(self.__class__.test_text, image_list))
 
         for item in image_list:
-            self.assertIsInstance(item['id'], (str, unicode))
-            self.assertIsInstance(item['name'], (str, unicode))
+            self.assertIsInstance(item['id'], str)
+            self.assertIsInstance(item['name'], str)
             #self.assertEqual(item['id'], self.__class__.image_id)
             self.assertEqual(item['name'], self.__class__.image_name)
 
@@ -1020,8 +1020,8 @@ class test_vimconn_get_image_list(test_base):
         filter_image_list = test_config["vim_conn"].get_image_list({'id': self.__class__.image_id})
 
         for item1 in filter_image_list:
-            self.assertIsInstance(item1['id'], (str, unicode))
-            self.assertIsInstance(item1['name'], (str, unicode))
+            self.assertIsInstance(item1['id'], str)
+            self.assertIsInstance(item1['name'], str)
             self.assertEqual(item1['id'], self.__class__.image_id)
             self.assertEqual(item1['name'], self.__class__.image_name)
 
@@ -1096,7 +1096,7 @@ class test_vimconn_new_vminstance(test_base):
                                                                                image_id=self.__class__.image_id,
                                                                                flavor_id=flavor_id, net_list=net_list)
 
-        self.assertIsInstance(self.__class__.instance_id, (str, unicode))
+        self.assertIsInstance(self.__class__.instance_id, str)
 
     def test_010_new_vminstance_by_model(self):
         flavor_data = {'name': _get_random_string(20),'ram': 1024, 'vcpus': 2, 'disk': 10}
@@ -1118,7 +1118,7 @@ class test_vimconn_new_vminstance(test_base):
                                                                 image_id=self.__class__.image_id,
                                                                 flavor_id=flavor_id,net_list=net_list)
 
-        self.assertIsInstance(instance_id, (str, unicode))
+        self.assertIsInstance(instance_id, str)
 
         # Deleting created vm instance
         logger.info("Deleting created vm intance")
@@ -1144,7 +1144,7 @@ class test_vimconn_new_vminstance(test_base):
         instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False,
                                                                 image_id=self.__class__.image_id,disk_list=None,
                                                                 flavor_id=flavor_id, net_list=net_list)
-        self.assertIsInstance(instance_id, (str, unicode))
+        self.assertIsInstance(instance_id, str)
 
         # Deleting created vm instance
         logger.info("Deleting created vm intance")
@@ -1230,7 +1230,7 @@ class test_vimconn_new_vminstance(test_base):
                                                                 flavor_id=flavor_id,net_list=net_list,
                                                                 cloud_config=cloud_data)
 
-        self.assertIsInstance(instance_id, (str, unicode))
+        self.assertIsInstance(instance_id, str)
 
         # Deleting created vm instance
         logger.info("Deleting created vm intance")
@@ -1259,7 +1259,7 @@ class test_vimconn_new_vminstance(test_base):
                                                                 flavor_id=flavor_id, net_list=net_list,
                                                                 disk_list=device_data)
 
-        self.assertIsInstance(instance_id, (str, unicode))
+        self.assertIsInstance(instance_id, str)
         # Deleting created vm instance
         logger.info("Deleting created vm intance")
         test_config["vim_conn"].delete_vminstance(instance_id)
@@ -1490,7 +1490,7 @@ class test_vimconn_new_vminstance(test_base):
                                                                 image_id=self.__class__.image_id, flavor_id=flavor_id,
                                                                 net_list=net_list)
 
-        self.assertIsInstance(instance_id, (str, unicode))
+        self.assertIsInstance(instance_id, str)
 
         logger.info("Waiting for created sriov-vm intance")
         time.sleep(10)
@@ -1515,8 +1515,8 @@ class test_vimconn_get_tenant_list(test_base):
         for item in tenant_list:
             if test_config['tenant'] == item['name']:
                 self.__class__.tenant_id = item['id']
-                self.assertIsInstance(item['name'], (str, unicode))
-                self.assertIsInstance(item['id'], (str, unicode))
+                self.assertIsInstance(item['name'], str)
+                self.assertIsInstance(item['id'], str)
 
     def test_010_get_tenant_list_by_id(self):
         self.__class__.test_text = "{}.{}. TEST {}".format(test_config["test_number"],
@@ -1529,7 +1529,7 @@ class test_vimconn_get_tenant_list(test_base):
         logger.debug(self.__class__.test_text + "Tenant list: " + str(filter_tenant_list))
 
         for item in filter_tenant_list:
-            self.assertIsInstance(item['id'], (str, unicode))
+            self.assertIsInstance(item['id'], str)
             self.assertEqual(item['id'], self.__class__.tenant_id)
 
     def test_020_get_tenant_list_by_name(self):
@@ -1543,7 +1543,7 @@ class test_vimconn_get_tenant_list(test_base):
         logger.debug(self.__class__.test_text + "Tenant list: " + str(filter_tenant_list))
 
         for item in filter_tenant_list:
-            self.assertIsInstance(item['name'], (str, unicode))
+            self.assertIsInstance(item['name'], str)
             self.assertEqual(item['name'], test_config['tenant'])
 
     def test_030_get_tenant_list_by_name_and_id(self):
@@ -1558,8 +1558,8 @@ class test_vimconn_get_tenant_list(test_base):
         logger.debug(self.__class__.test_text + "Tenant list: " + str(filter_tenant_list))
 
         for item in filter_tenant_list:
-            self.assertIsInstance(item['name'], (str, unicode))
-            self.assertIsInstance(item['id'], (str, unicode))
+            self.assertIsInstance(item['name'], str)
+            self.assertIsInstance(item['id'], str)
             self.assertEqual(item['name'], test_config['tenant'])
             self.assertEqual(item['id'], self.__class__.tenant_id)
 
@@ -1592,7 +1592,7 @@ class test_vimconn_new_tenant(test_base):
             self.__class__.tenant_id = test_config["vim_conn"].new_tenant(tenant_name, "")
             time.sleep(15)
 
-            self.assertIsInstance(self.__class__.tenant_id, (str, unicode))
+            self.assertIsInstance(self.__class__.tenant_id, str)
         else:
             with self.assertRaises(Exception) as context:
                 test_config["vim_conn"].new_tenant(self.__class__.tenant_id, "")
@@ -1625,7 +1625,7 @@ class test_vimconn_new_tenant(test_base):
 
         if test_config['vimtype'] != 'azure':
             tenant_id = test_config["vim_conn"].delete_tenant(self.__class__.tenant_id)
-            self.assertIsInstance(tenant_id, (str, unicode))
+            self.assertIsInstance(tenant_id, str)
         else:
             with self.assertRaises(Exception) as context:
                 test_config["vim_conn"].delete_tenant(self.__class__.tenant_id)
@@ -1692,8 +1692,8 @@ class test_vimconn_vminstance_by_ip_address(test_base):
            Pre-requesite: provided IP address should be from IP pool range which has used for network creation
         """
         name = "eth0"
-        # provide ip address  
-        ip_address = '' 
+        # provide ip address
+        ip_address = ''
 
         flavor_data = {'ram': 1024, 'vcpus': 1, 'disk': 10}
 
@@ -1774,7 +1774,7 @@ class test_vimconn_vminstance_by_ip_address(test_base):
 
     def test_030_vminstance_by_mac_address(self):
         name = "eth1"
-        mac_address = "74:54:2f:21:da:8c" 
+        mac_address = "74:54:2f:21:da:8c"
         flavor_data = {'ram': 1024, 'vcpus': 1, 'disk': 10}
 
         # create new flavor
@@ -1801,7 +1801,7 @@ class test_vimconn_vminstance_by_ip_address(test_base):
 
 class test_vimconn_vminstance_by_adding_10_nics(test_base):
     network_name = None
-    net_ids = [] 
+    net_ids = []
 
     def setUp(self):
         # create network
@@ -1874,7 +1874,7 @@ class test_vimconn_vminstance_by_existing_disk(test_base):
 
 
     def test_000_vminstance_by_existing_disk(self):
-        """ This testcase will add existing disk only if given catalog/image is free 
+        """ This testcase will add existing disk only if given catalog/image is free
             means not used by any other VM
         """
 
@@ -1897,7 +1897,7 @@ class test_vimconn_vminstance_by_existing_disk(test_base):
         net_list = [{'use': 'bridge', 'name': name, 'floating_ip': False, 'port_security': True,
                                         'type': 'virtual', 'net_id': self.network_id}]
 
-        instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False, 
+        instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False,
                                         image_id=image_id,
                                         flavor_id=flavor_id, net_list=net_list,disk_list=disk_list)
 
@@ -1925,7 +1925,7 @@ class test_vimconn_vminstance_by_existing_disk(test_base):
         net_list = [{'use': 'bridge', 'name': name, 'floating_ip': False, 'port_security': True,
                                                   'type': 'virtual', 'net_id': self.network_id}]
 
-        instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False, 
+        instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False,
                                         image_id=image_id,
                                         flavor_id=flavor_id, net_list=net_list,disk_list=disk_list)
 
@@ -2057,7 +2057,7 @@ class test_vimconn_vminstance_by_numa_affinity(test_base):
         net_list = [{'use': 'bridge', 'name': name, 'floating_ip': False, 'port_security': True,
                                         'type': 'virtual', 'net_id': self.network_id}]
 
-        instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False, 
+        instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', description='', start=False,
                                                             image_id=image_id,
                                                             flavor_id=flavor_id, net_list=net_list)
 
@@ -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"