diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ exec /etc/vpp/config/interface.vpp exec /etc/vpp/config/lcp.vpp comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ set logging class linux-cp rate-limit 1000 level warn syslog-level notice lcp default netns dataplane lcp lcp-sync on -lcp lcp-auto-subint off \ No newline at end of file +lcp lcp-auto-subint off + 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 17ffba7..3f2999e 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,22 +1,23 @@ comment { Gi10/0/0 is connected to the IPng Networks lab uplink } -set interface mtu 9216 GigabitEthernet10/0/0 +set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112 +set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112 -set interface address GigabitEthernet10/0/1 192.168.10.4/31 +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 state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down \ No newline at end of file +set interface state GigabitEthernet10/0/3 down + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ lcp create loop0 host-if loop0 lcp create GigabitEthernet10/0/0 host-if e0 lcp create GigabitEthernet10/0/1 host-if e1 lcp create GigabitEthernet10/0/2 host-if e2 -lcp create GigabitEthernet10/0/3 host-if e3 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp index 9ac3959..2b26986 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.10.0/32 -set interface ip address loop0 2001:678:d78:200::/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:200::/128 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..b698b84 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ exec /etc/vpp/config/interface.vpp exec /etc/vpp/config/lcp.vpp comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ set logging class linux-cp rate-limit 1000 level warn syslog-level notice lcp default netns dataplane lcp lcp-sync on -lcp lcp-auto-subint off \ No newline at end of file +lcp lcp-auto-subint off + 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 78e1c8d..28eece8 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 @@ -1,23 +1,24 @@ comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } -set interface mtu 9216 GigabitEthernet10/0/0 +set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112 -set interface address GigabitEthernet10/0/0 192.168.10.5/31 +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 state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112 -set interface address GigabitEthernet10/0/1 192.168.10.6/31 +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 state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down \ No newline at end of file +set interface state GigabitEthernet10/0/3 down + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ lcp create loop0 host-if loop0 lcp create GigabitEthernet10/0/0 host-if e0 lcp create GigabitEthernet10/0/1 host-if e1 lcp create GigabitEthernet10/0/2 host-if e2 -lcp create GigabitEthernet10/0/3 host-if e3 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp index 3b93449..dbb76d7 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.10.1/32 -set interface ip address loop0 2001:678:d78:200::1/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:200::1/128 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..b68870a --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ exec /etc/vpp/config/interface.vpp exec /etc/vpp/config/lcp.vpp comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ set logging class linux-cp rate-limit 1000 level warn syslog-level notice lcp default netns dataplane lcp lcp-sync on -lcp lcp-auto-subint off \ No newline at end of file +lcp lcp-auto-subint off + 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 bd34499..ac3cd52 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 @@ -1,23 +1,24 @@ comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 } -set interface mtu 9216 GigabitEthernet10/0/0 -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112 -set interface address GigabitEthernet10/0/0 192.168.10.7/31 +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 state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112 -set interface address GigabitEthernet10/0/0 192.168.10.8/31 +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 state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down \ No newline at end of file +set interface state GigabitEthernet10/0/3 down + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ lcp create loop0 host-if loop0 lcp create GigabitEthernet10/0/0 host-if e0 lcp create GigabitEthernet10/0/1 host-if e1 lcp create GigabitEthernet10/0/2 host-if e2 -lcp create GigabitEthernet10/0/3 host-if e3 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp index d5a04e4..efb8a14 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.10.2/32 -set interface ip address loop0 2001:678:d78:200::2/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:200::2/128 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..359d613 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp index b94b6ea..0e1666c 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp @@ -5,4 +5,4 @@ exec /etc/vpp/config/interface.vpp exec /etc/vpp/config/lcp.vpp comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp \ No newline at end of file +exec /etc/vpp/config/manual.vpp diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp index 03ed063..dde7dbf 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp @@ -1,4 +1,5 @@ set logging class linux-cp rate-limit 1000 level warn syslog-level notice lcp default netns dataplane lcp lcp-sync on -lcp lcp-auto-subint off \ No newline at end of file +lcp lcp-auto-subint off + 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 86f1596..e1cb149 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 @@ -1,21 +1,22 @@ comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 } -set interface mtu 9216 GigabitEthernet10/0/0 -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::2:03/112 -set interface address GigabitEthernet10/0/0 192.168.10.9/31 +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 state GigabitEthernet10/0/0 up comment { Gi10/0/1 is free to use } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface state GigabitEthernet10/0/1 down comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down \ No newline at end of file +set interface state GigabitEthernet10/0/3 down + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp index 2e155db..b0fcea1 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp @@ -3,4 +3,5 @@ lcp create loop0 host-if loop0 lcp create GigabitEthernet10/0/0 host-if e0 lcp create GigabitEthernet10/0/1 host-if e1 lcp create GigabitEthernet10/0/2 host-if e2 -lcp create GigabitEthernet10/0/3 host-if e3 \ No newline at end of file +lcp create GigabitEthernet10/0/3 host-if e3 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp index ff4f19e..ba633e8 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp @@ -2,4 +2,5 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 192.168.10.3/32 -set interface ip address loop0 2001:678:d78:200::3/128 \ No newline at end of file +set interface ip address loop0 2001:678:d78:200::3/128 + diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp new file mode 100644 index 0000000..9d67c9b --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 b/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 index 0e1666c..d3e6939 100644 --- a/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 +++ b/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 @@ -6,3 +6,4 @@ exec /etc/vpp/config/lcp.vpp comment { Allow user to set persistent manual configs } exec /etc/vpp/config/manual.vpp + diff --git a/overlays/bird/common/etc/vpp/config/defaults.vpp b/overlays/bird/common/etc/vpp/config/defaults.vpp index 07b8c5c..de79f47 100644 --- a/overlays/bird/common/etc/vpp/config/defaults.vpp +++ b/overlays/bird/common/etc/vpp/config/defaults.vpp @@ -2,3 +2,5 @@ set logging class linux-cp rate-limit 1000 level warn syslog-level notice lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off + + diff --git a/overlays/bird/common/etc/vpp/config/interface.vpp.j2 b/overlays/bird/common/etc/vpp/config/interface.vpp.j2 index 549cc7a..205454c 100644 --- a/overlays/bird/common/etc/vpp/config/interface.vpp.j2 +++ b/overlays/bird/common/etc/vpp/config/interface.vpp.j2 @@ -1 +1,2 @@ comment { This file is overridden by blobs/{{node.hostname}}/etc/vpp/config/interfaces.vpp } + diff --git a/overlays/bird/common/etc/vpp/config/lcp.vpp b/overlays/bird/common/etc/vpp/config/lcp.vpp index 95d3ceb..08d4115 100644 --- a/overlays/bird/common/etc/vpp/config/lcp.vpp +++ b/overlays/bird/common/etc/vpp/config/lcp.vpp @@ -4,3 +4,5 @@ lcp create GigabitEthernet10/0/0 host-if e0 lcp create GigabitEthernet10/0/1 host-if e1 lcp create GigabitEthernet10/0/2 host-if e2 lcp create GigabitEthernet10/0/3 host-if e3 + + diff --git a/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 b/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 index c3e1aeb..827f1f1 100644 --- a/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 +++ b/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 @@ -3,3 +3,5 @@ create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 {{ node.loopback.ipv4 }} set interface ip address loop0 {{ node.loopback.ipv6 }} + + diff --git a/overlays/bird/common/etc/vpp/config/manual.vpp.j2 b/overlays/bird/common/etc/vpp/config/manual.vpp.j2 new file mode 100644 index 0000000..88d2262 --- /dev/null +++ b/overlays/bird/common/etc/vpp/config/manual.vpp.j2 @@ -0,0 +1,3 @@ +comment { Put any config for {{ node.hostname }} you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } + 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 643f858..454b158 100644 --- a/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp @@ -1,22 +1,24 @@ comment { Gi10/0/0 is connected to the IPng Networks lab uplink } -set interface mtu 9216 GigabitEthernet10/0/0 +set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112 +set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:00/112 set interface state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112 -set interface address GigabitEthernet10/0/1 192.168.10.4/31 +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 state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 set interface state GigabitEthernet10/0/3 down + + 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 610003a..95eff30 100644 --- a/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp @@ -1,23 +1,25 @@ comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } -set interface mtu 9216 GigabitEthernet10/0/0 +set interface mtu 9000 GigabitEthernet10/0/0 set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112 -set interface address GigabitEthernet10/0/0 192.168.10.5/31 +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 state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112 -set interface address GigabitEthernet10/0/1 192.168.10.6/31 +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 state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 set interface state GigabitEthernet10/0/3 down + + 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 788ef6f..eb410ef 100644 --- a/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp @@ -1,23 +1,25 @@ comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 } -set interface mtu 9216 GigabitEthernet10/0/0 -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112 -set interface address GigabitEthernet10/0/0 192.168.10.7/31 +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 state GigabitEthernet10/0/0 up comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112 -set interface address GigabitEthernet10/0/0 192.168.10.8/31 +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 state GigabitEthernet10/0/1 up comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 set interface state GigabitEthernet10/0/3 down + + 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 53bdd60..183c7a4 100644 --- a/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp +++ b/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp @@ -1,21 +1,23 @@ comment { Gi10/0/0 is connected to vpp0-2:Gi0/0/1 } -set interface mtu 9216 GigabitEthernet10/0/0 -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface address GigabitEthernet10/0/0 2001:678:d78:201::2:03/112 -set interface address GigabitEthernet10/0/0 192.168.10.9/31 +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 state GigabitEthernet10/0/0 up comment { Gi10/0/1 is free to use } -set interface mtu 9216 GigabitEthernet10/0/1 +set interface mtu 9000 GigabitEthernet10/0/1 set interface mtu packet 9000 GigabitEthernet10/0/1 set interface state GigabitEthernet10/0/1 down comment { Gi10/0/2 is free to use } -set interface mtu 9216 GigabitEthernet10/0/2 +set interface mtu 9000 GigabitEthernet10/0/2 set interface mtu packet 9000 GigabitEthernet10/0/2 set interface state GigabitEthernet10/0/2 down comment { Gi10/0/3 is free to use } -set interface mtu 9216 GigabitEthernet10/0/3 +set interface mtu 9000 GigabitEthernet10/0/3 set interface mtu packet 9000 GigabitEthernet10/0/3 set interface state GigabitEthernet10/0/3 down + +