Fix bgp l2vpn evpn test 48/77548/9
authortomas.markovic <tomas.markovic@pantheon.tech>
Tue, 6 Nov 2018 14:59:28 +0000 (15:59 +0100)
committerLuis Gomez <ecelgp@gmail.com>
Wed, 14 Nov 2018 01:19:48 +0000 (01:19 +0000)
Change-Id: I53d392ff8302473f4e9d0aa5239d3085fb177c30
Signed-off-by: tomas.markovic <tomas.markovic@pantheon.tech>
39 files changed:
csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
csit/variables/bgpfunctional/l2vpn_evpn/empty_routes.oxygen/empty_routes.json [new file with mode: 0644]
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

index 159d21cbcbe44dce72862011684f40a8342b2977..d6f58d8e6990db7ee50f6febb61c53fb484e4895 100644 (file)
@@ -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}<path-id>0</path-id>${\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 (file)
index 0000000..373bece
--- /dev/null
@@ -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": {}
+    }
+  ]
+}
index 824ab4a0e2c63a5ff0418f2c3699825c0b11d731..d706065ff065e0231b9791cc26b365d8ac9ffdfc 100644 (file)
@@ -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
+      }
+    }
+  ]
 }
index 57d0961a49563643d354a94b6cbb249283445603..290e9651de4d0de8b142c1d2a1882ade084c69fa 100644 (file)
@@ -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
                 }
             }
         ]
index f479de594efa601cdbd9b70f8522e41a170468c2..d1188ad49f747ddc911eaf759fe5e441b74c14cf 100644 (file)
@@ -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
                 }
             }
         ]
index 5af9f82651d163368e027ab17568deae267a3d80..4403ea50e74b7d56a1d65a28e4364393ccc89105 100644 (file)
@@ -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
+}
index f6385150b82934198a163306bb38274ca95c5991..63d65859b38268d3eb3e9246bd71d17c4990cb02 100644 (file)
@@ -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
                 }
             }
         ]
index cfb55d239f915964279d4256ca1bfb12a105c8db..56ea05ee0e9b2901a458c683e60845d14d7f5907 100644 (file)
@@ -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
                 }
             }
         ]
index e258b6274c38505ad2e45d26dcb7692702ed16da..8f247bb1d81a5047ba6e216f2806d33c7ad8433b 100644 (file)
@@ -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
                 }
             }
         ]
index e47526609a6329a86d99252f58a9416547fe7ac2..26c933c0c188a9f0d46b5dea2f36aadff7ebb61a 100644 (file)
@@ -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
                 }
             }
         ]
index f78af2cb3c90c152e608e89c910da0d3fb5da431..29492f8d01af025f4772b7f91db964b235c15d37 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==",
index 1a0bf10a48dab117f52f75476d6d16fd3242c033..a934c39d7854279e92de1b1b2ec0a0d80e18dd18 100644 (file)
@@ -18,8 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQUBAQEBAAAH0AAgKysrKw==",
index 9b9521368eca8ac771f2270f45fcaa04abe99df6..beace7c24293e875368b1580d852449aaa030f2a 100644 (file)
@@ -18,8 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQHyDN2An/cAFgAgKysrKw==",
index 72afcc049a552cbee090867090ae7d5884c6dbcc..2b6cf87452eda36e1c1fb180ab13d628f404d3b9 100644 (file)
@@ -18,8 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQLyDN2An/cAFAAgKysrKw==",
index a94de5511456edea3d0978732e9d9377a2883186..1fa2161e5e709b87801abc6d27856c1ef859fff3 100644 (file)
@@ -18,8 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQPyDN2An/cAB9AgKysrKw==",
index f3337d748c89c19604111668e9ce196ea3196911..584e134338a500fb4577935bde4de77c72084245 100644 (file)
@@ -18,8 +18,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQQrKysrAAAH0AAgKysrKw==",
index e21ef83327698766025a1fc428f42f9b5ddc55c6..0d2886359a359dee40343081ec2b6e6eeea09a21 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQAAAAAAAAAAAAAAAAAK",
index 7705e0c47a61abe9ce73ecc200f7773e1a754b53..dbc7a451e3c4d734324a7ded9b9b1d75e5372b5f 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQUBAQEBAAAH0AAAAAAK",
index 178de7b98a8927027c994fa93d6122a0f55bc461..ebf2efe78346d15601e0611693d56587d4288770 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index e902126a4d5d36327919ffa2b40ff1b7c8a39b94..579b3d31b51c4596bc5106b4e3cdbab587bd93e8 100644 (file)
@@ -17,8 +17,7 @@
           ],
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index aaef4ccbd3d21b5b5a03c6547bcb1fe7ad96d176..2c59f53585d9269ea0e04b512e103f941440e262 100644 (file)
@@ -20,8 +20,7 @@
           ],
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 54033405b8edc86bbad07b1df23636eab016e634..d7ccd18fe91aa563d636d654acbbfd79e9a40e5f 100644 (file)
@@ -19,8 +19,7 @@
           ],
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 3226cf06b0cc9212f1a9863397405e813ebfefb9..2b33310f9acc4ffd14d23c1d391068d5b9a74c3c 100644 (file)
@@ -22,8 +22,7 @@
           ],
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 44271471c0ace46564ead47f2f4da05526a1cc8d..8d40d1c9bd59064229f156d6a0b2fdd3ab62954b 100644 (file)
@@ -20,8 +20,7 @@
           ],
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
index 4dfd2a776dfb0ae31fa624217511a293a4889839..760b58d3f77477a8861277b2fd036c44bf1840bf 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQLyDN2An/cAFAAAAAAK",
index 95fbab702876f2b9fc630ee3b1fd98c6b80c437c..b9aeb6a0cb5bbb141153723941447fd8457923eb 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQPyDN2An/cAB9AAAAAK",
index 6e6b2008fe82761cba648ac1a5b75473edf02fd6..4090536e4df60da2659cc9befdac7d54a713a59e 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQQrKysrAAAH0AAAAAAK",
index 6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f..54d08c837b911cbefa77bd72b347842caafe0f57 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f..54d08c837b911cbefa77bd72b347842caafe0f57 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f..54d08c837b911cbefa77bd72b347842caafe0f57 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f..54d08c837b911cbefa77bd72b347842caafe0f57 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f..54d08c837b911cbefa77bd72b347842caafe0f57 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f..54d08c837b911cbefa77bd72b347842caafe0f57 100644 (file)
@@ -17,8 +17,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
index 05e15e61644af1fb15038b9203f89a8add5be92a..2cf2ddc60bbb4e69a197b4cc7e878e7b9bc3a664 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 3433533a8a27f3a3d379ebbe4785940c38a61a5e..ebca4ca9f4073baf27abdcdda99c8f5ca57d3761 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 1a7bd11479f0bf89e12e6a4bd854b9182d564226..e3cc10a995c6d0ea85702644c4dac74ec9fa1972 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 26b8e91e6f01e27c36a99684eb22946f37290e85..ae7abdf13379681e188bde77f3d0deee9c0cbe21 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index fcbbb97aa712ceacf7574acc3a857612f0415217..591f67abbe0dc7dccdbba70638074673a8fca46e 100644 (file)
@@ -11,8 +11,7 @@
           },
           "local-pref": {
             "pref": 100
-          },
-          "as-path": {}
+          }$AS_PATH
         },
         "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
index 573b5570002e691678794fe098bae460682dd073..117a6842302c65117a8e151513ed769bf6c2405d 100644 (file)
@@ -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"
+                }
+            }
+        ]
+    }
 }