]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fixes undefined variable 'network_type' in OVS agent
authorAkihiro MOTOKI <motoki@da.jp.nec.com>
Tue, 4 Sep 2012 11:13:18 +0000 (20:13 +0900)
committerAkihiro MOTOKI <motoki@da.jp.nec.com>
Tue, 4 Sep 2012 11:13:18 +0000 (20:13 +0900)
bug 1045749

Change-Id: Icd2e79722cfcb816bfdfa85bd8b8ab5198908474

quantum/plugins/openvswitch/agent/ovs_quantum_agent.py

index e9be365b606ea0462fcea348fe32a2f90bda44bd..90d7542c257bf96b8cb1a418e1851fed881633bc 100755 (executable)
@@ -287,12 +287,13 @@ class OVSQuantumAgent(object):
         :param net_uuid: the network uuid associated with this vlan.
         :param lvm: a LocalVLANMapping object that tracks (vlan, lsw_id,
             vif_ids) mapping.'''
-        LOG.info("reclaming vlan = %s from net-id = %s" % (lvm.vlan, net_uuid))
+        LOG.info("reclaiming vlan = %s from net-id = %s" %
+                 (lvm.vlan, net_uuid))
 
         if lvm.network_type == constants.TYPE_GRE:
             self.tun_br.delete_flows(tun_id=lvm.segmentation_id)
             self.tun_br.delete_flows(dl_vlan=lvm.vlan)
-        elif network_type == constants.TYPE_FLAT:
+        elif lvm.network_type == constants.TYPE_FLAT:
             # outbound
             br = self.phys_brs[lvm.physical_network]
             br.delete_flows(in_port=self.phys_ofports[lvm.physical_network],
@@ -301,7 +302,7 @@ class OVSQuantumAgent(object):
             br = self.int_br
             br.delete_flows(in_port=self.int_ofports[lvm.physical_network],
                             dl_vlan=0xffff)
-        elif network_type == constants.TYPE_VLAN:
+        elif lvm.network_type == constants.TYPE_VLAN:
             # outbound
             br = self.phys_brs[lvm.physical_network]
             br.delete_flows(in_port=self.phys_ofports[lvm.physical_network],