Merge "Expose BIOS interface"

ironic/conductor/manager.py

@@ -2055,11 +2055,6 @@ class ConductorManager(base_manager.BaseConductorManager):
                                               task.node.instance_info)
             task.node.driver_internal_info['is_whole_disk_image'] = iwdi
             for iface_name in task.driver.non_vendor_interfaces:
-                # TODO(zshi): Remove this check in 'bios' API patch
-                # Do not have to return the validation result for 'bios'
-                # interface.
-                if iface_name == 'bios':
-                    continue
                 iface = getattr(task.driver, iface_name)
                 result = reason = None
                 try:

ironic/conf/default.py

@@ -52,18 +52,6 @@ _DEFAULT_IFACE_HELP = _('Default {0} interface to be used for nodes that '
                         'be found by enumerating the '
                         '"ironic.hardware.interfaces.{0}" entrypoint.')
 
-# TODO(zshi) Remove this in BIOS API patch.
-_ENABLED_IFACE_HELP_FOR_BIOS = (_ENABLED_IFACE_HELP +
-                                _(' This option is part of BIOS feature '
-                                  'work, which is not currently exposed to '
-                                  'users.'))
-
-# TODO(zshi) Remove this in BIOS API patch.
-_DEFAULT_IFACE_HELP_FOR_BIOS = (_DEFAULT_IFACE_HELP +
-                                _(' This option is part of BIOS feature '
-                                  'work, which is not currently exposed to '
-                                  'users.'))
-
 api_opts = [
     cfg.StrOpt(
         'auth_strategy',
@@ -111,9 +99,9 @@ driver_opts = [
                        '"ironic.hardware.types" entrypoint.')),
     cfg.ListOpt('enabled_bios_interfaces',
                 default=['no-bios'],
-                help=_ENABLED_IFACE_HELP_FOR_BIOS.format('bios')),
+                help=_ENABLED_IFACE_HELP.format('bios')),
     cfg.StrOpt('default_bios_interface',
-               help=_DEFAULT_IFACE_HELP_FOR_BIOS.format('bios')),
+               help=_DEFAULT_IFACE_HELP.format('bios')),
     cfg.ListOpt('enabled_boot_interfaces',
                 default=['pxe'],
                 help=_ENABLED_IFACE_HELP.format('boot')),

ironic/tests/unit/conductor/test_manager.py

@@ -4286,7 +4286,8 @@ class MiscTestCase(mgr_utils.ServiceSetUpMixin, mgr_utils.CommonMixIn,
                     'deploy': {'result': True},
                     'network': {'result': True},
                     'storage': {'result': True},
-                    'rescue': {'result': True}}
+                    'rescue': {'result': True},
+                    'bios': {'result': True}}
         self.assertEqual(expected, ret)
         mock_iwdi.assert_called_once_with(self.context, node.instance_info)