Fix route-key argument in ibgp test

The route-key on neon is now in proper base64
enconding so we can change test to reflect this.

Change-Id: I892daed80b4ca30b2bbf8f5048a04889d3535f9b
Signed-off-by: tomas.markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
index 226b6a9e95e29ddb88c76ece678dffb80898bb07..ff57524f291401ee7136e7d700c9dfe7144ae144 100644 (file)
--- a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
+++ b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
@@ -19,6 +19,7 @@ Library           RequestsLibrary
 Library           DateTime
 Resource          ../../../libraries/BGPcliKeywords.robot
 Resource          ../../../libraries/BgpOperations.robot
+Resource          ../../../libraries/CompareStream.robot
 Resource          ../../../libraries/KarafKeywords.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/SSHKeywords.robot
@@ -43,6 +44,8 @@ ${CONFIG_SESSION}    config-session
 ${SKIP_PARAMS}    --skipattr
 ${RIB_INSTANCE}    example-bgp-rib
 ${PROTOCOL_OPENCONFIG}    ${RIB_INSTANCE}
+${OLD_ROUTE_KEY}    [0, 5, 0, 21, 7, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 0, 1, 0, 1, 5, 6, 7, 8]
+${NEW_ROUTE_KEY}    AAUAFQcAAAAAAAAAAQECAwQAAQABBQYHCA==
 
 *** Test Cases ***
 TC1_Configure_iBGP_Peer
@@ -100,7 +103,8 @@ TC2_Connect_BGP_Peer
 TC2_Check_Example_Bgp_Rib
     [Documentation]    Check RIB for linkstate-route(s) and check all of their attributes.
     [Tags]    critical
-    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}
+    ${route_key} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_ROUTE_KEY}    ${OLD_ROUTE_KEY}
+    &{mapping}    BuiltIn.Create_Dictionary    IP=${TOOLS_SYSTEM_IP}    ROUTE_KEY=${route_key}
     BuiltIn.Wait_Until_Keyword_Succeeds    ${DEFAULT_RIB_CHECK_TIMEOUT}    ${DEFAULT_RIB_CHECK_PERIOD}    TemplatedRequests.Get_As_Json_Templated    ${BGP_VARIABLES_FOLDER}/lsp/effective_rib_in    mapping=${mapping}    session=${CONFIG_SESSION}
     ...    verify=True
 

diff --git a/csit/variables/bgpuser/lsp/effective_rib_in/data.json b/csit/variables/bgpuser/lsp/effective_rib_in/data.json
index 1d7e68e23d9e1d7ebb273940b58f1a99b2498daa..f603da25a8320d08be0d4e3cd28269153ced864f 100644 (file)
--- a/csit/variables/bgpuser/lsp/effective_rib_in/data.json
+++ b/csit/variables/bgpuser/lsp/effective_rib_in/data.json
@@ -3,7 +3,7 @@
         "linkstate-route": [
             {
                 "path-id": 0,
-                "route-key": "[0, 5, 0, 21, 7, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 0, 1, 0, 1, 5, 6, 7, 8]",
+                "route-key": "$ROUTE_KEY",
                 "tunnel-id": 1,
                 "lsp-id": 1,
                 "ipv4-tunnel-endpoint-address": "5.6.7.8",