Merge "Follow-up changes to iRMC bios interface."

doc/source/admin/drivers/irmc.rst

@@ -18,7 +18,7 @@ Prerequisites
 * Install `python-scciclient <https://pypi.org/project/python-scciclient>`_
   and `pysnmp <https://pypi.org/project/pysnmp>`_ packages::
 
-  $ pip install "python-scciclient>=0.7.1" pysnmp
+  $ pip install "python-scciclient>=0.7.2" pysnmp
 
 Hardware Type
 =============
@@ -101,7 +101,7 @@ Here is a command example to enroll a node with ``irmc`` hardware type.
 
 .. code-block:: console
 
-   openstack baremetal node create --os-baremetal-api-version=1.31 \
+   openstack baremetal node create \
       --bios-interface irmc \
       --boot-interface irmc-pxe \
       --deploy-interface direct \

driver-requirements.txt

@@ -8,7 +8,7 @@ proliantutils>=2.5.0
 pysnmp>=4.3.0,<5.0.0
 python-ironic-inspector-client>=1.5.0
 python-oneviewclient<3.0.0,>=2.5.2
-python-scciclient>=0.7.1
+python-scciclient>=0.7.2
 python-ilorest-library>=2.1.0
 hpOneView>=4.4.0
 UcsSdk==0.8.2.2

ironic/tests/unit/drivers/modules/irmc/test_bios.py

@@ -30,7 +30,6 @@ class IRMCBIOSTestCase(test_common.BaseIRMCTest):
 
     def setUp(self):
         super(IRMCBIOSTestCase, self).setUp()
-        self.config(enabled_bios_interfaces=['irmc'])
 
     @mock.patch.object(irmc_common, 'parse_driver_info',
                        autospec=True)

ironic/tests/unit/drivers/test_irmc.py

@@ -167,7 +167,7 @@ class IRMCHardwareTestCase(db_base.DbTestCase):
             self.context, driver='irmc',
             deploy_interface='direct',
             rescue_interface='agent',
-            bios_interface='irmc')
+            bios_interface='no-bios')
         with task_manager.acquire(self.context, node.id) as task:
             self.assertIsInstance(task.driver.boot,
                                   irmc.boot.IRMCVirtualMediaBoot)
@@ -182,6 +182,6 @@ class IRMCHardwareTestCase(db_base.DbTestCase):
             self.assertIsInstance(task.driver.power,
                                   irmc.power.IRMCPower)
             self.assertIsInstance(task.driver.bios,
-                                  irmc_bios.IRMCBIOS)
+                                  noop.NoBIOS)
             self.assertIsInstance(task.driver.rescue,
                                   agent.AgentRescue)

releasenotes/notes/irmc-manual-clean-bios-configuration-1ad24831501456d5.yaml

@@ -1,6 +1,6 @@
 ---
 features:
   - |
-    Adds new ``bios`` interface to ``irmc`` hardware type. And provide
+    Adds new ``bios`` interface to ``irmc`` hardware type. This provides
     out-of-band BIOS configuration solution for iRMC driver which makes
     the functionality available via manual cleaning.