From 5bc0d2c84cc1434cec2b039c0a44ea3d1fe54b9b Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Tue, 18 Oct 2022 16:27:18 +0200 Subject: [PATCH] Futher flesh out the generator - Create a per-host directory called overlays/$(overlay)/hostname/$(host.hostname) to have files that ought to be included only for that host. Things like /etc/vpp/config/interface.vpp go there - Rename the "templates" directory as overlays/$(overlay)/common/ - Render one after the other, so a file can exist in common and hostname, the latter taking precedence - Remove the config for 'pubkeys' and instead just make these common/root/.ssh/* and common/home/ipng/.ssh/* - Split out bootstrap.vpp so that a per-host include can be overriden for interfaces.vpp - But keep a default common/etc/vpp/config/interface.vpp as a placeholder, so that VPP will still start even if the per-hostname override isn't provided. - Generate a fresh output for 'default' on all machines --- .../vpp0-0/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp0-0/etc/vpp/config/defaults.vpp | 4 ++ .../vpp0-0/etc/vpp/config/interface.vpp | 22 ++++++++++ .../vpp0-0/etc/vpp/config/lcp.vpp | 6 +++ .../vpp0-0/etc/vpp/config/loopback.vpp | 5 +++ .../vpp0-0/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp0-0/root/.ssh/authorized_keys | 5 +++ .../vpp0-1/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp0-1/etc/vpp/config/defaults.vpp | 4 ++ .../vpp0-1/etc/vpp/config/interface.vpp | 23 ++++++++++ .../vpp0-1/etc/vpp/config/lcp.vpp | 6 +++ .../vpp0-1/etc/vpp/config/loopback.vpp | 5 +++ .../vpp0-1/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp0-1/root/.ssh/authorized_keys | 5 +++ .../vpp0-2/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp0-2/etc/vpp/config/defaults.vpp | 4 ++ .../vpp0-2/etc/vpp/config/interface.vpp | 23 ++++++++++ .../vpp0-2/etc/vpp/config/lcp.vpp | 6 +++ .../vpp0-2/etc/vpp/config/loopback.vpp | 5 +++ .../vpp0-2/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp0-2/root/.ssh/authorized_keys | 5 +++ .../vpp0-3/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp0-3/etc/vpp/config/defaults.vpp | 4 ++ .../vpp0-3/etc/vpp/config/interface.vpp | 21 +++++++++ .../vpp0-3/etc/vpp/config/lcp.vpp | 6 +++ .../vpp0-3/etc/vpp/config/loopback.vpp | 5 +++ .../vpp0-3/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp0-3/root/.ssh/authorized_keys | 5 +++ .../vpp1-0/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp1-0/etc/vpp/config/defaults.vpp | 4 ++ .../vpp1-0/etc/vpp/config/interface.vpp | 1 + .../vpp1-0/etc/vpp/config/lcp.vpp | 6 +++ .../vpp1-0/etc/vpp/config/loopback.vpp | 5 +++ .../vpp1-0/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp1-0/root/.ssh/authorized_keys | 5 +++ .../vpp1-1/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp1-1/etc/vpp/config/defaults.vpp | 4 ++ .../vpp1-1/etc/vpp/config/interface.vpp | 1 + .../vpp1-1/etc/vpp/config/lcp.vpp | 6 +++ .../vpp1-1/etc/vpp/config/loopback.vpp | 5 +++ .../vpp1-1/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp1-1/root/.ssh/authorized_keys | 5 +++ .../vpp1-2/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp1-2/etc/vpp/config/defaults.vpp | 4 ++ .../vpp1-2/etc/vpp/config/interface.vpp | 1 + .../vpp1-2/etc/vpp/config/lcp.vpp | 6 +++ .../vpp1-2/etc/vpp/config/loopback.vpp | 5 +++ .../vpp1-2/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp1-2/root/.ssh/authorized_keys | 5 +++ .../vpp1-3/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp1-3/etc/vpp/config/defaults.vpp | 4 ++ .../vpp1-3/etc/vpp/config/interface.vpp | 1 + .../vpp1-3/etc/vpp/config/lcp.vpp | 6 +++ .../vpp1-3/etc/vpp/config/loopback.vpp | 5 +++ .../vpp1-3/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp1-3/root/.ssh/authorized_keys | 5 +++ .../vpp2-0/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp2-0/etc/vpp/config/defaults.vpp | 4 ++ .../vpp2-0/etc/vpp/config/interface.vpp | 1 + .../vpp2-0/etc/vpp/config/lcp.vpp | 6 +++ .../vpp2-0/etc/vpp/config/loopback.vpp | 5 +++ .../vpp2-0/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp2-0/root/.ssh/authorized_keys | 5 +++ .../vpp2-1/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp2-1/etc/vpp/config/defaults.vpp | 4 ++ .../vpp2-1/etc/vpp/config/interface.vpp | 1 + .../vpp2-1/etc/vpp/config/lcp.vpp | 6 +++ .../vpp2-1/etc/vpp/config/loopback.vpp | 5 +++ .../vpp2-1/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp2-1/root/.ssh/authorized_keys | 5 +++ .../vpp2-2/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp2-2/etc/vpp/config/defaults.vpp | 4 ++ .../vpp2-2/etc/vpp/config/interface.vpp | 1 + .../vpp2-2/etc/vpp/config/lcp.vpp | 6 +++ .../vpp2-2/etc/vpp/config/loopback.vpp | 5 +++ .../vpp2-2/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp2-2/root/.ssh/authorized_keys | 5 +++ .../vpp2-3/etc/vpp/bootstrap.vpp | 44 +++---------------- .../vpp2-3/etc/vpp/config/defaults.vpp | 4 ++ .../vpp2-3/etc/vpp/config/interface.vpp | 1 + .../vpp2-3/etc/vpp/config/lcp.vpp | 6 +++ .../vpp2-3/etc/vpp/config/loopback.vpp | 5 +++ .../vpp2-3/home/ipng/.ssh/authorized_keys | 5 +++ .../vpp2-3/root/.ssh/authorized_keys | 5 +++ config/common/generic.yaml | 9 ---- generate | 18 ++++---- .../etc/bird/bfd.conf.j2 | 0 .../etc/bird/bird.conf.j2 | 0 .../etc/bird/ibgp.conf.j2 | 0 .../etc/bird/ospf.conf.j2 | 0 .../etc/bird/static.conf.j2 | 0 .../{templates => common}/etc/hostname.j2 | 0 .../bird/{templates => common}/etc/hosts.j2 | 0 .../etc/netplan/01-netcfg.yaml.j2 | 0 overlays/bird/common/etc/vpp/bootstrap.vpp.j2 | 8 ++++ .../bird/common/etc/vpp/config/defaults.vpp | 4 ++ .../common/etc/vpp/config/interface.vpp.j2 | 1 + overlays/bird/common/etc/vpp/config/lcp.vpp | 6 +++ .../common/etc/vpp/config/loopback.vpp.j2 | 5 +++ .../common/home/ipng/.ssh/authorized_keys | 5 +++ .../bird/common/root/.ssh/authorized_keys | 5 +++ .../vpp0-0/etc/vpp/config/interface.vpp | 22 ++++++++++ .../vpp0-1/etc/vpp/config/interface.vpp | 23 ++++++++++ .../vpp0-2/etc/vpp/config/interface.vpp | 23 ++++++++++ .../vpp0-3/etc/vpp/config/interface.vpp | 21 +++++++++ .../bird/templates/etc/vpp/bootstrap.vpp.j2 | 38 ---------------- 106 files changed, 614 insertions(+), 499 deletions(-) create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys rename overlays/bird/{templates => common}/etc/bird/bfd.conf.j2 (100%) rename overlays/bird/{templates => common}/etc/bird/bird.conf.j2 (100%) rename overlays/bird/{templates => common}/etc/bird/ibgp.conf.j2 (100%) rename overlays/bird/{templates => common}/etc/bird/ospf.conf.j2 (100%) rename overlays/bird/{templates => common}/etc/bird/static.conf.j2 (100%) rename overlays/bird/{templates => common}/etc/hostname.j2 (100%) rename overlays/bird/{templates => common}/etc/hosts.j2 (100%) rename overlays/bird/{templates => common}/etc/netplan/01-netcfg.yaml.j2 (100%) create mode 100644 overlays/bird/common/etc/vpp/bootstrap.vpp.j2 create mode 100644 overlays/bird/common/etc/vpp/config/defaults.vpp create mode 100644 overlays/bird/common/etc/vpp/config/interface.vpp.j2 create mode 100644 overlays/bird/common/etc/vpp/config/lcp.vpp create mode 100644 overlays/bird/common/etc/vpp/config/loopback.vpp.j2 create mode 100644 overlays/bird/common/home/ipng/.ssh/authorized_keys create mode 100644 overlays/bird/common/root/.ssh/authorized_keys create mode 100644 overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp create mode 100644 overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp create mode 100644 overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp create mode 100644 overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp delete mode 100644 overlays/bird/templates/etc/vpp/bootstrap.vpp.j2 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 db0094a..b94b6ea 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 @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -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 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file 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 new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 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 new file mode 100644 index 0000000..17ffba7 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp @@ -0,0 +1,22 @@ +comment { Gi10/0/0 is connected to the IPng Networks lab uplink } +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::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 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 state GigabitEthernet10/0/1 up + +comment { Gi10/0/2 is free to use } +set interface mtu 9216 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 packet 9000 GigabitEthernet10/0/3 +set interface state GigabitEthernet10/0/3 down \ No newline at end of file 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 new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 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 new file mode 100644 index 0000000..9ac3959 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp @@ -0,0 +1,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 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file 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 b8b3f14..b94b6ea 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 @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -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 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file 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 new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 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 new file mode 100644 index 0000000..78e1c8d --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp @@ -0,0 +1,23 @@ +comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } +set interface mtu 9216 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 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 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 state GigabitEthernet10/0/1 up + +comment { Gi10/0/2 is free to use } +set interface mtu 9216 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 packet 9000 GigabitEthernet10/0/3 +set interface state GigabitEthernet10/0/3 down \ No newline at end of file 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 new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 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 new file mode 100644 index 0000000..3b93449 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp @@ -0,0 +1,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 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file 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 de80238..b94b6ea 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 @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -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 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file 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 new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 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 new file mode 100644 index 0000000..bd34499 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp @@ -0,0 +1,23 @@ +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 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 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 state GigabitEthernet10/0/1 up + +comment { Gi10/0/2 is free to use } +set interface mtu 9216 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 packet 9000 GigabitEthernet10/0/3 +set interface state GigabitEthernet10/0/3 down \ No newline at end of file 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 new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 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 new file mode 100644 index 0000000..d5a04e4 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp @@ -0,0 +1,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 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file 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 a4f23ce..b94b6ea 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 @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -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 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file 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 new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 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 new file mode 100644 index 0000000..86f1596 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp @@ -0,0 +1,21 @@ +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 state GigabitEthernet10/0/0 up + +comment { Gi10/0/1 is free to use } +set interface mtu 9216 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 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 packet 9000 GigabitEthernet10/0/3 +set interface state GigabitEthernet10/0/3 down \ No newline at end of file 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 new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 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 new file mode 100644 index 0000000..ff4f19e --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp @@ -0,0 +1,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 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys b/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp index c02fbcb..b94b6ea 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.11.0/32 -set interface ip address loop0 2001:678:d78:210::/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..d912e2e --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp1-0/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..24d7fde --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.11.0/32 +set interface ip address loop0 2001:678:d78:210::/128 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp index 26cbe45..b94b6ea 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.11.1/32 -set interface ip address loop0 2001:678:d78:210::1/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..71b0fae --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp1-1/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..b7a52f9 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.11.1/32 +set interface ip address loop0 2001:678:d78:210::1/128 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp index 86aad2a..b94b6ea 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.11.2/32 -set interface ip address loop0 2001:678:d78:210::2/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..d965f09 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp1-2/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..443d817 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.11.2/32 +set interface ip address loop0 2001:678:d78:210::2/128 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp index aee83d9..b94b6ea 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.11.3/32 -set interface ip address loop0 2001:678:d78:210::3/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..769b96b --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp1-3/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..3ddec1f --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.11.3/32 +set interface ip address loop0 2001:678:d78:210::3/128 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys b/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp index a29f609..b94b6ea 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.12.0/32 -set interface ip address loop0 2001:678:d78:220::/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..8dd3d41 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp2-0/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..336568a --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.12.0/32 +set interface ip address loop0 2001:678:d78:220::/128 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp index 38f8719..b94b6ea 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.12.1/32 -set interface ip address loop0 2001:678:d78:220::1/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..a26ef2f --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp2-1/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..8d49807 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.12.1/32 +set interface ip address loop0 2001:678:d78:220::1/128 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp index 20441b9..b94b6ea 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.12.2/32 -set interface ip address loop0 2001:678:d78:220::2/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..b048bf0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp2-2/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..1b53875 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.12.2/32 +set interface ip address loop0 2001:678:d78:220::2/128 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp index 4b91a61..b94b6ea 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp @@ -1,38 +1,8 @@ -set logging class linux-cp rate-limit 1000 level warn syslog-level notice +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +exec /etc/vpp/config/interface.vpp +exec /etc/vpp/config/lcp.vpp -lcp default netns dataplane -lcp lcp-sync on -lcp lcp-auto-subint off - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 192.168.12.3/32 -set interface ip address loop0 2001:678:d78:220::3/128 - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3 \ No newline at end of file +comment { Allow user to set persistent manual configs } +exec /etc/vpp/config/manual.vpp \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..03ed063 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..af19359 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/interface.vpp @@ -0,0 +1 @@ +comment { This file is overridden by blobs/vpp2-3/etc/vpp/config/interfaces.vpp } \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp new file mode 100644 index 0000000..2e155db --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp new file mode 100644 index 0000000..82448c3 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/loopback.vpp @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +create loopback interface instance 0 +set interface state loop0 up +set interface ip address loop0 192.168.12.3/32 +set interface ip address loop0 2001:678:d78:220::3/128 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys b/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys new file mode 100644 index 0000000..a93b5a0 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= \ No newline at end of file diff --git a/config/common/generic.yaml b/config/common/generic.yaml index 8294f30..6fb629a 100644 --- a/config/common/generic.yaml +++ b/config/common/generic.yaml @@ -1,12 +1,3 @@ -pubkeys: - root: - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl" - - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=" - ipng: - - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl" - - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=" - - overlays: default: path: overlays/bird/ diff --git a/generate b/generate index 00c2171..93c6892 100755 --- a/generate +++ b/generate @@ -72,7 +72,7 @@ def tpl2fn(tpl, prefix): def find(file_or_dir_list): - log.info("Finding templates in %s" % file_or_dir_list) + log.info("Finding files in %s" % file_or_dir_list) ret = {} for e in file_or_dir_list: if e.startswith("_"): @@ -91,9 +91,9 @@ def find(file_or_dir_list): return ret -def generate(templates, data, debug=False): +def generate(files, data, debug=False): output = {} - for tpl, fn in templates.items(): + for tpl, fn in files.items(): log.info("Rendering %s into %s" % (tpl, fn)) try: output[fn] = render(tpl, data) @@ -240,18 +240,20 @@ def main(): log.error("Overlay not defined, bailing.") return - # Assemble a dictionary of tpl=>fn - overlay = data["overlays"][args.overlay] - template_root = overlay["path"] + "templates/" - templates = find([template_root]) for node_id in range(data["lab"]["nodes"]): log.info("Generating for node %d" % node_id) data["node"] = create_node(data["lab"], node_id) log.debug("node: %s" % data["node"]) + # Assemble a dictionary of tpl=>fn + overlay = data["overlays"][args.overlay] + common_root = overlay["path"] + "common/" + hostname_root = overlay["path"] + "hostname/" + data["node"]["hostname"] + "/" + files = find([common_root, hostname_root]) + # Assemble a dictionary of fn=>output - build = generate(templates, data, args.debug) + build = generate(files, data, args.debug) if not build: return diff --git a/overlays/bird/templates/etc/bird/bfd.conf.j2 b/overlays/bird/common/etc/bird/bfd.conf.j2 similarity index 100% rename from overlays/bird/templates/etc/bird/bfd.conf.j2 rename to overlays/bird/common/etc/bird/bfd.conf.j2 diff --git a/overlays/bird/templates/etc/bird/bird.conf.j2 b/overlays/bird/common/etc/bird/bird.conf.j2 similarity index 100% rename from overlays/bird/templates/etc/bird/bird.conf.j2 rename to overlays/bird/common/etc/bird/bird.conf.j2 diff --git a/overlays/bird/templates/etc/bird/ibgp.conf.j2 b/overlays/bird/common/etc/bird/ibgp.conf.j2 similarity index 100% rename from overlays/bird/templates/etc/bird/ibgp.conf.j2 rename to overlays/bird/common/etc/bird/ibgp.conf.j2 diff --git a/overlays/bird/templates/etc/bird/ospf.conf.j2 b/overlays/bird/common/etc/bird/ospf.conf.j2 similarity index 100% rename from overlays/bird/templates/etc/bird/ospf.conf.j2 rename to overlays/bird/common/etc/bird/ospf.conf.j2 diff --git a/overlays/bird/templates/etc/bird/static.conf.j2 b/overlays/bird/common/etc/bird/static.conf.j2 similarity index 100% rename from overlays/bird/templates/etc/bird/static.conf.j2 rename to overlays/bird/common/etc/bird/static.conf.j2 diff --git a/overlays/bird/templates/etc/hostname.j2 b/overlays/bird/common/etc/hostname.j2 similarity index 100% rename from overlays/bird/templates/etc/hostname.j2 rename to overlays/bird/common/etc/hostname.j2 diff --git a/overlays/bird/templates/etc/hosts.j2 b/overlays/bird/common/etc/hosts.j2 similarity index 100% rename from overlays/bird/templates/etc/hosts.j2 rename to overlays/bird/common/etc/hosts.j2 diff --git a/overlays/bird/templates/etc/netplan/01-netcfg.yaml.j2 b/overlays/bird/common/etc/netplan/01-netcfg.yaml.j2 similarity index 100% rename from overlays/bird/templates/etc/netplan/01-netcfg.yaml.j2 rename to overlays/bird/common/etc/netplan/01-netcfg.yaml.j2 diff --git a/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 b/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 new file mode 100644 index 0000000..0e1666c --- /dev/null +++ b/overlays/bird/common/etc/vpp/bootstrap.vpp.j2 @@ -0,0 +1,8 @@ +comment { Apply system defaults from the build } +exec /etc/vpp/config/defaults.vpp +exec /etc/vpp/config/loopback.vpp +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 diff --git a/overlays/bird/common/etc/vpp/config/defaults.vpp b/overlays/bird/common/etc/vpp/config/defaults.vpp new file mode 100644 index 0000000..07b8c5c --- /dev/null +++ b/overlays/bird/common/etc/vpp/config/defaults.vpp @@ -0,0 +1,4 @@ +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 new file mode 100644 index 0000000..549cc7a --- /dev/null +++ b/overlays/bird/common/etc/vpp/config/interface.vpp.j2 @@ -0,0 +1 @@ +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 new file mode 100644 index 0000000..95d3ceb --- /dev/null +++ b/overlays/bird/common/etc/vpp/config/lcp.vpp @@ -0,0 +1,6 @@ +comment { Create one LinuxCP Interface Pair for each phy } +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 diff --git a/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 b/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 new file mode 100644 index 0000000..c3e1aeb --- /dev/null +++ b/overlays/bird/common/etc/vpp/config/loopback.vpp.j2 @@ -0,0 +1,5 @@ +comment { Create a loopback interface } +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/home/ipng/.ssh/authorized_keys b/overlays/bird/common/home/ipng/.ssh/authorized_keys new file mode 100644 index 0000000..868d2af --- /dev/null +++ b/overlays/bird/common/home/ipng/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= diff --git a/overlays/bird/common/root/.ssh/authorized_keys b/overlays/bird/common/root/.ssh/authorized_keys new file mode 100644 index 0000000..868d2af --- /dev/null +++ b/overlays/bird/common/root/.ssh/authorized_keys @@ -0,0 +1,5 @@ +# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl + +# pim's M1 macbookpro SeKEY +ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k= diff --git a/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp b/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp new file mode 100644 index 0000000..643f858 --- /dev/null +++ b/overlays/bird/hostname/vpp0-0/etc/vpp/config/interface.vpp @@ -0,0 +1,22 @@ +comment { Gi10/0/0 is connected to the IPng Networks lab uplink } +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::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 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 state GigabitEthernet10/0/1 up + +comment { Gi10/0/2 is free to use } +set interface mtu 9216 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 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 new file mode 100644 index 0000000..610003a --- /dev/null +++ b/overlays/bird/hostname/vpp0-1/etc/vpp/config/interface.vpp @@ -0,0 +1,23 @@ +comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } +set interface mtu 9216 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 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 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 state GigabitEthernet10/0/1 up + +comment { Gi10/0/2 is free to use } +set interface mtu 9216 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 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 new file mode 100644 index 0000000..788ef6f --- /dev/null +++ b/overlays/bird/hostname/vpp0-2/etc/vpp/config/interface.vpp @@ -0,0 +1,23 @@ +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 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 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 state GigabitEthernet10/0/1 up + +comment { Gi10/0/2 is free to use } +set interface mtu 9216 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 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 new file mode 100644 index 0000000..53bdd60 --- /dev/null +++ b/overlays/bird/hostname/vpp0-3/etc/vpp/config/interface.vpp @@ -0,0 +1,21 @@ +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 state GigabitEthernet10/0/0 up + +comment { Gi10/0/1 is free to use } +set interface mtu 9216 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 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 packet 9000 GigabitEthernet10/0/3 +set interface state GigabitEthernet10/0/3 down diff --git a/overlays/bird/templates/etc/vpp/bootstrap.vpp.j2 b/overlays/bird/templates/etc/vpp/bootstrap.vpp.j2 deleted file mode 100644 index 27010ea..0000000 --- a/overlays/bird/templates/etc/vpp/bootstrap.vpp.j2 +++ /dev/null @@ -1,38 +0,0 @@ -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 - -comment { Create a loopback interface } -create loopback interface instance 0 -lcp create loop0 host-if loop0 -set interface state loop0 up -set interface ip address loop0 {{ node.loopback.ipv4 }} -set interface ip address loop0 {{ node.loopback.ipv6 }} - -comment { Create one LinuxCP Interface Pair for each phy } -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 - -comment { e0 is uplink to AS8298 } -set interface state GigabitEthernet10/0/0 up -set interface mtu packet 1500 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::00:00/112 - -comment { e1 is ptp with e0.vpp0-1 } -set interface state GigabitEthernet10/0/1 up -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::01:00/112 - -comment { e2 is free to use } -set interface state GigabitEthernet10/0/2 down -set interface mtu packet 9000 GigabitEthernet10/0/2 - -comment { e3 is free to use } -set interface state GigabitEthernet10/0/3 down -set interface mtu packet 9000 GigabitEthernet10/0/3