Fix default bridge IP and comms_settings start

Some fixes after testing commit done so far. Jira-Id: SCDI-43 Signed-off-by: Mika Joenpera <[email protected]>
tiiuae · Oct 12, 2023 · d3b2709 · d3b2709
1 parent ca2fc96
commit d3b2709
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/common/scripts/mesh-helper.sh b/common/scripts/mesh-helper.sh
@@ -45,7 +45,7 @@ EOF
 
 generate_br_lan_ip() {
   local mesh_if_mac
-  mesh_if_mac="$(ip -brief link | grep "$MESH_VIF" | awk '{print $3; exit}')"
+  mesh_if_mac="$(ip -brief link | grep "$id0_MESH_VIF" | awk '{print $3; exit}')"
   local ip_random
   ip_random="$(echo "$mesh_if_mac" | cut -b 16-17)"
   br_lan_ip="192.168.1."$((16#$ip_random))

diff --git a/modules/sc-mesh-secure-deployment/src/nats/src/comms_settings.py b/modules/sc-mesh-secure-deployment/src/nats/src/comms_settings.py
@@ -49,8 +49,9 @@ def __init__(self, comms_status: [cs.CommsStatus, ...], logger):
         self.csa_state: int = 0  # 0: not started, 1: stored, 2: triggered
         self.csa_count: int = 0  # number of CSA triggered
         self.device_amount: str = "0"  # number of devices to trigger CSA from nats message
-        ret, info = self.__load_settings()
-        self.logger.debug("load settings: %s, %s", ret, info)
+        # TODO: check can we do this
+        # ret, info = self.__load_settings()
+        # self.logger.debug("load settings: %s, %s", ret, info)
 
     def validate_mesh_settings(self, index: int) -> (str, str):
         """