diff options
| author | Moshe Levi <moshele@mellanox.com> | 2018-02-27 21:09:14 +0200 |
|---|---|---|
| committer | Moshe Levi <moshele@mellanox.com> | 2018-03-08 12:19:05 +0000 |
| commit | d2d24dd80ef7661bf4f273f3645f2cfe1ab6a161 (patch) | |
| tree | 61fec7e6da7002e8ed5c9d23b5bf3bf1d0de122e /ironic | |
| parent | 98b61f4ceed804e222c4cb22b45b23bc35ee833d (diff) | |
| download | ironic-d2d24dd80ef7661bf4f273f3645f2cfe1ab6a161.tar.gz | |
Don't validate local_link_connection when port has client-id
Infiniband ports do not require the local_link_connection field to be
populated as the network topology is discoverable by the Infiniband
Subnet Manager.
This change removes the requirement for local_link_connection for
Infiniband ports. Infiniband ports have a client-id in their extra
field.
Closes-Bug: #1753222
Change-Id: I2bfac4ccaf825bd9aa8ea0d2b447fcd7767acbc5
(cherry picked from commit dcebb77d9d7a2cebcc645dd632a12d224bd113c8)
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/common/neutron.py | 6 | ||||
| -rw-r--r-- | ironic/tests/unit/common/test_neutron.py | 27 |
2 files changed, 33 insertions, 0 deletions
diff --git a/ironic/common/neutron.py b/ironic/common/neutron.py index a9918dcb4..2796e179d 100644 --- a/ironic/common/neutron.py +++ b/ironic/common/neutron.py @@ -407,6 +407,12 @@ def validate_port_info(node, port): :param port: Ironic port object. :returns: True if port info is valid, False otherwise. """ + # Note(moshele): client-id in the port extra field indicates an InfiniBand + # port. In this case we don't require local_link_connection to be + # populated because the network topology is discoverable by the Infiniband + # Subnet Manager. + if port.extra.get('client-id'): + return True if (node.network_interface == 'neutron' and not port.local_link_connection): LOG.warning(_LW("The local_link_connection is required for " diff --git a/ironic/tests/unit/common/test_neutron.py b/ironic/tests/unit/common/test_neutron.py index 5bba84d50..be1f28353 100644 --- a/ironic/tests/unit/common/test_neutron.py +++ b/ironic/tests/unit/common/test_neutron.py @@ -495,6 +495,33 @@ class TestNeutronNetworkActions(db_base.DbTestCase): self.assertTrue(res) self.assertFalse(log_mock.warning.called) + @mock.patch.object(neutron, 'LOG', autospec=True) + def test_validate_port_info_flat_interface_with_client_id(self, log_mock): + self.node.network_interface = 'flat' + self.node.save() + llc = {} + port = object_utils.create_test_port( + self.context, node_id=self.node.id, uuid=uuidutils.generate_uuid(), + address='52:54:00:cf:2d:33', local_link_connection=llc, + extra={'client-id': self._CLIENT_ID}) + res = neutron.validate_port_info(self.node, port) + self.assertTrue(res) + self.assertFalse(log_mock.warning.called) + + @mock.patch.object(neutron, 'LOG', autospec=True) + def test_validate_port_info_neutron_interface_with_client_id( + self, log_mock): + self.node.network_interface = 'neutron' + self.node.save() + llc = {} + port = object_utils.create_test_port( + self.context, node_id=self.node.id, uuid=uuidutils.generate_uuid(), + address='52:54:00:cf:2d:33', local_link_connection=llc, + extra={'client-id': self._CLIENT_ID}) + res = neutron.validate_port_info(self.node, port) + self.assertTrue(res) + self.assertFalse(log_mock.warning.called) + @mock.patch.object(neutron, 'get_client', autospec=True) class TestValidateNetwork(base.TestCase): |