openstack
/
tripleo-common
Code Issues Proposed changes

Remove support for enrolling nodes with Cisco hardware types 

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

Change-Id: I76e1438e8d532beefbab4079216e01ad52c0c3fd
This commit is contained in:
Dmitry Tantsur 2019-07-25 12:33:12 +02:00
parent 4a4f8adf3b
commit 44f5abab8e
3 changed files with 9 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/no-cisco-46992167cd0ab6d0.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.

81
tripleo_common/tests/utils/test_nodes.py
View File

@ -227,44 +227,6 @@ class iBootDriverInfoTest(base.TestCase):
self.driver_info.unique_id_from_node(node))
class UcsDriverInfoTest(base.TestCase):
driver_info = nodes.UcsDriverInfo()
def test_convert_key(self):
keys = {
'pm_addr': 'ucs_address',
'pm_user': 'ucs_username',
'pm_password': 'ucs_password',
'pm_service_profile': 'ucs_service_profile'
}
for key, expected in keys.items():
self.assertEqual(expected, self.driver_info.convert_key(key))
self.assertIsNone(self.driver_info.convert_key('unknown'))
def test_unique_id_from_fields(self):
fields = {
'pm_addr': '127.0.0.1',
'pm_user': 'user',
'pm_password': '123456',
"pm_service_profile": 'org-root/org-CPC/ls-CPC-test'
}
self.assertEqual('127.0.0.1:org-root/org-CPC/ls-CPC-test',
self.driver_info.unique_id_from_fields(fields))
def test_unique_id_from_node(self):
node = mock.Mock(
driver_info={
'ucs_address': '127.0.0.1',
'ucs_username': 'user',
'ucs_password': '123456',
"ucs_service_profile": 'org-root/org-CPC/ls-CPC-test'
}
)
self.assertEqual('127.0.0.1:org-root/org-CPC/ls-CPC-test',
self.driver_info.unique_id_from_node(node))
class FindNodeHandlerTest(base.TestCase):
def test_found(self):
test = [('fake', 'fake'),
@ -275,8 +237,6 @@ class FindNodeHandlerTest(base.TestCase):
('ilo', 'ilo'),
('pxe_drac', 'drac'),
('idrac', 'drac'),
('pxe_ucs', 'ucs'),
('cisco-ucs-managed', 'ucs'),
('agent_irmc', 'irmc'),
('irmc', 'irmc')]
for driver, prefix in test:
@ -862,23 +822,6 @@ class NodesTest(base.TestCase):
resource_class='baremetal',
driver_info={})
def test_register_ironic_node_ucs(self):
node_properties = {"cpus": "1",
"memory_mb": "2048",
"local_gb": "30",
"cpu_arch": "amd64",
"capabilities": "num_nics:6"}
node = self._get_node()
node['pm_type'] = 'cisco-ucs-managed'
client = mock.MagicMock()
nodes.register_ironic_node(node, client=client)
client.node.create.assert_called_once_with(
driver='cisco-ucs-managed', name='node1',
properties=node_properties,
resource_class='baremetal',
driver_info={'ucs_password': 'random', 'ucs_address': 'foo.bar',
'ucs_username': 'test'})
def test_register_ironic_node_conductor_group(self):
node_properties = {"cpus": "1",
"memory_mb": "2048",
@ -886,35 +829,17 @@ class NodesTest(base.TestCase):
"cpu_arch": "amd64",
"capabilities": "num_nics:6"}
node = self._get_node()
node['pm_type'] = 'cisco-ucs-managed'
node['conductor_group'] = 'cg1'
client = mock.MagicMock()
nodes.register_ironic_node(node, client=client)
client.node.create.assert_called_once_with(
driver='cisco-ucs-managed', name='node1',
driver='ipmi', name='node1',
properties=node_properties,
resource_class='baremetal',
driver_info={'ucs_password': 'random', 'ucs_address': 'foo.bar',
'ucs_username': 'test'},
driver_info={'ipmi_password': 'random', 'ipmi_address': 'foo.bar',
'ipmi_username': 'test'},
conductor_group='cg1')
def test_register_ironic_node_pxe_ucs(self):
node_properties = {"cpus": "1",
"memory_mb": "2048",
"local_gb": "30",
"cpu_arch": "amd64",
"capabilities": "num_nics:6"}
node = self._get_node()
node['pm_type'] = 'pxe_ucs'
client = mock.MagicMock()
nodes.register_ironic_node(node, client=client)
client.node.create.assert_called_once_with(
driver='cisco-ucs-managed', name='node1',
properties=node_properties,
resource_class='baremetal',
driver_info={'ucs_password': 'random', 'ucs_address': 'foo.bar',
'ucs_username': 'test'})
def test_register_ironic_node_ipmi(self):
node_properties = {"cpus": "1",
"memory_mb": "2048",

32
tripleo_common/utils/nodes.py
View File

@ -264,37 +264,6 @@ class iBootDriverInfo(PrefixedDriverInfo):
return result
class UcsDriverInfo(DriverInfo):
def __init__(self):
mapping = {
'pm_addr': 'ucs_address',
'pm_user': 'ucs_username',
'pm_password': 'ucs_password',
'pm_service_profile': 'ucs_service_profile'
}
mandatory_fields = list(mapping)
super(UcsDriverInfo, self).__init__(
'ucs', mapping,
mandatory_fields=mandatory_fields,
hardware_type='cisco-ucs-managed',
)
def unique_id_from_fields(self, fields):
try:
return '%s:%s' % (fields['pm_addr'], fields['pm_service_profile'])
except KeyError:
return
def unique_id_from_node(self, node):
try:
return '%s:%s' % (node.driver_info['ucs_address'],
node.driver_info['ucs_service_profile'])
except KeyError:
return
DRIVER_INFO = {
# production drivers
'(ipmi|.*_ipmitool)': PrefixedDriverInfo('ipmi', has_port=True,
@ -306,7 +275,6 @@ DRIVER_INFO = {
hardware_type='idrac'),
'(ilo|.*_ilo)': PrefixedDriverInfo('ilo', has_port=True,
hardware_type='ilo'),
r'(cisco\-ucs\-managed|.*_ucs)': UcsDriverInfo(),
'(irmc|.*_irmc)': PrefixedDriverInfo('irmc', has_port=True,
hardware_type='irmc'),
'redfish': RedfishDriverInfo(),