x/vmware-nsx
Code Issues Proposed changes

Merge "Pep8 fixes for quantum master."

Browse Source
This commit is contained in:
Jenkins 2012-11-06 15:41:26 +00:00 committed by Gerrit Code Review
commit 14346d3419
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/plugins/linuxbridge/db/l2network_db_v2.py
View File

@ -128,8 +128,8 @@ def reserve_specific_network(session, physical_network, vlan_id):
one()) one())
if state.allocated: if state.allocated:
if vlan_id == constants.FLAT_VLAN_ID: if vlan_id == constants.FLAT_VLAN_ID:
raise q_exc.FlatNetworkInUse(physical_network= raise q_exc.FlatNetworkInUse(
physical_network) physical_network=physical_network)
else: else:
raise q_exc.VlanIdInUse(vlan_id=vlan_id, raise q_exc.VlanIdInUse(vlan_id=vlan_id,
physical_network=physical_network) physical_network=physical_network)

13
quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
View File

@ -255,9 +255,10 @@ class OVSQuantumAgent(object):
actions="set_tunnel:%s,normal" % actions="set_tunnel:%s,normal" %
segmentation_id) segmentation_id)
# inbound bcast/mcast # inbound bcast/mcast
self.tun_br.add_flow(priority=3, tun_id=segmentation_id, self.tun_br.add_flow(
dl_dst= priority=3,
"01:00:00:00:00:00/01:00:00:00:00:00", tun_id=segmentation_id,
dl_dst="01:00:00:00:00:00/01:00:00:00:00:00",
actions="mod_vlan_vid:%s,output:%s" % actions="mod_vlan_vid:%s,output:%s" %
(lvid, self.patch_int_ofport)) (lvid, self.patch_int_ofport))
else: else:
@ -272,9 +273,9 @@ class OVSQuantumAgent(object):
dl_vlan=lvid, dl_vlan=lvid,
actions="strip_vlan,normal") actions="strip_vlan,normal")
# inbound # inbound
self.int_br.add_flow(priority=3, self.int_br.add_flow(
in_port= priority=3,
self.int_ofports[physical_network], in_port=self.int_ofports[physical_network],
dl_vlan=0xffff, dl_vlan=0xffff,
actions="mod_vlan_vid:%s,normal" % lvid) actions="mod_vlan_vid:%s,normal" % lvid)
else: else:

4
quantum/plugins/openvswitch/ovs_db_v2.py
View File

@ -146,8 +146,8 @@ def reserve_specific_vlan(session, physical_network, vlan_id):
one()) one())
if alloc.allocated: if alloc.allocated:
if vlan_id == constants.FLAT_VLAN_ID: if vlan_id == constants.FLAT_VLAN_ID:
raise q_exc.FlatNetworkInUse(physical_network= raise q_exc.FlatNetworkInUse(
physical_network) physical_network=physical_network)
else: else:
raise q_exc.VlanIdInUse(vlan_id=vlan_id, raise q_exc.VlanIdInUse(vlan_id=vlan_id,
physical_network=physical_network) physical_network=physical_network)