From 1b241fe82a8f6f9e5315f621736344684f0db83a Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Wed, 19 Oct 2022 12:48:07 +0200 Subject: [PATCH] Renumber IPv4 transit nets so that 4/31 is lab?.lab.ipng.ch <-> e0.vpp?-0 --- build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf | 0 .../hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp | 5 +++-- build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf | 0 .../hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp | 4 ++-- build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf | 0 .../hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp | 4 ++-- build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf | 0 .../hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp | 2 +- overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp | 5 +++-- overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp | 4 ++-- overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp | 4 ++-- overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp | 2 +- overlays/bird/ovs-config.sh | 1 + 13 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/resolv.conf new file mode 100644 index 0000000..e69de29 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp index 3f2999e..b936a8d 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp @@ -1,14 +1,15 @@ comment { Gi10/0/0 is connected to the IPng Networks lab uplink } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112 +set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:fffe/112 +set interface ip address GigabitEthernet10/0/0 192.168.10.5/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 } set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.4/31 +set interface ip address GigabitEthernet10/0/1 192.168.10.6/31 set interface state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/resolv.conf new file mode 100644 index 0000000..e69de29 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp index 28eece8..1d063c8 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp @@ -2,14 +2,14 @@ comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.5/31 +set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 } set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.6/31 +set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 set interface state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/resolv.conf new file mode 100644 index 0000000..e69de29 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp index ac3cd52..fdbbdf0 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp @@ -2,14 +2,14 @@ comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 +set interface ip address GigabitEthernet10/0/0 192.168.10.9/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 } set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 +set interface ip address GigabitEthernet10/0/1 192.168.10.10/31 set interface state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/resolv.conf new file mode 100644 index 0000000..e69de29 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp index e1cb149..79ec961 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp @@ -2,7 +2,7 @@ comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:03/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.9/31 +set interface ip address GigabitEthernet10/0/0 192.168.10.11/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is free to use } diff --git a/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp index 454b158..ba1de85 100644 --- a/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp @@ -1,14 +1,15 @@ comment { Gi10/0/0 is connected to the IPng Networks lab uplink } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112 +set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:fffe/112 +set interface ip address GigabitEthernet10/0/0 192.168.10.5/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 } set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.4/31 +set interface ip address GigabitEthernet10/0/1 192.168.10.6/31 set interface state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } diff --git a/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp index 95eff30..d5865c8 100644 --- a/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp @@ -2,14 +2,14 @@ comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.5/31 +set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 } set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.6/31 +set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 set interface state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } diff --git a/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp index eb410ef..5968799 100644 --- a/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp @@ -2,14 +2,14 @@ comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 +set interface ip address GigabitEthernet10/0/0 192.168.10.9/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 } set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 +set interface ip address GigabitEthernet10/0/1 192.168.10.10/31 set interface state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } diff --git a/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp index 183c7a4..506e62f 100644 --- a/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp @@ -2,7 +2,7 @@ comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 } set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:03/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.9/31 +set interface ip address GigabitEthernet10/0/0 192.168.10.11/31 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is free to use } diff --git a/overlays/bird/ovs-config.sh b/overlays/bird/ovs-config.sh index 86265c4..a643dc2 100755 --- a/overlays/bird/ovs-config.sh +++ b/overlays/bird/ovs-config.sh @@ -11,6 +11,7 @@ done # Uplink is VLAN 10 ovs-vsctl add port vpp${LAB}-0-0 tag 10 +ovs-vsctl add port uplink tag 10 # Link vpp${LAB}-0 <-> vpp${LAB}-1 in VLAN 20 ovs-vsctl add port vpp${LAB}-0-1 tag 20