Merge "Update idrac-redfish export configuration step"

doc/source/admin/drivers/idrac.rst

@@ -396,6 +396,12 @@ section uses the iDRAC Server Configuration Profile (SCP) and can be edited as
 necessary if it complies with the SCP. For more information about SCP and its
 capabilities, see SCP_Reference_Guide_.
 
+.. NOTE::
+   iDRAC BMC connection settings are not exported to avoid overwriting these in
+   another system when using unmodified exported configuration mold in import
+   step. If need to replicate iDRAC BMC connection settings, then add these
+   settings manually to configuration mold for import step.
+
 To replicate the system configuration to that of a similar system, perform the
 following steps:
 

driver-requirements.txt

@@ -17,4 +17,4 @@ ansible>=2.7
 python-ibmcclient>=0.2.2,<0.3.0
 
 # Dell EMC iDRAC sushy OEM extension
-sushy-oem-idrac>=3.0.1,<4.0.0
+sushy-oem-idrac>=4.0.0,<5.0.0

ironic/drivers/modules/drac/management.py

@@ -396,7 +396,8 @@ class DracRedfishManagement(redfish_management.RedfishManagement):
 
         configuration = drac_utils.execute_oem_manager_method(
             task, 'export system configuration',
-            lambda m: m.export_system_configuration())
+            lambda m: m.export_system_configuration(
+                include_destructive_fields=False))
 
         if configuration and configuration.status_code == 200:
             configuration = {"oem": {"interface": "idrac-redfish",

ironic/tests/unit/drivers/modules/drac/test_management.py

@@ -890,6 +890,8 @@ class DracRedfishManagementTestCase(test_utils.BaseDracTest):
         mock_get_system.return_value.managers = [fake_manager1, fake_manager2]
         self.management.export_configuration(task, 'edge')
 
+        fake_manager_oem2.export_system_configuration.assert_called_once_with(
+            include_destructive_fields=False)
         mock_save_configuration.assert_called_once_with(
             task,
             'edge',

releasenotes/notes/update-idrac-redfish-management-export-conf-9fb17273c4d9a050.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Updates ``idrac-redfish`` management interface export configuration step
+    to not export iDRAC BMC connection settings to avoid overwriting those
+    in another system when using unmodified configuration mold in import step.
+    For import step it is still possible to add these settings back manually.