Merge pull request #1 from Cray-HPE/CASMHMS-5604

CASMHMS-5604: Fixed an issue where node MAC addresses where node bein…

Author: rsjostrand-hpe

.version

@@ -1 +1 @@
-1.2.0
+1.3.0

CHANGELOG.md

@@ -24,6 +24,16 @@ Fixed - for any bug fixes
 Security - in case of vulnerabilities
 -->
 
+## [1.3.0] - 2022-07-01
+
+### Fixed
+
+- CASMHMS-5604: Fixed an issue where node MAC addresses where node being randomized.
+
+### Changed
+
+- Remove build dependencies at the end of the build step to create a leaner docker image. The image size is now 156MB, when in the pervious release is 1.42GB.
+
 ## [1.2.0] - 2022-06-17
 
 ### Added

Dockerfile

@@ -28,7 +28,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-FROM artifactory.algol60.net/docker.io/library/golang:1.16-alpine AS build-base
+FROM artifactory.algol60.net/docker.io/library/alpine:3.16 AS base
 
 # Insert our emulator extentions
 COPY src /app
@@ -52,7 +52,16 @@ RUN set -ex \
         pip \
         setuptools \
     && pip3 install wheel \
-    && pip3 install -r /app/requirements.txt
+    && pip3 install -r /app/requirements.txt \
+    && apk del \
+        build-base \
+        gcc \
+        python3-dev \
+        openssl-dev \
+        libffi-dev \
+        musl-dev \
+        cargo
+
 
 EXPOSE 5000
 ENV MOCKUPFOLDER="public-rackmount1"

src/api_emulator/loader.py

@@ -528,7 +528,7 @@ def randomize(self):
                                     foundSNs[sn] = rndSN
                                     page['SerialNumber'] = rndSN
                 if 'EthernetInterfaces' in system:
-                    url = system[collection]['@odata.id'].replace('/redfish/v1/', '')
+                    url = system['EthernetInterfaces']['@odata.id'].replace('/redfish/v1/', '')
                     collection_page = self.resource_dictionary.get_resource(url)
                     for memberUrl in collection_page['Members']:
                         url = memberUrl['@odata.id'].replace('/redfish/v1/', '')