summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-14 22:59:58 +0000
committerGerrit Code Review <review@openstack.org>2017-11-14 22:59:59 +0000
commit0d944da575b8d493e5fef9ee63262b8ea5da44b8 (patch)
treeb346d6964ff32a0e97d5144ec7ecc3ed5a8f6ab7
parentde7911b2cc289399e5ae8a030b703c69baca1d25 (diff)
parent4432fa9950f8300604528ae9b519bc78db37a768 (diff)
Merge "Add no-vendor interface to the idrac hardware types"9.2.0
-rw-r--r--ironic/drivers/drac.py2
-rw-r--r--ironic/tests/unit/drivers/test_drac.py10
-rw-r--r--releasenotes/notes/idrac-no-vendor-911904dd69457826.yaml5
3 files changed, 15 insertions, 2 deletions
diff --git a/ironic/drivers/drac.py b/ironic/drivers/drac.py
index 12262d4..7fedaee 100644
--- a/ironic/drivers/drac.py
+++ b/ironic/drivers/drac.py
@@ -65,7 +65,7 @@ class IDRACHardware(generic.GenericHardware):
65 @property 65 @property
66 def supported_vendor_interfaces(self): 66 def supported_vendor_interfaces(self):
67 """List of supported vendor interfaces.""" 67 """List of supported vendor interfaces."""
68 return [vendor_passthru.DracVendorPassthru] 68 return [vendor_passthru.DracVendorPassthru, noop.NoVendor]
69 69
70 70
71class PXEDracDriver(base.BaseDriver): 71class PXEDracDriver(base.BaseDriver):
diff --git a/ironic/tests/unit/drivers/test_drac.py b/ironic/tests/unit/drivers/test_drac.py
index 53ed69c..9ec609a 100644
--- a/ironic/tests/unit/drivers/test_drac.py
+++ b/ironic/tests/unit/drivers/test_drac.py
@@ -96,7 +96,7 @@ class IDRACHardwareTestCase(BaseIDRACTestCase):
96 'idrac', 'inspector', 'no-inspect'], 96 'idrac', 'inspector', 'no-inspect'],
97 enabled_network_interfaces=['flat', 'neutron', 'noop'], 97 enabled_network_interfaces=['flat', 'neutron', 'noop'],
98 enabled_raid_interfaces=['idrac', 'no-raid'], 98 enabled_raid_interfaces=['idrac', 'no-raid'],
99 enabled_vendor_interfaces=['idrac']) 99 enabled_vendor_interfaces=['idrac', 'no-vendor'])
100 100
101 def test_default_interfaces(self): 101 def test_default_interfaces(self):
102 node = obj_utils.create_test_node(self.context, driver='idrac') 102 node = obj_utils.create_test_node(self.context, driver='idrac')
@@ -129,6 +129,14 @@ class IDRACHardwareTestCase(BaseIDRACTestCase):
129 console=noop.NoConsole, 129 console=noop.NoConsole,
130 raid=noop.NoRAID) 130 raid=noop.NoRAID)
131 131
132 def test_override_no_vendor(self):
133 node = obj_utils.create_test_node(self.context, driver='idrac',
134 vendor_interface='no-vendor')
135 with task_manager.acquire(self.context, node.id) as task:
136 self._validate_interfaces(task.driver,
137 console=noop.NoConsole,
138 vendor=noop.NoVendor)
139
132 140
133@mock.patch.object(importutils, 'try_import', spec_set=True, autospec=True) 141@mock.patch.object(importutils, 'try_import', spec_set=True, autospec=True)
134class DracClassicDriversTestCase(BaseIDRACTestCase): 142class DracClassicDriversTestCase(BaseIDRACTestCase):
diff --git a/releasenotes/notes/idrac-no-vendor-911904dd69457826.yaml b/releasenotes/notes/idrac-no-vendor-911904dd69457826.yaml
new file mode 100644
index 0000000..d5defb2
--- /dev/null
+++ b/releasenotes/notes/idrac-no-vendor-911904dd69457826.yaml
@@ -0,0 +1,5 @@
1---
2fixes:
3 - |
4 Adds missing ``no-vendor`` implementation to supported vendor interfaces
5 of the ``idrac`` hardware type.