import sys
import time
import uuid
-import json
-from pyvcloud.vcloudair import VCA
from argparse import ArgumentParser
__author__ = "Pablo Montes, Alfonso Tierno"
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,
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
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,
# 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
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})
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})
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'):
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,
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
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):
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,
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,
# 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"],
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")
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')
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:
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))
# 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))
projects / osm / RO.git / blobdiff