From 5edda90b6229b2fa8883c6f6cf2aec89edf44858 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Tue, 7 Apr 2026 17:43:01 +0000 Subject: [PATCH] Move to vppcfg based configs - generate the initial config in vpp.service. Needs 20260406-2 --- .../vpp0-0/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-0/etc/vpp/config/defaults.vpp | 1 + .../vpp0-0/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-0/etc/vpp/config/interface.vpp | 24 ----------- .../vpp0-0/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-0/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp0-0/etc/vpp/config/manual-pre.vpp} | 0 .../vpp0-0/etc/vpp/config/mpls.vpp | 2 - .../vpp0-0/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-0/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-0/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp0-0/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-1/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-1/etc/vpp/config/defaults.vpp | 1 + .../vpp0-1/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-1/etc/vpp/config/interface.vpp | 24 ----------- .../vpp0-1/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-1/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp0-1/etc/vpp/config/manual-pre.vpp} | 0 .../vpp0-1/etc/vpp/config/mpls.vpp | 3 -- .../vpp0-1/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-1/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-1/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp0-1/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-2/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-2/etc/vpp/config/defaults.vpp | 1 + .../vpp0-2/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-2/etc/vpp/config/interface.vpp | 24 ----------- .../vpp0-2/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-2/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp0-2/etc/vpp/config/manual-pre.vpp} | 0 .../vpp0-2/etc/vpp/config/mpls.vpp | 3 -- .../vpp0-2/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-2/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-2/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp0-2/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-3/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-3/etc/vpp/config/defaults.vpp | 1 + .../vpp0-3/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-3/etc/vpp/config/interface.vpp | 22 ---------- .../vpp0-3/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-3/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp0-3/etc/vpp/config/manual-pre.vpp} | 0 .../vpp0-3/etc/vpp/config/mpls.vpp | 2 - .../vpp0-3/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-3/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-3/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp0-3/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-0/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-0/etc/vpp/config/defaults.vpp | 1 + .../vpp1-0/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-0/etc/vpp/config/interface.vpp | 24 ----------- .../vpp1-0/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-0/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp1-0/etc/vpp/config/manual-pre.vpp} | 0 .../vpp1-0/etc/vpp/config/mpls.vpp | 2 - .../vpp1-0/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-0/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-0/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp1-0/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-1/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-1/etc/vpp/config/defaults.vpp | 1 + .../vpp1-1/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-1/etc/vpp/config/interface.vpp | 24 ----------- .../vpp1-1/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-1/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp1-1/etc/vpp/config/manual-pre.vpp} | 0 .../vpp1-1/etc/vpp/config/mpls.vpp | 3 -- .../vpp1-1/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-1/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-1/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp1-1/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-2/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-2/etc/vpp/config/defaults.vpp | 1 + .../vpp1-2/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-2/etc/vpp/config/interface.vpp | 24 ----------- .../vpp1-2/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-2/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp1-2/etc/vpp/config/manual-pre.vpp} | 0 .../vpp1-2/etc/vpp/config/mpls.vpp | 3 -- .../vpp1-2/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-2/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-2/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp1-2/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-3/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-3/etc/vpp/config/defaults.vpp | 1 + .../vpp1-3/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-3/etc/vpp/config/interface.vpp | 22 ---------- .../vpp1-3/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-3/etc/vpp/config/loopback.vpp | 5 --- .../config/{manual.vpp => manual-post.vpp} | 0 .../vpp1-3/etc/vpp/config/manual-pre.vpp} | 0 .../vpp1-3/etc/vpp/config/mpls.vpp | 2 - .../vpp1-3/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-3/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-3/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp1-3/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-0/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-0/etc/vpp/config/defaults.vpp | 1 + .../vpp0-0/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-0/etc/vpp/config/interface.vpp | 24 ----------- .../vpp0-0/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-0/etc/vpp/config/loopback.vpp | 5 --- .../vpp0-0/etc/vpp/config/manual-post.vpp | 2 + .../vpp0-0/etc/vpp/config/manual-pre.vpp | 2 + .../vpp0-0/etc/vpp/config/mpls.vpp | 2 - .../vpp0-0/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-0/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-0/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp0-0/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-1/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-1/etc/vpp/config/defaults.vpp | 1 + .../vpp0-1/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-1/etc/vpp/config/interface.vpp | 24 ----------- .../vpp0-1/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-1/etc/vpp/config/loopback.vpp | 5 --- .../vpp0-1/etc/vpp/config/manual-post.vpp | 2 + .../vpp0-1/etc/vpp/config/manual-pre.vpp | 2 + .../vpp0-1/etc/vpp/config/mpls.vpp | 3 -- .../vpp0-1/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-1/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-1/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp0-1/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-2/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-2/etc/vpp/config/defaults.vpp | 1 + .../vpp0-2/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-2/etc/vpp/config/interface.vpp | 24 ----------- .../vpp0-2/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-2/etc/vpp/config/loopback.vpp | 5 --- .../vpp0-2/etc/vpp/config/manual-post.vpp | 2 + .../vpp0-2/etc/vpp/config/manual-pre.vpp | 2 + .../vpp0-2/etc/vpp/config/mpls.vpp | 3 -- .../vpp0-2/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-2/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-2/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp0-2/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp0-3/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp0-3/etc/vpp/config/defaults.vpp | 1 + .../vpp0-3/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp0-3/etc/vpp/config/interface.vpp | 22 ---------- .../vpp0-3/etc/vpp/config/lcp.vpp | 7 ---- .../vpp0-3/etc/vpp/config/loopback.vpp | 5 --- .../vpp0-3/etc/vpp/config/manual-post.vpp | 2 + .../vpp0-3/etc/vpp/config/manual-pre.vpp | 2 + .../vpp0-3/etc/vpp/config/mpls.vpp | 2 - .../vpp0-3/etc/vpp/config/sflow.vpp | 8 ---- .../vpp0-3/etc/vpp/config/vppcfg.vpp | 1 + .../vpp0-3/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp0-3/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-0/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-0/etc/vpp/config/defaults.vpp | 1 + .../vpp1-0/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-0/etc/vpp/config/interface.vpp | 24 ----------- .../vpp1-0/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-0/etc/vpp/config/loopback.vpp | 5 --- .../vpp1-0/etc/vpp/config/manual-post.vpp | 2 + .../vpp1-0/etc/vpp/config/manual-pre.vpp | 2 + .../vpp1-0/etc/vpp/config/mpls.vpp | 2 - .../vpp1-0/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-0/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-0/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp1-0/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-1/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-1/etc/vpp/config/defaults.vpp | 1 + .../vpp1-1/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-1/etc/vpp/config/interface.vpp | 24 ----------- .../vpp1-1/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-1/etc/vpp/config/loopback.vpp | 5 --- .../vpp1-1/etc/vpp/config/manual-post.vpp | 2 + .../vpp1-1/etc/vpp/config/manual-pre.vpp | 2 + .../vpp1-1/etc/vpp/config/mpls.vpp | 3 -- .../vpp1-1/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-1/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-1/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp1-1/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-2/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-2/etc/vpp/config/defaults.vpp | 1 + .../vpp1-2/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-2/etc/vpp/config/interface.vpp | 24 ----------- .../vpp1-2/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-2/etc/vpp/config/loopback.vpp | 5 --- .../vpp1-2/etc/vpp/config/manual-post.vpp | 2 + .../vpp1-2/etc/vpp/config/manual-pre.vpp | 2 + .../vpp1-2/etc/vpp/config/mpls.vpp | 3 -- .../vpp1-2/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-2/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-2/etc/vpp/vppcfg.yaml | 31 ++++++++++++++ .../vpp1-2/lib/systemd/system/vpp.service | 19 +++++++++ .../vpp1-3/etc/vpp/bootstrap.vpp | 14 ++----- .../vpp1-3/etc/vpp/config/defaults.vpp | 1 + .../vpp1-3/etc/vpp/config/flowprobe.vpp | 10 ----- .../vpp1-3/etc/vpp/config/interface.vpp | 22 ---------- .../vpp1-3/etc/vpp/config/lcp.vpp | 7 ---- .../vpp1-3/etc/vpp/config/loopback.vpp | 5 --- .../vpp1-3/etc/vpp/config/manual-post.vpp | 2 + .../vpp1-3/etc/vpp/config/manual-pre.vpp | 2 + .../vpp1-3/etc/vpp/config/mpls.vpp | 2 - .../vpp1-3/etc/vpp/config/sflow.vpp | 8 ---- .../vpp1-3/etc/vpp/config/vppcfg.vpp | 1 + .../vpp1-3/etc/vpp/vppcfg.yaml | 30 +++++++++++++ .../vpp1-3/lib/systemd/system/vpp.service | 19 +++++++++ create | 4 +- overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 | 14 ++----- .../_common/vpp/etc/vpp/config/defaults.vpp | 1 + .../vpp/etc/vpp/config/flowprobe.vpp.j2 | 11 ----- .../vpp/etc/vpp/config/interface.vpp.j2 | 41 ------------------ overlays/_common/vpp/etc/vpp/config/lcp.vpp | 8 ---- .../vpp/etc/vpp/config/loopback.vpp.j2 | 6 --- .../{manual.vpp.j2 => manual-post.vpp.j2} | 0 .../vpp/etc/vpp/config/manual-pre.vpp.j2 | 3 ++ .../_common/vpp/etc/vpp/config/mpls.vpp.j2 | 8 ---- .../_common/vpp/etc/vpp/config/sflow.vpp.j2 | 8 ---- .../_common/vpp/etc/vpp/config/vppcfg.vpp | 1 + overlays/_common/vpp/etc/vpp/vppcfg.yaml.j2 | 42 +++++++++++++++++++ .../vpp/lib/systemd/system/vpp.service | 19 +++++++++ .../bird/vpp/lib/systemd/system/vpp.service | 1 + .../frr/vpp/lib/systemd/system/vpp.service | 1 + 224 files changed, 977 insertions(+), 1167 deletions(-) delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp rename build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp => bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp rename build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp => bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp rename build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp => bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp rename build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp => bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp rename build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp => bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp rename build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp => bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp rename build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp => bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp rename build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/{manual.vpp => manual-post.vpp} (100%) rename build/{frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp => bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp} (100%) delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp delete mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-post.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp delete mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml create mode 100644 build/frr/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service delete mode 100644 overlays/_common/vpp/etc/vpp/config/flowprobe.vpp.j2 delete mode 100644 overlays/_common/vpp/etc/vpp/config/interface.vpp.j2 delete mode 100644 overlays/_common/vpp/etc/vpp/config/lcp.vpp delete mode 100644 overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 rename overlays/_common/vpp/etc/vpp/config/{manual.vpp.j2 => manual-post.vpp.j2} (100%) create mode 100644 overlays/_common/vpp/etc/vpp/config/manual-pre.vpp.j2 delete mode 100644 overlays/_common/vpp/etc/vpp/config/mpls.vpp.j2 delete mode 100644 overlays/_common/vpp/etc/vpp/config/sflow.vpp.j2 create mode 100644 overlays/_common/vpp/etc/vpp/config/vppcfg.vpp create mode 100644 overlays/_common/vpp/etc/vpp/vppcfg.yaml.j2 create mode 100644 overlays/_common/vpp/lib/systemd/system/vpp.service create mode 120000 overlays/bird/vpp/lib/systemd/system/vpp.service create mode 120000 overlays/frr/vpp/lib/systemd/system/vpp.service diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 12c86d3..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.0 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp deleted file mode 100644 index 02bfe6a..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to lab.ipng.ch:lab0 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:fffe/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.5/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.6/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp deleted file mode 100644 index 343dd35..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp deleted file mode 100644 index 0f2a444..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..05a98c3 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp0-0' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.0/32, 2001:678:d78:200::/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to lab.ipng.ch:lab0' + addresses: [ 192.168.10.5/31, 2001:678:d78:201::fffe/112 ] + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp0-1:Gi10/0/0' + addresses: [ 192.168.10.6/31, 2001:678:d78:201::1:00/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f0' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f0' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service b/build/bird/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 002955b..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.1 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp deleted file mode 100644 index 1d063c8..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp deleted file mode 100644 index 4ae0b98..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..6774c02 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp0-1' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.1/32, 2001:678:d78:200::1/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp0-0:Gi10/0/1' + addresses: [ 192.168.10.7/31, 2001:678:d78:201::1:01/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp0-2:Gi10/0/0' + addresses: [ 192.168.10.8/31, 2001:678:d78:201::2:01/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f1' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f1' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service b/build/bird/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 46a0d49..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.2 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp deleted file mode 100644 index fdbbdf0..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.9/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.10/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp deleted file mode 100644 index 6148ae4..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..8d51437 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp0-2' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.2/32, 2001:678:d78:200::2/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp0-1:Gi10/0/1' + addresses: [ 192.168.10.9/31, 2001:678:d78:201::2:02/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp0-3:Gi10/0/0' + addresses: [ 192.168.10.10/31, 2001:678:d78:201::3:02/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f2' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f2' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service b/build/bird/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index c6968b0..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.3 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp deleted file mode 100644 index 5d38b42..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,22 +0,0 @@ -comment { Gi10/0/0 is connected to vpp0-2:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::3:03/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.11/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is free to use } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface state GigabitEthernet10/0/1 down - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp deleted file mode 100644 index 5f952fd..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual.vpp rename to build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp deleted file mode 100644 index ed52371..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..a6430c8 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp0-3' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.3/32, 2001:678:d78:200::3/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp0-2:Gi10/0/1' + addresses: [ 192.168.10.11/31, 2001:678:d78:201::3:03/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is free to use' + state: down + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f3' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f3' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service b/build/bird/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 5f2d02b..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.0 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp deleted file mode 100644 index a6900ac..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to lab.ipng.ch:lab1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::0:fffe/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.5/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp1-1:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::1:10/112 -set interface ip address GigabitEthernet10/0/1 192.168.11.6/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp deleted file mode 100644 index a25cae3..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp deleted file mode 100644 index 0f2a444..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..d155a5d --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp1-0' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.0/32, 2001:678:d78:210::/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to lab.ipng.ch:lab1' + addresses: [ 192.168.11.5/31, 2001:678:d78:211::fffe/112 ] + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp1-1:Gi10/0/0' + addresses: [ 192.168.11.6/31, 2001:678:d78:211::1:10/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f0' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f0' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service b/build/bird/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index a9518b7..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.1 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp deleted file mode 100644 index 5c7e54f..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp1-0:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::1:11/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.7/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp1-2:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::2:11/112 -set interface ip address GigabitEthernet10/0/1 192.168.11.8/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp deleted file mode 100644 index 3265535..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..6341f29 --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp1-1' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.1/32, 2001:678:d78:210::1/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp1-0:Gi10/0/1' + addresses: [ 192.168.11.7/31, 2001:678:d78:211::1:11/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp1-2:Gi10/0/0' + addresses: [ 192.168.11.8/31, 2001:678:d78:211::2:11/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f1' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f1' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service b/build/bird/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 70ed3ed..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.2 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp deleted file mode 100644 index 3d359bd..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp1-1:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::2:12/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.9/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp1-3:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::3:12/112 -set interface ip address GigabitEthernet10/0/1 192.168.11.10/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp deleted file mode 100644 index 792cfab..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..4c65eef --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp1-2' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.2/32, 2001:678:d78:210::2/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp1-1:Gi10/0/1' + addresses: [ 192.168.11.9/31, 2001:678:d78:211::2:12/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp1-3:Gi10/0/0' + addresses: [ 192.168.11.10/31, 2001:678:d78:211::3:12/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f2' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f2' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service b/build/bird/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 36de70b..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.3 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp deleted file mode 100644 index c749b49..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,22 +0,0 @@ -comment { Gi10/0/0 is connected to vpp1-2:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::3:13/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.11/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is free to use } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface state GigabitEthernet10/0/1 down - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp deleted file mode 100644 index 8d47ac7..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-post.vpp similarity index 100% rename from build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp similarity index 100% rename from build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual.vpp rename to build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp deleted file mode 100644 index ed52371..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..f4183f8 --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp1-3' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.3/32, 2001:678:d78:210::3/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp1-2:Gi10/0/1' + addresses: [ 192.168.11.11/31, 2001:678:d78:211::3:13/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is free to use' + state: down + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f3' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f3' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service b/build/bird/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 12c86d3..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.0 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp deleted file mode 100644 index 02bfe6a..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to lab.ipng.ch:lab0 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::0:fffe/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.5/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp0-1:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::1:00/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.6/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp deleted file mode 100644 index 343dd35..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-post.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..b698b84 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..b698b84 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp deleted file mode 100644 index 0f2a444..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..05a98c3 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp0-0' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.0/32, 2001:678:d78:200::/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to lab.ipng.ch:lab0' + addresses: [ 192.168.10.5/31, 2001:678:d78:201::fffe/112 ] + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp0-1:Gi10/0/0' + addresses: [ 192.168.10.6/31, 2001:678:d78:201::1:00/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f0' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f0' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service b/build/frr/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 002955b..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.1 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp deleted file mode 100644 index 1d063c8..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp0-0:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::1:01/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.7/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp0-2:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::2:01/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.8/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp deleted file mode 100644 index 4ae0b98..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-post.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..b68870a --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..b68870a --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..6774c02 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp0-1' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.1/32, 2001:678:d78:200::1/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp0-0:Gi10/0/1' + addresses: [ 192.168.10.7/31, 2001:678:d78:201::1:01/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp0-2:Gi10/0/0' + addresses: [ 192.168.10.8/31, 2001:678:d78:201::2:01/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f1' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f1' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service b/build/frr/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 46a0d49..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.2 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp deleted file mode 100644 index fdbbdf0..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp0-1:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::2:02/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.9/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp0-3:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:201::3:02/112 -set interface ip address GigabitEthernet10/0/1 192.168.10.10/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp deleted file mode 100644 index 6148ae4..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-post.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..359d613 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..359d613 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..8d51437 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp0-2' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.2/32, 2001:678:d78:200::2/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp0-1:Gi10/0/1' + addresses: [ 192.168.10.9/31, 2001:678:d78:201::2:02/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp0-3:Gi10/0/0' + addresses: [ 192.168.10.10/31, 2001:678:d78:201::3:02/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f2' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f2' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service b/build/frr/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index c6968b0..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.10.3 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp deleted file mode 100644 index 5d38b42..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,22 +0,0 @@ -comment { Gi10/0/0 is connected to vpp0-2:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:201::3:03/112 -set interface ip address GigabitEthernet10/0/0 192.168.10.11/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is free to use } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface state GigabitEthernet10/0/1 down - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp deleted file mode 100644 index 5f952fd..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-post.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..9d67c9b --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..9d67c9b --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp0-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp deleted file mode 100644 index ed52371..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..a6430c8 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp0-3' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.10.3/32, 2001:678:d78:200::3/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp0-2:Gi10/0/1' + addresses: [ 192.168.10.11/31, 2001:678:d78:201::3:03/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is free to use' + state: down + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host0-0:enp16s0f3' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host0-1:enp16s0f3' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service b/build/frr/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 5f2d02b..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.0 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp deleted file mode 100644 index a6900ac..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to lab.ipng.ch:lab1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::0:fffe/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.5/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp1-1:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::1:10/112 -set interface ip address GigabitEthernet10/0/1 192.168.11.6/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp deleted file mode 100644 index a25cae3..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-post.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..18a442a --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..18a442a --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-0 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp deleted file mode 100644 index 0f2a444..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..d155a5d --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp1-0' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.0/32, 2001:678:d78:210::/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to lab.ipng.ch:lab1' + addresses: [ 192.168.11.5/31, 2001:678:d78:211::fffe/112 ] + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp1-1:Gi10/0/0' + addresses: [ 192.168.11.6/31, 2001:678:d78:211::1:10/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f0' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f0' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service b/build/frr/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index a9518b7..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.1 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp deleted file mode 100644 index 5c7e54f..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp1-0:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::1:11/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.7/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp1-2:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::2:11/112 -set interface ip address GigabitEthernet10/0/1 192.168.11.8/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp deleted file mode 100644 index 3265535..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-post.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..a7935ef --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..a7935ef --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-1 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..6341f29 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp1-1' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.1/32, 2001:678:d78:210::1/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp1-0:Gi10/0/1' + addresses: [ 192.168.11.7/31, 2001:678:d78:211::1:11/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp1-2:Gi10/0/0' + addresses: [ 192.168.11.8/31, 2001:678:d78:211::2:11/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f1' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f1' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service b/build/frr/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 70ed3ed..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.2 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp deleted file mode 100644 index 3d359bd..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,24 +0,0 @@ -comment { Gi10/0/0 is connected to vpp1-1:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::2:12/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.9/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is connected to vpp1-3:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:211::3:12/112 -set interface ip address GigabitEthernet10/0/1 192.168.11.10/31 -set interface state GigabitEthernet10/0/1 up - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp deleted file mode 100644 index 792cfab..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-post.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..8416868 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..8416868 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-2 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp deleted file mode 100644 index 2ba18c5..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,3 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable -set interface mpls GigabitEthernet10/0/1 enable diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..4c65eef --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/vppcfg.yaml @@ -0,0 +1,31 @@ +loopbacks: + loop0: + description: 'Core: vpp1-2' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.2/32, 2001:678:d78:210::2/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp1-1:Gi10/0/1' + addresses: [ 192.168.11.9/31, 2001:678:d78:211::2:12/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is connected to vpp1-3:Gi10/0/0' + addresses: [ 192.168.11.10/31, 2001:678:d78:211::3:12/112 ] + mpls: true + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f2' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f2' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service b/build/frr/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp index e2df372..72f8516 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp @@ -1,13 +1,5 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp index dde7dbf..092362d 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/defaults.vpp @@ -3,3 +3,4 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp deleted file mode 100644 index 36de70b..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/flowprobe.vpp +++ /dev/null @@ -1,10 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src 192.168.11.3 port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp deleted file mode 100644 index c749b49..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/interface.vpp +++ /dev/null @@ -1,22 +0,0 @@ -comment { Gi10/0/0 is connected to vpp1-2:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:211::3:13/112 -set interface ip address GigabitEthernet10/0/0 192.168.11.11/31 -set interface state GigabitEthernet10/0/0 up - -comment { Gi10/0/1 is free to use } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface state GigabitEthernet10/0/1 down - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp deleted file mode 100644 index b0fcea1..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,7 +0,0 @@ -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/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp deleted file mode 100644 index 8d47ac7..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-post.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-post.vpp new file mode 100644 index 0000000..c4d4763 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-post.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp new file mode 100644 index 0000000..c4d4763 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/manual-pre.vpp @@ -0,0 +1,2 @@ +comment { Put any config for vpp1-3 you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp deleted file mode 100644 index ed52371..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/mpls.vpp +++ /dev/null @@ -1,2 +0,0 @@ -mpls table add 0 -set interface mpls GigabitEthernet10/0/0 enable diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp deleted file mode 100644 index 5b71e18..0000000 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -sflow enable GigabitEthernet10/0/0 -sflow enable GigabitEthernet10/0/1 -sflow enable GigabitEthernet10/0/2 -sflow enable GigabitEthernet10/0/3 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..1b4b97b --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } \ No newline at end of file diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml new file mode 100644 index 0000000..f4183f8 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/vppcfg.yaml @@ -0,0 +1,30 @@ +loopbacks: + loop0: + description: 'Core: vpp1-3' + mtu: 9000 + lcp: loop0 + addresses: [ 192.168.11.3/32, 2001:678:d78:210::3/128 ] +interfaces: + GigabitEthernet10/0/0: + description: 'Gi10/0/0 is connected to vpp1-2:Gi10/0/1' + addresses: [ 192.168.11.11/31, 2001:678:d78:211::3:13/112 ] + mpls: true + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: + description: 'Gi10/0/1 is free to use' + state: down + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host1-0:enp16s0f3' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host1-1:enp16s0f3' + lcp: e3 + mtu: 9000 + sflow: true diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service b/build/frr/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service new file mode 100644 index 0000000..c24e517 --- /dev/null +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/create b/create index 50f91a3..9080bfe 100755 --- a/create +++ b/create @@ -15,7 +15,7 @@ ## * Unmount the staging directories ## * Start the VMs -BASE=${BASE:=vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-trixie-disk0@20260223-release} +BASE=${BASE:=vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-trixie-disk0@20260407-release-2} BUILD=${BUILD:=frr} ## or bird LAB=${LAB:=0} @@ -46,7 +46,7 @@ for VM in $VMS; do echo "[$VM] Mounting in staging" ssh root@$HVN "mount $MOUNTFLAGS /dev/zvol/vol0/$VM-$PARTITION $STAGING/$VM" echo "[$VM] Rsyncing build" - rsync -aIcg build/$BUILD/$HVN/$VM/ root@${HVN}:$STAGING/$VM/ + rsync -aIcK build/$BUILD/$HVN/$VM/ root@${HVN}:$STAGING/$VM/ if [ "$TARGET" = "LINUX" ]; then echo "[$VM] Running lab-build snippets" ssh root@$HVN "cd $STAGING/$VM; for s in root/lab-build/*; do chroot $STAGING/$VM /bin/sh /\$s; done" diff --git a/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 b/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 index 19dec01..b2a22d7 100644 --- a/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 +++ b/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 @@ -1,14 +1,6 @@ -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 -exec /etc/vpp/config/mpls.vpp +exec /etc/vpp/config/manual-pre.vpp +exec /etc/vpp/config/vppcfg.vpp exec /etc/vpp/config/srv6.vpp -exec /etc/vpp/config/sflow.vpp - -comment { exec /etc/vpp/config/flowprobe.vpp } - -comment { Allow user to set persistent manual configs } -exec /etc/vpp/config/manual.vpp +exec /etc/vpp/config/manual-post.vpp diff --git a/overlays/_common/vpp/etc/vpp/config/defaults.vpp b/overlays/_common/vpp/etc/vpp/config/defaults.vpp index de79f47..3c0e14e 100644 --- a/overlays/_common/vpp/etc/vpp/config/defaults.vpp +++ b/overlays/_common/vpp/etc/vpp/config/defaults.vpp @@ -3,4 +3,5 @@ lcp default netns dataplane lcp lcp-sync on lcp lcp-auto-subint off +mpls table add 0 diff --git a/overlays/_common/vpp/etc/vpp/config/flowprobe.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/flowprobe.vpp.j2 deleted file mode 100644 index becf419..0000000 --- a/overlays/_common/vpp/etc/vpp/config/flowprobe.vpp.j2 +++ /dev/null @@ -1,11 +0,0 @@ -comment { Generate full IPFIX stats, send them to lab.ipng.ch } - -set ipfix exporter collector 194.1.163.86 src {{node.loopback.ipv4.split("/")[0]}} port 4739 path-mtu 1450 template-interval 30 - -flowprobe params record l2 l3 l4 active 10 passive 60 - -flowprobe feature add-del GigabitEthernet10/0/0 l2 both -flowprobe feature add-del GigabitEthernet10/0/1 l2 both -flowprobe feature add-del GigabitEthernet10/0/2 l2 both -flowprobe feature add-del GigabitEthernet10/0/3 l2 both - diff --git a/overlays/_common/vpp/etc/vpp/config/interface.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/interface.vpp.j2 deleted file mode 100644 index 7a44df0..0000000 --- a/overlays/_common/vpp/etc/vpp/config/interface.vpp.j2 +++ /dev/null @@ -1,41 +0,0 @@ -{% if node.id == 0 %} -comment { Gi10/0/0 is connected to lab.ipng.ch:lab{{lab.id}} } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:2{{lab.id}}1::{{node.id}}:fffe/112 -set interface ip address GigabitEthernet10/0/0 192.168.{{10+lab.id}}.{{5+2*node.id}}/31 -set interface state GigabitEthernet10/0/0 up -{% else %} -comment { Gi10/0/0 is connected to vpp{{lab.id}}-{{node.id-1}}:Gi10/0/1 } -set interface mtu 9000 GigabitEthernet10/0/0 -set interface mtu packet 9000 GigabitEthernet10/0/0 -set interface ip address GigabitEthernet10/0/0 2001:678:d78:2{{lab.id}}1::{{node.id}}:{{lab.id}}{{node.id}}/112 -set interface ip address GigabitEthernet10/0/0 192.168.{{10+lab.id}}.{{5+2*node.id}}/31 -set interface state GigabitEthernet10/0/0 up -{% endif %} - -{% if node.id < 3 %} -comment { Gi10/0/1 is connected to vpp{{lab.id}}-{{node.id+1}}:Gi10/0/0 } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface ip address GigabitEthernet10/0/1 2001:678:d78:2{{lab.id}}1::{{node.id+1}}:{{lab.id}}{{node.id}}/112 -set interface ip address GigabitEthernet10/0/1 192.168.{{10+lab.id}}.{{6+2*node.id}}/31 -set interface state GigabitEthernet10/0/1 up -{% else %} -comment { Gi10/0/1 is free to use } -set interface mtu 9000 GigabitEthernet10/0/1 -set interface mtu packet 9000 GigabitEthernet10/0/1 -set interface state GigabitEthernet10/0/1 down -{% endif %} - -comment { Gi10/0/2 is free to use } -set interface mtu 9000 GigabitEthernet10/0/2 -set interface mtu packet 9000 GigabitEthernet10/0/2 -set interface state GigabitEthernet10/0/2 down - -comment { Gi10/0/3 is free to use } -set interface mtu 9000 GigabitEthernet10/0/3 -set interface mtu packet 9000 GigabitEthernet10/0/3 -set interface state GigabitEthernet10/0/3 down - - diff --git a/overlays/_common/vpp/etc/vpp/config/lcp.vpp b/overlays/_common/vpp/etc/vpp/config/lcp.vpp deleted file mode 100644 index 08d4115..0000000 --- a/overlays/_common/vpp/etc/vpp/config/lcp.vpp +++ /dev/null @@ -1,8 +0,0 @@ -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/_common/vpp/etc/vpp/config/loopback.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 deleted file mode 100644 index 3aea22f..0000000 --- a/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 +++ /dev/null @@ -1,6 +0,0 @@ -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/_common/vpp/etc/vpp/config/manual.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/manual-post.vpp.j2 similarity index 100% rename from overlays/_common/vpp/etc/vpp/config/manual.vpp.j2 rename to overlays/_common/vpp/etc/vpp/config/manual-post.vpp.j2 diff --git a/overlays/_common/vpp/etc/vpp/config/manual-pre.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/manual-pre.vpp.j2 new file mode 100644 index 0000000..88d2262 --- /dev/null +++ b/overlays/_common/vpp/etc/vpp/config/manual-pre.vpp.j2 @@ -0,0 +1,3 @@ +comment { Put any config for {{ node.hostname }} you'd like here. } +comment { It will persist across restarts of VPP and reboots of the VM. } + diff --git a/overlays/_common/vpp/etc/vpp/config/mpls.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/mpls.vpp.j2 deleted file mode 100644 index 656cb41..0000000 --- a/overlays/_common/vpp/etc/vpp/config/mpls.vpp.j2 +++ /dev/null @@ -1,8 +0,0 @@ -mpls table add 0 -{% if node.id > 0 %} -set interface mpls GigabitEthernet10/0/0 enable -{% endif %} -{% if node.id < 3 %} -set interface mpls GigabitEthernet10/0/1 enable -{% endif %} - diff --git a/overlays/_common/vpp/etc/vpp/config/sflow.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/sflow.vpp.j2 deleted file mode 100644 index 2f95acd..0000000 --- a/overlays/_common/vpp/etc/vpp/config/sflow.vpp.j2 +++ /dev/null @@ -1,8 +0,0 @@ -sflow header-bytes 128 -sflow sampling-rate 100 -sflow polling-interval 10 - -{% for i in range(4) %} -sflow enable GigabitEthernet10/0/{{ i }} -{% endfor %} - diff --git a/overlays/_common/vpp/etc/vpp/config/vppcfg.vpp b/overlays/_common/vpp/etc/vpp/config/vppcfg.vpp new file mode 100644 index 0000000..34b750c --- /dev/null +++ b/overlays/_common/vpp/etc/vpp/config/vppcfg.vpp @@ -0,0 +1 @@ +comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time } diff --git a/overlays/_common/vpp/etc/vpp/vppcfg.yaml.j2 b/overlays/_common/vpp/etc/vpp/vppcfg.yaml.j2 new file mode 100644 index 0000000..048deac --- /dev/null +++ b/overlays/_common/vpp/etc/vpp/vppcfg.yaml.j2 @@ -0,0 +1,42 @@ +loopbacks: + loop0: + description: 'Core: vpp{{lab.id}}-{{node.id}}' + mtu: 9000 + lcp: loop0 + addresses: [ {{node.loopback.ipv4}}, {{node.loopback.ipv6}} ] +interfaces: + GigabitEthernet10/0/0: +{% if node.id == 0 %} + description: 'Gi10/0/0 is connected to lab.ipng.ch:lab{{lab.id}}' + addresses: [ 192.168.{{10+lab.id}}.{{5+2*node.id}}/31, 2001:678:d78:2{{lab.id}}1::fffe/112 ] +{% else %} + description: 'Gi10/0/0 is connected to vpp{{lab.id}}-{{node.id-1}}:Gi10/0/1' + addresses: [ 192.168.{{10+lab.id}}.{{5+2*node.id}}/31, 2001:678:d78:2{{lab.id}}1::{{node.id}}:{{lab.id}}{{node.id}}/112 ] + mpls: true +{% endif %} + lcp: e0 + mtu: 9000 + sflow: true + GigabitEthernet10/0/1: +{% if node.id < 3 %} + description: 'Gi10/0/1 is connected to vpp{{lab.id}}-{{node.id+1}}:Gi10/0/0' + addresses: [ 192.168.{{10+lab.id}}.{{6+2*node.id}}/31, 2001:678:d78:2{{lab.id}}1::{{node.id+1}}:{{lab.id}}{{node.id}}/112 ] + mpls: true +{% else %} + description: 'Gi10/0/1 is free to use' + state: down +{% endif %} + lcp: e1 + mtu: 9000 + sflow: true + GigabitEthernet10/0/2: + description: 'Gi10/0/2 is connected to host{{lab.id}}-0:enp16s0f{{node.id}}' + lcp: e2 + mtu: 9000 + sflow: true + GigabitEthernet10/0/3: + description: 'Gi10/0/3 is connected to host{{lab.id}}-1:enp16s0f{{node.id}}' + lcp: e3 + mtu: 9000 + sflow: true + diff --git a/overlays/_common/vpp/lib/systemd/system/vpp.service b/overlays/_common/vpp/lib/systemd/system/vpp.service new file mode 100644 index 0000000..84861f2 --- /dev/null +++ b/overlays/_common/vpp/lib/systemd/system/vpp.service @@ -0,0 +1,19 @@ +[Unit] +Description=vector packet processing engine +After=network.target + +[Service] +Type=simple +ExecStartPre=-/sbin/modprobe uio_pci_generic +ExecStartPre=-/usr/local/bin/vppcfg plan --novpp -c /etc/vpp/vppcfg.yaml -o /etc/vpp/config/vppcfg.vpp +ExecStart=/usr/bin/vpp -c /etc/vpp/startup.conf +ExecStopPost=/bin/rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api +Restart=always +# Uncomment the following line to enable VPP coredumps on crash +# You still need to configure the rest of the system to collect them, see +# https://fdio-vpp.readthedocs.io/en/latest/troubleshooting/reportingissues/reportingissues.html#core-files +# for details +#LimitCORE=infinity + +[Install] +WantedBy=multi-user.target diff --git a/overlays/bird/vpp/lib/systemd/system/vpp.service b/overlays/bird/vpp/lib/systemd/system/vpp.service new file mode 120000 index 0000000..ce47f69 --- /dev/null +++ b/overlays/bird/vpp/lib/systemd/system/vpp.service @@ -0,0 +1 @@ +../../../../../_common/vpp/lib/systemd/system/vpp.service \ No newline at end of file diff --git a/overlays/frr/vpp/lib/systemd/system/vpp.service b/overlays/frr/vpp/lib/systemd/system/vpp.service new file mode 120000 index 0000000..ce47f69 --- /dev/null +++ b/overlays/frr/vpp/lib/systemd/system/vpp.service @@ -0,0 +1 @@ +../../../../../_common/vpp/lib/systemd/system/vpp.service \ No newline at end of file