NEXMANAGE-733 Fix typo in package_list during conversion from INBS to…

… cloudadapter (#590)
intel · Oct 30, 2024 · 64bea9a · 64bea9a
1 parent c051447
commit 64bea9a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/inbm/Changelog.md b/inbm/Changelog.md
@@ -10,6 +10,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 ### Added
  - (NEXMANAGE-950) Add Set Power State Capability to cloudadapter from UDM
 
+### Fixed
+ - (NEXMANAGE-733) Fixed typo in package_list during conversion from INBS to cloudadapter
+
 ## 4.2.6.2 - 2024-10-25
 ### Added
  - (NEXMANAGE-900) Add UpdateFirmware to the common proto file and cloudadapter support from UDM

diff --git a/inbm/cloudadapter-agent/cloudadapter/cloud/adapters/inbs/operation.py b/inbm/cloudadapter-agent/cloudadapter/cloud/adapters/inbs/operation.py
@@ -247,7 +247,7 @@ def convert_system_software_operation_to_xml_manifest(operation: UpdateSystemSof
     # Convert package list to comma-separated string
     if len(operation.package_list) > 0:
         package_list_str = ','.join(operation.package_list)
-        ET.SubElement(sota, 'packageList').text = package_list_str
+        ET.SubElement(sota, 'package_list').text = package_list_str
 
     # Fetch URL
     if operation.url != '':

diff --git a/inbm/cloudadapter-agent/tests/unit/cloud/adapters/inbs/test_operation.py b/inbm/cloudadapter-agent/tests/unit/cloud/adapters/inbs/test_operation.py
@@ -59,7 +59,7 @@
     '<?xml version="1.0" encoding="utf-8"?>\n'
     "<manifest><type>ota</type><ota><header><type>sota</type><repo>remote</repo></header>"
     '<type><sota><cmd logtofile="y">update</cmd><mode>full</mode>'
-    "<packageList>package1,package2</packageList>"
+    "<package_list>package1,package2</package_list>"
     "<fetch>http://example.com/update</fetch>"
     "<releaseDate>2023-01-01</releaseDate>"
     "<deviceReboot>yes</deviceReboot>"

diff --git a/inbm/dockerfiles/Dockerfile-Windows.m4 b/inbm/dockerfiles/Dockerfile-Windows.m4
@@ -4,7 +4,7 @@
 include(`image.main.m4')
 
 # base windows/wine build image
-FROM registry.hub.docker.com/tobix/pywine:3.12 as base-windows
+FROM registry.hub.docker.com/tobix/pywine:3.12 AS base-windows
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -43,7 +43,7 @@ RUN pip3 install wheel
 COPY inbm-lib /src/inbm-lib
 RUN pip3 install -e /src/inbm-lib
 
-FROM base-windows as windows-cloudadapter-py3
+FROM base-windows AS windows-cloudadapter-py3
 COPY inbm/cloudadapter-agent/requirements.txt /src/cloudadapter-agent/requirements.txt
 COPY inbm/cloudadapter-agent/test-requirements.txt /src/cloudadapter-agent/test-requirements.txt
 WORKDIR /src/cloudadapter-agent
@@ -58,23 +58,23 @@ RUN mkdir -p /output && \
 RUN pyinstaller inbm-cloudadapter-windows.spec && \
     cp -r ../cloudadapter-agent/dist/inbm-cloudadapter /output
 
-FROM registry.hub.docker.com/library/golang:1.22-bookworm as inb-provision-certs-windows
+FROM registry.hub.docker.com/library/golang:1.22-bookworm AS inb-provision-certs-windows
 COPY inbm/fpm/inb-provision-certs /inb-provision-certs
 RUN cd /inb-provision-certs && GOOS=windows GOARCH=386 CGO_ENABLED=0 go build . && \
     rm -rf /output/ && mkdir /output && cp /inb-provision-certs/inb-provision-certs.exe /output/inb-provision-certs.exe
 
-FROM registry.hub.docker.com/library/golang:1.22-bookworm as inb-provision-cloud-windows
+FROM registry.hub.docker.com/library/golang:1.22-bookworm AS inb-provision-cloud-windows
 COPY inbm/fpm/inb-provision-cloud /inb-provision-cloud
 RUN cd /inb-provision-cloud && GOOS=windows GOARCH=386 CGO_ENABLED=0 go build . && \
     rm -rf /output/ && mkdir /output && cp /inb-provision-cloud/inb-provision-cloud.exe /output/inb-provision-cloud.exe
 
-FROM registry.hub.docker.com/library/golang:1.22-bookworm as inb-provision-ota-cert-windows
+FROM registry.hub.docker.com/library/golang:1.22-bookworm AS inb-provision-ota-cert-windows
 COPY inbm/fpm/inb-provision-ota-cert /inb-provision-ota-cert
 RUN cd /inb-provision-ota-cert && GOOS=windows GOARCH=386 CGO_ENABLED=0 go build . && \
     rm -rf /output/ && mkdir /output && cp /inb-provision-ota-cert/inb-provision-ota-cert.exe /output/inb-provision-ota-cert.exe
 
 # output container
-FROM registry.hub.docker.com/library/ubuntu:20.04 as output-windows
+FROM registry.hub.docker.com/library/ubuntu:20.04 AS output-windows
 RUN apt-get update && apt-get install -y -q wget
 COPY --from=windows-cloudadapter-py3 /output/ /windows-cloudadapter-py3
 COPY --from=inb-provision-certs-windows /output /windows-inb-provision-certs