openstack
/
python-tripleoclient
Code Issues Proposed changes

Add XClarity in the list of supported hw types 

This patch proposes to add XClarity in the list of supported
hardware types by python-tripleoclient.

Change-Id: If1e32d13836dbb430ca9543edf6873e1c7971fb0
This commit is contained in:
Rushil Chugh 2018-02-07 01:47:40 -05:00 committed by Dmitry Tantsur
parent 12ffd71970
commit fbe0ea6fe0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/tests/v1/undercloud/test_undercloud_config.py
View File

@ -78,7 +78,8 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
self.conf.enabled_hardware_types = (
self.conf.enabled_hardware_types + ['staging-ovirt', 'snmp',
'irmc', 'cisco-ucs-managed',
'cisco-ucs-standalone']
'cisco-ucs-standalone',
'xclarity']
)
undercloud_config._process_drivers_and_hardware_types(self.conf, env)
@ -87,16 +88,18 @@ class TestProcessDriversAndHardwareTypes(base.TestCase):
'IronicEnabledHardwareTypes': ['cisco-ucs-managed',
'cisco-ucs-standalone',
'idrac', 'ilo', 'ipmi', 'irmc',
'redfish', 'snmp', 'staging-ovirt'],
'redfish', 'snmp', 'staging-ovirt',
'xclarity'],
'IronicEnabledBootInterfaces': ['ilo-pxe', 'irmc-pxe', 'pxe'],
'IronicEnabledManagementInterfaces': ['cimc', 'fake', 'idrac',
'ilo', 'ipmitool', 'irmc',
'redfish', 'staging-ovirt',
'ucsm'],
'ucsm', 'xclarity'],
'IronicEnabledPowerInterfaces': ['cimc', 'fake', 'idrac',
'ilo', 'ipmitool', 'irmc',
'redfish', 'snmp',
'staging-ovirt', 'ucsm'],
'staging-ovirt', 'ucsm',
'xclarity'],
'IronicEnabledRaidInterfaces': ['idrac', 'no-raid'],
'IronicEnabledVendorInterfaces': ['idrac', 'ipmitool', 'no-vendor']
}, env)

3
tripleoclient/v1/undercloud_config.py
View File

@ -413,7 +413,8 @@ def _process_drivers_and_hardware_types(conf, env):
# use one variable for them.
mgmt_interfaces = {'fake', 'ipmitool'}
# TODO(dtantsur): can we somehow avoid hardcoding hardware types here?
for hw_type in ('redfish', 'idrac', 'ilo', 'irmc', 'staging-ovirt'):
for hw_type in ('redfish', 'idrac', 'ilo', 'irmc', 'staging-ovirt',
'xclarity'):
if hw_type in enabled_hardware_types:
mgmt_interfaces.add(hw_type)
for (hw_type, iface) in [('cisco-ucs-managed', 'ucsm'),