From: Lou Berger <lberger@labn.net>
Date: Fri, 26 Jan 2018 04:06:12 +0000 (-0500)
Subject: bgp_l3vpn_to_bgp_vrf: don't set vrf-policy, wait for new format
X-Git-Tag: frr-7.1-dev~151^2~152
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=308ae0773f3696218e58ec9d26294f3684ae8ee8;p=mirror%2Ffrr.git

bgp_l3vpn_to_bgp_vrf: don't set vrf-policy, wait for new format

Signed-off-by: Lou Berger <lberger@labn.net>
---

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
index cb8a806ebe..2f2abb4233 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -19,12 +19,13 @@ router bgp 5226
      neighbor 2.2.2.2 activate
    exit-address-family
 !
-   vrf-policy cust1
-      label 101
-      rd 10:1
-      rt both 52:100
-      !nexthop 192.168.1.1
-   exit-vrf-policy
+#wait for new syntax
+#   vrf-policy cust1
+#      label 101
+#      rd 10:1
+#      rt both 52:100
+#      !nexthop 192.168.1.1
+#   exit-vrf-policy
 !
  !vnc export bgp mode group-nve
  !vnc export bgp group-nve group cust1
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
index 9dcc07f1b1..fd14af45e1 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf
@@ -19,12 +19,13 @@ router bgp 5226
      neighbor 2.2.2.2 activate
    exit-address-family
 !
-   vrf-policy cust1
-      label 103
-      rd 10:3
-      rt both 52:100
-!      nexthop 192.168.1.1
-   exit-vrf-policy
+#wait for new syntax
+#   vrf-policy cust1
+#      label 103
+#      rd 10:3
+#      rt both 52:100
+#!      nexthop 192.168.1.1
+#   exit-vrf-policy
 !
 ! vnc export bgp mode group-nve
 ! vnc export bgp group-nve group cust1
diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
index 3bdc059645..c125ba1b44 100644
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
@@ -18,20 +18,21 @@ router bgp 5226
      neighbor 2.2.2.2 activate
    exit-address-family
 !
-   vrf-policy cust1
-      label 104
-      rd 10:4
-      rt both 52:100
-!      nexthop 192.168.1.1
-   exit-vrf-policy
-!
-   vrf-policy cust2
-      label 104
-      rd 10:4
-      #note RT same as cust1 for inter-vrf route leaking
-      rt both 52:100
-!      nexthop 192.168.2.1
-   exit-vrf-policy
+#wait for new syntax
+#   vrf-policy cust1
+#      label 104
+#      rd 10:4
+#      rt both 52:100
+#!      nexthop 192.168.1.1
+#   exit-vrf-policy
+#!
+#   vrf-policy cust2
+#      label 104
+#      rd 10:4
+#      #note RT same as cust1 for inter-vrf route leaking
+#      rt both 52:100
+#!      nexthop 192.168.2.1
+#   exit-vrf-policy
 !
 ! vnc export bgp mode group-nve
 ! vnc export bgp group-nve group cust1