From 1fad4fbe6da0a092f56874a387a4dbfc142a817e Mon Sep 17 00:00:00 2001 From: Shivaprasad Ashok Metimath Date: Mon, 18 Mar 2024 10:12:37 +0000 Subject: [PATCH] CRAYSAT-1935:create_image_customization_session() missing `image_name` argument Backport `CRAYSAT-1747: Allow passing CFS session name` to SAT 2.6 / CSM 1.5 Incorrect logging is observed in sat bootprep logs SAT is also generating a session name, which is conflicting with session name generated in create_image_customization_session Hence updating the `begin_image_configure` to pass session name to address sat bootprep incorrect logging (cherry picked from commit e35ac289cfac844d98727f715c742248ce9239e7) --- CHANGELOG.md | 6 ++++++ requirements.txt | 2 +- sat/cli/bootprep/input/image.py | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c584044c..16bc62aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.25.16] - 2024-11-13 + +### Changed +- Updated `begin_image_configure` to pass session name generated to address the + sat bootprep incorrect logging of 2 session names + ## [3.25.15] - 2024-10-10 ### Changed diff --git a/requirements.txt b/requirements.txt index 1ec80a78..e8519511 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # Top-level requirements for sat package to function. -# (C) Copyright 2019-2023 Hewlett Packard Enterprise Development LP. +# (C) Copyright 2019-2024 Hewlett Packard Enterprise Development LP. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), diff --git a/sat/cli/bootprep/input/image.py b/sat/cli/bootprep/input/image.py index 1eceeb66..3d106002 100644 --- a/sat/cli/bootprep/input/image.py +++ b/sat/cli/bootprep/input/image.py @@ -1,7 +1,7 @@ # # MIT License # -# (C) Copyright 2021-2023 Hewlett Packard Enterprise Development LP +# (C) Copyright 2021-2024 Hewlett Packard Enterprise Development LP # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -403,7 +403,7 @@ def begin_image_configure(self): try: self.image_configure_session = self.cfs_client.create_image_customization_session( - self.configuration, self.image_id_to_configure, self.configuration_group_names, self.name) + session_name, self.configuration, self.image_id_to_configure, self.configuration_group_names, self.name) except APIError as err: raise ImageCreateError(f'Failed to launch image customization CFS session: {err}')