bgpd: hide "router bgp" commands also under "address-family ipv4 unicast"

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Updated the docs and sample configs

diff --git a/bgpd/bgpd.conf.sample b/bgpd/bgpd.conf.sample
index b6a8b6f100caf9a07acbd5b815b68dfcfe87d617..60a74a71ef0f3744cb9f09c401f206ce0f4b654b 100644 (file)
--- a/bgpd/bgpd.conf.sample
+++ b/bgpd/bgpd.conf.sample
@@ -14,9 +14,12 @@ router bgp 7675
 ! bgp router-id 10.0.0.1
 ! network 10.0.0.0/8
 ! neighbor 10.0.0.2 remote-as 7675
-! neighbor 10.0.0.2 route-map set-nexthop out
 ! neighbor 10.0.0.2 ebgp-multihop
-! neighbor 10.0.0.2 next-hop-self
+!
+! address-family ipv4 unicast
+!  neighbor 10.0.0.2 route-map set-nexthop out
+!  neighbor 10.0.0.2 next-hop-self
+! exit-address-family
 !
 ! access-list all permit any
 !

diff --git a/bgpd/bgpd.conf.vnc.sample b/bgpd/bgpd.conf.vnc.sample
index 863abde3a6dfdac833bc3c503627360c7b1cec08..a8a2dc5fa0a63dc39c3a306a179132b442183ff6 100644 (file)
--- a/bgpd/bgpd.conf.vnc.sample
+++ b/bgpd/bgpd.conf.vnc.sample
@@ -19,13 +19,15 @@ router bgp 64512
     neighbor 192.1.1.2 description H192.1.1.2
     neighbor 192.1.1.2 update-source 192.1.1.1
     neighbor 192.1.1.2 advertisement-interval 1
-    no neighbor 192.1.1.2 activate
 
     neighbor 192.1.1.3 remote-as 64512
     neighbor 192.1.1.3 description H192.1.1.3
     neighbor 192.1.1.3 update-source 192.1.1.1
     neighbor 192.1.1.3 advertisement-interval 1
-    no neighbor 192.1.1.3 activate
+
+    address-family ipv4 unicast
+        no neighbor 192.1.1.2 activate
+        no neighbor 192.1.1.3 activate
 
     address-family vpnv4
         neighbor 192.1.1.2 activate

diff --git a/doc/bgpd.texi b/doc/bgpd.texi
index 08cd4149a4d1d9757af5519c6797e20833762018..8e0da129493bd1d007fd3728aa8c9d423e756996 100644 (file)
--- a/doc/bgpd.texi
+++ b/doc/bgpd.texi
@@ -526,7 +526,9 @@ This command adds the announcement network.
 @example
 @group
 router bgp 1
- network 10.0.0.0/8
+ address-family ipv4 unicast
+  network 10.0.0.0/8
+ exit-address-family
 @end group
 @end example
 This configuration example says that network 10.0.0.0/8 will be
@@ -1160,7 +1162,9 @@ communities attribute to the updates.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list 70 permit 7675:70
 ip community-list 70 deny
@@ -1191,7 +1195,9 @@ value 80.
 router bgp 100
  network 10.0.0.0/8
  neighbor 192.168.0.2 remote-as 7675
- neighbor 192.168.0.2 route-map RMAP out
+ address-family ipv4 unicast
+  neighbor 192.168.0.2 route-map RMAP out
+ exit-address-family
 !
 ip prefix-list PLIST permit 10.0.0.0/8
 !
@@ -1209,7 +1215,9 @@ limit the BGP routes announcement into the internal network.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list 1 permit 0:80 0:90
 !
@@ -1224,7 +1232,9 @@ filtering all of routes, we need to define permit any at last.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list standard FILTER deny 1:1
 ip community-list standard FILTER permit
@@ -1252,7 +1262,9 @@ community-list is used.  @code{deny} community-list is ignored.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list standard DEL permit 100:1 100:2
 !
@@ -1606,11 +1618,15 @@ to specify @command{neighbor A.B.C.D send-community} command.
 !
 router bgp 1
  neighbor 10.0.0.1 remote-as 1
- no neighbor 10.0.0.1 send-community
+ address-family ipv4 unicast
+  no neighbor 10.0.0.1 send-community
+ exit-address-family
 !
 router bgp 1
  neighbor 10.0.0.1 remote-as 1
- neighbor 10.0.0.1 send-community
+ address-family ipv4 unicast
+  neighbor 10.0.0.1 send-community
+ exit-address-family
 !
 @end example
 
@@ -1680,11 +1696,15 @@ bgp multiple-instance
 !
 router bgp 1 view 1
  neighbor 10.0.0.1 remote-as 2
- neighbor 10.0.0.1 distribute-list 1 in
+ address-family ipv4 unicast
+  neighbor 10.0.0.1 distribute-list 1 in
+ exit-address-family
 !
 router bgp 1 view 2
  neighbor 10.0.0.1 remote-as 2
- neighbor 10.0.0.1 distribute-list 2 in
+ address-family ipv4 unicast
+  neighbor 10.0.0.1 distribute-list 2 in
+ exit-address-family
 @end group
 @end example
 
@@ -1792,13 +1812,16 @@ Example of a session to an upstream, advertising only one prefix to it.
 @example
 router bgp 64512
  bgp router-id 10.236.87.1
- network 10.236.87.0/24
  neighbor upstream peer-group
  neighbor upstream remote-as 64515
  neighbor upstream capability dynamic
- neighbor upstream prefix-list pl-allowed-adv out
  neighbor 10.1.1.1 peer-group upstream
  neighbor 10.1.1.1 description ACME ISP
+
+ address-family ipv4 unicast
+  network 10.236.87.0/24
+  neighbor upstream prefix-list pl-allowed-adv out
+ exit-address-family
 !
 ip prefix-list pl-allowed-adv seq 5 permit 82.195.133.0/25
 ip prefix-list pl-allowed-adv seq 10 deny any
@@ -1816,18 +1839,9 @@ flaws.
 @example
 router bgp 64512
  bgp router-id 10.236.87.1
- network 10.123.456.0/24
- network 10.123.456.128/25 route-map rm-no-export
  neighbor upstream capability dynamic
- neighbor upstream route-map rm-upstream-out out
  neighbor cust capability dynamic
- neighbor cust route-map rm-cust-in in
- neighbor cust route-map rm-cust-out out
- neighbor cust send-community both
  neighbor peer capability dynamic
- neighbor peer route-map rm-peer-in in
- neighbor peer route-map rm-peer-out out
- neighbor peer send-community both
  neighbor 10.1.1.1 remote-as 64515
  neighbor 10.1.1.1 peer-group upstream
  neighbor 10.2.1.1 remote-as 64516
@@ -1835,19 +1849,31 @@ router bgp 64512
  neighbor 10.3.1.1 remote-as 64517
  neighbor 10.3.1.1 peer-group cust-default
  neighbor 10.3.1.1 description customer1
- neighbor 10.3.1.1 prefix-list pl-cust1-network in
  neighbor 10.4.1.1 remote-as 64518
  neighbor 10.4.1.1 peer-group cust
- neighbor 10.4.1.1 prefix-list pl-cust2-network in
  neighbor 10.4.1.1 description customer2
  neighbor 10.5.1.1 remote-as 64519
  neighbor 10.5.1.1 peer-group peer
- neighbor 10.5.1.1 prefix-list pl-peer1-network in
  neighbor 10.5.1.1 description peer AS 1
  neighbor 10.6.1.1 remote-as 64520
  neighbor 10.6.1.1 peer-group peer
- neighbor 10.6.1.1 prefix-list pl-peer2-network in
  neighbor 10.6.1.1 description peer AS 2
+
+ address-family ipv4 unicast
+  network 10.123.456.0/24
+  network 10.123.456.128/25 route-map rm-no-export
+  neighbor upstream route-map rm-upstream-out out
+  neighbor cust route-map rm-cust-in in
+  neighbor cust route-map rm-cust-out out
+  neighbor cust send-community both
+  neighbor peer route-map rm-peer-in in
+  neighbor peer route-map rm-peer-out out
+  neighbor peer send-community both
+  neighbor 10.3.1.1 prefix-list pl-cust1-network in
+  neighbor 10.4.1.1 prefix-list pl-cust2-network in
+  neighbor 10.5.1.1 prefix-list pl-peer1-network in
+  neighbor 10.6.1.1 prefix-list pl-peer2-network in
+ exit-address-family
 !
 ip prefix-list pl-default permit 0.0.0.0/0
 !

diff --git a/doc/nhrpd.texi b/doc/nhrpd.texi
index 1820044aea3ba2812718f6e6f1b2dabf41589f63..069b46495c7c3d5b0627bb9b41c0a0148baa8fe5 100644 (file)
--- a/doc/nhrpd.texi
+++ b/doc/nhrpd.texi
@@ -64,8 +64,10 @@ command defines the GRE subnet):
 @example
 @group
 router bgp 65555
+ address-family ipv4 unicast
    network 172.16.0.0/16
    redistribute nhrp
+ exit-address-family
 @end group
 @end example
 

diff --git a/doc/vnc.texi b/doc/vnc.texi
index f375d3a7df30ecfb279107a35c2f43bd987ae0be..b1489942108691dcd6e6715ae21309a533297afe 100644 (file)
--- a/doc/vnc.texi
+++ b/doc/vnc.texi
@@ -1115,18 +1115,21 @@ The configuration for @code{VNC-GW 1} is shown below.
 router bgp 64512
  bgp router-id 192.168.1.101
  bgp cluster-id 1.2.3.4
- redistribute vnc-direct
  neighbor 192.168.1.102 remote-as 64512
- no neighbor 192.168.1.102 activate
  neighbor 192.168.1.103 remote-as 64512
- no neighbor 192.168.1.103 activate
  neighbor 192.168.1.104 remote-as 64512
- no neighbor 192.168.1.104 activate
  neighbor 172.16.1.2 remote-as 64512
- neighbor 172.16.1.2 route-reflector-client
  neighbor 172.16.2.2 remote-as 64512
- neighbor 172.16.2.2 route-reflector-client
-!
+ !
+ address-family ipv4 unicast
+  redistribute vnc-direct
+  no neighbor 192.168.1.102 activate
+  no neighbor 192.168.1.103 activate
+  no neighbor 192.168.1.104 activate
+  neighbor 172.16.1.2 route-reflector-client
+  neighbor 172.16.2.2 route-reflector-client
+ exit-address-family
+ !
  address-family vpnv4 unicast
    neighbor 192.168.1.102 activate
    neighbor 192.168.1.103 activate
@@ -1148,16 +1151,21 @@ Configuration for @code{NVA 2}:
 router bgp 64512
  bgp router-id 192.168.1.104
  neighbor 192.168.1.101 remote-as 64512
- no neighbor 192.168.1.101 activate
  neighbor 192.168.1.102 remote-as 64512
- no neighbor 192.168.1.102 activate
  neighbor 192.168.1.103 remote-as 64512
- no neighbor 192.168.1.103 activate
+ !
+ address-family ipv4 unicast
+  no neighbor 192.168.1.101 activate
+  no neighbor 192.168.1.102 activate
+  no neighbor 192.168.1.103 activate
+ exit-address-family
+ !
  address-family vpnv4 unicast
    neighbor 192.168.1.101 activate
    neighbor 192.168.1.102 activate
    neighbor 192.168.1.103 activate
  exit-address-family
+ !
  vnc defaults
   response-lifetime 3600
   exit-vnc
@@ -1231,12 +1239,15 @@ router bgp 64512
     neighbor 192.168.1.101 remote-as 64512
     neighbor 192.168.1.101 port 7179
     neighbor 192.168.1.101 description iBGP-client-192-168-1-101
-    neighbor 192.168.1.101 route-reflector-client
 
     neighbor 192.168.1.102 remote-as 64512
     neighbor 192.168.1.102 port 7179
     neighbor 192.168.1.102 description iBGP-client-192-168-1-102
-    neighbor 192.168.1.102 route-reflector-client
+
+    address-family ipv4 unicast
+        neighbor 192.168.1.101 route-reflector-client
+        neighbor 192.168.1.102 route-reflector-client
+    exit-address-family
 
     address-family vpnv4
         neighbor 192.168.1.101 activate