bgp_l3vpn_to_bgp_vrf: updated config files to current vpn-policy syntax

Signed-off-by: G. Paul Ziemba <paulz@labn.net>

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
index 5acc1103119de9505f0a97e2526833ddfa7c3810..1713ecd2093d07400b832780ce818270922d2a32 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5227
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
+     network 99.0.0.1/32
      network 5.1.0.0/24 route-map rm-nh
      network 5.1.1.0/24 route-map rm-nh
      neighbor 192.168.1.1 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
index 9f3aad733bd5a01ffb3c4761b83012e559517333..6bfa411eddcf6a555eacf149bd0c2c0d0c6f93c5 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5227
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
+     network 99.0.0.2/32
      network 5.1.0.0/24 route-map rm-nh
      network 5.1.1.0/24 route-map rm-nh
      neighbor 192.168.1.1 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
index 219a93cfc9412038964215b77856cd71e9263d47..1fe3a1a72805d940f4439f64258bd3587ab36413 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5227
    neighbor 192.168.1.1 remote-as 5227
    neighbor 192.168.1.1 update-source 192.168.1.2
    address-family ipv4 unicast
+     network 99.0.0.3/32
      network 5.1.2.0/24 route-map rm-nh
      network 5.1.3.0/24 route-map rm-nh
      neighbor 192.168.1.1 activate

diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
index 713edb419522532b49e6407eb79e90596cff11c2..6f7c7a2a396ac28060d9b299351b2a081dc02683 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf
@@ -10,6 +10,7 @@ router bgp 5228
    neighbor 192.168.2.1 remote-as 5228
    neighbor 192.168.2.1 update-source 192.168.2.2
    address-family ipv4 unicast
+     network 99.0.0.4/32
      network 5.4.2.0/24 route-map rm-nh
      network 5.4.3.0/24 route-map rm-nh
      neighbor 192.168.2.1 activate

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 e45420d105f76af372f5ea33512abe834dbf9cbb..e7c18c594bc1d31c8775bdbfc66b73b75958bd08 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf
@@ -8,9 +8,10 @@ log commands
 
 log file /tmp/topotests/bgp_l3vpn_to_bgp_vrf.test_bgp_l3vpn_to_bgp_vrf/r1-bgpd.log debugging
 
-debug bgp vpn leak-to-vrf
-debug bgp vpn leak-from-vrf
-debug bgp vpn label
+#debug bgp vpn leak-to-vrf
+#debug bgp vpn leak-from-vrf
+#debug bgp vpn label
+#debug bgp updates out
 
 router bgp 5226
    bgp router-id 1.1.1.1

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 88cb51cfa792d78a3d4d1b8f09f2de5ea21e174a..aa1c2a086d93509f62c483187d6d719707d46ba0 100644 (file)
--- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
+++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf
@@ -1,5 +1,5 @@
 frr defaults traditional
-!
+
 hostname r4
 password zebra
 log stdout notifications
@@ -13,7 +13,7 @@ router bgp 5226
    bgp cluster-id 4.4.4.4
    neighbor 2.2.2.2 remote-as 5226
    neighbor 2.2.2.2 update-source 4.4.4.4
-!
+
    address-family ipv4 unicast
      no neighbor 2.2.2.2 activate
    exit-address-family
@@ -22,26 +22,6 @@ router bgp 5226
      neighbor 2.2.2.2 activate
    exit-address-family
 
-
-
-!
-#wait for new syntax
-#   vrf-policy r4-cust1
-#      label 104
-#      rd 10:4
-#      rt both 52:100
-#!      nexthop 192.168.1.1
-#   exit-vrf-policy
-#!
-#   vrf-policy r4-cust2
-#      label 104
-#      rd 10:4
-#      #note RT same as r4-cust1 for inter-vrf route leaking
-#      rt both 52:100
-#!      nexthop 192.168.2.1
-#   exit-vrf-policy
-
-
 router bgp 5227 vrf r4-cust1
 
    bgp router-id 192.168.1.1
@@ -63,7 +43,7 @@ router bgp 5227 vrf r4-cust1
      redistribute vpn
      export vpn
    exit-address-family
-!
+
 router bgp 5228 vrf r4-cust2
 
    bgp router-id 192.168.2.1
@@ -74,7 +54,7 @@ router bgp 5228 vrf r4-cust2
    vpn-policy ipv4
        label 1042
        rd 10:4
-        #note RT same as r4-cust1 for inter-vrf route leaking (???)
+        #note RT same as r4-cust1 for inter-vrf route leaking
        rt both 52:100
       !  nexthop 192.168.1.1
    exit
@@ -86,5 +66,5 @@ router bgp 5228 vrf r4-cust2
      redistribute vpn
      export vpn
    exit-address-family
-!
+
 end