bgpuserfeatures additional fixes after the carbon change towards openconfig usage

Change-Id: Ie03ce001b21b8e14ceebe76b5778ad9512eca43f
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
index dfd57dbbd10fd6fa787e580dec445ae581106be5..ac23699fd4b32aa1e3c227324e67ab9a269b3f7d 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
+++ b/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
@@ -57,10 +57,13 @@ Reconfigure_ODL_To_Accept_Connection
 Exa_To_Send_Route_Request
     [Documentation]    Exabgp sends route refresh and count received updates
     [Setup]    Configure_Routes_And_Start_ExaBgp    ${BGP_CFG_NAME}
-    Verify_Odl_Received_Route_Request    0
+    # TODO: remove Run_Keyword_If_At_Most_Boron and leave Verify_Odl_Received_Route_Request only after bug 5032 is implemented.
+    # ... This will require also kw Verify_Odl_Received_Route_Request adaptation for ${ODL_STREAM} as the stats url will be different in carbon/openconfig
+    # ... comparing to boron(${JOLOKURL})
+    CompareStream.Run_Keyword_If_At_Most_Boron    Verify_Odl_Received_Route_Request    0
     BgpRpcClient.exa_clean_received_update_count
     BgpRpcClient.exa_announce    announce route-refresh ipv4 unicast
-    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_Odl_Received_Route_Request    1
+    CompareStream.Run_Keyword_If_At_Most_Boron    BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_Odl_Received_Route_Request    1
     BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_ExaBgp_Received_Updates    ${nr_configured_routes}
     [Teardown]    Deconfigure_Routes_And_Stop_ExaBgp
 

diff --git a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
index 6e93c8229857bd2ebebde9d02f4b832b67c445a4..baa54e30b1fc5c9b1291c5eb22d4deb3213ce795 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
+++ b/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
@@ -304,7 +304,7 @@ Delete_Bgp_Peer_Configuration
 Delete_Bgp_Application_Peer_Configuration
     [Documentation]    Revert the BGP configuration to the original state: without any configured peers.
     [Tags]    critical
-    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    NAME=${BGP_PEER_APP_NAME}    IP=${TOOLS_SYSTEM_IP}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
+    &{mapping}    BuiltIn.Create_Dictionary    DEVICE_NAME=${DEVICE_NAME}    NAME=${BGP_PEER_APP_NAME}    IP=${ODL_SYSTEM_IP}    BGP_RIB_OPENCONFIG=${PROTOCOL_OPENCONFIG}
     TemplatedRequests.Delete_Templated    ${BGP_VARIABLES_FOLDER}${/}bgp_application_peer    mapping=${mapping}    session=${CONFIG_SESSION}
 
 *** Keywords ***