OTA-2541: Add suffix '-sndry' to a default HW_ID for Secondary. Ability to define IP and Port in local.conf

Signed-off-by: Mike Sul <ext-mykhaylo.sul@here.com>

3 files changed, 7 insertions, 5 deletions

diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/recipes-test/demo-network-config/primary-network-config.bb
index ce19f07..9725898 100644
--- a/recipes-test/demo-network-config/primary-network-config.bb
+++ b/recipes-test/demo-network-config/primary-network-config.bb
@@ -16,7 +16,8 @@ do_install() {
     install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}/usr/lib/systemd/network/
 }
 
-SECONDARY_NETWORK_IP_ADDR ?= "10.0.3.1"
+PRIMARY_IP ?= "10.0.3.1"
+IP_ADDR = "${PRIMARY_IP}"
 
 require static-network-config.inc
 
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/recipes-test/demo-network-config/secondary-network-config.bb
index 6473e05..e33229d 100644
--- a/recipes-test/demo-network-config/secondary-network-config.bb
+++ b/recipes-test/demo-network-config/secondary-network-config.bb
@@ -20,7 +20,8 @@ do_install() {
     install -m 0644 ${WORKDIR}/27-dhcp-client-external.network ${D}/usr/lib/systemd/network/
 }
 
-SECONDARY_NETWORK_IP_ADDR ?= "10.0.3.2"
+SECONDARY_IP ?= "10.0.3.2"
+IP_ADDR = "${SECONDARY_IP}"
 
 require static-network-config.inc
 
diff --git a/recipes-test/demo-network-config/static-network-config.inc b/recipes-test/demo-network-config/static-network-config.inc
index 27d2a20..e64675e 100644
--- a/recipes-test/demo-network-config/static-network-config.inc
+++ b/recipes-test/demo-network-config/static-network-config.inc
@@ -2,13 +2,13 @@ SRC_URI_append = "\
     file://26-static-client.network \
     "
 
-SECONDARY_NETWORK_INTERFACE_NAME ?= "enp0s5"
+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@|${SECONDARY_NETWORK_IP_ADDR}|g' \
-           -e 's|@IFNAME@|${SECONDARY_NETWORK_INTERFACE_NAME}|g' \
+    sed -i -e 's|@ADDR@|${IP_ADDR}|g' \
+           -e 's|@IFNAME@|${SECONDARY_INTERFACE}|g' \
            ${D}/usr/lib/systemd/network/26-static-client.network
 
 }