X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=test%2Ftest_RO.py;h=0307ec4131270e094d207599b52b91deadd8fc9a;hb=c76a3eee8272c5f3c66f43b8eafe2c48273ee0c7;hp=0e7a5e6b51a42ad55cfbca3de4860d4783d77396;hpb=ed85457dd43e9a092a8766a65e47540419b1bd7f;p=osm%2FRO.git diff --git a/test/test_RO.py b/test/test_RO.py index 0e7a5e6b..0307ec41 100755 --- a/test/test_RO.py +++ b/test/test_RO.py @@ -37,8 +37,6 @@ import yaml import sys import time import uuid -import json -from pyvcloud.vcloudair import VCA from argparse import ArgumentParser __author__ = "Pablo Montes, Alfonso Tierno" @@ -151,7 +149,7 @@ class test_VIM_datacenter_operations(test_base): self.datacenter = test_config["client"].attach_datacenter(name=self.__class__.datacenter_name, vim_tenant_name='fake') logger.debug("{}".format(self.datacenter)) - assert ('vim_tenants' in self.datacenter.get('datacenter', {})) + assert ('uuid' in self.datacenter.get('datacenter', {})) def test_030_list_attached_datacenter(self): self.__class__.test_text = "{}.{}. TEST {}".format(test_config["test_number"], self.__class__.test_index, @@ -292,8 +290,12 @@ class test_vimconn_connect(test_base): if test_config['vimtype'] == 'vmware': vca_object = test_config["vim_conn"].connect() logger.debug("{}".format(vca_object)) - self.assertIsInstance(vca_object, VCA) - + self.assertIsNotNone(vca_object) + elif test_config['vimtype'] == 'openstack': + test_config["vim_conn"]._reload_connection() + network_list = test_config["vim_conn"].get_network_list() + logger.debug("{}".format(network_list)) + self.assertIsNotNone(network_list) class test_vimconn_new_network(test_base): network_name = None @@ -375,11 +377,16 @@ class test_vimconn_new_network(test_base): version = item['ip-profile']['ip-version'] dhcp_count = item['ip-profile']['dhcp']['count'] dhcp_enabled = item['ip-profile']['dhcp']['enabled'] + dhcp_start_address = item['ip-profile']['dhcp']['start-address'] + subnet_address = item['ip-profile']['subnet-address'] + self.__class__.network_name = _get_random_string(20) ip_profile = {'dhcp_count': dhcp_count, 'dhcp_enabled': dhcp_enabled, - 'ip_version': version + 'dhcp_start_address': dhcp_start_address, + 'ip_version': version, + 'subnet_address': subnet_address } self.__class__.test_text = "{}.{}. TEST {}".format(test_config["test_number"], self.__class__.test_index, @@ -483,7 +490,11 @@ class test_vimconn_new_network(test_base): # refresh net status net_dict = test_config["vim_conn"].refresh_nets_status([unknown_net_id]) - self.assertEqual(net_dict, {}) + if test_config['vimtype'] == 'openstack': + self.assertEqual(net_dict[unknown_net_id]['status'], 'DELETED') + else: + # TODO : Fix vmware connector to return status DELETED as per vimconn.py + self.assertEqual(net_dict, {}) class test_vimconn_get_network_list(test_base): network_name = None @@ -527,7 +538,10 @@ class test_vimconn_get_network_list(test_base): inspect.currentframe().f_code.co_name) self.__class__.test_index += 1 - network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) + if test_config['vimtype'] == 'openstack': + network_name = test_config['vim_conn'].get_network(self.__class__.network_id)['name'] + else: + network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) # find network from list by it's name new_network_list = test_config["vim_conn"].get_network_list({'name': network_name}) @@ -558,7 +572,10 @@ class test_vimconn_get_network_list(test_base): inspect.currentframe().f_code.co_name) self.__class__.test_index += 1 - network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) + if test_config['vimtype'] == 'openstack': + network_name = test_config['vim_conn'].get_network(self.__class__.network_id)['name'] + else: + network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) # find network from list by it's shared value new_network_list = test_config["vim_conn"].get_network_list({'shared':Shared, 'name':network_name}) @@ -575,7 +592,10 @@ class test_vimconn_get_network_list(test_base): self.__class__.test_index += 1 tenant_list = test_config["vim_conn"].get_tenant_list() - network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) + if test_config['vimtype'] == 'openstack': + network_name = test_config['vim_conn'].get_network(self.__class__.network_id)['name'] + else: + network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) for tenant_item in tenant_list: if test_config['tenant'] == tenant_item.get('name'): @@ -596,7 +616,10 @@ class test_vimconn_get_network_list(test_base): self.__class__.test_index += 1 status = 'ACTIVE' - network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) + if test_config['vimtype'] == 'openstack': + network_name = test_config['vim_conn'].get_network(self.__class__.network_id)['name'] + else: + network_name = test_config['vim_conn'].get_network_name_by_id(self.__class__.network_id) # find network from list by it's status new_network_list = test_config["vim_conn"].get_network_list({'status':status, @@ -655,9 +678,10 @@ class test_vimconn_get_network(test_base): self.__class__.test_index, inspect.currentframe().f_code.co_name) self.__class__.test_index += 1 + with self.assertRaises(Exception) as context: + test_config["vim_conn"].get_network(Non_exist_id) - network_info = test_config["vim_conn"].get_network(Non_exist_id) - self.assertEqual(network_info, {}) + self.assertEqual((context.exception).http_code, 404) class test_vimconn_delete_network(test_base): network_name = None @@ -697,7 +721,7 @@ class test_vimconn_delete_network(test_base): with self.assertRaises(Exception) as context: test_config["vim_conn"].delete_network(Non_exist_id) - self.assertEqual((context.exception).http_code, 400) + self.assertEqual((context.exception).http_code, 404) class test_vimconn_get_flavor(test_base): @@ -721,10 +745,12 @@ class test_vimconn_get_flavor(test_base): vcpus = item['vcpus'] disk = item['disk'] - flavor_data = {'ram': ram, + flavor_data = { + 'name' : _get_random_string(20), + 'ram': ram, 'vcpus': vcpus, 'disk': disk - } + } self.__class__.test_text = "{}.{}. TEST {}".format(test_config["test_number"], self.__class__.test_index, @@ -762,7 +788,7 @@ class test_vimconn_new_flavor(test_base): flavor_id = None def test_000_new_flavor(self): - flavor_data = {'ram': 1024, 'vpcus': 1, 'disk': 10} + flavor_data = {'name': _get_random_string(20), 'ram': 1024, 'vpcus': 1, 'disk': 10} self.__class__.test_text = "{}.{}. TEST {}".format(test_config["test_number"], self.__class__.test_index, @@ -771,8 +797,8 @@ class test_vimconn_new_flavor(test_base): # create new flavor self.__class__.flavor_id = test_config["vim_conn"].new_flavor(flavor_data) - self.assertEqual(type(self.__class__.flavor_id),str) - self.assertIsInstance(uuid.UUID(self.__class__.flavor_id),uuid.UUID) + self.assertIsInstance(self.__class__.flavor_id, (str, unicode)) + self.assertIsInstance(uuid.UUID(self.__class__.flavor_id), uuid.UUID) def test_010_delete_flavor(self): self.__class__.test_text = "{}.{}. TEST {}".format(test_config["test_number"], @@ -824,10 +850,10 @@ class test_vimconn_new_image(test_base): image_path = test_config['image_path'] if image_path: - image_id = test_config["vim_conn"].new_image({ 'name': 'TestImage', 'location' : image_path }) + self.__class__.image_id = test_config["vim_conn"].new_image({ 'name': 'TestImage', 'location' : image_path }) time.sleep(20) - self.assertEqual(type(image_id),str) - self.assertIsInstance(uuid.UUID(image_id),uuid.UUID) + self.assertEqual(type(self.__class__.image_id),str) + self.assertIsInstance(uuid.UUID(self.__class__.image_id),uuid.UUID) else: self.skipTest("Skipping test as image file not present at RO container") @@ -1005,7 +1031,7 @@ class test_vimconn_new_vminstance(test_base): net_list = [{'use': self.__class__.net_type, 'name': name, 'floating_ip': False, 'vpci': vpci, 'port_security': True, 'type': 'virtual', 'net_id': self.__class__.network_id}] - self.__class__.instance_id = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list) + self.__class__.instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list) self.assertEqual(type(self.__class__.instance_id),str) @@ -1024,7 +1050,7 @@ class test_vimconn_new_vminstance(test_base): net_list = [{'use': self.__class__.net_type, 'name': name, 'floating_ip': False, 'port_security': True, 'model': model_name, 'type': 'virtual', 'net_id': self.__class__.network_id}] - instance_id = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, + instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list) self.assertEqual(type(instance_id),str) @@ -1048,7 +1074,7 @@ class test_vimconn_new_vminstance(test_base): net_list = [{'use': net_use, 'name': name, 'floating_ip': False, 'port_security': True, 'type': 'virtual', 'net_id': self.__class__.network_id}] - instance_id = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, + instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list) self.assertEqual(type(instance_id),str) @@ -1072,7 +1098,7 @@ class test_vimconn_new_vminstance(test_base): net_list = [{'use': self.__class__.net_type, 'name': name, 'floating_ip': False, 'port_security': True, 'type': _type, 'net_id': self.__class__.network_id}] - instance_id = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, + instance_id, _ = test_config["vim_conn"].new_vminstance(name='Test1_vm', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list) self.assertEqual(type(instance_id),str) @@ -1102,7 +1128,7 @@ class test_vimconn_new_vminstance(test_base): net_list = [{'use': self.__class__.net_type, 'name': name, 'floating_ip': False, 'port_security': True, 'type': 'virtual', 'net_id': self.__class__.network_id}] - instance_id = test_config["vim_conn"].new_vminstance(name='Cloud_vm', image_id=self.__class__.image_id, + instance_id, _ = test_config["vim_conn"].new_vminstance(name='Cloud_vm', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list, cloud_config=cloud_data) @@ -1128,7 +1154,7 @@ class test_vimconn_new_vminstance(test_base): net_list = [{'use': self.__class__.net_type, 'name': name, 'floating_ip': False, 'port_security': True, 'type': 'virtual', 'net_id': self.__class__.network_id}] - instance_id = test_config["vim_conn"].new_vminstance(name='VM_test1', image_id=self.__class__.image_id, + instance_id, _ = test_config["vim_conn"].new_vminstance(name='VM_test1', image_id=self.__class__.image_id, flavor_id=flavor_id, net_list=net_list, disk_list=device_data) @@ -1543,7 +1569,7 @@ def test_vimconnector(args): tenant_name = args.tenant_name test_config['tenant'] = tenant_name - config_params = json.loads(args.config_param) + config_params = yaml.load(args.config_param) org_name = config_params.get('orgname') org_user = config_params.get('user') org_passwd = config_params.get('passwd') @@ -1558,6 +1584,29 @@ def test_vimconnector(args): import vimconn_aws as vim elif args.vimtype == "openstack": import vimconn_openstack as vim + + test_config["test_directory"] = os.path.dirname(__file__) + "/RO_tests" + + tenant_name = args.tenant_name + test_config['tenant'] = tenant_name + config_params = yaml.load(args.config_param) + os_user = config_params.get('user') + os_passwd = config_params.get('passwd') + vim_url = args.endpoint_url + test_config['image_path'] = args.image_path + test_config['image_name'] = args.image_name + + # openstack connector obj + vim_persistent_info = {} + test_config['vim_conn'] = vim.vimconnector( + uuid="test-uuid-1", name="VIO-openstack", + tenant_id=None, tenant_name=tenant_name, + url=vim_url, url_admin=None, + user=os_user, passwd=os_passwd, + config=config_params, persistent_info=vim_persistent_info + ) + test_config['vim_conn'].debug = "true" + elif args.vimtype == "openvim": import vimconn_openvim as vim else: @@ -1570,7 +1619,7 @@ def test_vimconnector(args): if args.list_tests: tests_names = [] for cls in clsmembers: - if cls[0].startswith('test_vimconnector'): + if cls[0].startswith('test_vimconn'): tests_names.append(cls[0]) msg = "The 'vim' set tests are:\n\t" + ', '.join(sorted(tests_names)) @@ -1593,7 +1642,7 @@ def test_vimconnector(args): # include all tests for cls in clsmembers: # We exclude 'test_VIM_tenant_operations' unless it is specifically requested by the user - if cls[0].startswith('test_vimconnector'): + if cls[0].startswith('test_vimconn'): code_based_tests.append(cls[1]) logger.debug("tests to be executed: {}".format(code_based_tests))