Move to vppcfg based configs - generate the initial config in vpp.service. Needs 20260406-2
This commit is contained in:
Pim van Pelt
@@ -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
|
||||
|
||||
@@ -3,3 +3,4 @@ lcp default netns dataplane
|
||||
lcp lcp-sync on
|
||||
lcp lcp-auto-subint off
|
||||
|
||||
mpls table add 0
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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. }
|
||||
@@ -1,3 +0,0 @@
|
||||
mpls table add 0
|
||||
set interface mpls GigabitEthernet10/0/0 enable
|
||||
set interface mpls GigabitEthernet10/0/1 enable
|
||||
@@ -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
|
||||
@@ -0,0 +1 @@
|
||||
comment { This file is autogenerated from /etc/vpp/vppcfg.yaml at boot time }
|
||||
31
build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml
Normal file
31
build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/vppcfg.yaml
Normal file
@@ -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
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user