summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-03-01 09:42:07 +0000
committerGerrit Code Review <review@openstack.org>2023-03-01 09:42:07 +0000
commitfb08c34561bebf537a728c8043f643b0fffad771 (patch)
treed5f783bd90b476846dfef6469f28c92d92a51d81
parent814f60b046a5628f0e65bdc13596ebbf9f0fb8c1 (diff)
parentf5dc708e1a8138aa79eff07db68ff59d7b5b6a94 (diff)
downloadneutron-fb08c34561bebf537a728c8043f643b0fffad771.tar.gz
Merge "Check port.tag is not DEAD_VLAN_TAG in ``DHCPAgentOVSTestFramework``"
-rw-r--r--neutron/tests/functional/agent/test_dhcp_agent.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/neutron/tests/functional/agent/test_dhcp_agent.py b/neutron/tests/functional/agent/test_dhcp_agent.py
index 0327919f66..47f38115e3 100644
--- a/neutron/tests/functional/agent/test_dhcp_agent.py
+++ b/neutron/tests/functional/agent/test_dhcp_agent.py
@@ -77,8 +77,9 @@ class DHCPAgentOVSTestFramework(base.BaseSudoTestCase):
'interface_driver',
'neutron.agent.linux.interface.OVSInterfaceDriver')
self.conf.set_override('report_interval', 0, 'AGENT')
- br_int = self.useFixture(net_helpers.OVSBridgeFixture()).bridge
- self.conf.set_override('integration_bridge', br_int.br_name, 'OVS')
+ self.br_int = self.useFixture(net_helpers.OVSBridgeFixture()).bridge
+ self.conf.set_override('integration_bridge', self.br_int.br_name,
+ 'OVS')
self.mock_plugin_api = mock.patch(
'neutron.agent.dhcp.agent.DhcpPluginApi').start().return_value
@@ -223,6 +224,10 @@ class DHCPAgentOVSTestFramework(base.BaseSudoTestCase):
def assert_good_allocation_for_port(self, network, port):
vif_name = self.get_interface_name(network.id, port)
+ tag = self.br_int.ovsdb.db_get('Port', vif_name, 'tag').execute(
+ check_error=True)
+ self.assertEqual([], tag)
+
self._run_dhclient(vif_name, network)
predicate = lambda: len(