Refactor the things that are common between bird and frr build types -- no-op for the build/ output

build/bird/hvn0.lab.ipng.ch/vpp0-0/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn0.lab.ipng.ch/vpp0-1/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn0.lab.ipng.ch/vpp0-2/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn0.lab.ipng.ch/vpp0-3/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn1.lab.ipng.ch/vpp1-0/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn1.lab.ipng.ch/vpp1-1/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn1.lab.ipng.ch/vpp1-2/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn1.lab.ipng.ch/vpp1-3/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn2.lab.ipng.ch/vpp2-0/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn2.lab.ipng.ch/vpp2-1/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn2.lab.ipng.ch/vpp2-2/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

build/bird/hvn2.lab.ipng.ch/vpp2-3/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

overlays/_common/ovs-config.sh.j2

@@ -0,0 +1,79 @@
+#!/bin/bash
+#
+# OVS configuration for the `{{ overlay }}` overlay
+
+LAB=${LAB:=0}
+BR=vpplan
+for p in $(ovs-vsctl list-ifaces $BR); do
+  ovs-vsctl set port $p vlan_mode=access
+done
+
+# Uplink is VLAN 10
+ovs-vsctl add port vpp${LAB}-0-0 tag 10
+ovs-vsctl add port uplink tag 10
+
+# Link vpp${LAB}-0 <-> vpp${LAB}-1 in VLAN 20
+ovs-vsctl add port vpp${LAB}-0-1 tag 20
+ovs-vsctl add port vpp${LAB}-1-0 tag 20
+
+# Link vpp${LAB}-1 <-> vpp${LAB}-2 in VLAN 21
+ovs-vsctl add port vpp${LAB}-1-1 tag 21
+ovs-vsctl add port vpp${LAB}-2-0 tag 21
+
+# Link vpp${LAB}-2 <-> vpp${LAB}-3 in VLAN 22
+ovs-vsctl add port vpp${LAB}-2-1 tag 22
+ovs-vsctl add port vpp${LAB}-3-0 tag 22
+
+## Wire host${LAB}-0-[0123] to e2 of all VPP machines
+ovs-vsctl set port vpp${LAB}-0-2 tag=30
+ovs-vsctl set port host${LAB}-0-0 tag=30
+ovs-vsctl set port vpp${LAB}-1-2 tag=31
+ovs-vsctl set port host${LAB}-0-1 tag=31
+ovs-vsctl set port vpp${LAB}-2-2 tag=32
+ovs-vsctl set port host${LAB}-0-2 tag=32
+ovs-vsctl set port vpp${LAB}-3-2 tag=33
+ovs-vsctl set port host${LAB}-0-3 tag=33
+
+## Wire host${LAB}-1-[0123] to e3 of all VPP machines
+ovs-vsctl set port vpp${LAB}-0-3 tag=40
+ovs-vsctl set port host${LAB}-1-0 tag=40
+ovs-vsctl set port vpp${LAB}-1-3 tag=41
+ovs-vsctl set port host${LAB}-1-1 tag=41
+ovs-vsctl set port vpp${LAB}-2-3 tag=42
+ovs-vsctl set port host${LAB}-1-2 tag=42
+ovs-vsctl set port vpp${LAB}-3-3 tag=43
+ovs-vsctl set port host${LAB}-1-3 tag=43
+
+## Wire tap${LAB}-0-0 as 'rx' tap
+MIRROR=mirror-rx
+ovs-vsctl set port tap${LAB}-0-0 vlan_mode=native-tagged
+[ ovs-vsctl list mirror $MIRROR >/dev/null 2>&1 ] || \
+  ovs-vsctl -- --id=@m get mirror $MIRROR -- remove bridge $BR mirrors @m
+ovs-vsctl --id=@m create mirror name=$MIRROR \
+  -- --id=@p get port tap${LAB}-0-0 \
+  -- add bridge $BR mirrors @m \
+  -- set mirror $MIRROR output-port=@p \
+  -- set mirror $MIRROR select_dst_port=[] \
+  -- set mirror $MIRROR select_src_port=[]
+for iface in $(ovs-vsctl list-ports $BR); do
+  [[ $iface == tap* ]] && continue
+  [[ $iface == uplink ]] && continue
+  ovs-vsctl add mirror $MIRROR select_dst_port $(ovs-vsctl get port $iface _uuid)
+done
+
+## Wire tap${LAB}-0-1 as 'tx' tap
+MIRROR=mirror-tx
+ovs-vsctl set port tap${LAB}-0-1 vlan_mode=native-tagged
+[ ovs-vsctl list mirror $MIRROR >/dev/null 2>&1 ] || \
+  ovs-vsctl -- --id=@m get mirror $MIRROR -- remove bridge $BR mirrors @m
+ovs-vsctl --id=@m create mirror name=$MIRROR \
+  -- --id=@p get port tap${LAB}-0-1 \
+  -- add bridge $BR mirrors @m \
+  -- set mirror $MIRROR output-port=@p \
+  -- set mirror $MIRROR select_dst_port=[] \
+  -- set mirror $MIRROR select_src_port=[]
+for iface in $(ovs-vsctl list-ports $BR); do
+  [[ $iface == tap* ]] && continue
+  [[ $iface == uplink ]] && continue
+  ovs-vsctl add mirror $MIRROR select_src_port $(ovs-vsctl get port $iface _uuid)
+done

overlays/bird/common

@@ -0,0 +1 @@
+../_common/common/

overlays/bird/host

@@ -0,0 +1 @@
+../_common/host

overlays/bird/ovs-config.sh.j2

@@ -1,79 +0,0 @@
-#!/bin/bash
-#
-# OVS configuration for the `{{ overlay }}` overlay
-
-LAB=${LAB:=0}
-BR=vpplan
-for p in $(ovs-vsctl list-ifaces $BR); do
-  ovs-vsctl set port $p vlan_mode=access
-done
-
-# Uplink is VLAN 10
-ovs-vsctl add port vpp${LAB}-0-0 tag 10
-ovs-vsctl add port uplink tag 10
-
-# Link vpp${LAB}-0 <-> vpp${LAB}-1 in VLAN 20
-ovs-vsctl add port vpp${LAB}-0-1 tag 20
-ovs-vsctl add port vpp${LAB}-1-0 tag 20
-
-# Link vpp${LAB}-1 <-> vpp${LAB}-2 in VLAN 21
-ovs-vsctl add port vpp${LAB}-1-1 tag 21
-ovs-vsctl add port vpp${LAB}-2-0 tag 21
-
-# Link vpp${LAB}-2 <-> vpp${LAB}-3 in VLAN 22
-ovs-vsctl add port vpp${LAB}-2-1 tag 22
-ovs-vsctl add port vpp${LAB}-3-0 tag 22
-
-## Wire host${LAB}-0-[0123] to e2 of all VPP machines
-ovs-vsctl set port vpp${LAB}-0-2 tag=30
-ovs-vsctl set port host${LAB}-0-0 tag=30
-ovs-vsctl set port vpp${LAB}-1-2 tag=31
-ovs-vsctl set port host${LAB}-0-1 tag=31
-ovs-vsctl set port vpp${LAB}-2-2 tag=32
-ovs-vsctl set port host${LAB}-0-2 tag=32
-ovs-vsctl set port vpp${LAB}-3-2 tag=33
-ovs-vsctl set port host${LAB}-0-3 tag=33
-
-## Wire host${LAB}-1-[0123] to e3 of all VPP machines
-ovs-vsctl set port vpp${LAB}-0-3 tag=40
-ovs-vsctl set port host${LAB}-1-0 tag=40
-ovs-vsctl set port vpp${LAB}-1-3 tag=41
-ovs-vsctl set port host${LAB}-1-1 tag=41
-ovs-vsctl set port vpp${LAB}-2-3 tag=42
-ovs-vsctl set port host${LAB}-1-2 tag=42
-ovs-vsctl set port vpp${LAB}-3-3 tag=43
-ovs-vsctl set port host${LAB}-1-3 tag=43
-
-## Wire tap${LAB}-0-0 as 'rx' tap
-MIRROR=mirror-rx
-ovs-vsctl set port tap${LAB}-0-0 vlan_mode=native-tagged
-[ ovs-vsctl list mirror $MIRROR >/dev/null 2>&1 ] || \
-  ovs-vsctl -- --id=@m get mirror $MIRROR -- remove bridge $BR mirrors @m
-ovs-vsctl --id=@m create mirror name=$MIRROR \
-  -- --id=@p get port tap${LAB}-0-0 \
-  -- add bridge $BR mirrors @m \
-  -- set mirror $MIRROR output-port=@p \
-  -- set mirror $MIRROR select_dst_port=[] \
-  -- set mirror $MIRROR select_src_port=[]
-for iface in $(ovs-vsctl list-ports $BR); do
-  [[ $iface == tap* ]] && continue
-  [[ $iface == uplink ]] && continue
-  ovs-vsctl add mirror $MIRROR select_dst_port $(ovs-vsctl get port $iface _uuid)
-done
-
-## Wire tap${LAB}-0-1 as 'tx' tap
-MIRROR=mirror-tx
-ovs-vsctl set port tap${LAB}-0-1 vlan_mode=native-tagged
-[ ovs-vsctl list mirror $MIRROR >/dev/null 2>&1 ] || \
-  ovs-vsctl -- --id=@m get mirror $MIRROR -- remove bridge $BR mirrors @m
-ovs-vsctl --id=@m create mirror name=$MIRROR \
-  -- --id=@p get port tap${LAB}-0-1 \
-  -- add bridge $BR mirrors @m \
-  -- set mirror $MIRROR output-port=@p \
-  -- set mirror $MIRROR select_dst_port=[] \
-  -- set mirror $MIRROR select_src_port=[]
-for iface in $(ovs-vsctl list-ports $BR); do
-  [[ $iface == tap* ]] && continue
-  [[ $iface == uplink ]] && continue
-  ovs-vsctl add mirror $MIRROR select_src_port $(ovs-vsctl get port $iface _uuid)
-done

overlays/bird/ovs-config.sh.j2

@@ -0,0 +1 @@
+../_common/ovs-config.sh.j2

overlays/bird/tap

@@ -0,0 +1 @@
+../_common/tap

overlays/bird/vpp/etc/vpp

@@ -0,0 +1 @@
+../../../_common/vpp/etc/vpp/

overlays/bird/vpp/root/lab-build/disable-frr

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+echo " * Disabling FRR"
+for i in frr; do
+  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
+  ln -sf /dev/null /etc/systemd/system/${i}.service
+done

overlays/frr/common

@@ -1 +1 @@
-../bird/common/
+../_common/common/

overlays/frr/host

@@ -1 +1 @@
-../bird/host/
+../_common/host/

overlays/frr/ovs-config.sh.j2

@@ -1 +1 @@
-../bird/ovs-config.sh.j2
+../_common/ovs-config.sh.j2

overlays/frr/tap

@@ -1 +1 @@
-../bird/tap/
+../_common/tap/

overlays/frr/vpp/etc/vpp

@@ -1 +1 @@
-../../../bird/vpp/etc/vpp/
+../../../_common/vpp/etc/vpp/