x
/
vmware-nsx
Code Issues Proposed changes

Refresh rpc_backend values in unit tests to those from oslo.messaging 

Though old values are supported via compatibility transport aliases [1],
it's better to stick to those values that are officially supported by
oslo.messaging.

[1]: neutron/common/rpc.py:TRANSPORT_ALIASES

blueprint oslo-messaging

Change-Id: I7bc03e323151cfdda2cb2bc4cd6f5aea9b87a746
This commit is contained in:
Ihar Hrachyshka 2014-08-21 15:49:24 +02:00
parent d816a6adb8
commit 5c376126a2
13 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/etc/neutron.conf.test
View File

@ -18,7 +18,7 @@ api_extensions_path = unit/extensions
api_paste_config = api-paste.ini.test
# The messaging module to use, defaults to kombu.
rpc_backend = neutron.openstack.common.rpc.impl_fake
rpc_backend = fake
lock_path = $state_path/lock

3
neutron/tests/unit/hyperv/test_hyperv_neutron_agent.py
View File

@ -36,9 +36,6 @@ class TestHyperVNeutronAgent(base.BaseTestCase):
def setUp(self):
super(TestHyperVNeutronAgent, self).setUp()
# Avoid rpc initialization for unit tests
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
utilsfactory._get_windows_version = mock.MagicMock(
return_value='6.2.0')

3
neutron/tests/unit/ibm/test_sdnve_agent.py
View File

@ -59,9 +59,6 @@ class TestSdnveNeutronAgent(base.BaseTestCase):
notifier_cls = notifier_p.start()
self.notifier = mock.Mock()
notifier_cls.return_value = self.notifier
# Avoid rpc initialization for unit tests
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_override('integration_bridge',
'br_int', group='SDNVE')
kwargs = sdnve_neutron_agent.create_agent_config_map(cfg.CONF)

2
neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
View File

@ -95,8 +95,6 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
super(TestLinuxBridgeAgent, self).setUp()
# disable setting up periodic state reporting
cfg.CONF.set_override('report_interval', 0, 'AGENT')
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')

3
neutron/tests/unit/mlnx/test_mlnx_neutron_agent.py
View File

@ -66,9 +66,6 @@ class TestEswitchAgent(base.BaseTestCase):
def setUp(self):
super(TestEswitchAgent, self).setUp()
# Avoid rpc initialization for unit tests
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')

2
neutron/tests/unit/mlnx/test_mlnx_plugin_config.py
View File

@ -33,8 +33,6 @@ class TestMlnxPluginConfig(testlib_api.SqlTestCase):
def setUp(self):
super(TestMlnxPluginConfig, self).setUp()
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_override(group='MLNX',
name='network_vlan_ranges',
override=self.config_vlan_ranges)

2
neutron/tests/unit/nec/test_nec_agent.py
View File

@ -39,8 +39,6 @@ class TestNecAgentBase(base.BaseTestCase):
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_override('host', 'dummy-host')
with contextlib.nested(
mock.patch.object(ovs_lib.OVSBridge, 'get_datapath_id',

3
neutron/tests/unit/ofagent/test_ofa_neutron_agent.py
View File

@ -192,9 +192,6 @@ class TestOFANeutronAgent(ofa_test_base.OFAAgentTestBase):
notifier_cls = notifier_p.start()
self.notifier = mock.Mock()
notifier_cls.return_value = self.notifier
# Avoid rpc initialization for unit tests
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
kwargs = self.mod_agent.create_agent_config_map(cfg.CONF)
class MockFixedIntervalLoopingCall(object):

2
neutron/tests/unit/oneconvergence/test_nvsd_agent.py
View File

@ -36,8 +36,6 @@ class TestOneConvergenceAgentBase(base.BaseTestCase):
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
with contextlib.nested(
mock.patch('neutron.openstack.common.loopingcall.'
'FixedIntervalLoopingCall'),

6
neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py
View File

@ -105,9 +105,6 @@ class TestOvsNeutronAgent(base.BaseTestCase):
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')
# Avoid rpc initialization for unit tests
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
kwargs = ovs_neutron_agent.create_agent_config_map(cfg.CONF)
class MockFixedIntervalLoopingCall(object):
@ -1379,9 +1376,6 @@ class AncillaryBridgesTest(base.BaseTestCase):
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')
# Avoid rpc initialization for unit tests
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_override('report_interval', 0, 'AGENT')
self.kwargs = ovs_neutron_agent.create_agent_config_map(cfg.CONF)

2
neutron/tests/unit/openvswitch/test_ovs_tunnel.py
View File

@ -74,8 +74,6 @@ class TunnelTest(base.BaseTestCase):
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_override('report_interval', 0, 'AGENT')
self.INT_BRIDGE = 'integration_bridge'

2
neutron/tests/unit/sriovnicagent/test_sriov_neutron_agent.py
View File

@ -29,8 +29,6 @@ class TestSriovAgent(base.BaseTestCase):
super(TestSriovAgent, self).setUp()
# disable setting up periodic state reporting
cfg.CONF.set_override('report_interval', 0, 'AGENT')
cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake')
cfg.CONF.set_default('firewall_driver',
'neutron.agent.firewall.NoopFirewallDriver',
group='SECURITYGROUP')

2
neutron/tests/unit/vmware/etc/neutron.conf.test
View File

@ -18,7 +18,7 @@ bind_port = 9696
api_paste_config = api-paste.ini.test
# The messaging module to use, defaults to kombu.
rpc_backend = neutron.openstack.common.rpc.impl_fake
rpc_backend = fake
lock_path = $state_path/lock