Add 3 node suites for dcgw cases

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

diff --git a/csit/variables/l2gw/Variables.robot b/csit/variables/l2gw/Variables.robot
index cc28a80291b6fdae7c5e8a7c991192f6a153fa72..371ea9f27ba1dc2add4ce7f85645988aa45b6b5d 100644 (file)
--- a/csit/variables/l2gw/Variables.robot
+++ b/csit/variables/l2gw/Variables.robot
@@ -1,3 +1,6 @@
+*** Settings ***
+Resource          ../../variables/netvirt/Variables.robot
+
 *** Variables ***
 #Configurable Variables
 ${OS_IP}          ${OS_CONTROL_NODE_IP}
@@ -7,8 +10,8 @@ ${HWVTEP_IP}      ${TOOLS_SYSTEM_1_IP}
 ${HWVTEP2_IP}     ${TOOLS_SYSTEM_2_IP}
 ${ODL_IP}         ${ODL_SYSTEM_1_IP}
 ${OS_PASSWORD}    ${EMPTY}
-${HWVTEP_BRIDGE}    br-ovs
-${HWVTEP2_BRIDGE}    br-ovs2
+${HWVTEP_BRIDGE}    br-hwvtep-blue
+${HWVTEP2_BRIDGE}    br-hwvtep-red
 ${DEVSTACK_DEPLOY_PATH}    /home/stack/devstack
 ${HWVTEP_NS1}     NS1
 ${HWVTEP_NS2}     NS2
@@ -16,8 +19,9 @@ ${HWVTEP2_NS1}    NS3
 ${HWVTEP2_NS2}    NS4
 ${HWVTEP_PORT_1}    HWVPORT1
 ${HWVTEP_PORT_2}    HWVPORT2
-${HWVTEP2_PORT_1}    HWVPORT3
-${HWVTEP2_PORT_2}    HWVPORT4
+${HWVTEP_PORT_3}    HWVPORT3
+${HWVTEP2_PORT_1}    HWVPORT4
+${HWVTEP2_PORT_2}    HWVPORT5
 ${L2GW_NAME1}     GW1
 ${L2GW_NAME2}     GW2
 ${L2GW_NAME3}     GW3
@@ -28,13 +32,15 @@ ${NET_2_SEGID}    1064
 ${NET_2}          NETHWV2
 ${NS_PORT1}       PORT1
 ${NS_PORT2}       PORT2
-${NS2_PORT1}      PORT3
-${NS2_PORT2}      PORT4
+${NS_PORT3}       PORT3
+${NS2_PORT1}      PORT4
+${NS2_PORT2}      PORT5
 ${NS_TAP1}        TAP1
-${NS2_TAP1}       TAP2
-${NS3_TAP1}       TAP3
-${NS4_TAP1}       TAP4
-${OVS_BRIDGE}     br-int
+${NS_TAP2}        TAP2
+${NS_TAP3}        TAP3
+${NS2_TAP1}       TAP4
+${NS3_TAP1}       TAP5
+${NS4_TAP1}       TAP6
 ${OVS_PORT_1}     OVSPORT1
 ${OVS_PORT_2}     OVSPORT2
 ${OVS2_PORT_1}    OVSPORT3
@@ -44,6 +50,7 @@ ${OVS_VM2_NAME}    VM2
 ${OVS2_VM1_NAME}    VM3
 ${OVS_VM2_NAME}    VM4
 ${SECURITY_GROUP_L2GW}    sg-l2gateway
+${SECURITY_GROUP_L2GW_NONE}    --no-security-groups
 ${SUBNET_1}       HWV-SUB1
 ${SUBNET_2}       HWV-SUB2
 ${SUBNET_RANGE1}    13.0.0.0/24
@@ -57,7 +64,7 @@ ${CREATE_OVS_PORT}    sudo ovs-vsctl add-port
 ${CREATE_OVSDB}    sudo ovsdb-tool create /etc/openvswitch/ovs.db ${OVS_HOME}/vswitch.ovsschema
 ${DEL_OVS_BRIDGE}    sudo ovs-vsctl del-br
 ${DETACH_VSWITCHD}    sudo ovs-vswitchd --pidfile --detach
-${GET_DPNID}      printf "%d\\n" 0x`sudo ovs-ofctl show -O Openflow13 br-int | head -1 | awk -F "dpid:" '{print $2}'`
+${GET_DPNID}      printf "%d\\n" 0x`sudo ovs-ofctl show -O Openflow13 ${INTEGRATION_BRIDGE} | head -1 | awk -F "dpid:" '{print $2}'`
 ${GET_PORT_URL}    neutron:neutron/ports/port
 ${GREP_OVS}       ps -ef | grep ovs
 ${GREP_OVSDB_DUMP_MANAGER_TABLE}    sudo ovsdb-client dump hardware_vtep -f csv | grep -A2 "Manager table"
@@ -78,6 +85,7 @@ ${L2GW_CONN_DELETE}    neutron l2-gateway-connection-delete
 ${L2GW_LIST_REST_URL}    /restconf/config/neutron:neutron/l2gateways/
 ${L2GW_CONN_LIST_REST_URL}    /restconf/config/neutron:neutron/l2gatewayConnections/
 ${L2GW_CREATE}    neutron l2-gateway-create --device
+${L2GW_UPDATE}    neutron l2-gateway-update --device
 ${L2GW_DELETE}    neutron l2-gateway-delete
 ${L2GW_GET_CONN_YAML}    neutron l2-gateway-connection-list -f yaml
 ${L2GW_GET_CONN}    neutron l2-gateway-connection-list