Replace Start Suite with Suite Setup

[integration/test.git] / csit / suites / netvirt / bgpmultipath / l3vpn_bgp_multipath.robot

diff --git a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
index 271dbd548ac21319691a9d6c22682645cc42a859..337580d1ecdfbae5deea7c215296ea0ad1b5e065 100644 (file)
--- a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
+++ b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
@@ -3,7 +3,7 @@ Documentation     The objective of this testsuite is to test QBGP and ODL for mu
 ...               QBGP should be capable to receive multiple ECMP paths from different DC-GWs and
 ...               to export the ECMP paths to ODL instead of best path selection.
 ...               ODL should be capable to receive ECMP paths and it should program the FIB with ECMP paths.
-Suite Setup       Start Suite
+Suite Setup       Suite Setup
 Suite Teardown    Stop Suite
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     Test Cleanup
@@ -30,9 +30,7 @@ Resource          ../../../variables/Variables.robot
 @{SUBNET_CIDR}    22.1.1.0/24    33.1.1.0/24    44.1.1.0/24
 @{ROUTERS}        multipath_router_1    multipath_router_2    multipath_router_3
 ${AS_ID}          100
-${VPNV4_ADDR_FAMILY}    vpnv4
 ${BGP_CACHE}      bgp-cache
-${BGP_CONNECT}    bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add
 ${DIPSLAY_FIB}    fib-show
 ${ENABLE}         enable
 ${DISABLE}        disable
@@ -121,7 +119,7 @@ Verify that ECMP path gets withdrawn by QBGP after disabling multipath
     BuiltIn.Wait Until Keyword Succeeds    30s    5s    Verify FIB Entry On ODL    @{NETWORK_IP}[0]    @{NUM_OF_ROUTES}[2]
 
 *** Keywords ***
-Start Suite
+Suite Setup
     [Documentation]    Setup start suite
     VpnOperations.Basic Suite Setup
     Create Setup
@@ -147,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}