Merge pull request #530 from advancedtelematic/feat/OTA-2294/preconfigured-secondaries-on-RPi

OTA-2541: Primary and Secondary network configuration in case of RPi

6 files changed, 32 insertions, 18 deletions

diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc
index ea420ba..7e320af 100644
--- a/conf/include/bblayers/sota_raspberrypi3.inc
+++ b/conf/include/bblayers/sota_raspberrypi3.inc
@@ -1,2 +1,3 @@
 BBLAYERS += "${METADIR}/meta-updater-raspberrypi"
 BBLAYERS += "${METADIR}/meta-raspberrypi"
+BBLAYERS += "${METADIR}/meta-openembedded/meta-networking"
diff --git a/recipes-test/demo-network-config/files/26-multihomed-client.network b/recipes-test/demo-network-config/files/26-multihomed-client.network
new file mode 100644
index 0000000..f1e6cc6
--- /dev/null
+++ b/recipes-test/demo-network-config/files/26-multihomed-client.network
@@ -0,0 +1,9 @@
+[Match]
+Name=@IFNAME@
+
+[Network]
+Description=Multihomed network. DHCP-assigned IP for Primary<->Backend. Statically assigned IP for Primary<->Secondary
+DHCP=yes
+
+[Address]
+Address=@ADDR@
diff --git a/recipes-test/demo-network-config/network-config.inc b/recipes-test/demo-network-config/network-config.inc
new file mode 100644
index 0000000..ed623d4
--- /dev/null
+++ b/recipes-test/demo-network-config/network-config.inc
@@ -0,0 +1,17 @@
+SRC_URI_append = "\
+    file://26-${CONF_TYPE}-client.network \
+    "
+
+SECONDARY_INTERFACE ?= "${@ 'eth0' if d.getVar('MACHINE') == 'raspberrypi3' else 'enp0s5'}"
+
+do_install_append() {
+    bbnote "Network configuration type to be applied: ${CONF_TYPE}"
+    install -d ${D}/usr/lib/systemd/network
+    install -m 0644 ${WORKDIR}/26-${CONF_TYPE}-client.network ${D}/usr/lib/systemd/network/
+    sed -i -e 's|@ADDR@|${IP_ADDR}|g' \
+           -e 's|@IFNAME@|${SECONDARY_INTERFACE}|g' \
+           ${D}/usr/lib/systemd/network/26-${CONF_TYPE}-client.network
+
+}
+
+# vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb
index c7daa15..d840a95 100644
--- a/recipes-test/demo-network-config/primary-network-config.bb
+++ b/recipes-test/demo-network-config/primary-network-config.bb
@@ -18,8 +18,10 @@ do_install() {
 }
 
 PRIMARY_IP ?= "10.0.3.1"
+
 IP_ADDR = "${PRIMARY_IP}"
+CONF_TYPE ?= "${@ 'multihomed' if d.getVar('MACHINE') == 'raspberrypi3' and d.getVar('RPI_WIFI_ENABLE') != '1' else 'static'}"
 
-require static-network-config.inc
+require network-config.inc
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb
index c70d88a..b1d70f1 100644
--- a/recipes-test/demo-network-config/secondary-network-config.bb
+++ b/recipes-test/demo-network-config/secondary-network-config.bb
@@ -23,7 +23,8 @@ do_install() {
 
 SECONDARY_IP ?= "10.0.3.2"
 IP_ADDR = "${SECONDARY_IP}"
+CONF_TYPE = "static"
 
-require static-network-config.inc
+require network-config.inc
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-test/demo-network-config/static-network-config.inc b/recipes-test/demo-network-config/static-network-config.inc
deleted file mode 100644
index e64675e..0000000
--- a/recipes-test/demo-network-config/static-network-config.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SRC_URI_append = "\
-    file://26-static-client.network \
-    "
-
-SECONDARY_INTERFACE ?= "enp0s5"
-
-do_install_append() {
-    install -d ${D}/usr/lib/systemd/network
-    install -m 0644 ${WORKDIR}/26-static-client.network ${D}/usr/lib/systemd/network/
-    sed -i -e 's|@ADDR@|${IP_ADDR}|g' \
-           -e 's|@IFNAME@|${SECONDARY_INTERFACE}|g' \
-           ${D}/usr/lib/systemd/network/26-static-client.network
-
-}
-
-# vim:set ts=4 sw=4 sts=4 expandtab: