From 8bd138ca85cf80911153064ab9286f6a3fd90118 Mon Sep 17 00:00:00 2001
From: Yushiro FURUKAWA <y.furukawa_2@jp.fujitsu.com>
Date: Wed, 9 Sep 2020 01:45:19 +0900
Subject: [PATCH] Support iRMC hardware type again

This commit supports ``irmc`` hardware type again.

Co-Authored-By: Vanou Ishii <ishii.vanou@fujitsu.com>
Change-Id: I37b9ac5943a153f54ea64f26cbd758f53982a6ac
---
 ironic/drivers/irmc.py                                      | 2 --
 ironic/drivers/modules/irmc/bios.py                         | 2 --
 ironic/drivers/modules/irmc/boot.py                         | 6 ------
 ironic/drivers/modules/irmc/inspect.py                      | 2 --
 ironic/drivers/modules/irmc/power.py                        | 2 --
 ironic/drivers/modules/irmc/raid.py                         | 2 --
 .../notes/support-irmc-driver-again-589db26927e32847.yaml   | 5 +++++
 7 files changed, 5 insertions(+), 16 deletions(-)
 create mode 100644 releasenotes/notes/support-irmc-driver-again-589db26927e32847.yaml

diff --git a/ironic/drivers/irmc.py b/ironic/drivers/irmc.py
index 0e3cb53860..f3c2d7c65f 100644
--- a/ironic/drivers/irmc.py
+++ b/ironic/drivers/irmc.py
@@ -38,8 +38,6 @@ class IRMCHardware(generic.GenericHardware):
     have iRMC S4 management system.
     """
 
-    supported = False
-
     @property
     def supported_bios_interfaces(self):
         """List of supported bios interfaces."""
diff --git a/ironic/drivers/modules/irmc/bios.py b/ironic/drivers/modules/irmc/bios.py
index 8bf3a026de..55201b5d1a 100644
--- a/ironic/drivers/modules/irmc/bios.py
+++ b/ironic/drivers/modules/irmc/bios.py
@@ -34,8 +34,6 @@ METRICS = metrics_utils.get_metrics_logger(__name__)
 
 class IRMCBIOS(base.BIOSInterface):
 
-    supported = False
-
     def get_properties(self):
         """Return the properties of the interface."""
         return irmc_common.COMMON_PROPERTIES
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py
index f36df670a4..8152548430 100644
--- a/ironic/drivers/modules/irmc/boot.py
+++ b/ironic/drivers/modules/irmc/boot.py
@@ -580,8 +580,6 @@ class IRMCVolumeBootMixIn(object):
     used by VIOM (Virtual I/O Manager) library of SCCI client.
     """
 
-    supported = False
-
     def _validate_volume_boot(self, task):
         """Validate information for volume boot with this interface.
 
@@ -900,8 +898,6 @@ class IRMCVolumeBootMixIn(object):
 class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
     """iRMC Virtual Media boot-related actions."""
 
-    supported = False
-
     capabilities = ['iscsi_volume_boot', 'fibre_channel_volume_boot']
 
     def __init__(self):
@@ -1105,8 +1101,6 @@ class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
 class IRMCPXEBoot(pxe.PXEBoot):
     """iRMC PXE boot."""
 
-    supported = False
-
     @METRICS.timer('IRMCPXEBoot.prepare_ramdisk')
     def prepare_ramdisk(self, task, ramdisk_params):
         """Prepares the boot of Ironic ramdisk using PXE.
diff --git a/ironic/drivers/modules/irmc/inspect.py b/ironic/drivers/modules/irmc/inspect.py
index 87b8fb9287..5d438a6c81 100644
--- a/ironic/drivers/modules/irmc/inspect.py
+++ b/ironic/drivers/modules/irmc/inspect.py
@@ -197,8 +197,6 @@ def _inspect_hardware(node, existing_traits=None, **kwargs):
 class IRMCInspect(base.InspectInterface):
     """Interface for out of band inspection."""
 
-    supported = False
-
     def __init__(self):
         """Validate the driver-specific inspection information.
 
diff --git a/ironic/drivers/modules/irmc/power.py b/ironic/drivers/modules/irmc/power.py
index 3adea8ce7d..fbadffb5ee 100644
--- a/ironic/drivers/modules/irmc/power.py
+++ b/ironic/drivers/modules/irmc/power.py
@@ -208,8 +208,6 @@ def _set_power_state(task, target_state, timeout=None):
 class IRMCPower(base.PowerInterface):
     """Interface for power-related actions."""
 
-    supported = False
-
     def get_properties(self):
         """Return the properties of the interface.
 
diff --git a/ironic/drivers/modules/irmc/raid.py b/ironic/drivers/modules/irmc/raid.py
index 55c268fb13..9016956322 100644
--- a/ironic/drivers/modules/irmc/raid.py
+++ b/ironic/drivers/modules/irmc/raid.py
@@ -339,8 +339,6 @@ def _validate_physical_disks(node, logical_disks):
 
 class IRMCRAID(base.RAIDInterface):
 
-    supported = False
-
     def get_properties(self):
         """Return the properties of the interface."""
         return irmc_common.COMMON_PROPERTIES
diff --git a/releasenotes/notes/support-irmc-driver-again-589db26927e32847.yaml b/releasenotes/notes/support-irmc-driver-again-589db26927e32847.yaml
new file mode 100644
index 0000000000..e38822c0b2
--- /dev/null
+++ b/releasenotes/notes/support-irmc-driver-again-589db26927e32847.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Supports the Fujitsu ``irmc`` hardware type again. The Third Party CI for
+    the driver has started to work correctly in September 2020.