#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
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):
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()
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)
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)
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}
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")
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")
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")
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)
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)
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"],
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):
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):
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)
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, "")
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)
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}
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
class test_vimconn_vminstance_by_adding_10_nics(test_base):
network_name = None
- net_ids = []
+ net_ids = []
def setUp(self):
# create network
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
"""
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)
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)
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)
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):
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"
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"
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"
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(
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(
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"