From: rossella <rsblendido@suse.com>
Date: Fri, 31 Jul 2015 17:25:37 +0000 (+0000)
Subject: check_changed_vlans doesn't need registered_ports as param
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=71dd3a0f87eb69072696f6905f8380924dd67c1a;p=openstack-build%2Fneutron-build.git

check_changed_vlans doesn't need registered_ports as param

check_changed_vlans doesn't need registered_ports since the
ports processed by the agent are accessible from local_vlan_map

Partially-Implements: blueprint restructure-l2-agent
Change-Id: I279dcaff469337c553b358f6f5476c7238e89a59
---

diff --git a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index 6c7999f9d..5a8b8bc17 100644
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@ -1137,7 +1137,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         port_info = self._get_port_info(registered_ports, cur_ports)
         if updated_ports is None:
             updated_ports = set()
-        updated_ports.update(self.check_changed_vlans(registered_ports))
+        updated_ports.update(self.check_changed_vlans())
         if updated_ports:
             # Some updated ports might have been removed in the
             # meanwhile, and therefore should not be processed.
@@ -1154,7 +1154,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
             cur_ports |= bridge.get_vif_port_set()
         return self._get_port_info(registered_ports, cur_ports)
 
-    def check_changed_vlans(self, registered_ports):
+    def check_changed_vlans(self):
         """Return ports which have lost their vlan tag.
 
         The returned value is a set of port ids of the ports concerned by a
@@ -1163,19 +1163,18 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         port_tags = self.int_br.get_port_tag_dict()
         changed_ports = set()
         for lvm in self.local_vlan_map.values():
-            for port in registered_ports:
+            for port in lvm.vif_ports.values():
                 if (
-                    port in lvm.vif_ports
-                    and lvm.vif_ports[port].port_name in port_tags
-                    and port_tags[lvm.vif_ports[port].port_name] != lvm.vlan
+                    port.port_name in port_tags
+                    and port_tags[port.port_name] != lvm.vlan
                 ):
                     LOG.info(
                         _LI("Port '%(port_name)s' has lost "
                             "its vlan tag '%(vlan_tag)d'!"),
-                        {'port_name': lvm.vif_ports[port].port_name,
+                        {'port_name': port.port_name,
                          'vlan_tag': lvm.vlan}
                     )
-                    changed_ports.add(port)
+                    changed_ports.add(port.vif_id)
         return changed_ports
 
     def treat_vif_port(self, vif_port, port_id, network_id, network_type,