BGPCEP-781: Adjust evpn routes

Due to addition of path-id to evpn,
so we can use multiple evpn routes at once,
tests have to be adjusted since path-id is
now mandatory for evpn

Change-Id: I99f799464256c3f0a299cfeb89785c29dd87899d
Signed-off-by: Tomas Markovic <tomas.markovic@pantheon.tech>

diff --git a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
index a6fc564d445cf7c2101ab88d462bca1e5616323c..d0aefaad8f3a5039ff94b73f253391bdfcfdfd24 100644 (file)
--- a/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
+++ b/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
@@ -18,13 +18,15 @@ Test Setup        Run Keywords    SetupUtils.Setup_Test_With_Logging_And_Without
 ...               AND    Verify Test Preconditions
 Library           RequestsLibrary
 Library           SSHLibrary
-Variables         ${CURDIR}/../../../variables/Variables.py
+Library           String
+Resource          ${CURDIR}/../../../variables/Variables.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
 Library           ${CURDIR}/../../../libraries/BgpRpcClient.py    ${TOOLS_SYSTEM_IP}
 Resource          ${CURDIR}/../../../libraries/BGPcliKeywords.robot
 Resource          ${CURDIR}/../../../libraries/BGPSpeaker.robot
 Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
+Resource          ${CURDIR}/../../../libraries/CompareStream.robot
 
 *** Variables ***
 ${HOLDTIME}       180
@@ -39,6 +41,9 @@ ${CONFIG_SESSION}    config-session
 ${EVPN_VARIABLES_DIR}    ${CURDIR}/../../../variables/bgpfunctional/l2vpn_evpn
 ${BGP_TOOL_LOG_LEVEL}    debug
 ${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}
 
 *** Test Cases ***
 Configure_App_Peer
@@ -340,12 +345,14 @@ Odl_To_Play_Template
     ${data_json}=    OperatingSystem.Get_File    ${EVPN_VARIABLES_DIR}/${totest}.json
     ${announce_hex}=    OperatingSystem.Get_File    ${EVPN_VARIABLES_DIR}/announce_${totest}.hex
     ${withdraw_hex}=    OperatingSystem.Get_File    ${EVPN_VARIABLES_DIR}/withdraw_${totest}.hex
-    BuiltIn.Log    ${data_xml}
+    ${data_path_xml}    CompareStream.Run_Keyword_If_Less_Than_Fluorine    String.Replace_String    ${data_xml}    ${PATH_ID_XML}    ${EMPTY}
+    ${post_data_xml}    CompareStream.Set_Variable_If_At_Least_Fluorine    ${data_xml}    ${data_path_xml}
+    BuiltIn.Log    ${post_data_xml}
     BuiltIn.Log    ${data_json}
     BuiltIn.Log    ${announce_hex}
     BuiltIn.Log    ${withdraw_hex}
     BgpRpcClient.play_clean
-    ${resp}=    RequestsLibrary.Post_Request    ${CONFIG_SESSION}    ${EVPN_CONF_URL}    data=${data_xml}    headers=${HEADERS_XML}
+    ${resp}=    RequestsLibrary.Post_Request    ${CONFIG_SESSION}    ${EVPN_CONF_URL}    data=${post_data_xml}    headers=${HEADERS_XML}
     BuiltIn.Should_Be_Equal_As_Numbers    ${resp.status_code}    204
     ${resp}=    RequestsLibrary.Get_Request    ${CONFIG_SESSION}    ${EVPN_CONF_URL}    headers=${HEADERS_XML}
     BuiltIn.Log    ${resp.content}
@@ -366,16 +373,18 @@ Play_To_Odl_Template
     ${announce_hex}=    OperatingSystem.Get_File    ${EVPN_VARIABLES_DIR}/announce_${totest}.hex
     ${withdraw_hex}=    OperatingSystem.Get_File    ${EVPN_VARIABLES_DIR}/withdraw_${totest}.hex
     ${empty_routes}=    OperatingSystem.Get_File    ${EVPN_VARIABLES_DIR}/empty_routes.json
+    ${data_path_json}    CompareStream.Run_Keyword_If_Less_Than_Fluorine    String.Replace_String    ${data_json}    ${PATH_ID_JSON}    ${EMPTY}
+    ${data_json_exp}    CompareStream.Set_Variable_If_At_Least_Fluorine    ${data_json}    ${data_path_json}
     BuiltIn.Set_Suite_Variable    ${withdraw_hex}
     BuiltIn.Set_Suite_Variable    ${empty_routes}
     BuiltIn.Log    ${data_xml}
-    BuiltIn.Log    ${data_json}
+    BuiltIn.Log    ${data_json_exp}
     BuiltIn.Log    ${announce_hex}
     BuiltIn.Log    ${withdraw_hex}
     BuiltIn.Log    ${empty_routes}
     BgpRpcClient.play_clean
     BgpRpcClient.play_send    ${announce_hex}
-    BuiltIn.Wait_Until_Keyword_Succeeds    4x    2s    Loc_Rib_Presnece    ${data_json}
+    BuiltIn.Wait_Until_Keyword_Succeeds    4x    2s    Loc_Rib_Presnece    ${data_json_exp}
     BgpRpcClient.play_send    ${withdraw_hex}
     BuiltIn.Wait_Until_Keyword_Succeeds    4x    2s    Loc_Rib_Presnece    ${empty_routes}
     [Teardown]    Withdraw_Route_And_Verify    ${withdraw_hex}

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.json
index 4d04e53d45791480f548e36b139cfe127c3049fd..f78af2cb3c90c152e608e89c910da0d3fb5da431 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.xml
index a6a08076122a6297f728313222f4f972647cb60a..f0b191a833b9cf28fc5d18a6fcdf980dd274e04b 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_arb.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <es-route>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-               <arbitrary>
-                       <arbitrary>AAAAAAAAAAAA</arbitrary>
-               </arbitrary>
-       </es-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>BBcAAhmZmZkAAQAAAAAAAAAAAAAgKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <es-route>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+        <arbitrary>
+            <arbitrary>AAAAAAAAAAAA</arbitrary>
+        </arbitrary>
+    </es-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.json
index 96e31b1b1abf7fc4be515406d61fb634181d28b3..1a0bf10a48dab117f52f75476d6d16fd3242c033 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.json
@@ -21,6 +21,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQUBAQEBAAAH0AAgKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.xml
index 30d6b7f088b7baf0b528868ba9f8c853effd3b55..bdbae442e754a66bf882cd91f0e788ca2605fc95 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_as.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>BBcAAhmZmZkAAQUBAQEBAAAH0AAgKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <es-route>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-               <as-generated>
-                       <as>16843009</as>
-                       <local-discriminator>2000</local-discriminator>
-               </as-generated>
-       </es-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>BBcAAhmZmZkAAQUBAQEBAAAH0AAgKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <es-route>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+        <as-generated>
+            <as>16843009</as>
+            <local-discriminator>2000</local-discriminator>
+        </as-generated>
+    </es-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.json
index cd4cc44baa66be36deabbc0f0116eacda356d5cf..9b9521368eca8ac771f2270f45fcaa04abe99df6 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.json
@@ -21,6 +21,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQHyDN2An/cAFgAgKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.xml
index 7c8a821752f6928af3f516d55c95b917ee118161..c258eeaf2a305885a25edf37f4a9e14a12277382 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lacp.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>BBcAAhmZmZkAAQHyDN2An/cAFgAgKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <es-route>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </es-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>BBcAAhmZmZkAAQHyDN2An/cAFgAgKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <es-route>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </es-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.json
index 175ea670e01819853b1f7570c5e93792a7940ce9..72afcc049a552cbee090867090ae7d5884c6dbcc 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.json
@@ -21,6 +21,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQLyDN2An/cAFAAgKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.xml
index f87ccc97316ff5462a6e5a7cbc4e4789952294f2..f7c134d0f6c6d910590694aa8dae79dcb0d57033 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_lan.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>BBcAAhmZmZkAAQLyDN2An/cAFAAgKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <es-route>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-               <lan-auto-generated>
-                       <root-bridge-mac-address>f2:0c:dd:80:9f:f7</root-bridge-mac-address>
-                       <root-bridge-priority>20</root-bridge-priority>
-               </lan-auto-generated>
-       </es-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>BBcAAhmZmZkAAQLyDN2An/cAFAAgKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <es-route>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+        <lan-auto-generated>
+            <root-bridge-mac-address>f2:0c:dd:80:9f:f7</root-bridge-mac-address>
+            <root-bridge-priority>20</root-bridge-priority>
+        </lan-auto-generated>
+    </es-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.json
index d0972cedfc370003c5b7b99250cc7c8f2b238c4d..a94de5511456edea3d0978732e9d9377a2883186 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.json
@@ -21,6 +21,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQPyDN2An/cAB9AgKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.xml
index c2d30957e370d2b886d086fcd4b53006b353d8af..c3092bcf17678d014db9939adac0b786f77fd602 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_mac.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>BBcAAhmZmZkAAQPyDN2An/cAB9AgKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <es-route>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-               <mac-auto-generated>
-                       <system-mac-address>f2:0c:dd:80:9f:f7</system-mac-address>
-                       <local-discriminator>2000</local-discriminator>
-               </mac-auto-generated>
-       </es-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>BBcAAhmZmZkAAQPyDN2An/cAB9AgKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <es-route>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+        <mac-auto-generated>
+            <system-mac-address>f2:0c:dd:80:9f:f7</system-mac-address>
+            <local-discriminator>2000</local-discriminator>
+        </mac-auto-generated>
+    </es-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.json
index 94ed6e423bb67397c558a1de092af755ccb74043..f3337d748c89c19604111668e9ce196ea3196911 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.json
@@ -21,6 +21,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "BBcAAhmZmZkAAQQrKysrAAAH0AAgKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.xml
index 148c976da0e9b333e2e819f7265f3409697cb9c8..3629db5abc974327415002437589efc8c1dd1954 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_es_rou.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>BBcAAhmZmZkAAQQrKysrAAAH0AAgKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <es-route>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-               <router-id-generated>
-                       <router-id>43.43.43.43</router-id>
-                       <local-discriminator>2000</local-discriminator>
-               </router-id-generated>
-       </es-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>BBcAAhmZmZkAAQQrKysrAAAH0AAgKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <es-route>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+        <router-id-generated>
+            <router-id>43.43.43.43</router-id>
+            <local-discriminator>2000</local-discriminator>
+        </router-id-generated>
+    </es-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.json
index 57f29dc00b0767218c484bde41bfa03c55c88486..e21ef83327698766025a1fc428f42f9b5ddc55c6 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQAAAAAAAAAAAAAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.xml
index 129d2ecd2dfe161770f1e43f4e4e5d2ee0706c97..7aeb2f885899f8517f6ef61944e20a8107be0590 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_arb.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQAAAAAAAAAAAAAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <arbitrary>
-                       <arbitrary>AAAAAAAAAAAA</arbitrary>
-               </arbitrary>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQAAAAAAAAAAAAAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <arbitrary>
+            <arbitrary>AAAAAAAAAAAA</arbitrary>
+        </arbitrary>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.json
index 6ab79f80cf4f7d378100e186ca4dd62e7c45db4c..7705e0c47a61abe9ce73ecc200f7773e1a754b53 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQUBAQEBAAAH0AAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.xml
index 340ec82eec8387cec78ac29c453275e9bbcb1c4f..57c57a3260585a425f3ab72603ff5cc415c9cd5e 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_as.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQUBAQEBAAAH0AAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <as-generated>
-                       <as>16843009</as>
-                       <local-discriminator>2000</local-discriminator>
-               </as-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQUBAQEBAAAH0AAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <as-generated>
+            <as>16843009</as>
+            <local-discriminator>2000</local-discriminator>
+        </as-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.json
index 8dc51edacfce38f58c7cf5f1945a5be5f8981b4f..178de7b98a8927027c994fa93d6122a0f55bc461 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.xml
index 87b177ce28437c2a19ca3cd11947c8025e62e3e8..bcb93d58fc40df924597cf53fdeb0250a5d68c07 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.json
index 9c34692b03267bd7d77b4be3fd0f9a90012aa180..e902126a4d5d36327919ffa2b40ff1b7c8a39b94 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.xml
index 950fc69460f48db304c759219843b8c0578a2741..a9074d7aee7f093a43f75015adad2c03194f9a7d 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extdef.xml
@@ -1,32 +1,33 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-               <extended-communities>
-                       <transitive>true</transitive>
-                       <default-gateway-extended-community>
-                       </default-gateway-extended-community>
-               </extended-communities>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+        <extended-communities>
+            <transitive>true</transitive>
+            <default-gateway-extended-community>
+            </default-gateway-extended-community>
+        </extended-communities>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.json
index 57794659b4d5722f6feb2e9e144357c317769ead..aaef4ccbd3d21b5b5a03c6547bcb1fe7ad96d176 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.json
@@ -23,6 +23,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.xml
index d4f7a3974bb7e88bc9fbff9288348b00dcfb20e9..07f5b0e9dd2dd371eb698290e0ddbf8e1cace64e 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesilab.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-               <extended-communities>
-                       <transitive>true</transitive>
-                       <esi-label-extended-community>
-                               <single-active-mode>true</single-active-mode>
-                               <esi-label>24001</esi-label>
-                       </esi-label-extended-community>
-               </extended-communities>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+        <extended-communities>
+            <transitive>true</transitive>
+            <esi-label-extended-community>
+                <single-active-mode>true</single-active-mode>
+                <esi-label>24001</esi-label>
+            </esi-label-extended-community>
+        </extended-communities>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.json
index 216137f55701a28fe962afecc4969c25421d49d9..54033405b8edc86bbad07b1df23636eab016e634 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.json
@@ -22,6 +22,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.xml
index f6e7c8bc481017f88ecf8fbe1ffa1e380a2ac5e2..5e382190918c59e38056d6c14d860726d19e2f7c 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extesr.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-               <extended-communities>
-                       <transitive>true</transitive>
-                       <es-import-route-extended-community>
-                               <es-import>f2:0c:dd:80:9f:f8</es-import>
-                       </es-import-route-extended-community>
-               </extended-communities>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+        <extended-communities>
+            <transitive>true</transitive>
+            <es-import-route-extended-community>
+                <es-import>f2:0c:dd:80:9f:f8</es-import>
+            </es-import-route-extended-community>
+        </extended-communities>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.json
index 185fde0b74d12e0f809206487eb446e524f14a1e..3226cf06b0cc9212f1a9863397405e813ebfefb9 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.json
@@ -25,6 +25,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.xml
index 88ae8a9958315f654d1733a51737e70d77522f8f..66a228756e98d2a206a3acd2fb00f0ce4472a867 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extl2.xml
@@ -1,36 +1,37 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-               <extended-communities>
-                       <transitive>false</transitive>
-                       <layer-2-attributes-extended-community>
-                               <primary-pe>true</primary-pe>
-                               <backup-pe>true</backup-pe>
-                               <control-word>true</control-word>
-                               <l2-mtu>200</l2-mtu>
-                       </layer-2-attributes-extended-community>
-               </extended-communities>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+        <extended-communities>
+            <transitive>false</transitive>
+            <layer-2-attributes-extended-community>
+                <primary-pe>true</primary-pe>
+                <backup-pe>true</backup-pe>
+                <control-word>true</control-word>
+                <l2-mtu>200</l2-mtu>
+            </layer-2-attributes-extended-community>
+        </extended-communities>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.json
index 6a2c4880013c7ed80241e1e7d9f5f0c9b07cc124..44271471c0ace46564ead47f2f4da05526a1cc8d 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.json
@@ -23,6 +23,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.xml
index 98b44d6fb2170e688e32f7b2ef1f893f20a6c568..620b2caae4bfa81eb426733e3ead2c5701b557d6 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lacp_extmac.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-               <extended-communities>
-                       <transitive>true</transitive>
-                       <mac-mobility-extended-community>
-                               <static>true</static>
-                               <seq-number>200</seq-number>
-                       </mac-mobility-extended-community>
-               </extended-communities>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQHyDN2An/cAFgAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+        <extended-communities>
+            <transitive>true</transitive>
+            <mac-mobility-extended-community>
+                <static>true</static>
+                <seq-number>200</seq-number>
+            </mac-mobility-extended-community>
+        </extended-communities>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.json
index 32e755916341f26e9dcc3fa132d3b3e4b62ae9aa..4dfd2a776dfb0ae31fa624217511a293a4889839 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQLyDN2An/cAFAAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.xml
index 58f27fc271df5ddeea2528b1faa5e4c5019e538e..62a082bc9c4d6b261aa8fee8c5e7b26047ca169a 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_lan.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQLyDN2An/cAFAAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <lan-auto-generated>
-                       <root-bridge-mac-address>f2:0c:dd:80:9f:f7</root-bridge-mac-address>
-                       <root-bridge-priority>20</root-bridge-priority>
-               </lan-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQLyDN2An/cAFAAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <lan-auto-generated>
+            <root-bridge-mac-address>f2:0c:dd:80:9f:f7</root-bridge-mac-address>
+            <root-bridge-priority>20</root-bridge-priority>
+        </lan-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.json
index db1d24370a11b87f66c4fa9c7c72e458e4bafde9..95fbab702876f2b9fc630ee3b1fd98c6b80c437c 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQPyDN2An/cAB9AAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.xml
index 6d874e73f6273abad34f393337915e500e0c37ad..131f11ee2b1bc7a80e03ee365c50085728d6d209 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_mac.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQPyDN2An/cAB9AAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-auto-generated>
-                       <system-mac-address>f2:0c:dd:80:9f:f7</system-mac-address>
-                       <local-discriminator>2000</local-discriminator>
-               </mac-auto-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQPyDN2An/cAB9AAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-auto-generated>
+            <system-mac-address>f2:0c:dd:80:9f:f7</system-mac-address>
+            <local-discriminator>2000</local-discriminator>
+        </mac-auto-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.json
index 339b9505b6cd4eaa0b6c6c23a60de86abaab0821..6e6b2008fe82761cba648ac1a5b75473edf02fd6 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "ARYAAhmZmZkAAQQrKysrAAAH0AAAAAAK",
         "route-distinguisher": "429496729:1",
         "ethernet-a-d-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.xml
index b5884aa8d797e26e75a0b1e6473a6349a4a3d45e..f7b7d0cf2940e00a20e0cd8fbd5ddb30890deee5 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_eth_rou.xml
@@ -1,27 +1,28 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>ARYAAhmZmZkAAQQrKysrAAAH0AAAAAAK</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <ethernet-a-d-route>
-               <mpls-label>24001</mpls-label>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <router-id-generated>
-                       <router-id>43.43.43.43</router-id>
-                       <local-discriminator>2000</local-discriminator>
-               </router-id-generated>
-       </ethernet-a-d-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>ARYAAhmZmZkAAQQrKysrAAAH0AAAAAAK</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <ethernet-a-d-route>
+        <mpls-label>24001</mpls-label>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <router-id-generated>
+            <router-id>43.43.43.43</router-id>
+            <local-discriminator>2000</local-discriminator>
+        </router-id-generated>
+    </ethernet-a-d-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.json
index 421e76b82b6fcf48c85734cb94f7a8bb633a4a57..6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.xml
index 761a404b3eb2cefdd7c58d8911534facc65c1d58..f7197518c159dc657ac2c37dca063f90f4e0ad47 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_arb.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <inc-multi-ethernet-tag-res>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-       </inc-multi-ethernet-tag-res>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <inc-multi-ethernet-tag-res>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+    </inc-multi-ethernet-tag-res>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.json
index 421e76b82b6fcf48c85734cb94f7a8bb633a4a57..6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.xml
index 761a404b3eb2cefdd7c58d8911534facc65c1d58..f7197518c159dc657ac2c37dca063f90f4e0ad47 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_as.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <inc-multi-ethernet-tag-res>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-       </inc-multi-ethernet-tag-res>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <inc-multi-ethernet-tag-res>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+    </inc-multi-ethernet-tag-res>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.json
index 421e76b82b6fcf48c85734cb94f7a8bb633a4a57..6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.xml
index 761a404b3eb2cefdd7c58d8911534facc65c1d58..f7197518c159dc657ac2c37dca063f90f4e0ad47 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lacp.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <inc-multi-ethernet-tag-res>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-       </inc-multi-ethernet-tag-res>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <inc-multi-ethernet-tag-res>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+    </inc-multi-ethernet-tag-res>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.json
index 421e76b82b6fcf48c85734cb94f7a8bb633a4a57..6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.xml
index 761a404b3eb2cefdd7c58d8911534facc65c1d58..f7197518c159dc657ac2c37dca063f90f4e0ad47 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_lan.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <inc-multi-ethernet-tag-res>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-       </inc-multi-ethernet-tag-res>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <inc-multi-ethernet-tag-res>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+    </inc-multi-ethernet-tag-res>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.json
index 421e76b82b6fcf48c85734cb94f7a8bb633a4a57..6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.xml
index 761a404b3eb2cefdd7c58d8911534facc65c1d58..f7197518c159dc657ac2c37dca063f90f4e0ad47 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_mac.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <inc-multi-ethernet-tag-res>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-       </inc-multi-ethernet-tag-res>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <inc-multi-ethernet-tag-res>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+    </inc-multi-ethernet-tag-res>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.json
index 421e76b82b6fcf48c85734cb94f7a8bb633a4a57..6b4a4148b86c6c99c8bac58e85f5ec8a935e8f7f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.json
@@ -20,6 +20,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AxEAAhmZmZkAAQAAAAogKysrKw==",
         "route-distinguisher": "429496729:1"
       }

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.xml
index 761a404b3eb2cefdd7c58d8911534facc65c1d58..f7197518c159dc657ac2c37dca063f90f4e0ad47 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_inc_rou.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <inc-multi-ethernet-tag-res>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <orig-route-ip>43.43.43.43</orig-route-ip>
-       </inc-multi-ethernet-tag-res>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AxEAAhmZmZkAAQAAAAogKysrKw==</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <inc-multi-ethernet-tag-res>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <orig-route-ip>43.43.43.43</orig-route-ip>
+    </inc-multi-ethernet-tag-res>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.json
index 3c6b68c1903d62b910859a6b0f036c1f52bcfe2a..05e15e61644af1fb15038b9203f89a8add5be92a 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
         "route-distinguisher": "429496729:1",
         "mac-ip-adv-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.xml
index 21d64be580371adc01817bec44da7c7390fb4f00..09752ea542aa07ee0f9085a9dd818ab0255d6d5f 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_arb.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <mac-ip-adv-route>
-               <arbitrary>
-                       <arbitrary>AAAAAAAAAAAA</arbitrary>
-               </arbitrary>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-address>f2:0c:dd:80:9f:f7</mac-address>
-               <ip-address>43.43.43.43</ip-address>
-               <mpls-label1>24002</mpls-label1>
-               <mpls-label2>24003</mpls-label2>
-       </mac-ip-adv-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <mac-ip-adv-route>
+        <arbitrary>
+            <arbitrary>AAAAAAAAAAAA</arbitrary>
+        </arbitrary>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-address>f2:0c:dd:80:9f:f7</mac-address>
+        <ip-address>43.43.43.43</ip-address>
+        <mpls-label1>24002</mpls-label1>
+        <mpls-label2>24003</mpls-label2>
+    </mac-ip-adv-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.json
index d748a3e8664a93a48a4ad1683dc95d2a02ab57ab..3433533a8a27f3a3d379ebbe4785940c38a61a5e 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
         "route-distinguisher": "429496729:1",
         "mac-ip-adv-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.xml
index acf570df1c8488cdcce6e3c7772512afd3284151..a54a77e3b624111731fb0ee81f5b5449c280fcb0 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_as.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <mac-ip-adv-route>
-               <as-generated>
-                       <as>16843009</as>
-                       <local-discriminator>2000</local-discriminator>
-               </as-generated>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-address>f2:0c:dd:80:9f:f7</mac-address>
-               <ip-address>43.43.43.43</ip-address>
-               <mpls-label1>24002</mpls-label1>
-               <mpls-label2>24003</mpls-label2>
-       </mac-ip-adv-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <mac-ip-adv-route>
+        <as-generated>
+            <as>16843009</as>
+            <local-discriminator>2000</local-discriminator>
+        </as-generated>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-address>f2:0c:dd:80:9f:f7</mac-address>
+        <ip-address>43.43.43.43</ip-address>
+        <mpls-label1>24002</mpls-label1>
+        <mpls-label2>24003</mpls-label2>
+    </mac-ip-adv-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.json
index 3bde4c2a8acaaa5b26fc0a5f2e03f4ac513badd3..1a7bd11479f0bf89e12e6a4bd854b9182d564226 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
         "route-distinguisher": "429496729:1",
         "mac-ip-adv-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.xml
index 05453ad0c5f8afb2e71649b2105d69fcc9c07bfd..d3e86b2c35d9ae9617cad658d6a4864e978428d0 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lacp.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <mac-ip-adv-route>
-               <lacp-auto-generated>
-                       <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
-                       <ce-lacp-port-key>22</ce-lacp-port-key>
-               </lacp-auto-generated>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-address>f2:0c:dd:80:9f:f7</mac-address>
-               <ip-address>43.43.43.43</ip-address>
-               <mpls-label1>24002</mpls-label1>
-               <mpls-label2>24003</mpls-label2>
-       </mac-ip-adv-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <mac-ip-adv-route>
+        <lacp-auto-generated>
+            <ce-lacp-mac-address>f2:0c:dd:80:9f:f7</ce-lacp-mac-address>
+            <ce-lacp-port-key>22</ce-lacp-port-key>
+        </lacp-auto-generated>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-address>f2:0c:dd:80:9f:f7</mac-address>
+        <ip-address>43.43.43.43</ip-address>
+        <mpls-label1>24002</mpls-label1>
+        <mpls-label2>24003</mpls-label2>
+    </mac-ip-adv-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.json
index a572faf0b8e2018e25de7730564c35b004f191c6..26b8e91e6f01e27c36a99684eb22946f37290e85 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
         "route-distinguisher": "429496729:1",
         "mac-ip-adv-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.xml
index e3576105118b579aa0aba9439b2727283bad100a..d4a033c662570fb3e8340635aaeaedef71f97979 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_lan.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <mac-ip-adv-route>
-               <lan-auto-generated>
-                       <root-bridge-mac-address>f2:0c:dd:80:9f:f7</root-bridge-mac-address>
-                       <root-bridge-priority>20</root-bridge-priority>
-               </lan-auto-generated>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-address>f2:0c:dd:80:9f:f7</mac-address>
-               <ip-address>43.43.43.43</ip-address>
-               <mpls-label1>24002</mpls-label1>
-               <mpls-label2>24003</mpls-label2>
-       </mac-ip-adv-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <mac-ip-adv-route>
+        <lan-auto-generated>
+            <root-bridge-mac-address>f2:0c:dd:80:9f:f7</root-bridge-mac-address>
+            <root-bridge-priority>20</root-bridge-priority>
+        </lan-auto-generated>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-address>f2:0c:dd:80:9f:f7</mac-address>
+        <ip-address>43.43.43.43</ip-address>
+        <mpls-label1>24002</mpls-label1>
+        <mpls-label2>24003</mpls-label2>
+    </mac-ip-adv-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.json
index 44567ea7532ef7d09f7c0864fbfe5ee789d6d10c..fcbbb97aa712ceacf7574acc3a857612f0415217 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
         "route-distinguisher": "429496729:1",
         "mac-ip-adv-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.xml
index 6fde9ae2057bae6fd8760a2fdab69efffae69501..8a2f01b6fdd4f5e8c0a5192cc1a4d9f9122947e2 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_mac.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <mac-ip-adv-route>
-               <mac-auto-generated>
-                       <system-mac-address>f2:0c:dd:80:9f:f7</system-mac-address>
-                       <local-discriminator>2000</local-discriminator>
-               </mac-auto-generated>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-address>f2:0c:dd:80:9f:f7</mac-address>
-               <ip-address>43.43.43.43</ip-address>
-               <mpls-label1>24002</mpls-label1>
-               <mpls-label2>24003</mpls-label2>
-       </mac-ip-adv-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <mac-ip-adv-route>
+        <mac-auto-generated>
+            <system-mac-address>f2:0c:dd:80:9f:f7</system-mac-address>
+            <local-discriminator>2000</local-discriminator>
+        </mac-auto-generated>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-address>f2:0c:dd:80:9f:f7</mac-address>
+        <ip-address>43.43.43.43</ip-address>
+        <mpls-label1>24002</mpls-label1>
+        <mpls-label2>24003</mpls-label2>
+    </mac-ip-adv-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.json b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.json
index d97f07c2afe18421e0b07d932fd1a5587e1163c2..573b5570002e691678794fe098bae460682dd073 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.json
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.json
@@ -14,6 +14,7 @@
           },
           "as-path": {}
         },
+        "path-id": 0,
         "route-key": "AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=",
         "route-distinguisher": "429496729:1",
         "mac-ip-adv-route": {

diff --git a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.xml b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.xml
index 1618eb3c3f976a2e6d043cf9d8675311a4d6cee6..98e70b78c8aee8001d867de23f3905c8f477ebaf 100644 (file)
--- a/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.xml
+++ b/csit/variables/bgpfunctional/l2vpn_evpn/route_mac_rou.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" ?>
 <evpn-route xmlns="urn:opendaylight:params:xml:ns:yang:bgp-evpn">
-       <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
-       <route-distinguisher>429496729:1</route-distinguisher>
-       <mac-ip-adv-route>
-               <router-id-generated>
-                       <router-id>43.43.43.43</router-id>
-                       <local-discriminator>2000</local-discriminator>
-               </router-id-generated>
-               <ethernet-tag-id>
-                       <vlan-id>10</vlan-id>
-               </ethernet-tag-id>
-               <mac-address>f2:0c:dd:80:9f:f7</mac-address>
-               <ip-address>43.43.43.43</ip-address>
-               <mpls-label1>24002</mpls-label1>
-               <mpls-label2>24003</mpls-label2>
-       </mac-ip-adv-route>
-       <attributes>
-               <ipv4-next-hop>
-                       <global>199.20.166.41</global>
-               </ipv4-next-hop>
-               <as-path/>
-               <origin>
-                       <value>igp</value>
-               </origin>
-               <local-pref>
-                       <pref>100</pref>
-               </local-pref>
-       </attributes>
+    <route-key>AhgAAhmZmZkAAQAAAAow8gzdgJ/3ICsrKys=</route-key>
+    <path-id>0</path-id>
+    <route-distinguisher>429496729:1</route-distinguisher>
+    <mac-ip-adv-route>
+        <router-id-generated>
+            <router-id>43.43.43.43</router-id>
+            <local-discriminator>2000</local-discriminator>
+        </router-id-generated>
+        <ethernet-tag-id>
+            <vlan-id>10</vlan-id>
+        </ethernet-tag-id>
+        <mac-address>f2:0c:dd:80:9f:f7</mac-address>
+        <ip-address>43.43.43.43</ip-address>
+        <mpls-label1>24002</mpls-label1>
+        <mpls-label2>24003</mpls-label2>
+    </mac-ip-adv-route>
+    <attributes>
+        <ipv4-next-hop>
+            <global>199.20.166.41</global>
+        </ipv4-next-hop>
+        <as-path/>
+        <origin>
+            <value>igp</value>
+        </origin>
+        <local-pref>
+            <pref>100</pref>
+        </local-pref>
+    </attributes>
 </evpn-route>