openstack
/
neutron
Code Issues Proposed changes

Merge "Fix incorrect comments"

This commit is contained in:
Jenkins 2015-03-13 14:18:22 +00:00 committed by Gerrit Code Review
parent 68c0e3d479 a0727afc77
commit 2d406067f8
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,8 +613,6 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
'''Reclaim a local VLAN.
:param net_uuid: the network uuid associated with this vlan.
:param lvm: a LocalVLANMapping object that tracks (vlan, lsw_id,
vif_ids) mapping.
'''
lvm = self.local_vlan_map.pop(net_uuid, None)
if lvm is None:
@ -746,10 +744,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
def setup_integration_br(self):
'''Setup the integration bridge.
Create patch ports and remove all existing flows.
:param bridge_name: the name of the integration bridge.
:returns: the integration bridge
Delete patch ports and remove all existing flows.
'''
# Ensure the integration bridge is created.
# ovs_lib.OVSBridge.create() will run
@ -920,7 +915,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
'''Setup the physical network bridges.
Creates physical network bridges and links them to the
integration bridge using veths.
integration bridge using veths or patch ports.
:param bridge_mappings: map physical network names to bridge names.
'''