From d6ba695f26c8cfeac5e97aa4de32e47d83bbbde6 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 17:22:19 +0100 Subject: dmvpn: migrate to reserved address space --- docs/appendix/examples/dmvpn.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/appendix/examples/dmvpn.rst b/docs/appendix/examples/dmvpn.rst index 30ca8e86..cbb9f300 100644 --- a/docs/appendix/examples/dmvpn.rst +++ b/docs/appendix/examples/dmvpn.rst @@ -13,7 +13,7 @@ Configuration set interfaces tunnel tun100 address '172.16.253.134/29' set interfaces tunnel tun100 encapsulation 'gre' - set interfaces tunnel tun100 local-ip '11.22.33.44' + set interfaces tunnel tun100 local-ip '203.0.113.44' set interfaces tunnel tun100 multicast 'enable' set interfaces tunnel tun100 parameters ip key '1' @@ -69,7 +69,7 @@ Use this configuration on your Cisco device: crypto pki token default removal timeout 0 crypto keyring DMVPN - pre-shared-key address 1.2.3.4 key + pre-shared-key address 198.51.100.2 key ! crypto isakmp policy 10 encr aes 256 @@ -80,7 +80,7 @@ Use this configuration on your Cisco device: crypto isakmp keepalive 30 30 periodic crypto isakmp profile DMVPN keyring DMVPN - match identity address 11.22.33.44 255.255.255.255 + match identity address 203.0.113.44 255.255.255.255 ! crypto ipsec transform-set DMVPN-AES256 esp-aes 256 esp-sha-hmac mode transport @@ -95,8 +95,8 @@ Use this configuration on your Cisco device: ip address 172.16.253.129 255.255.255.248 no ip redirects ip nhrp authentication - ip nhrp map multicast 11.22.33.44 - ip nhrp map 172.16.253.134 11.22.33.44 + ip nhrp map multicast 203.0.113.44 + ip nhrp map 172.16.253.134 203.0.113.44 ip nhrp network-id 1 ip nhrp holdtime 600 ip nhrp nhs 172.16.253.134 -- cgit v1.2.3 From 0462eac7696a858c5c4411b0660f4669b2033fbc Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 17:25:12 +0100 Subject: commandtree: migrate to reserved address space --- docs/appendix/commandtree/configmode.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/appendix/commandtree/configmode.rst b/docs/appendix/commandtree/configmode.rst index 29dc43d0..f70fbb23 100644 --- a/docs/appendix/commandtree/configmode.rst +++ b/docs/appendix/commandtree/configmode.rst @@ -389,7 +389,7 @@ See here how to move the configuration entrys from vlanid 3 to 2 [edit interfaces ethernet eth1] vyos@vyos# show duplex auto - hw-id 08:00:27:81:c6:59 + hw-id 00:53:22:81:c6:59 smp-affinity auto speed auto vif 3 { @@ -400,7 +400,7 @@ See here how to move the configuration entrys from vlanid 3 to 2 [edit interfaces ethernet eth1] vyos@vyos# show duplex auto - hw-id 08:00:27:81:c6:59 + hw-id 00:53:22:81:c6:59 smp-affinity auto speed auto +vif 2 { @@ -488,7 +488,7 @@ Show the hole config, the address and description of eth1 is moving to vlan 2 if ethernet eth0 { address dhcp duplex auto - hw-id 08:00:27:2b:c0:0b + hw-id 00:53:22:2b:c0:0b smp-affinity auto speed auto } @@ -496,7 +496,7 @@ Show the hole config, the address and description of eth1 is moving to vlan 2 if - address 10.1.1.1/32 - description "MGMT Interface" duplex auto - hw-id 08:00:27:81:c6:59 + hw-id 00:53:22:81:c6:59 smp-affinity auto speed auto + vif 2 { -- cgit v1.2.3 From 840ac72a298e9b7eaea18a0170b63f07f4c25099 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 20:40:00 +0100 Subject: Routing Policy: migrate to reserved address space --- docs/routing/routing-policy.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/routing/routing-policy.rst b/docs/routing/routing-policy.rst index a5714bf7..f9f3e826 100644 --- a/docs/routing/routing-policy.rst +++ b/docs/routing/routing-policy.rst @@ -22,8 +22,8 @@ Routing Policy Example set policy route-map setmet rule 2 set as-path-prepend '2 2 2' #Apply policy to BGP - set protocols bgp 1 neighbor 1.1.1.2 address-family ipv4-unicast route-map import 'setmet' - set protocols bgp 1 neighbor 1.1.1.2 address-family ipv4-unicast soft-reconfiguration 'inbound' <<<< *** + set protocols bgp 1 neighbor 203.0.113.2 address-family ipv4-unicast route-map import 'setmet' + set protocols bgp 1 neighbor 203.0.113.2 address-family ipv4-unicast soft-reconfiguration 'inbound' <<<< *** *** get policy update without bouncing the neighbor @@ -38,7 +38,7 @@ Routing Policy Example Origin codes: i - IGP, e - EGP, ? - incomplete Network Next Hop Metric LocPrf Weight Path - *> 22.22.22.22/32 1.1.1.2 1 0 2 i < Path + *> 198.51.100.3/32 203.0.113.2 1 0 2 i < Path Total number of prefixes 1 @@ -53,7 +53,7 @@ Routing Policy Example Origin codes: i - IGP, e - EGP, ? - incomplete Network Next Hop Metric LocPrf Weight Path - *> 22.22.22.22/32 1.1.1.2 1 0 2 2 2 2 i < longer AS_path length + *> 198.51.100.3/32 203.0.113.2 1 0 2 2 2 2 i < longer AS_path length Total number of prefixes 1 vyos@vos1:~$ -- cgit v1.2.3 From bc5fa4751f58ef132dca8115d45a68d471bb293d Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 20:41:52 +0100 Subject: ARP: migrate to reserved address space --- docs/routing/arp.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/routing/arp.rst b/docs/routing/arp.rst index 358476ac..96a6ffeb 100644 --- a/docs/routing/arp.rst +++ b/docs/routing/arp.rst @@ -35,8 +35,8 @@ Display all known ARP table entries spanning accross all interfaces vyos@vyos:~$ show protocols static arp Address HWtype HWaddress Flags Mask Iface - 10.1.1.1 ether 08:00:27:de:23:2e C eth1 - 10.1.1.100 ether 08:00:27:de:23:aa CM eth1 + 10.1.1.1 ether 00:53:00:de:23:2e C eth1 + 10.1.1.100 ether 00:53:00:de:23:aa CM eth1 .. opcmd:: show protocols static arp interface eth1 @@ -47,7 +47,7 @@ Display all known ARP table entries on a given interface only (`eth1`): vyos@vyos:~$ show protocols static arp interface eth1 Address HWtype HWaddress Flags Mask Iface - 10.1.1.1 ether 08:00:27:de:23:2e C eth1 - 10.1.1.100 ether 08:00:27:de:23:aa CM eth1 + 10.1.1.1 ether 00:53:00:de:23:2e C eth1 + 10.1.1.100 ether 00:53:00:de:23:aa CM eth1 .. _ARP: https://en.wikipedia.org/wiki/Address_Resolution_Protocol \ No newline at end of file -- cgit v1.2.3 From 1d4ecc067d8d8ce56975ee9b3ae8b912e135e4ae Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 20:50:52 +0100 Subject: PPPoE Server: migrate to reserved address space --- docs/services/pppoe-server.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/services/pppoe-server.rst b/docs/services/pppoe-server.rst index fbfd09be..36323db9 100644 --- a/docs/services/pppoe-server.rst +++ b/docs/services/pppoe-server.rst @@ -35,7 +35,7 @@ Connections can be locally checked via the command show pppoe-server sessions ifname | username | ip | calling-sid | rate-limit | state | uptime | rx-bytes | tx-bytes -------+----------+------------+-------------------+-------------+--------+----------+----------+---------- - ppp0 | foo | 10.1.1.100 | 08:00:27:ba:db:15 | 20480/10240 | active | 00:00:11 | 214 B | 76 B + ppp0 | foo | 10.1.1.100 | 00:53:00:ba:db:15 | 20480/10240 | active | 00:00:11 | 214 B | 76 B Client IP address pools @@ -163,7 +163,7 @@ Once the user is connected, the user session is using the set limits and can be show pppoe-server sessions ifname | username | ip | calling-sid | rate-limit | state | uptime | rx-bytes | tx-bytes -------+----------+------------+-------------------+-------------+--------+----------+----------+---------- - ppp0 | foo | 10.1.1.100 | 08:00:27:ba:db:15 | 20480/10240 | active | 00:00:11 | 214 B | 76 B + ppp0 | foo | 10.1.1.100 | 00:53:00:ba:db:15 | 20480/10240 | active | 00:00:11 | 214 B | 76 B RADIUS based shaper setup @@ -212,6 +212,6 @@ The client, once successfully authenticated, will receive an IPv4 and an IPv6 /6 vyos@pppoe-server:~$ sh pppoe-server sessions ifname | username | ip | ip6 | ip6-dp | calling-sid | rate-limit | state | uptime | rx-bytes | tx-bytes --------+----------+-------------+--------------------------+---------------------+-------------------+------------+--------+----------+----------+---------- - ppp0 | test | 192.168.0.1 | 2001:db8:8002:0:200::/64 | 2001:db8:8003::1/56 | 08:00:27:12:42:eb | | active | 00:00:49 | 875 B | 2.1 KiB + ppp0 | test | 192.168.0.1 | 2001:db8:8002:0:200::/64 | 2001:db8:8003::1/56 | 00:53:00:12:42:eb | | active | 00:00:49 | 875 B | 2.1 KiB .. _`accel-ppp`: https://accel-ppp.org/ -- cgit v1.2.3 From d00209e84be68fef0eba63af638eebe038801f07 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 21:03:10 +0100 Subject: Wireless: migrate to reserved address space --- docs/interfaces/wireless.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/interfaces/wireless.rst b/docs/interfaces/wireless.rst index 8bd84364..9e3c6cf5 100644 --- a/docs/interfaces/wireless.rst +++ b/docs/interfaces/wireless.rst @@ -39,7 +39,7 @@ to as :abbr:`SSID (Service Set Identifier)`, and MAC addresses. The WAP in this example has the following characteristics: -* IP address ``192.0.2.1/24`` +* IP address ``192.168.2.1/24`` * Network ID (SSID) ``TEST`` * WPA passphrase ``12345678`` * Use 802.11n protocol @@ -47,7 +47,7 @@ The WAP in this example has the following characteristics: .. code-block:: none - set interfaces wireless wlan0 address '192.0.2.1/24' + set interfaces wireless wlan0 address '192.168.2.1/24' set interfaces wireless wlan0 type access-point set interfaces wireless wlan0 channel 1 set interfaces wireless wlan0 mode n @@ -63,7 +63,7 @@ Resulting in interfaces { [...] wireless wlan0 { - address 192.0.2.1/24 + address 192.168.2.1/24 channel 1 mode n security { @@ -103,24 +103,24 @@ is responsible for authenticating the users. The WAP in this example has the following characteristics: -* IP address ``192.0.2.1/24`` +* IP address ``192.168.2.1/24`` * Network ID (SSID) ``Enterprise-TEST`` * WPA passphrase ``12345678`` * Use 802.11n protocol * Wireless channel ``1`` -* RADIUS server at ``192.0.3.10`` with shared-secret ``VyOSPassword`` +* RADIUS server at ``192.168.3.10`` with shared-secret ``VyOSPassword`` .. code-block:: none - set interfaces wireless wlan0 address '192.0.2.1/24' + set interfaces wireless wlan0 address '192.168.2.1/24' set interfaces wireless wlan0 type access-point set interfaces wireless wlan0 channel 1 set interfaces wireless wlan0 mode n set interfaces wireless wlan0 ssid 'TEST' set interfaces wireless wlan0 security wpa mode wpa2 set interfaces wireless wlan0 security wpa cipher CCMP - set interfaces wireless wlan0 security wpa radius server 192.0.3.10 key 'VyOSPassword' - set interfaces wireless wlan0 security wpa radius server 192.0.3.10 port 1812 + set interfaces wireless wlan0 security wpa radius server 192.168.3.10 key 'VyOSPassword' + set interfaces wireless wlan0 security wpa radius server 192.168.3.10 port 1812 Resulting in @@ -129,7 +129,7 @@ Resulting in interfaces { [...] wireless wlan0 { - address 192.0.2.1/24 + address 192.168.2.1/24 channel 1 mode n security { @@ -137,7 +137,7 @@ Resulting in cipher CCMP mode wpa2 radius { - server 192.0.3.10 { + server 192.168.3.10 { key 'VyOSPassword' port 1812 } @@ -263,7 +263,7 @@ The wireless interface identifier can range from wlan0 to wlan999. Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down Interface IP Address S/L Description --------- ---------- --- ----------- - wlan0 192.0.2.254/24 u/u + wlan0 192.168.2.254/24 u/u .. opcmd:: show interfaces wireless queue -- cgit v1.2.3 From 156ff82951460c5421f9a9d43dac46b116e3222b Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 21:04:38 +0100 Subject: Addresses: migrate to reserved address space --- docs/interfaces/addresses.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interfaces/addresses.rst b/docs/interfaces/addresses.rst index 19ba8225..034fb0ef 100644 --- a/docs/interfaces/addresses.rst +++ b/docs/interfaces/addresses.rst @@ -32,7 +32,7 @@ The command is ``set interfaces $type $name address $address``. Examples: set interfaces ethernet eth0 address 192.0.2.1/24 set interfaces tunnel tun0 address 10.0.0.1/30 set interfaces bridge br0 address 203.0.113.45/26 - set interfaces ethernet eth0 vif 30 address 192.0.30.254/24 + set interfaces ethernet eth0 vif 30 address 198.51.100.254/24 DHCP **** -- cgit v1.2.3 From e6b3260b2ac494c14ac0f808d39c17d21dcd2261 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 21:05:18 +0100 Subject: VLAN: migrate to reserved address space --- docs/interfaces/vlan.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interfaces/vlan.rst b/docs/interfaces/vlan.rst index 82f73efe..55656d5d 100644 --- a/docs/interfaces/vlan.rst +++ b/docs/interfaces/vlan.rst @@ -45,7 +45,7 @@ Resulting in: address 2001:db8:100::1/64 description INSIDE duplex auto - hw-id 00:0c:29:44:3b:19 + hw-id 00:53:29:44:3b:19 smp_affinity auto speed auto vif 100 { -- cgit v1.2.3 From d2d5b148cbf08e943058b30e64ef812b85f05b6a Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 21:06:07 +0100 Subject: Ethernet: migrate to reserved address space --- docs/interfaces/ethernet.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interfaces/ethernet.rst b/docs/interfaces/ethernet.rst index cbefbaf6..a8cee8c2 100644 --- a/docs/interfaces/ethernet.rst +++ b/docs/interfaces/ethernet.rst @@ -23,7 +23,7 @@ Resulting in: address 2001:db8:1::ffff/64 description INSIDE duplex auto - hw-id 00:0c:29:44:3b:19 + hw-id 00:53:29:44:3b:19 smp_affinity auto speed auto } -- cgit v1.2.3 From 6a5417418156ea5361da2627cbc02358dd465ea9 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 21:07:04 +0100 Subject: interfaces index: migrate to reserved address space --- docs/interfaces/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interfaces/index.rst b/docs/interfaces/index.rst index adcc7c71..0513adf1 100644 --- a/docs/interfaces/index.rst +++ b/docs/interfaces/index.rst @@ -25,7 +25,7 @@ command. vyos@vyos:~$ show interfaces ethernet eth0 eth0: mtu 1500 qdisc pfifo_fast state UP qlen 1000 - link/ether 00:0c:29:44:3b:0f brd ff:ff:ff:ff:ff:ff + link/ether 00:53:29:44:3b:0f brd ff:ff:ff:ff:ff:ff inet 172.16.51.129/24 brd 172.16.51.255 scope global eth0 inet6 fe80::20c:29ff:fe44:3b0f/64 scope link valid_lft forever preferred_lft forever -- cgit v1.2.3 From 3ba8224c1a7ec265a209d5035a6a1c910bebb7c6 Mon Sep 17 00:00:00 2001 From: Robert Göhler Date: Sun, 1 Dec 2019 21:07:58 +0100 Subject: Bridge: migrate to reserved address space --- docs/interfaces/bridge.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/interfaces/bridge.rst b/docs/interfaces/bridge.rst index 2ae6a243..a7bbbca6 100644 --- a/docs/interfaces/bridge.rst +++ b/docs/interfaces/bridge.rst @@ -109,4 +109,4 @@ The MAC address-table for a bridge can be displayed using the vyos@vyos:~$ show bridge br100 macs port no mac addr is local? ageing timer - 1 00:0c:29:44:3b:19 yes 0.00 + 1 00:53:29:44:3b:19 yes 0.00 -- cgit v1.2.3