openstack/python-tripleoclient
Code Issues Proposed changes

Remove support for Cisco hardware types

Browse Source 
Removed from ironic in https://review.opendev.org/#/c/653282/

Change-Id: I6e6a587333e93eb117afe8e6bad1c65962db6cb2
This commit is contained in:
Dmitry Tantsur 2019-07-25 12:16:53 +02:00
parent 7022d93e81
commit 719267e4db
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/no-cisco-bdddc17abb5f2847.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
Support for the ``cisco-ucs-managed`` and ``cisco-ucs-standalone``
hardware types has been removed since these hardware types have been
removed from Ironic due to lack of maintenance.

18
tripleoclient/tests/v1/undercloud/test_config.py
View File

@ -88,16 +88,12 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
env = {}
self.conf.enabled_hardware_types = (
self.conf.enabled_hardware_types + ['staging-ovirt', 'snmp',
'irmc', 'cisco-ucs-managed',
'cisco-ucs-standalone',
'xclarity']
'irmc', 'xclarity']
)
undercloud_config._process_drivers_and_hardware_types(self.conf, env)
self.assertEqual({
'IronicEnabledHardwareTypes': ['cisco-ucs-managed',
'cisco-ucs-standalone',
'idrac', 'ilo', 'ipmi', 'irmc',
'IronicEnabledHardwareTypes': ['idrac', 'ilo', 'ipmi', 'irmc',
'redfish', 'snmp', 'staging-ovirt',
'xclarity'],
'IronicEnabledBootInterfaces': ['ilo-pxe', 'ipxe', 'irmc-pxe',
@ -107,16 +103,14 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
'IronicEnabledInspectInterfaces': ['idrac', 'ilo', 'inspector',
'irmc', 'no-inspect',
'redfish'],
'IronicEnabledManagementInterfaces': ['cimc', 'fake', 'idrac',
'IronicEnabledManagementInterfaces': ['fake', 'idrac',
'ilo', 'ipmitool', 'irmc',
'noop', 'redfish',
'staging-ovirt',
'ucsm', 'xclarity'],
'IronicEnabledPowerInterfaces': ['cimc', 'fake', 'idrac',
'staging-ovirt', 'xclarity'],
'IronicEnabledPowerInterfaces': ['fake', 'idrac',
'ilo', 'ipmitool', 'irmc',
'redfish', 'snmp',
'staging-ovirt', 'ucsm',
'xclarity'],
'staging-ovirt', 'xclarity'],
'IronicEnabledRaidInterfaces': ['idrac', 'no-raid'],
'IronicEnabledVendorInterfaces': ['idrac', 'ipmitool', 'no-vendor']
}, env)

4
tripleoclient/v1/undercloud_config.py
View File

@ -151,10 +151,6 @@ def _process_drivers_and_hardware_types(conf, env):
'xclarity'):
if hw_type in enabled_hardware_types:
mgmt_interfaces.add(hw_type)
for (hw_type, iface) in [('cisco-ucs-managed', 'ucsm'),
('cisco-ucs-standalone', 'cimc')]:
if hw_type in enabled_hardware_types:
mgmt_interfaces.add(iface)
bios_interfaces = {'no-bios'}
for hw_type in ['ilo', 'irmc', 'redfish']: