Merge "Fix dns_integration and ml2 plugin unit tests modules"
This commit is contained in:
commit
c58698d1a0
@ -27,6 +27,7 @@ from oslo_config import cfg
|
||||
from oslo_utils import uuidutils
|
||||
import testtools
|
||||
|
||||
from neutron.common import config
|
||||
from neutron.objects import ports as port_obj
|
||||
from neutron.plugins.ml2.extensions import dns_integration
|
||||
from neutron.services.externaldns.drivers.designate import driver
|
||||
@ -53,6 +54,7 @@ class DNSIntegrationTestCase(test_plugin.Ml2PluginV2TestCase):
|
||||
_domain = DNSDOMAIN
|
||||
|
||||
def setUp(self):
|
||||
config.register_common_config_options()
|
||||
cfg.CONF.set_override('extension_drivers',
|
||||
self._extension_drivers,
|
||||
group='ml2')
|
||||
|
@ -49,6 +49,7 @@ import webob
|
||||
|
||||
from neutron._i18n import _
|
||||
from neutron.agent import rpc as agent_rpc
|
||||
from neutron.common import config
|
||||
from neutron.common import utils
|
||||
from neutron.db import agents_db
|
||||
from neutron.db import ipam_pluggable_backend
|
||||
@ -673,6 +674,7 @@ class TestMl2NetworksWithVlanTransparencyBase(TestMl2NetworksV2):
|
||||
'vlan_transparent': 'True'}}
|
||||
|
||||
def setUp(self, plugin=None):
|
||||
config.register_common_config_options()
|
||||
cfg.CONF.set_override('vlan_transparent', True)
|
||||
super(TestMl2NetworksWithVlanTransparencyBase, self).setUp(plugin)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user