From 8cfdb26dc78cd6df2c34e0a19804ec88cd17e1e0 Mon Sep 17 00:00:00 2001 From: Seppo Takalo Date: Wed, 24 May 2023 15:17:47 +0300 Subject: [PATCH] samples: lwm2m_client: Fix Coiote FOTA script Advanced Firmware object was renamed to Multicomponent Firmware Update object. This caused changes to REST API. Signed-off-by: Seppo Takalo --- samples/cellular/lwm2m_client/scripts/coiote.py | 14 +++++++------- samples/cellular/lwm2m_client/scripts/fota.py | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/cellular/lwm2m_client/scripts/coiote.py b/samples/cellular/lwm2m_client/scripts/coiote.py index 9e6faad15e6..fcaa8f5806d 100755 --- a/samples/cellular/lwm2m_client/scripts/coiote.py +++ b/samples/cellular/lwm2m_client/scripts/coiote.py @@ -160,7 +160,7 @@ def delete(self, path): return Coiote.handle_response(resp) def fota_object(self): - resp = self.get(f'/cachedDataModels/{self.device_id}?parameters={"Advanced Firmware Update."}') + resp = self.get(f'/cachedDataModels/{self.device_id}?parameters={"Multicomponent Firmware Update."}') response_length = len(resp) if response_length: return 33629 @@ -241,7 +241,7 @@ def fota_update(self, object, instance, linked_instance=None): operation = Operationlist() if object == 33629: - resource = f'Advanced Firmware Update.{instance}.Update' + resource = f'Multicomponent Firmware Update.{instance}.Update' if linked_instance is not None: if isinstance(linked_instance, list): linked_list = "" @@ -269,10 +269,10 @@ def fota_object_read(self, object, instance): version_num = None if object == 33629: - resource = f'Advanced Firmware Update.{instance}.' - state_path = f'Advanced Firmware Update.{instance}.State' - result_path = f'Advanced Firmware Update.{instance}.Update Result' - version_num_path = f'Advanced Firmware Update.{instance}.Current Version' + resource = f'Multicomponent Firmware Update.{instance}.' + state_path = f'Multicomponent Firmware Update.{instance}.State' + result_path = f'Multicomponent Firmware Update.{instance}.Update Result' + version_num_path = f'Multicomponent Firmware Update.{instance}.Current Version' else: resource = f'Firmware Update.{instance}.' state_path = f'Firmware Update.{instance}.State' @@ -300,7 +300,7 @@ def fota_cancel(self, object, instance): operation = Operationlist() if object == 33629: - operation.resource = f'Advanced Firmware Update.{instance}.Cancel' + operation.resource = f'Multicomponent Firmware Update.{instance}.Cancel' return self.execute(operation, True) elif object == 5: operation.resource = "Firmware Update.0.Package URI" diff --git a/samples/cellular/lwm2m_client/scripts/fota.py b/samples/cellular/lwm2m_client/scripts/fota.py index 71e41327a6b..561f485cc54 100755 --- a/samples/cellular/lwm2m_client/scripts/fota.py +++ b/samples/cellular/lwm2m_client/scripts/fota.py @@ -101,7 +101,7 @@ def set_dev_id(self, dev_id): self.app_instance_id = 0 if self.fota_object == 33629: self.modem_instance_id = 1 - self.observation_url = "Advanced Firmware Update" + self.observation_url = "Multicomponent Firmware Update" else: self.modem_instance_id = 0 self.observation_url = "Firmware Update" @@ -121,7 +121,7 @@ def download_url_generate(self, resource_id, protocol): def firmware_url_resource_get(self, instance_id): app_pack_url = None if self.fota_object == 33629: - app_pack_url = f'Advanced Firmware Update.{instance_id}.Package URI' + app_pack_url = f'Multicomponent Firmware Update.{instance_id}.Package URI' else: app_pack_url = f'Firmware Update.{instance_id}.Package URI' return app_pack_url