wiliot-certificate 1.5.2a1__py3-none-any.whl → 4.4.0__py3-none-any.whl

gw_certificate/common/wltPb_pb2.py

@@ -1,12 +1,22 @@
 # -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
+# NO CHECKED-IN PROTOBUF GENCODE
 # source: wltPb.proto
-# Protobuf Python Version: 4.25.1
+# Protobuf Python Version: 6.30.2
 """Generated protocol buffer code."""
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import runtime_version as _runtime_version
 from google.protobuf import symbol_database as _symbol_database
 from google.protobuf.internal import builder as _builder
+_runtime_version.ValidateProtobufRuntimeVersion(
+    _runtime_version.Domain.PUBLIC,
+    6,
+    30,
+    2,
+    '',
+    'wltPb.proto'
+)
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -14,20 +24,20 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0bwltPb.proto\x12\x05wltPb\"$\n\x08Location\x12\x0b\n\x03lat\x18\x01 \x01(\x01\x12\x0b\n\x03lng\x18\x02 \x01(\x01\"j\n\x05Value\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x42\x06\n\x04type\"\x89\x02\n\x0bGatewayData\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12*\n\x07packets\x18\x03 \x03(\x0b\x32\x19.wltPb.GatewayData.Packet\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x00\x88\x01\x01\x1as\n\x06Packet\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12\x12\n\nsequenceId\x18\x03 \x01(\r\x12\x11\n\x04rssi\x18\x04 \x01(\rH\x00\x88\x01\x01\x12\x15\n\raliasBridgeId\x18\x05 \x01(\tB\x07\n\x05_rssiB\x0b\n\t_location\"\xc9\x01\n\rUplinkMessage\x12-\n\rgatewayStatus\x18\x01 \x01(\x0b\x32\x14.wltPb.GatewayStatusH\x00\x12)\n\x0bgatewayInfo\x18\x02 \x01(\x0b\x32\x12.wltPb.GatewayInfoH\x00\x12)\n\x0bgatewayLogs\x18\x03 \x01(\x0b\x32\x12.wltPb.GatewayLogsH\x00\x12+\n\x0c\x61\x63tionStatus\x18\x04 \x01(\x0b\x32\x13.wltPb.ActionStatusH\x00\x42\x06\n\x04type\"\xdb\x03\n\rGatewayStatus\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x13\n\x0bgatewayType\x18\x02 \x01(\t\x12\x19\n\x11\x64ownlinkSupported\x18\x03 \x01(\x08\x12!\n\x19\x62ridgeOtaUpgradeSupported\x18\x04 \x01(\x08\x12\x12\n\napiVersion\x18\x05 \x01(\r\x12\x14\n\x07version\x18\x06 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x08 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\t \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\n \x03(\x0b\x32 .wltPb.GatewayStatus.ConfigEntry\x12\x17\n\nbleAddress\x18\x0b \x01(\tH\x04\x88\x01\x01\x1a;\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_locationB\r\n\x0b_bleAddress\"}\n\x0bGatewayInfo\x12\x30\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x1f.wltPb.GatewayInfo.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\"\x1b\n\x0bGatewayLogs\x12\x0c\n\x04logs\x18\x01 \x03(\t\".\n\x0c\x41\x63tionStatus\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\r\x12\x0e\n\x06status\x18\x02 \x01(\r\"\xa7\x02\n\x0f\x44ownlinkMessage\x12#\n\x08txPacket\x18\x01 \x01(\x0b\x32\x0f.wltPb.TxPacketH\x00\x12-\n\rgatewayAction\x18\x02 \x01(\x0b\x32\x14.wltPb.GatewayActionH\x00\x12-\n\rbridgeUpgrade\x18\x03 \x01(\x0b\x32\x14.wltPb.BridgeUpgradeH\x00\x12-\n\rgatewayConfig\x18\x04 \x01(\x0b\x32\x14.wltPb.GatewayConfigH\x00\x12+\n\x0c\x63ustomBroker\x18\x05 \x01(\x0b\x32\x13.wltPb.CustomBrokerH\x00\x12-\n\rcustomMessage\x18\x06 \x01(\x0b\x32\x14.wltPb.CustomMessageH\x00\x42\x06\n\x04type\"F\n\x08TxPacket\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x12\n\nmaxRetries\x18\x02 \x01(\r\x12\x15\n\rmaxDurationMs\x18\x03 \x01(\r\"\x1f\n\rGatewayAction\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\"\xa5\x01\n\rBridgeUpgrade\x12\x14\n\x0crebootPacket\x18\x01 \x01(\x0c\x12\x17\n\x0ftxMaxDurationMs\x18\x02 \x01(\r\x12\x14\n\x0ctxMaxRetries\x18\x03 \x01(\r\x12\x10\n\x08\x62ridgeId\x18\x04 \x01(\t\x12\x13\n\x0bversionUuid\x18\x05 \x01(\t\x12\x13\n\x0bupgradeBlSd\x18\x06 \x01(\x08\x12\x13\n\x0bimageDirUrl\x18\x07 \x01(\t\"\xb9\x02\n\rGatewayConfig\x12\x14\n\x07version\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x03 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\x05 \x03(\x0b\x32 .wltPb.GatewayConfig.ConfigEntry\x1a;\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_location\"\xa6\x01\n\x0c\x43ustomBroker\x12\x14\n\x0c\x63ustomBroker\x18\x01 \x01(\x08\x12\x0c\n\x04port\x18\x02 \x01(\r\x12\x11\n\tbrokerUrl\x18\x03 \x01(\t\x12\x10\n\x08username\x18\x04 \x01(\t\x12\x10\n\x08password\x18\x05 \x01(\t\x12\x13\n\x0bupdateTopic\x18\x06 \x01(\t\x12\x13\n\x0bstatusTopic\x18\x07 \x01(\t\x12\x11\n\tdataTopic\x18\x08 \x01(\t\"\x81\x01\n\rCustomMessage\x12\x32\n\x07\x65ntries\x18\x01 \x03(\x0b\x32!.wltPb.CustomMessage.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0bwltPb.proto\x12\x05wltPb\"$\n\x08Location\x12\x0b\n\x03lat\x18\x01 \x01(\x01\x12\x0b\n\x03lng\x18\x02 \x01(\x01\"j\n\x05Value\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x42\x06\n\x04type\"\x89\x02\n\x0bGatewayData\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12*\n\x07packets\x18\x03 \x03(\x0b\x32\x19.wltPb.GatewayData.Packet\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x00\x88\x01\x01\x1as\n\x06Packet\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12\x12\n\nsequenceId\x18\x03 \x01(\r\x12\x11\n\x04rssi\x18\x04 \x01(\rH\x00\x88\x01\x01\x12\x15\n\raliasBridgeId\x18\x05 \x01(\tB\x07\n\x05_rssiB\x0b\n\t_location\"\xc9\x01\n\rUplinkMessage\x12-\n\rgatewayStatus\x18\x01 \x01(\x0b\x32\x14.wltPb.GatewayStatusH\x00\x12)\n\x0bgatewayInfo\x18\x02 \x01(\x0b\x32\x12.wltPb.GatewayInfoH\x00\x12)\n\x0bgatewayLogs\x18\x03 \x01(\x0b\x32\x12.wltPb.GatewayLogsH\x00\x12+\n\x0c\x61\x63tionStatus\x18\x04 \x01(\x0b\x32\x13.wltPb.ActionStatusH\x00\x42\x06\n\x04type\"&\n\x03\x41\x43L\x12\x12\n\nmode_allow\x18\x01 \x01(\x08\x12\x0b\n\x03ids\x18\x02 \x03(\x0c\"\x97\x01\n\x12GatewayConfigValue\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x12\x1e\n\x08\x61\x63lValue\x18\x05 \x01(\x0b\x32\n.wltPb.ACLH\x00\x42\x06\n\x04type\"\xe8\x03\n\rGatewayStatus\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x13\n\x0bgatewayType\x18\x02 \x01(\t\x12\x19\n\x11\x64ownlinkSupported\x18\x03 \x01(\x08\x12!\n\x19\x62ridgeOtaUpgradeSupported\x18\x04 \x01(\x08\x12\x12\n\napiVersion\x18\x05 \x01(\r\x12\x14\n\x07version\x18\x06 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x08 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\t \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\n \x03(\x0b\x32 .wltPb.GatewayStatus.ConfigEntry\x12\x17\n\nbleAddress\x18\x0b \x01(\tH\x04\x88\x01\x01\x1aH\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.wltPb.GatewayConfigValue:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_locationB\r\n\x0b_bleAddress\"}\n\x0bGatewayInfo\x12\x30\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x1f.wltPb.GatewayInfo.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\"\x1b\n\x0bGatewayLogs\x12\x0c\n\x04logs\x18\x01 \x03(\t\"\x92\x01\n\x0c\x41\x63tionStatus\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\r\x12\x0e\n\x06status\x18\x02 \x01(\r\x12\x11\n\x04step\x18\x03 \x01(\rH\x00\x88\x01\x01\x12\x15\n\x08progress\x18\x04 \x01(\rH\x01\x88\x01\x01\x12\x15\n\x08\x62ridgeId\x18\x05 \x01(\x0cH\x02\x88\x01\x01\x42\x07\n\x05_stepB\x0b\n\t_progressB\x0b\n\t_bridgeId\"\x8e\x02\n\x0f\x44ownlinkMessage\x12#\n\x08txPacket\x18\x01 \x01(\x0b\x32\x0f.wltPb.TxPacketH\x00\x12-\n\rgatewayAction\x18\x02 \x01(\x0b\x32\x14.wltPb.GatewayActionH\x00\x12-\n\rbridgeUpgrade\x18\x03 \x01(\x0b\x32\x14.wltPb.BridgeUpgradeH\x00\x12-\n\rgatewayConfig\x18\x04 \x01(\x0b\x32\x14.wltPb.GatewayConfigH\x00\x12-\n\rcustomMessage\x18\x06 \x01(\x0b\x32\x14.wltPb.CustomMessageH\x00\x42\x06\n\x04typeJ\x04\x08\x05\x10\x06R\x0c\x63ustomBroker\"F\n\x08TxPacket\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x12\n\nmaxRetries\x18\x02 \x01(\r\x12\x15\n\rmaxDurationMs\x18\x03 \x01(\r\"\x1f\n\rGatewayAction\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\"\xa5\x01\n\rBridgeUpgrade\x12\x14\n\x0crebootPacket\x18\x01 \x01(\x0c\x12\x17\n\x0ftxMaxDurationMs\x18\x02 \x01(\r\x12\x14\n\x0ctxMaxRetries\x18\x03 \x01(\r\x12\x10\n\x08\x62ridgeId\x18\x04 \x01(\t\x12\x13\n\x0bversionUuid\x18\x05 \x01(\t\x12\x13\n\x0bupgradeBlSd\x18\x06 \x01(\x08\x12\x13\n\x0bimageDirUrl\x18\x07 \x01(\t\"\xc6\x02\n\rGatewayConfig\x12\x14\n\x07version\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x03 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\x05 \x03(\x0b\x32 .wltPb.GatewayConfig.ConfigEntry\x1aH\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.wltPb.GatewayConfigValue:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_location\"\x81\x01\n\rCustomMessage\x12\x32\n\x07\x65ntries\x18\x01 \x03(\x0b\x32!.wltPb.CustomMessage.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\x62\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'wltPb_pb2', _globals)
-if _descriptor._USE_C_DESCRIPTORS == False:
-  DESCRIPTOR._options = None
-  _globals['_GATEWAYSTATUS_CONFIGENTRY']._options = None
+if not _descriptor._USE_C_DESCRIPTORS:
+  DESCRIPTOR._loaded_options = None
+  _globals['_GATEWAYSTATUS_CONFIGENTRY']._loaded_options = None
   _globals['_GATEWAYSTATUS_CONFIGENTRY']._serialized_options = b'8\001'
-  _globals['_GATEWAYINFO_ENTRIESENTRY']._options = None
+  _globals['_GATEWAYINFO_ENTRIESENTRY']._loaded_options = None
   _globals['_GATEWAYINFO_ENTRIESENTRY']._serialized_options = b'8\001'
-  _globals['_GATEWAYCONFIG_CONFIGENTRY']._options = None
+  _globals['_GATEWAYCONFIG_CONFIGENTRY']._loaded_options = None
   _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_options = b'8\001'
-  _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._options = None
+  _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._loaded_options = None
   _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_options = b'8\001'
   _globals['_LOCATION']._serialized_start=22
   _globals['_LOCATION']._serialized_end=58
@@ -39,34 +49,36 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _globals['_GATEWAYDATA_PACKET']._serialized_end=421
   _globals['_UPLINKMESSAGE']._serialized_start=437
   _globals['_UPLINKMESSAGE']._serialized_end=638
-  _globals['_GATEWAYSTATUS']._serialized_start=641
-  _globals['_GATEWAYSTATUS']._serialized_end=1116
-  _globals['_GATEWAYSTATUS_CONFIGENTRY']._serialized_start=977
-  _globals['_GATEWAYSTATUS_CONFIGENTRY']._serialized_end=1036
-  _globals['_GATEWAYINFO']._serialized_start=1118
-  _globals['_GATEWAYINFO']._serialized_end=1243
-  _globals['_GATEWAYINFO_ENTRIESENTRY']._serialized_start=1183
-  _globals['_GATEWAYINFO_ENTRIESENTRY']._serialized_end=1243
-  _globals['_GATEWAYLOGS']._serialized_start=1245
-  _globals['_GATEWAYLOGS']._serialized_end=1272
-  _globals['_ACTIONSTATUS']._serialized_start=1274
-  _globals['_ACTIONSTATUS']._serialized_end=1320
-  _globals['_DOWNLINKMESSAGE']._serialized_start=1323
-  _globals['_DOWNLINKMESSAGE']._serialized_end=1618
-  _globals['_TXPACKET']._serialized_start=1620
-  _globals['_TXPACKET']._serialized_end=1690
-  _globals['_GATEWAYACTION']._serialized_start=1692
-  _globals['_GATEWAYACTION']._serialized_end=1723
-  _globals['_BRIDGEUPGRADE']._serialized_start=1726
-  _globals['_BRIDGEUPGRADE']._serialized_end=1891
-  _globals['_GATEWAYCONFIG']._serialized_start=1894
-  _globals['_GATEWAYCONFIG']._serialized_end=2207
-  _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_start=977
-  _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_end=1036
-  _globals['_CUSTOMBROKER']._serialized_start=2210
-  _globals['_CUSTOMBROKER']._serialized_end=2376
-  _globals['_CUSTOMMESSAGE']._serialized_start=2379
-  _globals['_CUSTOMMESSAGE']._serialized_end=2508
-  _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_start=1183
-  _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_end=1243
+  _globals['_ACL']._serialized_start=640
+  _globals['_ACL']._serialized_end=678
+  _globals['_GATEWAYCONFIGVALUE']._serialized_start=681
+  _globals['_GATEWAYCONFIGVALUE']._serialized_end=832
+  _globals['_GATEWAYSTATUS']._serialized_start=835
+  _globals['_GATEWAYSTATUS']._serialized_end=1323
+  _globals['_GATEWAYSTATUS_CONFIGENTRY']._serialized_start=1171
+  _globals['_GATEWAYSTATUS_CONFIGENTRY']._serialized_end=1243
+  _globals['_GATEWAYINFO']._serialized_start=1325
+  _globals['_GATEWAYINFO']._serialized_end=1450
+  _globals['_GATEWAYINFO_ENTRIESENTRY']._serialized_start=1390
+  _globals['_GATEWAYINFO_ENTRIESENTRY']._serialized_end=1450
+  _globals['_GATEWAYLOGS']._serialized_start=1452
+  _globals['_GATEWAYLOGS']._serialized_end=1479
+  _globals['_ACTIONSTATUS']._serialized_start=1482
+  _globals['_ACTIONSTATUS']._serialized_end=1628
+  _globals['_DOWNLINKMESSAGE']._serialized_start=1631
+  _globals['_DOWNLINKMESSAGE']._serialized_end=1901
+  _globals['_TXPACKET']._serialized_start=1903
+  _globals['_TXPACKET']._serialized_end=1973
+  _globals['_GATEWAYACTION']._serialized_start=1975
+  _globals['_GATEWAYACTION']._serialized_end=2006
+  _globals['_BRIDGEUPGRADE']._serialized_start=2009
+  _globals['_BRIDGEUPGRADE']._serialized_end=2174
+  _globals['_GATEWAYCONFIG']._serialized_start=2177
+  _globals['_GATEWAYCONFIG']._serialized_end=2503
+  _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_start=1171
+  _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_end=1243
+  _globals['_CUSTOMMESSAGE']._serialized_start=2506
+  _globals['_CUSTOMMESSAGE']._serialized_end=2635
+  _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_start=1390
+  _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_end=1450
 # @@protoc_insertion_point(module_scope)

gw_certificate/common/wltPb_pb2.pyi

@@ -1,7 +1,8 @@
 from google.protobuf.internal import containers as _containers
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
-from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
+from collections.abc import Iterable as _Iterable, Mapping as _Mapping
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
@@ -62,6 +63,28 @@ class UplinkMessage(_message.Message):
     actionStatus: ActionStatus
     def __init__(self, gatewayStatus: _Optional[_Union[GatewayStatus, _Mapping]] = ..., gatewayInfo: _Optional[_Union[GatewayInfo, _Mapping]] = ..., gatewayLogs: _Optional[_Union[GatewayLogs, _Mapping]] = ..., actionStatus: _Optional[_Union[ActionStatus, _Mapping]] = ...) -> None: ...
 
+class ACL(_message.Message):
+    __slots__ = ("mode_allow", "ids")
+    MODE_ALLOW_FIELD_NUMBER: _ClassVar[int]
+    IDS_FIELD_NUMBER: _ClassVar[int]
+    mode_allow: bool
+    ids: _containers.RepeatedScalarFieldContainer[bytes]
+    def __init__(self, mode_allow: bool = ..., ids: _Optional[_Iterable[bytes]] = ...) -> None: ...
+
+class GatewayConfigValue(_message.Message):
+    __slots__ = ("integerValue", "numberValue", "stringValue", "boolValue", "aclValue")
+    INTEGERVALUE_FIELD_NUMBER: _ClassVar[int]
+    NUMBERVALUE_FIELD_NUMBER: _ClassVar[int]
+    STRINGVALUE_FIELD_NUMBER: _ClassVar[int]
+    BOOLVALUE_FIELD_NUMBER: _ClassVar[int]
+    ACLVALUE_FIELD_NUMBER: _ClassVar[int]
+    integerValue: int
+    numberValue: float
+    stringValue: str
+    boolValue: bool
+    aclValue: ACL
+    def __init__(self, integerValue: _Optional[int] = ..., numberValue: _Optional[float] = ..., stringValue: _Optional[str] = ..., boolValue: bool = ..., aclValue: _Optional[_Union[ACL, _Mapping]] = ...) -> None: ...
+
 class GatewayStatus(_message.Message):
     __slots__ = ("gatewayId", "gatewayType", "downlinkSupported", "bridgeOtaUpgradeSupported", "apiVersion", "version", "bleSwVersion", "interfaceSwVersion", "location", "config", "bleAddress")
     class ConfigEntry(_message.Message):
@@ -69,8 +92,8 @@ class GatewayStatus(_message.Message):
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
-        value: Value
-        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[Value, _Mapping]] = ...) -> None: ...
+        value: GatewayConfigValue
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[GatewayConfigValue, _Mapping]] = ...) -> None: ...
     GATEWAYID_FIELD_NUMBER: _ClassVar[int]
     GATEWAYTYPE_FIELD_NUMBER: _ClassVar[int]
     DOWNLINKSUPPORTED_FIELD_NUMBER: _ClassVar[int]
@@ -91,9 +114,9 @@ class GatewayStatus(_message.Message):
     bleSwVersion: str
     interfaceSwVersion: str
     location: Location
-    config: _containers.MessageMap[str, Value]
+    config: _containers.MessageMap[str, GatewayConfigValue]
     bleAddress: str
-    def __init__(self, gatewayId: _Optional[str] = ..., gatewayType: _Optional[str] = ..., downlinkSupported: bool = ..., bridgeOtaUpgradeSupported: bool = ..., apiVersion: _Optional[int] = ..., version: _Optional[str] = ..., bleSwVersion: _Optional[str] = ..., interfaceSwVersion: _Optional[str] = ..., location: _Optional[_Union[Location, _Mapping]] = ..., config: _Optional[_Mapping[str, Value]] = ..., bleAddress: _Optional[str] = ...) -> None: ...
+    def __init__(self, gatewayId: _Optional[str] = ..., gatewayType: _Optional[str] = ..., downlinkSupported: bool = ..., bridgeOtaUpgradeSupported: bool = ..., apiVersion: _Optional[int] = ..., version: _Optional[str] = ..., bleSwVersion: _Optional[str] = ..., interfaceSwVersion: _Optional[str] = ..., location: _Optional[_Union[Location, _Mapping]] = ..., config: _Optional[_Mapping[str, GatewayConfigValue]] = ..., bleAddress: _Optional[str] = ...) -> None: ...
 
 class GatewayInfo(_message.Message):
     __slots__ = ("entries",)
@@ -115,28 +138,32 @@ class GatewayLogs(_message.Message):
     def __init__(self, logs: _Optional[_Iterable[str]] = ...) -> None: ...
 
 class ActionStatus(_message.Message):
-    __slots__ = ("action", "status")
+    __slots__ = ("action", "status", "step", "progress", "bridgeId")
     ACTION_FIELD_NUMBER: _ClassVar[int]
     STATUS_FIELD_NUMBER: _ClassVar[int]
+    STEP_FIELD_NUMBER: _ClassVar[int]
+    PROGRESS_FIELD_NUMBER: _ClassVar[int]
+    BRIDGEID_FIELD_NUMBER: _ClassVar[int]
     action: int
     status: int
-    def __init__(self, action: _Optional[int] = ..., status: _Optional[int] = ...) -> None: ...
+    step: int
+    progress: int
+    bridgeId: bytes
+    def __init__(self, action: _Optional[int] = ..., status: _Optional[int] = ..., step: _Optional[int] = ..., progress: _Optional[int] = ..., bridgeId: _Optional[bytes] = ...) -> None: ...
 
 class DownlinkMessage(_message.Message):
-    __slots__ = ("txPacket", "gatewayAction", "bridgeUpgrade", "gatewayConfig", "customBroker", "customMessage")
+    __slots__ = ("txPacket", "gatewayAction", "bridgeUpgrade", "gatewayConfig", "customMessage")
     TXPACKET_FIELD_NUMBER: _ClassVar[int]
     GATEWAYACTION_FIELD_NUMBER: _ClassVar[int]
     BRIDGEUPGRADE_FIELD_NUMBER: _ClassVar[int]
     GATEWAYCONFIG_FIELD_NUMBER: _ClassVar[int]
-    CUSTOMBROKER_FIELD_NUMBER: _ClassVar[int]
     CUSTOMMESSAGE_FIELD_NUMBER: _ClassVar[int]
     txPacket: TxPacket
     gatewayAction: GatewayAction
     bridgeUpgrade: BridgeUpgrade
     gatewayConfig: GatewayConfig
-    customBroker: CustomBroker
     customMessage: CustomMessage
-    def __init__(self, txPacket: _Optional[_Union[TxPacket, _Mapping]] = ..., gatewayAction: _Optional[_Union[GatewayAction, _Mapping]] = ..., bridgeUpgrade: _Optional[_Union[BridgeUpgrade, _Mapping]] = ..., gatewayConfig: _Optional[_Union[GatewayConfig, _Mapping]] = ..., customBroker: _Optional[_Union[CustomBroker, _Mapping]] = ..., customMessage: _Optional[_Union[CustomMessage, _Mapping]] = ...) -> None: ...
+    def __init__(self, txPacket: _Optional[_Union[TxPacket, _Mapping]] = ..., gatewayAction: _Optional[_Union[GatewayAction, _Mapping]] = ..., bridgeUpgrade: _Optional[_Union[BridgeUpgrade, _Mapping]] = ..., gatewayConfig: _Optional[_Union[GatewayConfig, _Mapping]] = ..., customMessage: _Optional[_Union[CustomMessage, _Mapping]] = ...) -> None: ...
 
 class TxPacket(_message.Message):
     __slots__ = ("payload", "maxRetries", "maxDurationMs")
@@ -179,8 +206,8 @@ class GatewayConfig(_message.Message):
         KEY_FIELD_NUMBER: _ClassVar[int]
         VALUE_FIELD_NUMBER: _ClassVar[int]
         key: str
-        value: Value
-        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[Value, _Mapping]] = ...) -> None: ...
+        value: GatewayConfigValue
+        def __init__(self, key: _Optional[str] = ..., value: _Optional[_Union[GatewayConfigValue, _Mapping]] = ...) -> None: ...
     VERSION_FIELD_NUMBER: _ClassVar[int]
     BLESWVERSION_FIELD_NUMBER: _ClassVar[int]
     INTERFACESWVERSION_FIELD_NUMBER: _ClassVar[int]
@@ -190,28 +217,8 @@ class GatewayConfig(_message.Message):
     bleSwVersion: str
     interfaceSwVersion: str
     location: Location
-    config: _containers.MessageMap[str, Value]
-    def __init__(self, version: _Optional[str] = ..., bleSwVersion: _Optional[str] = ..., interfaceSwVersion: _Optional[str] = ..., location: _Optional[_Union[Location, _Mapping]] = ..., config: _Optional[_Mapping[str, Value]] = ...) -> None: ...
-
-class CustomBroker(_message.Message):
-    __slots__ = ("customBroker", "port", "brokerUrl", "username", "password", "updateTopic", "statusTopic", "dataTopic")
-    CUSTOMBROKER_FIELD_NUMBER: _ClassVar[int]
-    PORT_FIELD_NUMBER: _ClassVar[int]
-    BROKERURL_FIELD_NUMBER: _ClassVar[int]
-    USERNAME_FIELD_NUMBER: _ClassVar[int]
-    PASSWORD_FIELD_NUMBER: _ClassVar[int]
-    UPDATETOPIC_FIELD_NUMBER: _ClassVar[int]
-    STATUSTOPIC_FIELD_NUMBER: _ClassVar[int]
-    DATATOPIC_FIELD_NUMBER: _ClassVar[int]
-    customBroker: bool
-    port: int
-    brokerUrl: str
-    username: str
-    password: str
-    updateTopic: str
-    statusTopic: str
-    dataTopic: str
-    def __init__(self, customBroker: bool = ..., port: _Optional[int] = ..., brokerUrl: _Optional[str] = ..., username: _Optional[str] = ..., password: _Optional[str] = ..., updateTopic: _Optional[str] = ..., statusTopic: _Optional[str] = ..., dataTopic: _Optional[str] = ...) -> None: ...
+    config: _containers.MessageMap[str, GatewayConfigValue]
+    def __init__(self, version: _Optional[str] = ..., bleSwVersion: _Optional[str] = ..., interfaceSwVersion: _Optional[str] = ..., location: _Optional[_Union[Location, _Mapping]] = ..., config: _Optional[_Mapping[str, GatewayConfigValue]] = ...) -> None: ...
 
 class CustomMessage(_message.Message):
     __slots__ = ("entries",)

gw_certificate/gw_certificate.py

@@ -18,8 +18,9 @@ from gw_certificate.interface.ble_simulator import BLESimulator
 from gw_certificate.interface.mqtt import MqttClient
 from gw_certificate.tests import *
 from gw_certificate.interface.uart_ports import get_uart_ports
-from gw_certificate.api_if.gw_capabilities import GWCapabilities
+from gw_certificate.api_if.gw_capabilities import GWCapabilities, ConfigurationData
 from gw_certificate.tests import TESTS_NO_UART
+
 import gw_certificate.cert_results as cert_results
 
 GW_CERT_VERSION = importlib.metadata.version("wiliot-certificate")
@@ -58,6 +59,7 @@ class GWCertificate:
         self.result_pdf_path = os.path.join(self.certificate_dir, f'results_{self.current_datetime.strftime('%Y%m%d_%H%M%S')}.pdf')
         self.template_engine = TemplateEngine()
         self.env = env
+        self.error = ""
 
         # Version 
         self.gw_cert_version = GW_CERT_VERSION
@@ -71,7 +73,7 @@ class GWCertificate:
         self.stress_pps = stress_pps
         self.aggregation_time = aggregation_time
         self.actions = actions
-        self.error = ""
+        self.cfg_data = ConfigurationData()
         
         # UART-related. Require only when running tests that need it
         self.use_uart = not all(test in TESTS_NO_UART for test in tests)

gw_certificate/gw_certificate_cli.py

@@ -1,6 +1,6 @@
 
 import time
-from argparse import ArgumentParser
+from argparse import ArgumentParser, SUPPRESS
 
 from gw_certificate.common.debug import debug_print
 from gw_certificate.gw_certificate import GWCertificate, GW_CERT_VERSION
@@ -27,7 +27,7 @@ def filter_actions(actions_names):
 def main():
     usage = (
         "usage: wlt-gw-certificate [-h] -owner OWNER -gw GW\n"
-        f"                          [-tests {{connection, uplink, downlink, actions, stress}}] [-update] [-pps {STRESS_DEFAULT_PPS}]\n"
+        f"                          [-tests {{connection, uplink, downlink, actions, stress}}] [-noupdate] [-pps {STRESS_DEFAULT_PPS}]\n"
         f"                          [-actions {{info, reboot, bridgeota}}] [-agg AGG] [-env {{prod, test, dev}}]"
         )
 
@@ -44,13 +44,14 @@ def main():
                           default=['connection', 'uplink', 'downlink', 'actions', 'stress'])
     optional.add_argument('-actions', type=str, choices=['info', 'reboot', 'bridgeota'],
                           help="Action stages to run under ActionsTest", required=False, nargs='+', default=['info', 'reboot', 'bridgeota'])
-    optional.add_argument('-update', action='store_true', help='Update test board firmware', default=False, required=False)
     optional.add_argument('-pps', type=int, help='Single packets-per-second rate to simulate in the stress test',
                           choices=STRESS_DEFAULT_PPS, default=None, required=False)
     optional.add_argument('-agg', type=int, help='Aggregation time [seconds] the Uplink stages wait before processing results',
                           default=0, required=False)
     optional.add_argument('-env', type=str, help='Environment for the RegistrationTest & BridgeOTAStage',
                           choices=['prod', 'test', 'dev'], default='prod', required=False)
+    optional.add_argument('-update', action='store_true', help=SUPPRESS, default=True, required=False)
+    optional.add_argument('-noupdate', action='store_true', help='Skip the default certification kit firmware update', default=False, required=False)
     args = parser.parse_args()
 
     topic_suffix = '' if args.suffix == '' else '-'+args.suffix
@@ -72,7 +73,7 @@ def main():
         parser.error("When running any test other than registration, the gateway must be registered to an owner which should be provided using the '-owner' flag.")
 
 
-    gwc = GWCertificate(gw_id=args.gw, owner_id=args.owner, topic_suffix=topic_suffix, tests=tests, update_fw=args.update,
+    gwc = GWCertificate(gw_id=args.gw, owner_id=args.owner, topic_suffix=topic_suffix, tests=tests, update_fw=(not args.noupdate),
                         stress_pps=args.pps, aggregation_time=args.agg, env=args.env, actions=actions)
     debug_print(f"All arguments: {vars(args)}")
     gwc.run_tests()

gw_certificate/interface/ble_simulator.py

@@ -20,19 +20,21 @@ class BLESimulator():
             self.uart.reset_gw()
         time.sleep(3)
 
-    def send_packet(self, raw_packet, duplicates=DEFAULT_DUPLICATES, output_power=DEFAULT_OUTPUT_POWER, channel=SEND_ALL_ADV_CHANNELS, delay=DEFAULT_DELAY):
+    def send_packet(self, raw_packet, duplicates=DEFAULT_DUPLICATES, output_power=DEFAULT_OUTPUT_POWER, channel=SEND_ALL_ADV_CHANNELS,
+                    delay=DEFAULT_DELAY, print_for_debug=True):
         assert self.sim_mode is True, 'BLE Sim not initialized!'
         if len(raw_packet) == 62:
             # Add ADVA
             raw_packet = DEFAULT_ADVA + raw_packet
         if len(raw_packet) != 74:
             raise ValueError('Raw Packet must be 62/74 chars long!')
-        self.uart.write_ble_command(f"!ble_sim {str(raw_packet)} {str(duplicates)} {str(output_power)} {str(channel)} {str(delay)}")
+        self.uart.write_ble_command(f"!ble_sim {str(raw_packet)} {str(duplicates)} {str(output_power)} {str(channel)} {str(delay)}", print_for_debug=print_for_debug)
         if delay > 0:
             diff = time.perf_counter()
             time.sleep((delay/1000) * duplicates)
             diff = time.perf_counter() - diff
-            debug_print(f'Desired Delay: {(delay/1000) * duplicates} Actual Delay {diff}')
+            if print_for_debug:
+                debug_print(f'Desired Delay: {(delay/1000) * duplicates} Actual Delay {diff}')
 
     
     def send_data_si_pair(self, data_packet, si_packet, duplicates, output_power=DEFAULT_OUTPUT_POWER, delay=DEFAULT_DELAY, packet_error=None):

gw_certificate/interface/flash_fw.py

@@ -0,0 +1,90 @@
+import sys
+import serial
+import time
+import argparse
+import subprocess
+import serial.tools.list_ports
+import datetime
+import tkinter as tk
+from tkinter import filedialog
+SEP = "#"*100
+
+NRFUTIL_MAP = {"linux": "nrfutil-linux", "linux2": "nrfutil-linux", "darwin": "nrfutil-mac", "win32": ".\\nrfutil.exe"}
+
+def read_from_ble(ble_ser):
+    ble_ser_bytes = ble_ser.readline()
+    input = ble_ser_bytes.decode("utf-8", "ignore").strip()
+    if input:
+        print(input)
+    return input
+
+class Command:
+    def __init__(self, cmd, expected, delay=0):
+        self.cmd = cmd
+        self.cmd_exec = b'\r\n!'+bytes(cmd, encoding='utf-8')+b'\r\n'
+        self.expected = expected
+        self.delay = delay
+    def exec_cmd(self, ble_ser):
+        print("==>> !{}".format(self.cmd))
+        ble_ser.write(self.cmd_exec)
+        start_time = datetime.datetime.now()
+        while (datetime.datetime.now() - start_time).seconds < 2:
+            if self.expected in read_from_ble(ble_ser):
+                print("success!\n{}".format(SEP))
+                return 0
+        print("failure!\n{}".format(SEP))
+        return 1
+
+GW_COMMANDS = [
+    Command(cmd="version", expected="WILIOT_GW_BLE_CHIP_SW_VER"),
+    Command(cmd="move_to_bootloader", expected='')
+]
+
+def run_cmd(cmd):
+    print("Running: " + cmd)
+    p = subprocess.Popen(cmd, shell=True)
+    p.wait()
+    if p.returncode:
+        print(f"\nFailed running : {cmd}\n")
+        sys.exit(-1)
+    else:
+        print(f"\nSuccess running : {cmd}\n")
+
+def main():
+
+    ports = serial.tools.list_ports.comports()
+    print(SEP + "\nAvailable ports:")
+    for port, desc, hwid in sorted(ports):
+            print("{}: {} [{}]".format(port, desc, hwid))
+    print(SEP + "\n")
+
+    parser = argparse.ArgumentParser(description='Used to load gw image')
+    parser.add_argument('--p', type=str, help='COM for the ble - meaning loading gw zip file from UART')
+    args = parser.parse_args()
+
+
+    if args.p:
+        ble_ser = serial.Serial(port=args.p, baudrate=921600, timeout=0.1)
+        ble_ser.flushInput()
+
+        failures = 0
+        
+        for cmd in GW_COMMANDS:
+            failures += cmd.exec_cmd(ble_ser)
+            time.sleep(cmd.delay)
+        if failures == 0:
+            ble_ser.close()
+            time.sleep(2)
+            print("Please pick a file! (<X.Y.Z>_app.zip)")
+            root = tk.Tk()
+            root.withdraw()
+            file_path = filedialog.askopenfilename()
+            print(file_path)
+            cmd = f'{NRFUTIL_MAP[sys.platform]} dfu serial --package "{file_path}" -p {args.p} -fc 0 -b 115200 -t 10'
+            run_cmd(cmd)
+        else:
+            print("ERROR: failed to run UART commands!")
+
+
+if __name__ == "__main__":
+    main()

gw_certificate/interface/mqtt.py

@@ -346,7 +346,7 @@ class MqttClient:
                     return message.body_ex
         return None
         
-    def get_gw_configuration(self):
+    def get_gw_configuration_reboot(self):
         self.flush_messages()
         self.send_action(GwAction.REBOOT_GW)
         debug_print('---GW CONFIG---')
@@ -360,20 +360,29 @@ class MqttClient:
         if mqtt_mode == 'legacy':
             return self.send_action(GwAction.DISABLE_DEV_MODE)
         elif mqtt_mode == 'automatic':
-            custom_mqtt = {
-                "customBroker": False,
-                "brokerUrl": "",
-                "port": 8883,
-                "username": "",
-                "password": "",
-                "updateTopic": f"update/{self.owner_id}/{self.gw_id}",
-                "statusTopic": f"status/{self.owner_id}/{self.gw_id}",
-                "dataTopic": f"data/{self.owner_id}/{self.gw_id}"
-                }
             if self.get_serialization() in {Serialization.UNKNOWN, Serialization.JSON}:
+                custom_mqtt = {
+                    "customBroker": False,
+                    "brokerUrl": "",
+                    "port": 8883,
+                    "username": "",
+                    "password": "",
+                    "updateTopic": f"update/{self.owner_id}/{self.gw_id}",
+                    "statusTopic": f"status/{self.owner_id}/{self.gw_id}",
+                    "dataTopic": f"data/{self.owner_id}/{self.gw_id}"
+                    }
                 self.send_payload(custom_mqtt)
             if self.get_serialization() in {Serialization.UNKNOWN, Serialization.PB}:
-                self.send_payload({'customBroker': custom_mqtt})
+                custom_mqtt = wltPb_pb2.DownlinkMessage()
+                custom_mqtt.customMessage.entries['customBroker'].CopyFrom(wltPb_pb2.Value(boolValue=False))
+                custom_mqtt.customMessage.entries['brokerUrl'].CopyFrom(wltPb_pb2.Value(stringValue=""))
+                custom_mqtt.customMessage.entries['port'].CopyFrom(wltPb_pb2.Value(integerValue=8883))
+                custom_mqtt.customMessage.entries['username'].CopyFrom(wltPb_pb2.Value(stringValue=""))
+                custom_mqtt.customMessage.entries['password'].CopyFrom(wltPb_pb2.Value(stringValue=""))
+                custom_mqtt.customMessage.entries['updateTopic'].CopyFrom(wltPb_pb2.Value(stringValue=f"update/{self.owner_id}/{self.gw_id}"))
+                custom_mqtt.customMessage.entries['statusTopic'].CopyFrom(wltPb_pb2.Value(stringValue=f"status/{self.owner_id}/{self.gw_id}"))
+                custom_mqtt.customMessage.entries['dataTopic'].CopyFrom(wltPb_pb2.Value(stringValue=f"data/{self.owner_id}/{self.gw_id}"))
+                self.send_payload(custom_mqtt)
         elif mqtt_mode == 'manual':
             debug_print(f"Make sure GW {self.gw_id} is set to Wiliot MQTT broker")
             return True
@@ -383,6 +392,15 @@ class MqttClient:
         self.userdata = {'messages': WltMqttMessages(), 'gw_seen': False , 'logger': self.logger, 'serialization':self.get_serialization(), 'published':[]}
         self.client.user_data_set(self.userdata)
     
+    def flush_messages_topic(self, topic:Literal['status', 'data', 'update']):
+        if topic == 'data':
+            self.userdata['messages'].data = []
+        elif topic == 'status':
+            self.userdata['messages'].status = []
+        elif topic == 'update':
+            self.userdata['messages'].update = []
+            
+    
     def get_all_messages_from_topic(self, topic:Literal['status', 'data', 'update']):
         return getattr(self.userdata['messages'], topic)
     
@@ -406,19 +424,21 @@ class MqttClient:
                 elif GATEWAYSTATUS in message.body_ex.keys():
                     return message.body_ex[GATEWAYSTATUS]
         return None
-
+    
     def get_action_status_message(self):
+        # Implemented with a list since we can't expect when the GW will publish a msg. To avoid flushing it.
         messages = self.get_all_messages_from_topic('status')
+        action_status_msgs = []
         for message in messages:
             if GW_LOGS not in message.body_ex.keys():
                 if STATUS_CODE_STR in message.body_ex.keys():
-                    return message.body_ex
+                    action_status_msgs.append(message.body_ex)
                 elif ACTIONSTATUS in message.body_ex.keys():
-                    if 'status' not in message.body_ex[ACTIONSTATUS].keys():
-                        # Default values are omitted in protobuf, set 0 for explicitness
-                        message.body_ex[ACTIONSTATUS]['status'] = 0
-                    return message.body_ex[ACTIONSTATUS]
-        return None
+                    message.body_ex[ACTIONSTATUS].setdefault('status', 0)
+                    action_status_msgs.append(message.body_ex[ACTIONSTATUS])
+        if len(action_status_msgs) == 0:
+            return None
+        return action_status_msgs[-1]
     
     def get_coupled_tags_pkts(self):
         return [p for p in self.get_all_pkts_from_topic('data') if NFPKT in p]
@@ -517,9 +537,6 @@ def on_message_protobuf(mqttc, userdata, message):
         try:
             pb_message = wltPb_pb2.GatewayData()
             pb_message.ParseFromString(message.payload)
-            # # Decode packets payloads as hex
-            # for idx, packet in enumerate(pb_message.packets):
-            #     pb_message.packets[idx].payload = packet.payload.hex().upper().encode('utf-8')
         except DecodeError as e: 
             userdata['logger'].debug(f'{message.topic}: An exception occured:\n{e}\n(could be a JSON msg or pb msg that is not UplinkMessage)###########')
             userdata['logger'].debug(f'Raw Payload: {message.payload}')
@@ -528,7 +545,6 @@ def on_message_protobuf(mqttc, userdata, message):
         userdata['logger'].debug(f'{message.topic}: {message.payload}')
     if pb_message is not None:
         pb_message_dict = MessageToDict(pb_message)
-        # Decode b64 packet payloads to hex
         if 'data' in message.topic and 'packets' in pb_message_dict.keys():
             for idx, packet in enumerate(pb_message_dict['packets']):
                 pb_message_dict['packets'][idx]['payload'] = base64.b64decode(packet['payload']).hex().upper()

gw_certificate/interface/pkt_generator.py

@@ -185,15 +185,6 @@ class TagPktGenerator:
         assert len(pkt) == 62, "packet must be 74 / 62 hex chars long!"
         self.data_packet.set(pkt)
     
-    def get_expected_mqtt(self):
-        timestamp = int(datetime.datetime.now().timestamp() * 1000)
-        expected = {
-            TIMESTAMP: timestamp,
-            PAYLOAD: self.get_packet()[ADVA_LENGTH+GAP_LENGTH:]
-        }
-        return expected
-
-
 
 class BrgPktGenerator:
     """Bridge Packet Generator - represents 1 wiliot Bridge"""
@@ -451,41 +442,6 @@ class BrgPktGenerator:
         }
         return [expected_data, expected_si]
 
-    def get_expected_mqtt_unified(self, full_data_pkt, tag_idx:int=None):
-        if tag_idx is None:
-            tag_idx = 0
-        assert tag_idx <= len(self.tag_list), f'Tag index must be in {[i for i in range(len(self.tag_list))]}'
-
-        def extract_param_from_pkt():
-            # Take only the relevant digis from the data packet
-            param_hex_string = full_data_pkt[46:-22]
-            if len(param_hex_string) != 6:
-                raise ValueError("The parameters hex representation must be 6 digits long")
-            
-            # Convert to decimal from binari and assign
-            param_binari_string = bin(int(param_hex_string, 16))[2:].zfill(24)
-            nfpkt = int(param_binari_string[:8], 2)
-            rssi = int(param_binari_string[8:14], 2)
-            # Note: rssi here is -40 then the actual value. This portion is to be added on cloud
-            brg_latency = int(param_binari_string[14:20], 2)
-            brg_global_pacing_group = int(param_binari_string[20:], 2)
-            return [nfpkt, rssi, brg_latency, brg_global_pacing_group]
-
-        """generates expected MQTT packet"""
-        timestamp = int(datetime.datetime.now().timestamp() * 1000)
-        pkt_param = extract_param_from_pkt()
-
-        expected_data = {
-            TIMESTAMP: timestamp,
-            BRIDGE_ID: self.bridge_id,
-            NFPKT: pkt_param[0],
-            RSSI: pkt_param[1],
-            BRG_LATENCY: pkt_param[2],
-            BRG_GLOBAL_PACING_GROUP: pkt_param[3],
-            PAYLOAD: full_data_pkt[(ADVA_LENGTH+GAP_LENGTH):]
-        }
-        return [expected_data]
-
     def get_expected_hb_mqtt(self):
         timestamp = int(datetime.datetime.now().timestamp() * 1000)
         expected = {