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

diff --cc doc/source/devref/quality_of_service.rst
Simple merge

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index d07a76028154368922ef614364a9ce871cae4fa5,34f0ecf3fb66fd79e05821fcea94d68f4cef45b3..d07532bad9bf31ef91f7951b060a984e8d86cea4
--- 1/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
--- 2/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):

diff --cc neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
Simple merge