From b74b598d48a4e883c7597d712091e08ed2e4ad17 Mon Sep 17 00:00:00 2001 From: Mike Raineri Date: Fri, 3 Nov 2023 12:31:29 -0400 Subject: [PATCH 1/3] Redfish: Added workaround for Supermicro in VirtualMediaInsert command to treat 'NotConnected' slots as empty Signed-off-by: Mike Raineri --- ...edfish-supermicro-virtual-media-discover-empty-workaround | 2 ++ plugins/module_utils/redfish_utils.py | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround diff --git a/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround b/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround new file mode 100644 index 0000000000..9fb03e6c21 --- /dev/null +++ b/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround @@ -0,0 +1,2 @@ +bugfixes: + - redfish_command - add workaround in ``VirtualMediaInsert`` for Supermicro systems to treat slots marked as ``NotConnected`` as empty (https://github.com/ansible-collections/community.general/issues/6969). diff --git a/plugins/module_utils/redfish_utils.py b/plugins/module_utils/redfish_utils.py index 6c470c7da3..a60ec1fdac 100644 --- a/plugins/module_utils/redfish_utils.py +++ b/plugins/module_utils/redfish_utils.py @@ -2620,6 +2620,11 @@ class RedfishUtils(object): if (not data.get('Inserted', False) and not data.get('ImageName')): return uri, data + # WORKAROUND + # Supermicro systems do not properly clear out ImageName when media is ejected + if vendor == 'Supermicro': + if data.get('ConnectedVia') == 'NotConnected': + return uri, data return None, None @staticmethod From 7a11dcd704a94f1d809c051affe30bffe5b92dc9 Mon Sep 17 00:00:00 2001 From: Mike Raineri Date: Fri, 3 Nov 2023 12:55:29 -0400 Subject: [PATCH 2/3] Rename 6969-redfish-supermicro-virtual-media-discover-empty-workaround to 6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml --- ...edfish-supermicro-virtual-media-discover-empty-workaround.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelogs/fragments/{6969-redfish-supermicro-virtual-media-discover-empty-workaround => 6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml} (100%) diff --git a/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround b/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml similarity index 100% rename from changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround rename to changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml From 781d21bc9a9300e5ee9cda50cb4a3e2d9389cac5 Mon Sep 17 00:00:00 2001 From: Mike Raineri Date: Fri, 3 Nov 2023 12:55:53 -0400 Subject: [PATCH 3/3] Update 6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml --- ...dfish-supermicro-virtual-media-discover-empty-workaround.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml b/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml index 9fb03e6c21..0a58e218ff 100644 --- a/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml +++ b/changelogs/fragments/6969-redfish-supermicro-virtual-media-discover-empty-workaround.yml @@ -1,2 +1,2 @@ bugfixes: - - redfish_command - add workaround in ``VirtualMediaInsert`` for Supermicro systems to treat slots marked as ``NotConnected`` as empty (https://github.com/ansible-collections/community.general/issues/6969). + - redfish_command - add workaround in ``VirtualMediaInsert`` for Supermicro systems to treat slots marked as ``NotConnected`` as empty (https://github.com/ansible-collections/community.general/issues/6969, https://github.com/ansible-collections/community.general/pull/7470).