X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO%2Ftest%2Ftest_RO.py;h=b325dc4f6caff602bf9fcafac995ec6a19bb64a8;hp=85ccdc1cba92ae9f01b6c5247f458c06c0da37be;hb=3de27d6d03d6e371c385b27354c440bb8c3452fd;hpb=c91896052fa1dd2b68f9023a7f6400f4f5f95308 diff --git a/RO/test/test_RO.py b/RO/test/test_RO.py index 85ccdc1c..b325dc4f 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 @@ -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):