Remove bgp-connect duplicate variable from suites

Change-Id: Id20b500b488e6252de83ecf340d5058d86d7bcc3
Signed-off-by: JayaPr <jaya.priyadarshini@ericsson.com>

diff --git a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
index 0367392f3199fea8dec02b4f54adb55e46446dd2..2b8059a21b95e5f906e99d2fd8e1f4142c52ac6e 100644 (file)
--- 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 634c658de8e196e8acde4de5df085db87d01aec8..461fda7b3f2a086d320965bb83fc948ae3e02695 100644 (file)
--- 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 31f7ea4bb28385b5aa59f985a2b07a099ab16ea6..3a93b38d7ed5257bccc16582e8d3975c59d2af2a 100644 (file)
--- 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 51d4a814dd166c606b417265b28aaaa1eb820ac1..8fb7d5a7eb03c22d1749cfb2c2c922b45dcb8fba 100644 (file)
--- 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