From: Jenkins <jenkins@review.openstack.org>
Date: Sat, 8 Aug 2015 03:43:35 +0000 (+0000)
Subject: Merge "Moved l2/agent_extensions_manager into l2/extensions/manager.py" into feature/qos
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=dbb0e66953063089aef6922b4c89cac0d251b5f5;p=openstack-build%2Fneutron-build.git

Merge "Moved l2/agent_extensions_manager into l2/extensions/manager.py" into feature/qos
---

dbb0e66953063089aef6922b4c89cac0d251b5f5
diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index d07a76028,34f0ecf3f..d07532bad
--- a/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@@ -1263,9 -1264,12 +1263,9 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
                                                     details['fixed_ips'],
                                                     details['device_owner'],
                                                     ovs_restarted)
 -                if self.prevent_arp_spoofing:
 -                    self.setup_arp_spoofing_protection(self.int_br,
 -                                                       port, details)
                  if need_binding:
                      need_binding_devices.append(details)
-                 self.agent_extensions_mgr.handle_port(self.context, details)
+                 self.ext_manager.handle_port(self.context, details)
              else:
                  LOG.warn(_LW("Device %s not defined on plugin"), device)
                  if (port and port.ofport != -1):