Support only Neon+ distributions 89/102589/5
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 10 Oct 2022 12:01:12 +0000 (14:01 +0200)
committerSangwook Ha <sangwook.ha@verizon.com>
Tue, 20 Jun 2023 21:20:27 +0000 (14:20 -0700)
Fluorine is not supported anymore, remove the keywords and update
their keywords to work as if the distro is always at least Neon.
Also eliminate If_At_Least_Neon macros, as they evaluate to true.

JIRA: INTTEST-133
Change-Id: Ia66484a24fcda9278e7d0117848c6492479a00cc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
84 files changed:
csit/libraries/BgpOperations.robot
csit/libraries/ClusterOpenFlow.robot
csit/libraries/CompareStream.robot
csit/suites/bgpcep/bgpclustering/060_pcep_ha_karaf_restart.robot
csit/suites/bgpcep/bgpclustering/060_pcep_ha_karaf_stop.robot
csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
csit/suites/bgpcep/bgpfunct/050_bmp_basic.robot
csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
csit/suites/bgpcep/bgpfunct/bgp_policies_default.robot
csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot
csit/suites/genius/BFD_monitoring.robot
csit/suites/genius/ITM_Direct_Tunnels.robot
csit/suites/netconf/CRUD-ACTION/CRUD-ACTION.robot
csit/suites/netconf/CRUD/CRUD-RPC.robot
csit/suites/netconf/CRUD/CRUD.robot
csit/variables/bgpflowspec/bgp_flowspec/data.json
csit/variables/bgpflowspec/bgp_flowspec_redirect/data.json
csit/variables/bgpfunctional/bgppolicies/app_peer_rib/data.json
csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_1/data.json
csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_2/data.json
csit/variables/bgpfunctional/bgppolicies/effective_rib_in/peer_5/data.json
csit/variables/bgpfunctional/bmp_basic/filled_structure/data.json
csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json
csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json
csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json
csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json
csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json
csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json
csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json
csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json
csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json
csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json
csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json
csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json
csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json
csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json
csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json
csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json
csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json
csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json
csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json
csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json
csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json
csit/variables/bgpfunctional/l3vpn_ipv4/bgp_l3vpn_ipv4/data.json
csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast/rib/data.json
csit/variables/bgpfunctional/l3vpn_mcast/l3vpn_mcast_ipv6/rib/data.json
csit/variables/bgpfunctional/mvpn/inter_as_ipmsi_ad/rib/data.json
csit/variables/bgpfunctional/mvpn/intra_as_ipmsi_ad/rib/data.json
csit/variables/bgpfunctional/mvpn/intra_ipv6/rib/data.json
csit/variables/bgpfunctional/mvpn/intra_pe_distinguisher/rib/data.json
csit/variables/bgpfunctional/mvpn/intra_source_as/rib/data.json
csit/variables/bgpfunctional/mvpn/intra_source_as_4/rib/data.json
csit/variables/bgpfunctional/mvpn/intra_vrf/rib/data.json
csit/variables/bgpfunctional/mvpn/leaf_ad/rib/data.json
csit/variables/bgpfunctional/mvpn/shared_tree_join/rib/data.json
csit/variables/bgpfunctional/mvpn/source_active_ad/rib/data.json
csit/variables/bgpfunctional/mvpn/source_tree_join/rib/data.json
csit/variables/bgpfunctional/mvpn/spmsi_ad/rib/data.json
csit/variables/bgpfunctional/rt_constrain/l3vpn_rt_arg/rib/data.json
csit/variables/bgpfunctional/rt_constrain/rt_constrain_default/rib/data.json
csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_0/rib/data.json
csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_1/rib/data.json
csit/variables/bgpfunctional/rt_constrain/rt_constrain_type_2/rib/data.json

index 9937c33afed3d9ad17ff32ef2eddc1be6308ccde..0614d80011dd839ffcded16e5e03e622dd244e65 100644 (file)
@@ -18,11 +18,7 @@ ${BGP_RIB_URI}              bgp-rib:bgp-rib/rib=example-bgp-rib
 ${BGP_TOPOLOGY_URI}         ${TOPOLOGY_URL}=example-ipv4-topology
 ${VAR_BASE_BGP}             ${CURDIR}/../variables/bgpfunctional
 ${RIB_NAME}                 example-bgp-rib
-${OLD_AS_PATH}              \n"as-path": {},
-${NEW_AS_PATH}              ${EMPTY}
 &{APP_PEER}                 IP=${ODL_SYSTEM_IP}    BGP_RIB=${RIB_NAME}
-${NEW_IPV4_ROUTES_LINE}     ${EMPTY}
-${OLD_IPV4_ROUTES_LINE}     \n"bgp-inet:ipv4-routes": {},
 ${BGP_CONFIG_SERVER_CMD}    bgp-connect -h ${ODL_SYSTEM_IP} -p 7644 add
 ${VPNV4_ADDR_FAMILY}        vpnv4
 ${DISPLAY_VPN4_ALL}         show-bgp --cmd "ip bgp ${VPNV4_ADDR_FAMILY} all"
@@ -367,10 +363,7 @@ Bmp_Monitor_Precondition
 Bmp_Monitor_Postcondition
     [Documentation]    Verifies if example-bmp-monitor data contains one peer.
     [Arguments]    ${session}
-    ${routes_line} =    CompareStream.Set_Variable_If_At_Least_Neon
-    ...    ${NEW_IPV4_ROUTES_LINE}
-    ...    ${OLD_IPV4_ROUTES_LINE}
-    &{mapping} =    BuiltIn.Create_Dictionary    TOOL_IP=${TOOLS_SYSTEM_IP}    ROUTES_LINE=${routes_line}
+    &{mapping} =    BuiltIn.Create_Dictionary    TOOL_IP=${TOOLS_SYSTEM_IP}
     ${output} =    BuiltIn.Wait_Until_Keyword_Succeeds
     ...    10x
     ...    5s
@@ -399,16 +392,13 @@ Odl_To_Play_Template
 
 Play_To_Odl_Template
     [Arguments]    ${totest}    ${dir}    ${ipv}=ipv4
-    ${as_path} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
     &{adj_rib_in} =    BuiltIn.Create_Dictionary
     ...    PATH=peer\=bgp:%2F%2F${TOOLS_SYSTEM_IP}/adj-rib-in
     ...    BGP_RIB=${RIB_NAME}
-    ...    AS_PATH=${as_path}
     &{effective_rib_in} =    BuiltIn.Create_Dictionary
     ...    PATH=peer\=bgp:%2F%2F${TOOLS_SYSTEM_IP}/effective-rib-in
     ...    BGP_RIB=${RIB_NAME}
-    ...    AS_PATH=${as_path}
-    &{loc_rib} =    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
+    &{loc_rib} =    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}
     ${announce_hex} =    OperatingSystem.Get_File    ${dir}/${totest}/announce_${totest}.hex
     ${withdraw_hex} =    OperatingSystem.Get_File    ${dir}/${totest}/withdraw_${totest}.hex
     BgpRpcClient.play_clean
@@ -453,8 +443,7 @@ Play_To_Odl_Non_Removal_Template
     ${announce_hex} =    OperatingSystem.Get_File    ${dir}/${totest}/announce_${totest}.hex
     BgpRpcClient.play_clean
     BgpRpcClient.play_send    ${announce_hex}
-    ${as_path} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
-    &{loc_rib} =    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}    AS_PATH=${as_path}
+    &{loc_rib} =    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    2s
index 0bc1a4a27eede2e06da819f278b933ced9807b21..1a0460d59107b08bfac710a4f1901cd7f5fefc68 100644 (file)
@@ -112,21 +112,12 @@ Check No OpenFlow Network Operational Information
     [Documentation]    Check device is not in operational inventory or topology in all cluster instances in ${controller_index_list}.
     [Arguments]    ${controller_index_list}=${EMPTY}
     ${dictionary}=    Create Dictionary    openflow=0
-    CompareStream.Run_Keyword_If_At_Least_Neon
-    ...    Wait Until Keyword Succeeds
+    Wait Until Keyword Succeeds
     ...    5s
     ...    1s
     ...    ClusterManagement.Check_No_Content_Member_List_Or_All
     ...    uri=${RFC8040_OPERATIONAL_NODES_API}
     ...    member_index_list=${controller_index_list}
-    CompareStream.Run_Keyword_If_At_Most_Fluorine
-    ...    Wait Until Keyword Succeeds
-    ...    5s
-    ...    1s
-    ...    ClusterManagement.Check_Item_Occurrence_Member_List_Or_All
-    ...    uri=${RFC8040_OPERATIONAL_NODES_API}
-    ...    dictionary=${dictionary}
-    ...    member_index_list=${controller_index_list}
     ${dictionary}=    Create Dictionary    openflow=0
     Wait Until Keyword Succeeds
     ...    20s
index ae1145db63251986f887fd17eccf1b1a3241a683..7fe521a3044069e66ab24d26755411df44427b36 100644 (file)
@@ -11,7 +11,6 @@ Library             String
 
 *** Variables ***
 &{Stream_dict}
-...                 fluorine=${9}
 ...                 neon=${10}
 ...                 sodium=${11}
 ...                 magnesium=${12}
@@ -45,14 +44,8 @@ Set_Variable_If_At_Most
     ...    ${value_if_true}
     ...    ${value_if_false}
 
-Set_Variable_If_At_Least_Neon
-    [Documentation]    Compare neon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least neon,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    neon    ${value_if_true}    ${value_if_false}
-
 Set_Variable_If_At_Least_Sodium
-    [Documentation]    Compare neon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least sodium,
+    [Documentation]    Compare sodium to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at least sodium,
     ...    return ${value_if_false} otherwise.
     [Arguments]    ${value_if_true}    ${value_if_false}
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    sodium    ${value_if_true}    ${value_if_false}
@@ -87,12 +80,6 @@ Set_Variable_If_At_Least_Chlorine
     [Arguments]    ${value_if_true}    ${value_if_false}
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Least    chlorine    ${value_if_true}    ${value_if_false}
 
-Set_Variable_If_At_Most_Fluorine
-    [Documentation]    Compare fluorine to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most fluorine,
-    ...    return ${value_if_false} otherwise.
-    [Arguments]    ${value_if_true}    ${value_if_false}
-    BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Most    fluorine    ${value_if_true}    ${value_if_false}
-
 Set_Variable_If_At_Most_Neon
     [Documentation]    Compare neon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most neon,
     ...    return ${value_if_false} otherwise.
@@ -100,7 +87,7 @@ Set_Variable_If_At_Most_Neon
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Most    neon    ${value_if_true}    ${value_if_false}
 
 Set_Variable_If_At_Most_Sodium
-    [Documentation]    Compare neon to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most sodium,
+    [Documentation]    Compare sodium to ${ODL_STREAM} and return ${value_if_true} if ${ODL_STREAM} is at most sodium,
     ...    return ${value_if_false} otherwise.
     [Arguments]    ${value_if_true}    ${value_if_false}
     BuiltIn.Run_Keyword_And_Return    Set_Variable_If_At_Most    sodium    ${value_if_true}    ${value_if_false}
@@ -276,12 +263,6 @@ Run_Keyword_If_Less_Than
     ...    @{varargs}
     ...    &{kwargs}
 
-Run_Keyword_If_At_Least_Neon
-    [Documentation]    Compare neon to ${ODL_STREAM} and in case ${ODL_STREAM} is at least neon,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    neon    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_At_Least_Sodium
     [Documentation]    Compare sodium to ${ODL_STREAM} and in case ${ODL_STREAM} is at least sodium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -324,12 +305,6 @@ Run_Keyword_If_At_Least_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Least    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_At_Most_Fluorine
-    [Documentation]    Compare fluorine to ${ODL_STREAM} and in case ${ODL_STREAM} is at most fluroine,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    fluorine    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_At_Most_Neon
     [Documentation]    Compare neon to ${ODL_STREAM} and in case ${ODL_STREAM} is at most neon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -378,12 +353,6 @@ Run_Keyword_If_At_Most_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_At_Most    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_More_Than_Fluorine
-    [Documentation]    Compare fluorine to ${ODL_STREAM} and in case ${ODL_STREAM} is more than fluorine,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    fluorine    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_More_Than_Neon
     [Documentation]    Compare neon to ${ODL_STREAM} and in case ${ODL_STREAM} is more than neon,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
@@ -432,12 +401,6 @@ Run_Keyword_If_More_Than_Chlorine
     [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
     BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_More_Than    chlorine    ${kw_name}    @{varargs}    &{kwargs}
 
-Run_Keyword_If_Less_Than_Neon
-    [Documentation]    Compare neon to ${ODL_STREAM} and in case ${ODL_STREAM} is less than neon,
-    ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
-    [Arguments]    ${kw_name}    @{varargs}    &{kwargs}
-    BuiltIn.Run_Keyword_And_Return    Run_Keyword_If_Less_Than    neon    ${kw_name}    @{varargs}    &{kwargs}
-
 Run_Keyword_If_Less_Than_Sodium
     [Documentation]    Compare sodium to ${ODL_STREAM} and in case ${ODL_STREAM} is less than sodium,
     ...    run ${kw_name} @{varargs} &{kwargs} and return its value.
index cf8e9d99344af0190450aa56fcb2fb503ee67e31..b9ee1515796f3e9bb6a081d60d2141bc472eb4bf 100644 (file)
@@ -36,8 +36,7 @@ ${HOLDTIME}                 180
 ${DIR_WITH_TEMPLATES}       ${CURDIR}/../../../variables/bgpclustering/${ODL_STREAM}
 ${PCC_LOG_FILE}             pccmock.restart.log
 ${CONFIG_SESSION}           session
-${OLD_ERROR_ARGS}           \n"last-received-error": {},\n"last-sent-error": {},
-${NEW_ERROR_ARGS}           ${EMPTY}
+${ERROR_ARGS}               ${EMPTY}
 
 
 *** Test Cases ***
@@ -125,8 +124,6 @@ Setup_Everything
     ${code}=    Evaluate    binascii.b2a_base64('${pcc_name}')[:-1]    modules=binascii
     BuiltIn.Set_Suite_Variable    ${pcc_name_code}    ${code}
     PcepOperations.Pcep_Topology_Precondition    ${CONFIG_SESSION}
-    ${ERROR_ARGS}=    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_ERROR_ARGS}    ${OLD_ERROR_ARGS}
-    BuiltIn.Set_Suite_Variable    ${ERROR_ARGS}
     Start_Pcc_Mock
 
 Teardown_Everything
index 6f7bb7cfa78492aa40f944e2a2e8bc14e65d96e5..41bdc508ccbf9efbbec4f43f5f1116174cfdbb5f 100644 (file)
@@ -36,8 +36,7 @@ ${HOLDTIME}                 180
 ${DIR_WITH_TEMPLATES}       ${CURDIR}/../../../variables/bgpclustering/${ODL_STREAM}
 ${PCC_LOG_FILE}             pccmock.stop.log
 ${CONFIG_SESSION}           session
-${OLD_ERROR_ARGS}           \n"last-received-error": {},\n"last-sent-error": {},
-${NEW_ERROR_ARGS}           ${EMPTY}
+${ERROR_ARGS}               ${EMPTY}
 
 
 *** Test Cases ***
@@ -124,8 +123,6 @@ Setup_Everything
     ${code}=    Evaluate    binascii.b2a_base64('${pcc_name}')[:-1]    modules=binascii
     BuiltIn.Set_Suite_Variable    ${pcc_name_code}    ${code}
     PcepOperations.Pcep_Topology_Precondition    ${CONFIG_SESSION}
-    ${ERROR_ARGS}=    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_ERROR_ARGS}    ${OLD_ERROR_ARGS}
-    BuiltIn.Set_Suite_Variable    ${ERROR_ARGS}
     Start_Pcc_Mock
 
 Teardown_Everything
index 7da6c6f68bec326af1a62bda155e4312a5e48e3b..52d267b2e242493677d91f24d1ba08244503fc62 100644 (file)
@@ -23,8 +23,6 @@ Suite Teardown      Stop_Suite
 ${BGP_VARIABLES_FOLDER}     ${CURDIR}/../../../variables/bgpflowspec/
 ${CMD}                      env exabgp.tcp.port=1790 exabgp --debug
 ${HOLDTIME}                 180
-${OLD_AS_PATH}              \n"as-path": {},
-${NEW_AS_PATH}              ${EMPTY}
 ${EXP0}                     {"bgp-flowspec:flowspec-routes": {}}
 ${CFG1}                     bgp-flowspec.cfg
 ${EXP1}                     bgp_flowspec
@@ -90,8 +88,6 @@ Start_Suite
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
     Upload_Config_Files    ${BGP_VARIABLES_FOLDER}
-    ${AS_PATH}    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
-    BuiltIn.Set_Suite_Variable    ${AS_PATH}
 
 Stop_Suite
     [Documentation]    Suite teardown keyword
@@ -121,17 +117,14 @@ Setup_Testcase
 
 Verify_Empty_Flowspec_Data
     [Documentation]    Verify expected response.
-    CompareStream.Run_Keyword_If_At_Most_Fluorine    Normalize_And_Compare
-    CompareStream.Run_Keyword_If_At_Least_Neon    Verify_Empty_Flowspec_Data_Neon
+    Verify_Empty_Flowspec_Data_Neon
 
 Verify_Flowspec_Data
     [Documentation]    Verify expected response
     [Arguments]    ${exprspdir}
-    &{mapping}    BuiltIn.Create_Dictionary    AS_PATH=${AS_PATH}
     TemplatedRequests.Get_As_Json_Templated
     ...    ${BGP_VARIABLES_FOLDER}${/}${exprspdir}
     ...    session=${CONFIG_SESSION}
-    ...    mapping=${mapping}
     ...    verify=True
 
 Normalize_And_Compare
index 8b5e5f13bb736704da69ecb2d6d568064bd3b8ee..60602a7ea3edf178d384ffa7c24c84ee255b1be5 100644 (file)
@@ -48,8 +48,6 @@ ${L3VPN_EXA_CFG}                bgp-l3vpn-ipv4.cfg
 ${L3VPN_EXP}                    exa_expected
 ${L3VPN_RSP}                    bgp_l3vpn_ipv4
 ${L3VPN_RSPEMPTY}               bgp_l3vpn_ipv4_empty
-${OLD_AS_PATH}                  \n"as-path": {},
-${NEW_AS_PATH}                  ${EMPTY}
 ${PLAY_SCRIPT}                  ${CURDIR}/../../../../tools/fastbgp/play.py
 ${RIB_INSTANCE}                 example-bgp-rib
 ${RT_CONSTRAIN_DIR}             ${CURDIR}/../../../variables/bgpfunctional/rt_constrain
@@ -140,8 +138,6 @@ Start_Suite
     SSHKeywords.Virtual_Env_Install_Package    exabgp==3.4.16
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
     Upload_Config_Files
-    ${AS_PATH}    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
-    BuiltIn.Set_Suite_Variable    ${AS_PATH}
 
 Stop_Suite
     [Documentation]    Suite teardown keyword
@@ -192,20 +188,13 @@ Verify_ExaBgp_Received_Update
 
 Verify_Empty_Reported_Data
     [Documentation]    Verfiy empty data response
-    CompareStream.Run_Keyword_If_At_Most_Fluorine
-    ...    TemplatedRequests.Get_As_Json_Templated
-    ...    ${BGP_L3VPN_DIR}${/}${L3VPN_RSPEMPTY}
-    ...    session=${CONFIG_SESSION}
-    ...    verify=True
-    CompareStream.Run_Keyword_If_At_Least_Neon    Verify_Empty_Data_Neon
+    Verify_Empty_Data_Neon
 
 Verify_Reported_Data
     [Documentation]    Verifies expected response
     [Arguments]    ${exprspdir}
-    &{mapping}    BuiltIn.Create_Dictionary    AS_PATH=${AS_PATH}
     TemplatedRequests.Get_As_Json_Templated
     ...    ${BGP_L3VPN_DIR}${/}${exprspdir}
-    ...    mapping=${mapping}
     ...    session=${CONFIG_SESSION}
     ...    verify=True
 
index 5f9eee1dfa8bb5beb0a681192a40da7a5023b684..2135dbabdf917d4a784c3f3d7d96c79f43f9b9b7 100644 (file)
@@ -74,7 +74,7 @@ Odl Allpaths Exa SendReceived
     [Setup]    Configure_Path_Selection_And_App_Peer_And_Connect_Peer    ${ALLPATHS_SELM}    ${ADDPATHCAP_SR}
     Log_Loc_Rib_Operational
     Comment    From neon onwards there is extra BGP End-Of-RIB message
-    ${update_messages}    CompareStream.Set_Variable_If_At_Most_Fluorine    3    4
+    ${update_messages}    BuiltIn.Set_Variable    4
     BuiltIn.Wait_Until_Keyword_Succeeds    6x    2s    Verify_Expected_Update_Count    ${update_messages}
     [Teardown]    Remove_Odl_And_App_Peer_Configuration_And_Stop_ExaBgp
 
@@ -84,7 +84,7 @@ Odl Npaths Exa SendReceived
     [Setup]    Configure_Path_Selection_And_App_Peer_And_Connect_Peer    ${NPATHS_SELM}    ${ADDPATHCAP_SR}
     Log_Loc_Rib_Operational
     Comment    From neon onwards there is extra BGP End-Of-RIB message
-    ${update_messages}    CompareStream.Set_Variable_If_At_Most_Fluorine    2    3
+    ${update_messages}    BuiltIn.Set_Variable    3
     BuiltIn.Wait_Until_Keyword_Succeeds    6x    2s    Verify_Expected_Update_Count    ${update_messages}
     [Teardown]    Remove_Odl_And_App_Peer_Configuration_And_Stop_ExaBgp
 
index 4b749d3bd01f637873e367e24e735d786a991dd0..95398a9514da847eabdf96079c54745e5721442d 100644 (file)
@@ -42,10 +42,6 @@ ${CONFIG_SESSION}           config-session
 ${EVPN_DIR}                 ${CURDIR}/../../../variables/bgpfunctional/l2vpn_evpn
 ${BGP_TOOL_LOG_LEVEL}       debug
 ${PLAY_SCRIPT}              ${CURDIR}/../../../../tools/fastbgp/play.py
-${OLD_EVPN_ROUTES_LINE}     \n"odl-bgp-evpn:evpn-routes": {},
-${NEW_EVPN_ROUTES_LINE}     ${EMPTY}
-${OLD_AS_PATH}              ,\n"as-path": {}
-${NEW_AS_PATH}              ${EMPTY}
 
 
 *** Test Cases ***
@@ -295,14 +291,9 @@ Start_Suite
     BuiltIn.Set_Suite_Variable
     ...    ${EVPN_FAMILY_LOC_RIB}
     ...    /rests/data/bgp-rib:bgp-rib/rib=${RIB_NAME}/loc-rib/tables=odl-bgp-evpn%3Al2vpn-address-family,odl-bgp-evpn%3Aevpn-subsequent-address-family?content=nonconfig
-    ${evpn_routes_line} =    CompareStream.Set_Variable_If_At_Least_Neon
-    ...    ${NEW_EVPN_ROUTES_LINE}
-    ...    ${OLD_EVPN_ROUTES_LINE}
-    &{mapping} =    BuiltIn.Create_Dictionary    EVPN_ROUTES=${evpn_routes_line}
     ${EMPTY_ROUTES} =    TemplatedRequests.Resolve_Text_From_Template_File
     ...    ${EVPN_DIR}/empty_routes
     ...    empty_routes.json
-    ...    ${mapping}
     BuiltIn.Set_Suite_Variable    ${EMPTY_ROUTES}
 
 Stop_Suite
@@ -354,12 +345,9 @@ Odl_To_Play_Template
 Play_To_Odl_Template
     [Arguments]    ${totest}
     ${data_xml} =    OperatingSystem.Get_File    ${EVPN_DIR}/${totest}/${totest}.xml
-    ${AS_PATH} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
-    &{mapping} =    BuiltIn.Create_Dictionary    AS_PATH=${AS_PATH}
     ${data_json} =    TemplatedRequests.Resolve_Text_From_Template_File
     ...    ${EVPN_DIR}/${totest}
     ...    ${totest}.json
-    ...    ${mapping}
     ${announce_hex} =    OperatingSystem.Get_File    ${EVPN_DIR}/${totest}/announce_${totest}.hex
     ${withdraw_hex} =    OperatingSystem.Get_File    ${EVPN_DIR}/${totest}/withdraw_${totest}.hex
     BuiltIn.Log    ${data_xml}
index 87adc23ba67ad6cce985abdf14ed7c3fdc5653f4..fe1e9340f0456c5babf6ab33504e9e3095c28d02 100644 (file)
@@ -86,10 +86,10 @@ Exa_To_Send_Route_Refresh
     BgpRpcClient.exa_clean_received_update_count
     BgpRpcClient.exa_announce    announce route-refresh ipv4 unicast
     Comment    From neon onwards there are extra BGP End-Of-RIB message
-    ${update_count}    CompareStream.Set_Variable_If_At_Most_Fluorine    2    3
+    ${update_count}    BuiltIn.Set_Variable    3
     BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_ExaBgp_Received_Updates    ${update_count}
     Comment    From neon onwards there are extra BGP End-Of-RIB message per address family
-    ${update_count}    CompareStream.Set_Variable_If_At_Most_Fluorine    4    7
+    ${update_count}    BuiltIn.Set_Variable    7
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    5s
@@ -111,7 +111,7 @@ Odl_To_Send_Route_Refresh
     ...    session=${CONFIG_SESSION}
     BuiltIn.Wait_Until_Keyword_Succeeds    5x    2s    Verify_ExaBgp_Received_Route_Refresh    1
     Comment    From neon onwards there are extra BGP End-Of-RIB message per address family
-    ${update_count}    CompareStream.Set_Variable_If_At_Most_Fluorine    4    9
+    ${update_count}    BuiltIn.Set_Variable    9
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    5s
@@ -189,7 +189,7 @@ Configure_Routes_And_Start_ExaBgp
     END
     ExaBgpLib.Start_ExaBgp_And_Verify_Connected    ${cfg_file}    ${CONFIG_SESSION}    ${TOOLS_SYSTEM_IP}
     Comment    From neon onwards there are extra BGP End-Of-RIB message per address family
-    ${update_count}    CompareStream.Set_Variable_If_At_Most_Fluorine    2    4
+    ${update_count}    BuiltIn.Set_Variable    4
     BuiltIn.Wait_Until_Keyword_Succeeds    3x    3s    Verify_ExaBgp_Received_Updates    ${update_count}
 
 Deconfigure_Routes_And_Stop_ExaBgp
index 4532e5cc8302f0d59e03282f2f28d5383c30c206..2dfecde17d821a7879089c53dbee352c4c876435 100644 (file)
@@ -29,12 +29,10 @@ Suite Teardown      Tear_It_Down
 
 
 *** Variables ***
-${CONFIG_SESSION}           config-session
-${BGP_BMP_DIR}              ${CURDIR}/../../../variables/bgpfunctional/bmp_basic/filled_structure
-${BGP_BMP_FEAT_DIR}         ${CURDIR}/../../../variables/bgpfunctional/bmp_basic/empty_structure
-${BMP_LOG_FILE}             bmpmock.log
-${NEW_IPV4_ROUTES_LINE}     ${EMPTY}
-${OLD_IPV4_ROUTES_LINE}     \n"bgp-inet:ipv4-routes": {},
+${CONFIG_SESSION}       config-session
+${BGP_BMP_DIR}          ${CURDIR}/../../../variables/bgpfunctional/bmp_basic/filled_structure
+${BGP_BMP_FEAT_DIR}     ${CURDIR}/../../../variables/bgpfunctional/bmp_basic/empty_structure
+${BMP_LOG_FILE}         bmpmock.log
 
 
 *** Test Cases ***
@@ -62,10 +60,7 @@ Start_Bmp_Mock
 
 Verify Data Reported
     [Documentation]    Verifies if the tool reported expected data
-    ${IPV4_ROUTES_LINE}=    CompareStream.Set_Variable_If_At_Least_Neon
-    ...    ${NEW_IPV4_ROUTES_LINE}
-    ...    ${OLD_IPV4_ROUTES_LINE}
-    &{mapping}=    BuiltIn.Create_Dictionary    TOOL_IP=${TOOLS_SYSTEM_IP}    ROUTES_LINE=${IPV4_ROUTES_LINE}
+    &{mapping}=    BuiltIn.Create_Dictionary    TOOL_IP=${TOOLS_SYSTEM_IP}
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    2s
index 8c262cddf59ec21a4a9fbd7df76128f287a426fd..9b5f00dd4061e2820b6dbaa0e37badb7cdee989a 100644 (file)
@@ -45,8 +45,6 @@ ${RIB_NAME}                 example-bgp-rib
 ${ODL_2_IP}                 127.0.0.2
 ${ODL_3_IP}                 127.0.0.3
 ${ODL_4_IP}                 127.0.0.4
-${OLD_AS_PATH}              \n"as-path": {},
-${NEW_AS_PATH}              ${EMPTY}
 @{BGP_PEER_TYPES}           external    internal    internal
 @{BGP_PEER_AS_NUMBERS}      65000    64496    64496
 @{ODL_IP_INDICES_ALL}       2    3    4
@@ -88,7 +86,6 @@ Play_To_Odl_ext_l3vpn_rt_arg
     &{effective_rib_in} =    BuiltIn.Create_Dictionary
     ...    PATH=peer\=bgp:%2F%2F${ODL_2_IP}/effective-rib-in
     ...    BGP_RIB=${RIB_NAME}
-    ...    AS_PATH=${AS_PATH}
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    2s
@@ -101,7 +98,7 @@ Play_To_Odl_ext_l3vpn_rt_arg
 Play_To_Odl_rt_constrain_type_0
     [Documentation]    Sends RT route from node 2 to odl and then checks that odl advertizes l3vpn route from previous TC.
     Play_To_Odl_Non_Removal_BgpRpcClient3    rt_constrain_type_0    ${RT_CONSTRAIN_DIR}
-    &{loc_rib} =    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}    AS_PATH=${AS_PATH}
+    &{loc_rib} =    BuiltIn.Create_Dictionary    PATH=loc-rib    BGP_RIB=${RIB_NAME}
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    2s
@@ -135,7 +132,6 @@ Play_To_Odl_rt_constrain_type_1
     &{effective_rib_in} =    BuiltIn.Create_Dictionary
     ...    PATH=peer\=bgp:%2F%2F${ODL_4_IP}/effective-rib-in
     ...    BGP_RIB=${RIB_NAME}
-    ...    AS_PATH=${AS_PATH}
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    3x
     ...    2s
@@ -145,22 +141,11 @@ Play_To_Odl_rt_constrain_type_1
     ...    session=${CONFIG_SESSION}
     ...    verify=True
     ${update} =    BgpRpcClient4.play_get
-    Comment    From neon onwards there is extra BGP End-Of-RIB message
-    CompareStream.Run_Keyword_If_At_Most_Fluorine    BuiltIn.Should_Be_Equal    ${update}    ${Empty}
 
 Play_To_Odl_remove_rt
     [Documentation]    Removes RT from odl and then checks that second node withdrew l3vpn route and third node did not receive any message.
     BgpRpcClient3.play_clean
     Play_To_Odl_Routes_Removal_Template_BgpRpcClient3    rt_constrain_type_0    ${RT_CONSTRAIN_DIR}
-    Comment    From neon onwards there is extra BGP End-Of-RIB message
-    CompareStream.Run_Keyword_If_At_Most_Fluorine
-    ...    BuiltIn.Wait_Until_Keyword_Succeeds
-    ...    3x
-    ...    2s
-    ...    Verify_Empty_Reported_Data
-    ${update} =    BgpRpcClient4.play_get
-    Comment    From neon onwards there is extra BGP End-Of-RIB message
-    CompareStream.Run_Keyword_If_At_Most_Fluorine    BuiltIn.Should_Be_Equal    ${update}    ${Empty}
 
 Play_To_Odl_remove_routes
     [Documentation]    Removes rt arguments from odl.
@@ -201,8 +186,6 @@ Start_Suite
     RequestsLibrary.Create_Session    ${CONFIG_SESSION}    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
     SSHLibrary.Put_File    ${PLAY_SCRIPT}    .
     SSHKeywords.Assure_Library_Ipaddr    target_dir=.
-    ${AS_PATH} =    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
-    BuiltIn.Set_Suite_Variable    ${AS_PATH}
 
 Stop_Suite
     [Documentation]    Suite teardown keyword
index 4c0befc1d664618a0436ed131a026258529f3bd4..84b77a91ac6f68416ed6df5ec6d3d12b538c1cc7 100644 (file)
@@ -34,8 +34,6 @@ ${CMD}                  env exabgp.tcp.port=1790 exabgp --debug
 ${HOLDTIME}             180
 ${RIB_INSTANCE}         example-bgp-rib
 ${CONFIG_SESSION}       config-session
-${OLD_AS_PATH}          \n"as-path": {},
-${NEW_AS_PATH}          ${EMPTY}
 
 
 *** Test Cases ***
@@ -148,9 +146,8 @@ Verify_Rib_Status
     # gets and outputs full rib output for debug purposes if one of the peers reports faulty data.
     ${output}    TemplatedRequests.Get_As_Json_Templated    ${POLICIES_VAR}/rib_state    session=${CONFIG_SESSION}
     BuiltIn.Log    ${output}
-    ${AS_PATH}    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_AS_PATH}    ${OLD_AS_PATH}
     FOR    ${index}    IN    @{NUMBERS}
-        &{mapping}    BuiltIn.Create_Dictionary    IP=127.0.0.${index}    AS_PATH=${AS_PATH}
+        &{mapping}    BuiltIn.Create_Dictionary    IP=127.0.0.${index}
         BuiltIn.Wait_Until_Keyword_Succeeds
         ...    5x
         ...    3s
@@ -160,7 +157,7 @@ Verify_Rib_Status
         ...    session=${CONFIG_SESSION}
         ...    verify=True
     END
-    &{mapping}    BuiltIn.Create_Dictionary    IP=${ODL_SYSTEM_IP}    AS_PATH=${AS_PATH}
+    &{mapping}    BuiltIn.Create_Dictionary    IP=${ODL_SYSTEM_IP}
     # application peer verification
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    5x
index e35dae70a1d674c017b1696a61b5a33ebc296fed..fb9fe3feb586b213f15c3e3c0a02afca636f42c5 100644 (file)
@@ -460,7 +460,7 @@ TC3_BGP_Peer1_Check_Log_For_No_Updates
     [Tags]    critical
     SSHLibrary.Switch Connection    bgp_peer1_console
     Comment    From neon onwards there is extra BGP End-Of-RIB message
-    ${update_messages}    CompareStream.Set_Variable_If_At_Most_Fluorine    0    1
+    ${update_messages}    BuiltIn.Set_Variable    1
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    ${DEFAULT_LOG_CHECK_TIMEOUT}
     ...    ${DEFAULT_LOG_CHECK_PERIOD}
@@ -482,7 +482,7 @@ TC3_BGP_Peer2_Check_Log_For_No_Updates
     SSHLibrary.Switch Connection    bgp_peer2_console
     ${log_check_timeout}    DateTime.Convert_Time    ${DEFAULT_LOG_CHECK_TIMEOUT}    result_format=number
     Comment    From neon onwards there is extra BGP End-Of-RIB message
-    ${update_messages}    CompareStream.Set_Variable_If_At_Most_Fluorine    0    1
+    ${update_messages}    BuiltIn.Set_Variable    1
     BuiltIn.Wait_Until_Keyword_Succeeds
     ...    ${log_check_timeout*2}
     ...    ${DEFAULT_LOG_CHECK_PERIOD}
index b71e0a62ed3ebf9e7c6b5d133277233f7fdfc5c2..e794a8f07d778ce9c48c053aaa4bd2b84a8a4a25 100644 (file)
@@ -24,7 +24,6 @@ Documentation       TCPMD5 user-facing feature system tests, using PCEP.
 Library             OperatingSystem
 Library             RequestsLibrary
 Library             SSHLibrary    prompt=]>
-Resource            ../../../libraries/CompareStream.robot
 Resource            ../../../libraries/FailFast.robot
 Resource            ../../../libraries/KarafKeywords.robot
 Resource            ../../../libraries/NexusKeywords.robot
@@ -43,8 +42,7 @@ Test Teardown       FailFast.Start_Failing_Fast_If_This_Failed
 *** Variables ***
 ${DIR_WITH_TEMPLATES}       ${CURDIR}/../../../variables/tcpmd5user/${ODL_STREAM}
 ${CONFIG_SESSION}           session
-${OLD_ERROR_ARGS}           \n"last-received-error": {},\n"last-sent-error": {},
-${NEW_ERROR_ARGS}           ${EMPTY}
+${ERROR_ARGS}               ${EMPTY}
 
 
 *** Test Cases ***
@@ -222,8 +220,6 @@ Set_It_Up
     BuiltIn.Set_Suite_Variable    ${filename}    ${name}
     #Setting Pcc Name and its code for mapping for templates
     FailFast.Do_Not_Fail_Fast_From_Now_On
-    ${ERROR_ARGS}    CompareStream.Set_Variable_If_At_Least_Neon    ${NEW_ERROR_ARGS}    ${OLD_ERROR_ARGS}
-    BuiltIn.Set_Suite_Variable    ${ERROR_ARGS}
 
 Tear_It_Down
     [Documentation]    Download pccmock.log and Log its contents.
index dcfcaecdcfebfd86fc814fe812138832f1d4f6bc..2802feb84ca1d2b4b8b1a224b4c4d5e993fd123a 100644 (file)
@@ -50,40 +50,21 @@ BFD_TC00 Create ITM between DPNs
 
 BFD_TC01 Verify default BFD monitoring status on Controller
     [Documentation]    Verify the default value of BFD monitoring \ on the Controller
-    CompareStream.Run_Keyword_If_At_Least_Neon
-    ...    BuiltIn.Wait Until Keyword Succeeds
+    BuiltIn.Wait Until Keyword Succeeds
     ...    10s
     ...    2s
     ...    Genius.Verify Tunnel Monitoring Status
     ...    ${TUNNEL_MONITOR_OFF}
-    CompareStream.Run_Keyword_If_Less_Than_Neon
-    ...    BuiltIn.Wait Until Keyword Succeeds
-    ...    10s
-    ...    2s
-    ...    Genius.Verify Tunnel Monitoring Status
-    ...    ${TUNNEL_MONITOR_ON}
-    CompareStream.Run_Keyword_If_At_Least_Neon
-    ...    BuiltIn.Wait Until Keyword Succeeds
+    BuiltIn.Wait Until Keyword Succeeds
     ...    10s
     ...    2s
     ...    Verify Config Ietf Interface Output
     ...    ${INTERFACE_DS_MONI_FALSE}
     ...    ${INTERFACE_DS_MONI_INT_1000}
     ...    ${TUNNEL_MONI_PROTO}
-    CompareStream.Run_Keyword_If_Less_Than_Neon
-    ...    BuiltIn.Wait Until Keyword Succeeds
-    ...    10s
-    ...    2s
-    ...    Verify Config Ietf Interface Output
-    ...    ${INTERFACE_DS_MONI_TRUE}
-    ...    ${INTERFACE_DS_MONI_INT_1000}
-    ...    ${TUNNEL_MONI_PROTO}
 
 BFD_TC02 Enable BFD Monitoring And Verify On Controller
     [Documentation]    Enable BFD monitoring in branches greater than neon and verify that BFD is enabled in the controller.
-    CompareStream.Run_Keyword_If_Less_Than_Neon
-    ...    BuiltIn.Pass Execution
-    ...    Test case valid only for versions Neon and above
     Enable BFD And Verify    ${INTERFACE_DS_MONI_INT_1000}
 
 BFD_TC03 Verify that BFD tunnel monitoring interval is set with appropriate default value i.e.,1000
@@ -166,8 +147,7 @@ BFD_TC06 Verify that the tunnel state goes to UNKNOWN when DPN is disconnected
 
 BFD_TC07 Set BFD monitoring To Default Value
     [Documentation]    Disable BFD monitoring(setting it to default value) and verify that BFD is disabled on the controller.
-    CompareStream.Run_Keyword_If_At_Least_Neon    Disable BFD And Verify
-    CompareStream.Run_Keyword_If_Less_Than_Neon    Enable BFD And Verify    ${INTERFACE_DS_MONI_INT_5000}
+    Disable BFD And Verify
 
 
 *** Keywords ***
index 25c0c326b65e9b620b2d0a851e641a88616c988c..a81bb8cda3c3bc9d9af9285d5ee6178fc778b704 100644 (file)
@@ -56,10 +56,8 @@ Verify VTEP After Restarting Controller
 
 Verify Tunnels By Enabling/Disabling BFD
     [Documentation]    Verify tunnel creation by enabling and disabling BFD one after another with respect to the branch in such a way default value is retained at last.
-    CompareStream.Run_Keyword_If_At_Least_Neon    Verify Tunnels By Enabling BFD
-    CompareStream.Run_Keyword_If_At_Least_Neon    Verify Tunnels By Disabling BFD
-    CompareStream.Run_Keyword_If_Less_Than_Neon    Verify Tunnels By Disabling BFD
-    CompareStream.Run_Keyword_If_Less_Than_Neon    Verify Tunnels By Enabling BFD
+    Verify Tunnels By Enabling BFD
+    Verify Tunnels By Disabling BFD
 
 Delete and Verify VTEP
     [Documentation]    This Delete testcase , deletes the ITM tunnel created between 2 dpns.
index ae367856cd532ae98ffc68b967d14ca334376733..3a76977c490ff596261c905d74038ae0ff924986 100644 (file)
@@ -67,8 +67,7 @@ Wait_For_Device_To_Become_Connected
 
 Check_Device_Data_Is_Empty
     [Documentation]    Get the device data and make sure it is empty.
-    Run_Keyword_If_Less_Than_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"></data>
-    Run_Keyword_If_At_Least_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
 
 Invoke_Yang1.1_Action_Via_Xml_Post
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
index 6429dd641600d7db2ed61c7b4e5a21de83f74464..b6a80668d3ee50c36b25f3e8715476b2797d11b7 100644 (file)
@@ -80,8 +80,7 @@ Wait_For_Device_To_Become_Connected
 
 Check_Device_Data_Is_Empty
     [Documentation]    Get the device data and make sure it is empty.
-    Run_Keyword_If_Less_Than_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"></data>
-    Run_Keyword_If_At_Least_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
 
 Create_Device_Data_Label_Via_Xml
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
@@ -230,8 +229,7 @@ Delete_Device_Data
 
 Check_Device_Data_Is_Deleted
     [Documentation]    Get the device data and make sure it is empty again.
-    Run_Keyword_If_Less_Than_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"></data>
-    Run_Keyword_If_At_Least_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
 
 Deconfigure_Device_From_Netconf
     [Documentation]    Make request to deconfigure the testtool device on Netconf connector.
index 1bb2dfe96288cb660804e61315c7771b170648a6..d01bc69aaba359338f7d95fd5c94b6de7a85955d 100644 (file)
@@ -71,8 +71,7 @@ Wait_For_Device_To_Become_Connected
 
 Check_Device_Data_Is_Empty
     [Documentation]    Get the device data and make sure it is empty.
-    Run_Keyword_If_Less_Than_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"></data>
-    Run_Keyword_If_At_Least_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
 
 Create_Device_Data_Label_Via_Xml
     [Documentation]    Send a sample test data label into the device and check that the request went OK.
@@ -213,8 +212,7 @@ Delete_Device_Data
 
 Check_Device_Data_Is_Deleted
     [Documentation]    Get the device data and make sure it is empty again.
-    Run_Keyword_If_Less_Than_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"></data>
-    Run_Keyword_If_At_Least_Neon    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
+    Check_Config_Data    <data xmlns\="${ODL_NETCONF_NAMESPACE}"/>
 
 Deconfigure_Device_From_Netconf
     [Documentation]    Make request to deconfigure the testtool device on Netconf connector.
index 6113110a26ffcd3be32f8ea9a38a5d8cb68c1cbe..0264d387a9b23058f85f5dacca9fd4ea4d1d4553 100644 (file)
@@ -16,7 +16,7 @@
                     ],
                     "origin": {
                         "value": "igp"
-                    },$AS_PATH
+                    },
                     "local-pref": {
                         "pref": 100
                     }
index a70c9a3d2ea8363dd9efe57501a945d410b3b242..113b735c41089819127537db1a34b01c2bc7c35f 100644 (file)
@@ -19,7 +19,7 @@
                     },
                     "origin": {
                         "value": "igp"
-                    },$AS_PATH
+                    },
                     "local-pref": {
                         "pref": 100
                     }
@@ -48,7 +48,7 @@
                     ],
                     "origin": {
                         "value": "igp"
-                    },$AS_PATH
+                    },
                     "local-pref": {
                         "pref": 100
                     }
@@ -80,7 +80,7 @@
                     },
                     "origin": {
                         "value": "igp"
-                    },$AS_PATH
+                    },
                     "local-pref": {
                         "pref": 100
                     }
index 202065676b9bbfd7069270a3f591cef71196ef6e..a62aefb25a9f62df07139b0277b575126d2d74a9 100644 (file)
@@ -2,7 +2,7 @@
     "bgp-inet:ipv4-routes": {
         "ipv4-route": [
             {
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv4-next-hop": {
                         "global": "10.11.1.1"
                     },
index d7002a4093e821c1332ef200374156dbfa3b117e..c89947a9fdea2f07f7b36e7f4230925e10fce1ef 100644 (file)
@@ -2,7 +2,7 @@
     "bgp-inet:ipv4-routes": {
         "ipv4-route": [
             {
-                "attributes": {$AS_PATH
+                "attributes": {
                     "communities": [
                         {
                             "as-number": 30741,
index f6796b9a97c5f4e73ad61e359d8095c2931477c7..3265e281d15be20fc1465830daddfb8884f787e5 100644 (file)
@@ -2,7 +2,7 @@
     "bgp-inet:ipv4-routes": {
         "ipv4-route": [
             {
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv4-next-hop": {
                         "global": "12.0.255.254"
                     },
@@ -18,7 +18,7 @@
                 "route-key": "2.1.1.0/24"
             },
             {
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv4-next-hop": {
                         "global": "12.1.255.254"
                     },
@@ -34,7 +34,7 @@
                 "route-key": "2.2.1.0/24"
             },
             {
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv4-next-hop": {
                         "global": "12.3.255.254"
                     },
index 93a7e7ce8317afd17fc24fd9d81638c8737f3bae..93171bbc62e4de0ba6a6b9aef6c02d91d5a0fe03 100644 (file)
@@ -2,7 +2,7 @@
     "bgp-inet:ipv4-routes": {
         "ipv4-route": [
             {
-                "attributes": {$AS_PATH
+                "attributes": {
                     "extended-communities": [
                         {
                             "route-target-extended-community": {
index 8bbc8006596b5ab9835e07fc5a39b88a1f633eb2..6d5c77e015ad4b34cec5e6e590ae7a6ff160de6c 100644 (file)
@@ -16,7 +16,7 @@
                                     "tables": [
                                         {
                                             "afi": "bgp-types:ipv4-address-family",
-                                            "safi": "bgp-types:unicast-subsequent-address-family",$ROUTES_LINE
+                                            "safi": "bgp-types:unicast-subsequent-address-family",
                                             "attributes": {
                                                 "uptodate": false
                                             }
@@ -44,7 +44,7 @@
                                     "tables": [
                                         {
                                             "afi": "bgp-types:ipv4-address-family",
-                                            "safi": "bgp-types:unicast-subsequent-address-family",$ROUTES_LINE
+                                            "safi": "bgp-types:unicast-subsequent-address-family",
                                             "attributes": {
                                                 "uptodate": false
                                             }
index ac41fdebb9a28e8ac5eca9fe1799d1dee562a2ac..6e641c344fa46c1654f6f3a6ff6be5ec59772b95 100644 (file)
@@ -2,7 +2,7 @@
   "bgp-rib:tables": [
     {
       "afi": "odl-bgp-evpn:l2vpn-address-family",
-      "safi": "odl-bgp-evpn:evpn-subsequent-address-family",$EVPN_ROUTES
+      "safi": "odl-bgp-evpn:evpn-subsequent-address-family",
       "attributes": {
         "uptodate": false
       }
index 290e9651de4d0de8b142c1d2a1882ade084c69fa..ea354d4d9f57d8466d421b0d91dce1df13047af3 100644 (file)
@@ -28,7 +28,7 @@
                     },
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    }$AS_PATH
+                    }
                 }
             }
         ]
index d1188ad49f747ddc911eaf759fe5e441b74c14cf..4f77e3dcd4699dc97dc3aad21ea3b98bf8167858 100644 (file)
@@ -27,7 +27,7 @@
                     },
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    }$AS_PATH
+                    }
                 }
             }
         ]
index 4403ea50e74b7d56a1d65a28e4364393ccc89105..4b42091232e19addfa2c6883224830f4857f5608 100644 (file)
@@ -28,7 +28,7 @@
           },
           "ipv4-next-hop": {
             "global": "199.20.166.41"
-          }$AS_PATH
+          }
         }
       }
     ]
index 63d65859b38268d3eb3e9246bd71d17c4990cb02..71039f4972c999c2a67d09e093b98c19c27f9bf1 100644 (file)
@@ -34,7 +34,7 @@
                     },
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    }$AS_PATH
+                    }
                 }
             }
         ]
index 56ea05ee0e9b2901a458c683e60845d14d7f5907..6e7ded61888acc177119882bfee6e5f9ae8bbeca 100644 (file)
@@ -28,7 +28,7 @@
                     },
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    }$AS_PATH
+                    }
                 }
             }
         ]
index 8f247bb1d81a5047ba6e216f2806d33c7ad8433b..677674a8349fdb86fbfb3e67f13912ad7f2eeda5 100644 (file)
@@ -28,7 +28,7 @@
                     },
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    }$AS_PATH
+                    }
                 }
             }
         ]
index 26c933c0c188a9f0d46b5dea2f36aadff7ebb61a..8b209c39e422cb4534310a3c69746ca91e337918 100644 (file)
@@ -29,7 +29,7 @@
                     },
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    }$AS_PATH
+                    }
                 }
             }
         ]
index 29492f8d01af025f4772b7f91db964b235c15d37..f23dc290ad6a6219bdf5fab377540e24a7856cb6 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==",
index a934c39d7854279e92de1b1b2ec0a0d80e18dd18..7892d8853931daca512b0630591bba08a2b3b794 100644 (file)
@@ -18,7 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQUBAQEBAAAH0AAgKysrKw==",
index beace7c24293e875368b1580d852449aaa030f2a..05f112993a3415ca40ddc27c70b67ae1e187fc78 100644 (file)
@@ -18,7 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQHyDN2An/cAFgAgKysrKw==",
index 2b6cf87452eda36e1c1fb180ab13d628f404d3b9..88b95965088606953d4be648fb42ad3c159d67d2 100644 (file)
@@ -18,7 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQLyDN2An/cAFAAgKysrKw==",
index 1fa2161e5e709b87801abc6d27856c1ef859fff3..8a8f21943f9a750b4da398b2e3f37596a58ef864 100644 (file)
@@ -18,7 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQPyDN2An/cAB9AgKysrKw==",
index 584e134338a500fb4577935bde4de77c72084245..7c40226351d35fb5156cc94af839d9787e6d746a 100644 (file)
@@ -18,7 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQQrKysrAAAH0AAgKysrKw==",
index 0d2886359a359dee40343081ec2b6e6eeea09a21..e74ed651a5a787c8474939febcee244dc1909134 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQAAAAAAAAAAAAAAAAAK",
index dbc7a451e3c4d734324a7ded9b9b1d75e5372b5f..4c6d0875f21b5824fac5de5029a32c4edc177e30 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQUBAQEBAAAH0AAAAAAK",
index ebf2efe78346d15601e0611693d56587d4288770..b944d58f8916c9a88feba1a34f1ad69ac1330f23 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 579b3d31b51c4596bc5106b4e3cdbab587bd93e8..8395c878d065be0505bd2935d7bb7a3e256aabdc 100644 (file)
@@ -17,7 +17,7 @@
           ],
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 2c59f53585d9269ea0e04b512e103f941440e262..4d9333b6aa6a748db989d5c93af97602ee9e56b1 100644 (file)
@@ -20,7 +20,7 @@
           ],
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index d7ccd18fe91aa563d636d654acbbfd79e9a40e5f..a4a42fe1ae76fa59e3ddae07e6c84d1c13473aa9 100644 (file)
@@ -19,7 +19,7 @@
           ],
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 2b33310f9acc4ffd14d23c1d391068d5b9a74c3c..9a63923d695a308032aa46aa34eb098905dbf192 100644 (file)
@@ -22,7 +22,7 @@
           ],
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 8d40d1c9bd59064229f156d6a0b2fdd3ab62954b..cf3774dc0141d66e7a99f8d57f313b1c49b910d1 100644 (file)
@@ -20,7 +20,7 @@
           ],
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 760b58d3f77477a8861277b2fd036c44bf1840bf..04076a54c66a8344bdebc94e56b59df98471a3ad 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQLyDN2An/cAFAAAAAAK",
index b9aeb6a0cb5bbb141153723941447fd8457923eb..b49178d97bce8ba067f5df2fc21792cf6b2c007d 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQPyDN2An/cAB9AAAAAK",
index 4090536e4df60da2659cc9befdac7d54a713a59e..20fda8e080b7d2f4501f10c12e39a40df8dfe100 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQQrKysrAAAH0AAAAAAK",
index 54d08c837b911cbefa77bd72b347842caafe0f57..5b2e7b25ea1782a7f4102417504f1b4064eaadfc 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 54d08c837b911cbefa77bd72b347842caafe0f57..5b2e7b25ea1782a7f4102417504f1b4064eaadfc 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 54d08c837b911cbefa77bd72b347842caafe0f57..5b2e7b25ea1782a7f4102417504f1b4064eaadfc 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 54d08c837b911cbefa77bd72b347842caafe0f57..5b2e7b25ea1782a7f4102417504f1b4064eaadfc 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 54d08c837b911cbefa77bd72b347842caafe0f57..5b2e7b25ea1782a7f4102417504f1b4064eaadfc 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 54d08c837b911cbefa77bd72b347842caafe0f57..5b2e7b25ea1782a7f4102417504f1b4064eaadfc 100644 (file)
@@ -17,7 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 2cf2ddc60bbb4e69a197b4cc7e878e7b9bc3a664..fe8c66ab3d9d5b29f45ba26719103ee25fb8b53c 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index ebca4ca9f4073baf27abdcdda99c8f5ca57d3761..9846b3fb82091e334861a09da898c0d08b7be64c 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index e3cc10a995c6d0ea85702644c4dac74ec9fa1972..6167f46ed5ef1ed5dd461bf5320a26f85ec7c625 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index ae7abdf13379681e188bde77f3d0deee9c0cbe21..612f6dc016b9dfc7ae45992eb56d2f6015600a08 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 591f67abbe0dc7dccdbba70638074673a8fca46e..82f10f5259c7537feec65ee1164129b83a1b1d6c 100644 (file)
@@ -11,7 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          }$AS_PATH
+          }
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 117a6842302c65117a8e151513ed769bf6c2405d..fd0b6bdedd66b399148000a80bb383449c6de756 100644 (file)
@@ -11,7 +11,7 @@
                     },
                     "local-pref": {
                         "pref": 100
-                    }$AS_PATH
+                    }
                 },
                 "path-id": 0,
                 "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 9ef16743f637d5915e8665065e5cb1d50c1d7bdd..88c9cafed56f67034c4b29f29846587bd1ce18a0 100644 (file)
@@ -2,7 +2,7 @@
  "bgp-vpn-ipv4:vpn-ipv4-routes": {
   "vpn-route": [
    {
-    "attributes": {$AS_PATH
+    "attributes": {
      "ipv4-next-hop": {
       "global": "10.0.255.254"
      },
index f1ed1c2b227af30783f361c8ed6497d7c0da68d5..e45a3285298366a9e85b27ea5a279a7dc81b39ca 100644 (file)
@@ -7,7 +7,7 @@
                 "attributes": {
                     "ipv4-next-hop": {
                         "global": "127.16.0.44"
-                    },$AS_PATH
+                    },
                     "extended-communities": [
                         {
                             "vrf-route-import-extended-community": {
index 828ecadcc644d03eccba5ebf335a2af823db39e8..13af90762d508c0136f42b03e69f420cf9248df4 100644 (file)
@@ -7,7 +7,7 @@
                 "attributes": {
                     "ipv6-next-hop": {
                         "global": "2001:db8:1::7"
-                    },$AS_PATH
+                    },
                     "extended-communities": [
                         {
                             "vrf-route-import-extended-community": {
index 11345447ea52b8890cc77be73892ae6d34f872f0..65e0b86cbe99cb9fef4df13a38d717737c600c94 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index 906573be4f9f2895b9efdbbb383ac96e3118274e..a027c1a97fa044867540610c78e8e9bec39b75db 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index 08b8547c09ca1788fc5b2fd611084e21d3b8712a..7ca770fcf332df0dc136795ad8494c4720f8682b 100644 (file)
@@ -8,7 +8,7 @@
                     "route-distinguisher": "172.16.0.44:101",
                     "orig-route-ip": "192.168.100.1"
                 },
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv6-next-hop": {
                         "global": "2001:db8:1::6"
                     },
index d4e3ef459b9f52a885f4f5e171af0df5d58372a6..b882a7b81212481cb41618363212d9c80fdc077c 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "pe-distinguisher-labels-attribute": {
             "pe-distinguisher-label-attribute": [
               {
index b69c2feda35397deef5ab0cb898b349cd86fb7d3..8de0d2bc049a6aa434d394f903e0d1144db975b1 100644 (file)
@@ -18,7 +18,7 @@
           ],
           "ipv4-next-hop": {
             "global": "127.1.1.1"
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index 32e1237917410b8a26ad610578b7b379ddace68e..5ed1c3a84c62ca5d220f0079738f73ddd2136247 100644 (file)
@@ -18,7 +18,7 @@
           ],
           "ipv4-next-hop": {
             "global": "127.1.1.1"
-          },$AS_PATH
+          },
           "origin": {
             "value": "igp"
           },
index 243fc7c1bef8fea5b3cf522e191f67e64acf43e4..3c7c89f60f836e66ef2ca64fd18e6df83267c287 100644 (file)
@@ -21,7 +21,7 @@
           ],
           "ipv4-next-hop": {
             "global": "127.1.1.1"
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index a1efb21cefae9e1670982e04066f9f54cdd12836..46286ee7bd6cc464069696d1012a6c0c0a5c6762 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index 50e1a99f86a9ae75f7906c4bb1d60c8a46af5001..2e7bd9eef99772299f60342b6f494f907e9c9033 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index eed47aa9504b1619d8b34d6b164da980a60074a8..5d485271618fab357d7570c831503f39b098c832 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index 61eaa1a66b12183baf93e772b67ac12f562623c2..73a504f497709ff780d227f1f54d1e8549104aac 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index c35b64862174f312699324e923da136500a993f2..a1e95d3e1f881007cba2db861082d4f3ecad5f9a 100644 (file)
@@ -10,7 +10,7 @@
           },
           "multi-exit-disc": {
             "med": 0
-          },$AS_PATH
+          },
           "origin": {
             "value": "egp"
           },
index 74bd2ad546ce9d0a92fd4c18f12f3e19f8f8c700..7ab51a3265852fc9ef2c115bb9041fba2dd4cc37 100644 (file)
@@ -25,7 +25,7 @@
                     ],
                     "ipv4-next-hop": {
                         "global": "10.0.255.254"
-                    },$AS_PATH
+                    },
                     "origin": {
                         "value": "igp"
                     }
index b2ebd14839d91a5040f40f26469f5f2db1e65241..86c8175bf8c79b1c4db7abe8f87529bbf1cd6b49 100644 (file)
@@ -4,7 +4,7 @@
             {
                 "route-key": "",
                 "path-id": 0,
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
                     },
index 7c34965193f197991e29db5a227cff43774efaf9..f195dce3c6ebc22e0a77330a6cca735c06d9c02a 100644 (file)
@@ -7,7 +7,7 @@
                 "attributes": {
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    },$AS_PATH
+                    },
                     "origin": {
                         "value": "igp"
                     },
index 62af72453eb3cf765b726303e1f7fec1fe87c959..1278e72a37e63f9bfe0cea8adf5ac5e96f9e80f3 100644 (file)
@@ -7,7 +7,7 @@
                 "attributes": {
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
-                    },$AS_PATH
+                    },
                     "origin": {
                         "value": "igp"
                     },
index 583070a8d0e508c7832a329fd58d94d2e362045d..84cae397e861db2ab535d8ca0192c498d64a422b 100644 (file)
@@ -8,7 +8,7 @@
                         "local-administrator": 123
                     }
                 },
-                "attributes": {$AS_PATH
+                "attributes": {
                     "ipv4-next-hop": {
                         "global": "199.20.166.41"
                     },