Merge pull request #527 from advancedtelematic/refactor/sumo/renaming-secondaries-etc

Refactor/sumo/renaming secondaries etc

4 files changed, 49 insertions, 8 deletions

diff --git a/recipes-test/demo-network-config/files/26-static-client.network b/recipes-test/demo-network-config/files/26-static-client.network
new file mode 100644
index 0000000..19a6b83
--- /dev/null
+++ b/recipes-test/demo-network-config/files/26-static-client.network
@@ -0,0 +1,7 @@
+[Match]
+Name=@IFNAME@
+
+[Network]
+Description=Private internal network between aktualizr Primary and Secondary nodes
+Address=@ADDR@
+DHCP=no
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb
index 78678a2..c7daa15 100644
--- a/recipes-test/demo-network-config/primary-network-config.bb
+++ b/recipes-test/demo-network-config/primary-network-config.bb
@@ -1,10 +1,12 @@
 DESCRIPTION = "Sample network configuration for an Uptane Primary"
-LICENSE = "CLOSED"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 inherit allarch
 
-SRC_URI = "file://25-dhcp-server.network"
-
+SRC_URI = "\
+    file://27-dhcp-client-external.network \
+    "
 
 FILES_${PN} = "/usr/lib/systemd/network"
 
@@ -12,5 +14,12 @@ PR = "1"
 
 do_install() {
     install -d ${D}/usr/lib/systemd/network
-    install -m 0644 ${WORKDIR}/25-dhcp-server.network ${D}/usr/lib/systemd/network/
+    install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}/usr/lib/systemd/network/
 }
+
+PRIMARY_IP ?= "10.0.3.1"
+IP_ADDR = "${PRIMARY_IP}"
+
+require static-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 9091c65..c70d88a 100644
--- a/recipes-test/demo-network-config/secondary-network-config.bb
+++ b/recipes-test/demo-network-config/secondary-network-config.bb
@@ -1,20 +1,29 @@
 DESCRIPTION = "Sample network configuration for an Uptane Secondary"
-LICENSE = "CLOSED"
+LICENSE = "MPL-2.0"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 inherit allarch
 
+# TODO: It configures the 'user' interface in NAT mode and provides an access to public Inet via it
+# which is not desired for Secondary. It cannot be just removed since we get SSH access to Secondary
+# VM via this interface. So, the task is to configure the interface in such way that it does provide access
+# via SSH from a host machine and forbids an access to Inet
 SRC_URI = "\
-    file://26-dhcp-client.network \
     file://27-dhcp-client-external.network \
     "
 
-
 FILES_${PN} = "/usr/lib/systemd/network"
 
 PR = "1"
 
 do_install() {
     install -d ${D}/usr/lib/systemd/network
-    install -m 0644 ${WORKDIR}/26-dhcp-client.network ${D}/usr/lib/systemd/network/
     install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}/usr/lib/systemd/network/
 }
+
+SECONDARY_IP ?= "10.0.3.2"
+IP_ADDR = "${SECONDARY_IP}"
+
+require static-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
new file mode 100644
index 0000000..e64675e
--- /dev/null
+++ b/recipes-test/demo-network-config/static-network-config.inc
@@ -0,0 +1,16 @@
+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: