-@{legacy_feature_list} odl-vtn-manager-neutron odl-ovsdb-openstack
-@{NETWORKS} NETWORK1 NETWORK2 NETWORK3
-@{SUBNETS} SUBNET1 SUBNET2 SUBNET3
-@{SUBNET_CIDR} 10.10.10.0/24 10.20.20.0/24 10.30.30.0/24
-@{PORT_LIST} PORT1 PORT2 PORT3 PORT4 PORT5 PORT6
-@{VM_INSTANCES_NET1} VM1 VM2
-@{VM_INSTANCES_NET2} VM3 VM4
-@{VM_INSTANCES_NET3} VM5 VM6
-${ROUTERS} ROUTER_1
+# Exceptions for which we will not create a failure
+@{NETVIRT_DIAG_SERVICES} OPENFLOW IFM ITM DATASTORE ELAN OVSDB
+${CIRROS_stable/queens} cirros-0.3.5-x86_64-disk
+${CIRROS_stable/rocky} cirros-0.3.5-x86_64-disk
+${CIRROS_stable/stein} cirros-0.4.0-x86_64-disk
+${CIRROS_master} cirros-0.4.0-x86_64-disk
+${DEFAULT_PING_COUNT} 3
+${PRE_CLEAN_OPENSTACK_ALL} False
+${EXTERNAL_NET_NAME} external-net
+${EXTERNAL_SUBNET_NAME} external-subnet
+${INTEGRATION_BRIDGE} br-int
+${EXTERNAL_GATEWAY} 10.10.10.250
+${EXTERNAL_SUBNET} 10.10.10.0/24
+${EXTERNAL_SUBNET_ALLOCATION_POOL} start=10.10.10.2,end=10.10.10.249
+${NET1_IPV6_ADDR_POOL} --allocation-pool start=2001:db8:0:2::2,end=2001:db8:0:2:ffff:ffff:ffff:fffe
+${NET2_IPV6_ADDR_POOL} --allocation-pool start=2001:db8:0:3::2,end=2001:db8:0:3:ffff:ffff:ffff:fffe