From 21125bfc3475ccae795947a7bc262f653cb4be4d Mon Sep 17 00:00:00 2001 From: JayaPr Date: Mon, 18 Mar 2019 16:13:07 +0530 Subject: [PATCH] Remove bgp-connect duplicate variable from suites Change-Id: Id20b500b488e6252de83ecf340d5058d86d7bcc3 Signed-off-by: JayaPr --- csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot | 3 +-- csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot | 1 - csit/suites/netvirt/snatdnat/snat_dnat.robot | 1 - .../netvirt/subnet_routing/subnet_routing_and_multicast.robot | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot index 0367392f31..2b8059a21b 100644 --- a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot +++ b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot @@ -31,7 +31,6 @@ Resource ../../../variables/Variables.robot @{ROUTERS} multipath_router_1 multipath_router_2 multipath_router_3 ${AS_ID} 100 ${BGP_CACHE} bgp-cache -${BGP_CONNECT} bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add ${DIPSLAY_FIB} fib-show ${ENABLE} enable ${DISABLE} disable @@ -146,7 +145,7 @@ Create Setup : FOR ${dcgw} IN @{DCGW_IP_LIST} \ BgpOperations.Start Quagga Processes On DCGW ${dcgw} BgpOperations.Start Quagga Processes On ODL ${ODL_SYSTEM_IP} - KarafKeywords.Issue Command On Karaf Console ${BGP_CONNECT} + KarafKeywords.Issue Command On Karaf Console ${BGP_CONFIG_SERVER_CMD} BgpOperations.Create BGP Configuration On ODL localas=${AS_ID} routerid=${ODL_SYSTEM_IP} : FOR ${dcgw} IN @{DCGW_IP_LIST} \ BgpOperations.AddNeighbor To BGP Configuration On ODL remoteas=${AS_ID} neighborAddr=${dcgw} diff --git a/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot b/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot index 634c658de8..461fda7b3f 100644 --- a/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot +++ b/csit/suites/netvirt/multibgpvpn/multi_vpn_bgp.robot @@ -25,7 +25,6 @@ ${NUM_OF_VMS_PER_HOST} 3 ${NUM_OF_L3VPN} 3 ${AS_ID} 100 ${DCGW_SYSTEM_IP} ${TOOLS_SYSTEM_1_IP} -${BGP_CONFIG_SERVER_CMD} bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add ${NET} mvpn_net_new ${ROUTER} mvpn_router ${LOOPBACK_IP} 5.5.5.2/32 diff --git a/csit/suites/netvirt/snatdnat/snat_dnat.robot b/csit/suites/netvirt/snatdnat/snat_dnat.robot index 31f7ea4bb2..3a93b38d7e 100644 --- a/csit/suites/netvirt/snatdnat/snat_dnat.robot +++ b/csit/suites/netvirt/snatdnat/snat_dnat.robot @@ -26,7 +26,6 @@ ${SNAT_ENABLED} "enable_snat": true ${SNAT_DISABLED} "enable_snat": false ${ROUTER} nat_router ${AS_ID} 100 -${BGP_CONFIG_SERVER_CMD} bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add ${DCGW_SYSTEM_IP} ${TOOLS_SYSTEM_1_IP} ${LOOPBACK_IP} 5.5.5.2 ${DCGW_RD} 100:1 diff --git a/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot b/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot index 51d4a814dd..8fb7d5a7eb 100644 --- a/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot +++ b/csit/suites/netvirt/subnet_routing/subnet_routing_and_multicast.robot @@ -28,7 +28,6 @@ ${DCGW_SYSTEM_IP} ${TOOLS_SYSTEM_1_IP} ${RPING_MIP_IP} sudo arping -I eth0:1 -c 5 -b -s @{EXTRA_NW_SUBNET}[0] @{EXTRA_NW_SUBNET}[0] ${RPING_MIP_IP1} sudo arping -I eth0:1 -c 5 -b -s @{EXTRA_NW_SUBNET}[1] @{EXTRA_NW_SUBNET}[1] ${RPING_MIP_IP2} sudo arping -I eth0:1 -c 5 -b -s @{EXTRA_NW_SUBNET}[2] @{EXTRA_NW_SUBNET}[2] -${BGP_CONFIG_SERVER_CMD} bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add @{INTERFACE_STATE} up down @{NETWORKS} mc_net_1 mc_net_2 mc_net_3 @{NET_1_VMS} mc_net_1_vm_1 mc_net_1_vm_2 mc_net_1_vm_3 mc_net_1_vm_4 -- 2.36.6