X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fnetvirt%2Fbgpmultipath%2Fl3vpn_bgp_multipath.robot;h=2b8059a21b95e5f906e99d2fd8e1f4142c52ac6e;hb=21125bfc3475ccae795947a7bc262f653cb4be4d;hp=63650c07749718e641cd33d636ef3fcdc98db293;hpb=84fb01522dbbde6fe5f08019412157ae7cb79622;p=integration%2Ftest.git

diff --git a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
index 63650c0774..2b8059a21b 100644
--- a/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
+++ b/csit/suites/netvirt/bgpmultipath/l3vpn_bgp_multipath.robot
@@ -30,10 +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
-${DISPLAY_VPN4_ALL}    show-bgp --cmd "ip bgp ${VPNV4_ADDR_FAMILY} all"
 ${DIPSLAY_FIB}    fib-show
 ${ENABLE}         enable
 ${DISABLE}        disable
@@ -63,7 +60,7 @@ Verify CSC supports REST API/CLI for max path configuration
     : FOR    ${idx}    IN RANGE    ${START_VALUE}    ${NUM_OF_DCGW}
     \    Configure Maxpath    @{MAX_PATH_LIST}[2]    @{DCGW_RD_IRT_ERT}[${idx}]
     \    BuiltIn.Wait Until Keyword Succeeds    10s    2s    Verify Maxpath    @{MAX_PATH_LIST}[2]    @{DCGW_RD_IRT_ERT}[${idx}]
-    BuiltIn.Wait Until Keyword Succeeds    60s    10s    Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}    False
+    BuiltIn.Wait Until Keyword Succeeds    60s    10s    BgpOperations.Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}    False
 
 Verify max-path error message with invalid inputs
     [Documentation]    Verify max path error message while configuring maxpath with invalid range
@@ -75,7 +72,7 @@ Verify max-path error message with invalid inputs
     : FOR    ${invalid}    IN    @{MAX_PATH_INVALID_LIST}
     \    Configure Maxpath    ${invalid}    @{DCGW_RD_IRT_ERT}[0]
     \    BuiltIn.Wait Until Keyword Succeeds    10s    2s    Verify Maxpath    ${invalid}    @{DCGW_RD_IRT_ERT}[0]
-    BuiltIn.Wait Until Keyword Succeeds    60s    10s    Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}    False
+    BuiltIn.Wait Until Keyword Succeeds    60s    10s    BgpOperations.Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}    False
 
 Verify ODL supports dynamic configuration changes for max path value
     [Documentation]    Verify ODL supports dynamic configuration changes for max path value
@@ -89,7 +86,7 @@ Verify ODL supports dynamic configuration changes for max path value
     BuiltIn.Wait Until Keyword Succeeds    10s    2s    Verify Maxpath    @{MAX_PATH_LIST}[2]    @{DCGW_RD_IRT_ERT}[0]
     : FOR    ${idx}    IN RANGE    ${START_VALUE}    ${NUM_OF_DCGW}
     \    BgpOperations.Add Routes On DCGW    @{DCGW_IP_LIST}[${idx}]    @{DCGW_RD_IRT_ERT}[0]    @{NETWORK_IP}[0]    @{LABEL}[${idx}]
-    BuiltIn.Wait Until Keyword Succeeds    60s    10s    Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}
+    BuiltIn.Wait Until Keyword Succeeds    60s    10s    BgpOperations.Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}
     BuiltIn.Wait Until Keyword Succeeds    60s    10s    Verify Routing Entry On ODL    @{DCGW_RD_IRT_ERT}[0]    @{NETWORK_IP}[0]    @{NUM_OF_ROUTES}[2]
     BuiltIn.Wait Until Keyword Succeeds    30s    5s    Verify FIB Entry On ODL    @{NETWORK_IP}[0]    @{NUM_OF_ROUTES}[2]
     : FOR    ${index}    IN RANGE    0    3
@@ -111,7 +108,7 @@ Verify that ECMP path gets withdrawn by QBGP after disabling multipath
     BuiltIn.Wait Until Keyword Succeeds    10s    2s    Verify Maxpath    @{MAX_PATH_LIST}[2]    @{DCGW_RD_IRT_ERT}[0]
     : FOR    ${idx}    IN RANGE    ${START_VALUE}    ${NUM_OF_DCGW}
     \    BgpOperations.Add Routes On DCGW    @{DCGW_IP_LIST}[${idx}]    @{DCGW_RD_IRT_ERT}[0]    @{NETWORK_IP}[0]    @{LABEL}[${idx}]
-    BuiltIn.Wait Until Keyword Succeeds    60s    10s    Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}
+    BuiltIn.Wait Until Keyword Succeeds    60s    10s    BgpOperations.Check BGP VPNv4 Nbr On ODL    ${NUM_OF_DCGW}
     BuiltIn.Wait Until Keyword Succeeds    60s    10s    Verify Routing Entry On ODL    @{DCGW_RD_IRT_ERT}[0]    @{NETWORK_IP}[0]    @{NUM_OF_ROUTES}[2]
     BuiltIn.Wait Until Keyword Succeeds    30s    5s    Verify FIB Entry On ODL    @{NETWORK_IP}[0]    @{NUM_OF_ROUTES}[2]
     Configure Maxpath    @{MAX_PATH_LIST}[0]    @{DCGW_RD_IRT_ERT}[0]
@@ -148,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}
@@ -203,14 +200,6 @@ Verify Maxpath
     BuiltIn.Run Keyword If    0 < ${maxpath} < 65    BuiltIn.Should Match Regexp    ${output}    ${rd}\\s*${maxpath}
     ...    ELSE    BuiltIn.Should Not Match Regexp    ${output}    ${rd}\\s*${maxpath}
 
-Check BGP VPNv4 Nbr On ODL
-    [Arguments]    ${dcgw_count}    ${flag}=True    ${start}=${START_VALUE}
-    [Documentation]    Check BGP VPNv4 neighbor all on ODL
-    ${output} =    KarafKeywords.Issue Command On Karaf Console    ${DISPLAY_VPN4_ALL}
-    : FOR    ${index}    IN RANGE    ${start}    ${dcgw_count}
-    \    BuiltIn.Run Keyword If    ${flag}==True    BuiltIn.Should Contain    ${output}    ${DCGW_IP_LIST[${index}]}
-    \    ...    ELSE    BuiltIn.Should Not Contain    ${output}    ${DCGW_IP_LIST[${index}]}
-
 Verify Routing Entry On ODL
     [Arguments]    ${rd}    ${prefix}    ${no_of_times}
     [Documentation]    Verify routing table for specific prefix