openstack/neutron
Code Issues Proposed changes

Merge "Fix dns_integration and ml2 plugin unit tests modules"

Browse Source
This commit is contained in:
Zuul 2023-04-24 11:24:46 +00:00 committed by Gerrit Code Review
commit c58698d1a0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py
View File

@ -27,6 +27,7 @@ from oslo_config import cfg
from oslo_utils import uuidutils from oslo_utils import uuidutils
import testtools import testtools
from neutron.common import config
from neutron.objects import ports as port_obj from neutron.objects import ports as port_obj
from neutron.plugins.ml2.extensions import dns_integration from neutron.plugins.ml2.extensions import dns_integration
from neutron.services.externaldns.drivers.designate import driver from neutron.services.externaldns.drivers.designate import driver
@ -53,6 +54,7 @@ class DNSIntegrationTestCase(test_plugin.Ml2PluginV2TestCase):
_domain = DNSDOMAIN _domain = DNSDOMAIN
def setUp(self): def setUp(self):
config.register_common_config_options()
cfg.CONF.set_override('extension_drivers', cfg.CONF.set_override('extension_drivers',
self._extension_drivers, self._extension_drivers,
group='ml2') group='ml2')

2
neutron/tests/unit/plugins/ml2/test_plugin.py
View File

@ -49,6 +49,7 @@ import webob
from neutron._i18n import _ from neutron._i18n import _
from neutron.agent import rpc as agent_rpc from neutron.agent import rpc as agent_rpc
from neutron.common import config
from neutron.common import utils from neutron.common import utils
from neutron.db import agents_db from neutron.db import agents_db
from neutron.db import ipam_pluggable_backend from neutron.db import ipam_pluggable_backend
@ -673,6 +674,7 @@ class TestMl2NetworksWithVlanTransparencyBase(TestMl2NetworksV2):
'vlan_transparent': 'True'}} 'vlan_transparent': 'True'}}
def setUp(self, plugin=None): def setUp(self, plugin=None):
config.register_common_config_options()
cfg.CONF.set_override('vlan_transparent', True) cfg.CONF.set_override('vlan_transparent', True)
super(TestMl2NetworksWithVlanTransparencyBase, self).setUp(plugin) super(TestMl2NetworksWithVlanTransparencyBase, self).setUp(plugin)