#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
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"