Add queens cirros flavor

[integration/test.git] / csit / variables / netvirt / Variables.robot

diff --git a/csit/variables/netvirt/Variables.robot b/csit/variables/netvirt/Variables.robot
index 189d1f96297ae189913ea080cccc8881fc09fcbe..9d527fa0ab4eae76abe61ba27d5bdf9fab81353b 100644 (file)
--- a/csit/variables/netvirt/Variables.robot
+++ b/csit/variables/netvirt/Variables.robot
@@ -3,31 +3,28 @@ Documentation     Variables for Netvirt Test Suites
 
 *** Variables ***
 @{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
-@{VPN_INSTANCE_ID}    4ae8cd92-48ca-49b5-94e1-b2921a261111    4ae8cd92-48ca-49b5-94e1-b2921a261112    4ae8cd92-48ca-49b5-94e1-b2921a261113
-@{VPN_NAME}       vpn1    vpn2    vpn3
-${ROUTERS}        ROUTER_1
+${CIRROS_stable/newton}    cirros-0.3.4-x86_64-uec
+${CIRROS_stable/ocata}    cirros-0.3.4-x86_64-uec
+${CIRROS_stable/pike}    cirros-0.3.5-x86_64-disk
+${CIRROS_stable/queens}    cirros-0.3.5-x86_64-disk
+${CIRROS_master}    cirros-0.3.5-x86_64-disk
+${PRE_CLEAN_OPENSTACK_ALL}    False
+${EXTERNAL_NET_NAME}    external-net
+${EXTERNAL_SUBNET_NAME}    external-subnet
+${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
 ${RESP_CODE}      200
 ${RESP_ERROR_CODE}    400
 ${MAC_REGEX}      ([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})
 ${IP_REGEX}       (([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])
 ${IP6_REGEX}      (2001:([0-9A-Fa-f]{0,4}:){1,6}([0-9A-Fa-f]{1,4}))
+${IP6_SUBNET_CIDR_SUFFIX}    ::/64
+${IP6_ADDR_SUFFIX}    (:[a-f0-9]{,4}){,4}
 ${PING_REGEXP}    , 0% packet loss
 ${NO_PING_REGEXP}    , 100% packet loss
-# Values passed for ARP_Learning
-@{EXTRA_NW_IP}    192.168.10.110    192.168.20.110
-${FIB_ENTRY_2}    192.168.10.110
-${FIB_ENTRY_4}    192.168.20.110
-@{RDS}            ["2200:2"]    ["2300:2"]    ["2400:2"]
-${RPING_MIP_IP}    sudo arping -I eth0:1 -c 5 -b -s 192.168.10.110 192.168.10.110
-${RPING_MIP_IP_2}    sudo arping -I eth0:1 -c 5 -b -s 192.168.20.110 192.168.20.110
-${RPING_EXP_STR}    broadcast
 # Values passed for extra routes
 ${RT_OPTIONS}     --route
 ${RT_CLEAR}       --no-route