x/vmware-nsx
Code Issues Proposed changes

Merge "move rpc_setup to the last step of __init__"

Browse Source
This commit is contained in:
Jenkins 2013-12-12 00:25:36 +00:00 committed by Gerrit Code Review
commit 2ec4b184d8
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -792,8 +792,10 @@ class LinuxBridgeNeutronAgentRPC(sg_rpc.SecurityGroupAgentRpcMixin):
'agent_type': constants.AGENT_TYPE_LINUXBRIDGE, 'agent_type': constants.AGENT_TYPE_LINUXBRIDGE,
'start_flag': True} 'start_flag': True}
self.setup_rpc(interface_mappings.values())
self.init_firewall() self.init_firewall()
# Perform rpc initialization only once all other configuration
# is complete
self.setup_rpc(interface_mappings.values())
def _report_state(self): def _report_state(self):
try: try:

14
neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
View File

@ -200,7 +200,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.int_br_device_count = 0 self.int_br_device_count = 0
self.int_br = ovs_lib.OVSBridge(integ_br, self.root_helper) self.int_br = ovs_lib.OVSBridge(integ_br, self.root_helper)
self.setup_rpc()
self.setup_integration_br() self.setup_integration_br()
self.setup_physical_bridges(bridge_mappings) self.setup_physical_bridges(bridge_mappings)
self.local_vlan_map = {} self.local_vlan_map = {}
@ -224,12 +223,11 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
# Collect additional bridges to monitor # Collect additional bridges to monitor
self.ancillary_brs = self.setup_ancillary_bridges(integ_br, tun_br) self.ancillary_brs = self.setup_ancillary_bridges(integ_br, tun_br)
# Security group agent supprot
self.sg_agent = OVSSecurityGroupAgent(self.context,
self.plugin_rpc,
root_helper)
# Initialize iteration counter # Initialize iteration counter
self.iter_num = 0 self.iter_num = 0
# Perform rpc initialization only once all other configuration
# is complete
self.setup_rpc()
def _check_ovs_version(self): def _check_ovs_version(self):
if constants.TYPE_VXLAN in self.tunnel_types: if constants.TYPE_VXLAN in self.tunnel_types:
@ -253,9 +251,13 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.topic = topics.AGENT self.topic = topics.AGENT
self.plugin_rpc = OVSPluginApi(topics.PLUGIN) self.plugin_rpc = OVSPluginApi(topics.PLUGIN)
self.state_rpc = agent_rpc.PluginReportStateAPI(topics.PLUGIN) self.state_rpc = agent_rpc.PluginReportStateAPI(topics.PLUGIN)
# RPC network init # RPC network init
self.context = context.get_admin_context_without_session() self.context = context.get_admin_context_without_session()
# prepare sg_agent for Security group support
# before we enable RPC handler
self.sg_agent = OVSSecurityGroupAgent(self.context,
self.plugin_rpc,
self.root_helper)
# Handle updates from service # Handle updates from service
self.dispatcher = self.create_rpc_dispatcher() self.dispatcher = self.create_rpc_dispatcher()
# Define the listening consumers for the agent # Define the listening consumers for the agent

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

@ -100,7 +100,6 @@ class TunnelTest(base.BaseTestCase):
self.mock_int_bridge = self.ovs_bridges[self.INT_BRIDGE] self.mock_int_bridge = self.ovs_bridges[self.INT_BRIDGE]
self.mock_int_bridge.get_local_port_mac.return_value = '000000000001' self.mock_int_bridge.get_local_port_mac.return_value = '000000000001'
self.mock_int_bridge_expected = [ self.mock_int_bridge_expected = [
mock.call.get_local_port_mac(),
mock.call.delete_port('patch-tun'), mock.call.delete_port('patch-tun'),
mock.call.remove_all_flows(), mock.call.remove_all_flows(),
mock.call.add_flow(priority=1, actions='normal'), mock.call.add_flow(priority=1, actions='normal'),
@ -217,6 +216,8 @@ class TunnelTest(base.BaseTestCase):
self.execute = mock.patch('neutron.agent.linux.utils.execute').start() self.execute = mock.patch('neutron.agent.linux.utils.execute').start()
self.execute_expected = [mock.call(['/sbin/udevadm', 'settle', self.execute_expected = [mock.call(['/sbin/udevadm', 'settle',
'--timeout=10'])] '--timeout=10'])]
self.mock_int_bridge_expected += [
mock.call.get_local_port_mac()]
def _verify_mock_call(self, mock_obj, expected): def _verify_mock_call(self, mock_obj, expected):
mock_obj.assert_has_calls(expected) mock_obj.assert_has_calls(expected)