Merge "Fix failure cases around test_ports"

This commit is contained in:
Zuul 2024-11-19 20:36:10 +00:00 committed by Gerrit Code Review
commit b6c0572a8a
2 changed files with 24 additions and 0 deletions

View File

@ -25,9 +25,23 @@ class TestPorts(base.BaseBaremetalTest):
super(TestPorts, self).setUp()
_, self.chassis = self.create_chassis()
# NOTE(TheJulia): noop is required for the network interface for
# these tests, as newer versions of ironic can invoke network
# logic, and if is not configured with full integration configuration,
# can then result in failed tests.
_, self.node = self.create_node(self.chassis['uuid'])
_, self.port = self.create_port(self.node['uuid'],
data_utils.rand_mac_address())
self.useFixture(
api_microversion_fixture.APIMicroversionFixture('1.31'))
# Now with a 1.31 microversion, swap the network interfaces
# into place so the test doesn't break depending on
# the environment's default state.
self.client.update_node(self.node['uuid'],
[{'path': '/network_interface',
'op': 'replace',
'value': 'noop'}])
self.useFixture(api_microversion_fixture.APIMicroversionFixture('1.1'))
@decorators.idempotent_id('83975898-2e50-42ed-b5f0-e510e36a0b56')
def test_create_port(self):

View File

@ -26,6 +26,16 @@ class TestPortsNegative(base.BaseBaremetalTest):
_, self.chassis = self.create_chassis()
_, self.node = self.create_node(self.chassis['uuid'])
self.useFixture(
api_microversion_fixture.APIMicroversionFixture('1.31'))
# Now with a 1.31 microversion, swap the network interfaces
# into place so the test doesn't break depending on
# the environment's default state.
self.client.update_node(self.node['uuid'],
[{'path': '/network_interface',
'op': 'replace',
'value': 'noop'}])
self.useFixture(api_microversion_fixture.APIMicroversionFixture('1.1'))
@decorators.attr(type=['negative'])
@decorators.idempotent_id('0a6ee1f7-d0d9-4069-8778-37f3aa07303a')