From 246c5a835e9f0d6080d3b39a73168de4c7a60651 Mon Sep 17 00:00:00 2001 From: "tomas.markovic" Date: Tue, 6 Nov 2018 15:59:28 +0100 Subject: [PATCH] Fix bgp l2vpn evpn test Change-Id: I53d392ff8302473f4e9d0aa5239d3085fb177c30 Signed-off-by: tomas.markovic --- .../bgpfunct/030_bgp_functional_evpn.robot | 25 +++++-- .../empty_routes.oxygen/empty_routes.json | 9 +++ .../l2vpn_evpn/empty_routes/empty_routes.json | 10 ++- .../pmsi_bidir_pim_tree.json | 3 +- .../pmsi_ingress_replication.json | 3 +- .../pmsi_mldp_mp2mp_lsp.json | 5 +- .../pmsi_mldp_p2mp_lsp.json | 3 +- .../pmsi_pim_sm_tree/pmsi_pim_sm_tree.json | 3 +- .../pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json | 3 +- .../pmsi_rsvp_te_p2mp_lsp.json | 3 +- .../l2vpn_evpn/route_es_arb/route_es_arb.json | 3 +- .../l2vpn_evpn/route_es_as/route_es_as.json | 3 +- .../route_es_lacp/route_es_lacp.json | 3 +- .../l2vpn_evpn/route_es_lan/route_es_lan.json | 3 +- .../l2vpn_evpn/route_es_mac/route_es_mac.json | 3 +- .../l2vpn_evpn/route_es_rou/route_es_rou.json | 3 +- .../route_eth_arb/route_eth_arb.json | 3 +- .../l2vpn_evpn/route_eth_as/route_eth_as.json | 3 +- .../route_eth_lacp/route_eth_lacp.json | 3 +- .../route_eth_lacp_extdef.json | 3 +- .../route_eth_lacp_extesilab.json | 3 +- .../route_eth_lacp_extesr.json | 3 +- .../route_eth_lacp_extl2.json | 3 +- .../route_eth_lacp_extmac.json | 3 +- .../route_eth_lan/route_eth_lan.json | 3 +- .../route_eth_mac/route_eth_mac.json | 3 +- .../route_eth_rou/route_eth_rou.json | 3 +- .../route_inc_arb/route_inc_arb.json | 3 +- .../l2vpn_evpn/route_inc_as/route_inc_as.json | 3 +- .../route_inc_lacp/route_inc_lacp.json | 3 +- .../route_inc_lan/route_inc_lan.json | 3 +- .../route_inc_mac/route_inc_mac.json | 3 +- .../route_inc_rou/route_inc_rou.json | 3 +- .../route_mac_arb/route_mac_arb.json | 3 +- .../l2vpn_evpn/route_mac_as/route_mac_as.json | 3 +- .../route_mac_lacp/route_mac_lacp.json | 3 +- .../route_mac_lan/route_mac_lan.json | 3 +- .../route_mac_mac/route_mac_mac.json | 3 +- .../route_mac_rou/route_mac_rou.json | 67 +++++++++---------- 39 files changed, 105 insertions(+), 113 deletions(-) create mode 100644 csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.oxygen/empty_routes.json diff --git a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot index 159d21cbcb..d6f58d8e69 100644 --- a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot +++ b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot @@ -15,7 +15,7 @@ Documentation Functional test for bgp - evpn Suite Setup Start_Suite Suite Teardown Stop_Suite Test Setup Run Keywords SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing -... AND Verify Test Preconditions +... AND Verify_Test_Preconditions Test Template Odl_To_Play_Template Library RequestsLibrary Library SSHLibrary @@ -42,6 +42,10 @@ ${PLAY_SCRIPT} ${CURDIR}/../../../../tools/fastbgp/play.py ${SS} ${SPACE}${SPACE}${SPACE}${SPACE} ${PATH_ID_JSON} ${SS}${SS}"path-id": 0,${\n} ${PATH_ID_XML} ${SS}0${\n} +${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 *** Configure_App_Peer @@ -349,9 +353,12 @@ 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=. - BuiltIn.Set_Suite_Variable ${EVPN_CONF_URL} /restconf/config/bgp-rib:application-rib/${ODL_SYSTEM_IP}/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes/ + BuiltIn.Set_Suite_Variable ${EVPN_CONF_URL} /restconf/config/bgp-rib:application-rib/${ODL_SYSTEM_IP}/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes BuiltIn.Set_Suite_Variable ${EVPN_LOC_RIB} /restconf/operational/bgp-rib:bgp-rib/rib/${RIB_NAME}/loc-rib/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/odl-bgp-evpn:evpn-routes - ${EMPTY_ROUTES} = OperatingSystem.Get_File ${EVPN_DIR}/empty_routes/empty_routes.json + BuiltIn.Set_Suite_Variable ${EVPN_FAMILY_LOC_RIB} /restconf/operational/bgp-rib:bgp-rib/rib/${RIB_NAME}/loc-rib/tables/odl-bgp-evpn:l2vpn-address-family/odl-bgp-evpn:evpn-subsequent-address-family/ + ${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 @@ -397,7 +404,9 @@ Odl_To_Play_Template Play_To_Odl_Template [Arguments] ${totest} ${data_xml} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/${totest}.xml - ${data_json} = OperatingSystem.Get_File ${EVPN_DIR}/${totest}/${totest}.json + ${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 ${data_path_json} CompareStream.Run_Keyword_If_Less_Than_Fluorine String.Replace_String ${data_json} ${PATH_ID_JSON} ${EMPTY} @@ -410,13 +419,14 @@ Play_To_Odl_Template BgpRpcClient.play_send ${announce_hex} BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Loc_Rib_Presence ${data_json_exp} BgpRpcClient.play_send ${withdraw_hex} - BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Loc_Rib_Presence ${EMPTY_ROUTES} + BuiltIn.Wait_Until_Keyword_Succeeds 4x 2s Verify_Test_Preconditions [Teardown] Withdraw_Route_And_Verify ${withdraw_hex} Verify_Test_Preconditions ${resp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_CONF_URL} BuiltIn.Should_Be_Equal_As_Numbers ${resp.status_code} 404 - Loc_Rib_Presence ${EMPTY_ROUTES} + ${rsp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_FAMILY_LOC_RIB} headers=${HEADERS} + TemplatedRequests.Normalize_Jsons_And_Compare ${EMPTY_ROUTES} ${rsp.content} Remove_Configured_Routes [Documentation] Removes the route if present. First GET is for debug purposes. @@ -432,7 +442,7 @@ Withdraw_Route_And_Verify [Arguments] ${withdraw_hex} [Documentation] Sends withdraw update message from exabgp and verifies route removal from odl's rib BgpRpcClient.play_send ${withdraw_hex} - BuiltIn.Wait_Until_Keyword_Succeeds 3x 2s Loc_Rib_Presence ${EMPTY_ROUTES} + BuiltIn.Wait_Until_Keyword_Succeeds 3x 2s Verify_Test_Preconditions Get_Update_Content [Documentation] Gets received data from odl's peer @@ -446,4 +456,5 @@ Loc_Rib_Presence [Arguments] ${exp_content} [Documentation] Verifies if loc-rib contains expected data ${rsp} = RequestsLibrary.Get_Request ${CONFIG_SESSION} ${EVPN_LOC_RIB} headers=${HEADERS} + BuiltIn.Log_Many ${exp_content} ${rsp.content} TemplatedRequests.Normalize_Jsons_And_Compare ${exp_content} ${rsp.content} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.oxygen/empty_routes.json b/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.oxygen/empty_routes.json new file mode 100644 index 0000000000..373bece002 --- /dev/null +++ b/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.oxygen/empty_routes.json @@ -0,0 +1,9 @@ +{ + "tables": [ + { + "afi": "odl-bgp-evpn:l2vpn-address-family", + "safi": "odl-bgp-evpn:evpn-subsequent-address-family", + "odl-bgp-evpn:evpn-routes": {} + } + ] +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json b/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json index 824ab4a0e2..d706065ff0 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/empty_routes/empty_routes.json @@ -1,3 +1,11 @@ { - "odl-bgp-evpn:evpn-routes": {} + "tables": [ + { + "afi": "odl-bgp-evpn:l2vpn-address-family", + "safi": "odl-bgp-evpn:evpn-subsequent-address-family",$EVPN_ROUTES + "attributes": { + "uptodate": false + } + } + ] } diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json index 57d0961a49..290e9651de 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_bidir_pim_tree/pmsi_bidir_pim_tree.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": true, "mpls-label": 20024, @@ -29,7 +28,7 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json index f479de594e..d1188ad49f 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_ingress_replication/pmsi_ingress_replication.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": false, "mpls-label": 20024, @@ -28,7 +27,7 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json index 5af9f82651..4403ea50e7 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_mp2mp_lsp/pmsi_mldp_mp2mp_lsp.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": false, "mpls-label": 20024, @@ -29,9 +28,9 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] } -} \ No newline at end of file +} diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json index f6385150b8..63d65859b3 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_mldp_p2mp_lsp/pmsi_mldp_p2mp_lsp.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": true, "mpls-label": 20024, @@ -35,7 +34,7 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json index cfb55d239f..56ea05ee0e 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_sm_tree/pmsi_pim_sm_tree.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": true, "mpls-label": 20024, @@ -29,7 +28,7 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json index e258b6274c..8f247bb1d8 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_pim_ssm_tree/pmsi_pim_ssm_tree.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": true, "mpls-label": 20024, @@ -29,7 +28,7 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json index e47526609a..26c933c0c1 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/pmsi_rsvp_te_p2mp_lsp/pmsi_rsvp_te_p2mp_lsp.json @@ -18,7 +18,6 @@ "local-pref": { "pref": 100 }, - "as-path": {}, "pmsi-tunnel": { "leaf-information-required": true, "mpls-label": 20024, @@ -30,7 +29,7 @@ }, "ipv4-next-hop": { "global": "199.20.166.41" - } + }$AS_PATH } } ] diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json index f78af2cb3c..29492f8d01 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb/route_es_arb.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json index 1a0bf10a48..a934c39d78 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as/route_es_as.json @@ -18,8 +18,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "BBcAAhmZmZkAAQUBAQEBAAAH0AAgKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json index 9b9521368e..beace7c242 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp/route_es_lacp.json @@ -18,8 +18,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "BBcAAhmZmZkAAQHyDN2An/cAFgAgKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json index 72afcc049a..2b6cf87452 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan/route_es_lan.json @@ -18,8 +18,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "BBcAAhmZmZkAAQLyDN2An/cAFAAgKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json index a94de55114..1fa2161e5e 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac/route_es_mac.json @@ -18,8 +18,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "BBcAAhmZmZkAAQPyDN2An/cAB9AgKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json index f3337d748c..584e134338 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou/route_es_rou.json @@ -18,8 +18,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "BBcAAhmZmZkAAQQrKysrAAAH0AAgKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json index e21ef83327..0d2886359a 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb/route_eth_arb.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQAAAAAAAAAAAAAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json index 7705e0c47a..dbc7a451e3 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as/route_eth_as.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQUBAQEBAAAH0AAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json index 178de7b98a..ebf2efe783 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp/route_eth_lacp.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json index e902126a4d..579b3d31b5 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef/route_eth_lacp_extdef.json @@ -17,8 +17,7 @@ ], "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json index aaef4ccbd3..2c59f53585 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab/route_eth_lacp_extesilab.json @@ -20,8 +20,7 @@ ], "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json index 54033405b8..d7ccd18fe9 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr/route_eth_lacp_extesr.json @@ -19,8 +19,7 @@ ], "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json index 3226cf06b0..2b33310f9a 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2/route_eth_lacp_extl2.json @@ -22,8 +22,7 @@ ], "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json index 44271471c0..8d40d1c9bd 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac/route_eth_lacp_extmac.json @@ -20,8 +20,7 @@ ], "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json index 4dfd2a776d..760b58d3f7 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan/route_eth_lan.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQLyDN2An/cAFAAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json index 95fbab7028..b9aeb6a0cb 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac/route_eth_mac.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQPyDN2An/cAB9AAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json index 6e6b2008fe..4090536e4d 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou/route_eth_rou.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "ARYAAhmZmZkAAQQrKysrAAAH0AAAAAAK", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json index 6b4a4148b8..54d08c837b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb/route_inc_arb.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json index 6b4a4148b8..54d08c837b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as/route_inc_as.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json index 6b4a4148b8..54d08c837b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp/route_inc_lacp.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json index 6b4a4148b8..54d08c837b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan/route_inc_lan.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json index 6b4a4148b8..54d08c837b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac/route_inc_mac.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json index 6b4a4148b8..54d08c837b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou/route_inc_rou.json @@ -17,8 +17,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json index 05e15e6164..2cf2ddc60b 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb/route_mac_arb.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json index 3433533a8a..ebca4ca9f4 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as/route_mac_as.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json index 1a7bd11479..e3cc10a995 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp/route_mac_lacp.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json index 26b8e91e6f..ae7abdf133 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan/route_mac_lan.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json index fcbbb97aa7..591f67abbe 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac/route_mac_mac.json @@ -11,8 +11,7 @@ }, "local-pref": { "pref": 100 - }, - "as-path": {} + }$AS_PATH }, "path-id": 0, "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json index 573b557000..117a684230 100644 --- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json +++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou/route_mac_rou.json @@ -1,36 +1,35 @@ { - "odl-bgp-evpn:evpn-routes": { - "evpn-route": [ - { - "attributes": { - "origin": { - "value": "igp" - }, - "ipv4-next-hop": { - "global": "199.20.166.41" - }, - "local-pref": { - "pref": 100 - }, - "as-path": {} - }, - "path-id": 0, - "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", - "route-distinguisher": "429496729:1", - "mac-ip-adv-route": { - "router-id-generated": { - "local-discriminator": 2000, - "router-id": "43.43.43.43" - }, - "mpls-label1": 24002, - "mpls-label2": 24003, - "ip-address": "43.43.43.43", - "ethernet-tag-id": { - "vlan-id": 10 - }, - "mac-address": "f2:0c:dd:80:9f:f7" - } - } - ] - } + "odl-bgp-evpn:evpn-routes": { + "evpn-route": [ + { + "attributes": { + "origin": { + "value": "igp" + }, + "ipv4-next-hop": { + "global": "199.20.166.41" + }, + "local-pref": { + "pref": 100 + }$AS_PATH + }, + "path-id": 0, + "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=", + "route-distinguisher": "429496729:1", + "mac-ip-adv-route": { + "router-id-generated": { + "local-discriminator": 2000, + "router-id": "43.43.43.43" + }, + "mpls-label1": 24002, + "mpls-label2": 24003, + "ip-address": "43.43.43.43", + "ethernet-tag-id": { + "vlan-id": 10 + }, + "mac-address": "f2:0c:dd:80:9f:f7" + } + } + ] + } } -- 2.36.6