Merge remote-tracking branch 'origin/feature/qos' into merge-branch

Change-Id: I7a78ea4a8b3a03ef2013d41f9788e554f73c990b

diff --cc neutron/common/constants.py
Simple merge

diff --cc neutron/common/utils.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index b0d0ef3d307b37cede49c175970a73a7a9d3e0ce,b2aa8741dd4f6d1097121144306686d2c5b08d2c..d07a76028154368922ef614364a9ce871cae4fa5
--- 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
@@@ -1254,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:
-                     details['vif_port'] = port
                      need_binding_devices.append(details)
+                 self.agent_extensions_mgr.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/plugins/ml2/plugin.py
Simple merge

diff --cc neutron/tests/api/base.py
index 2790240eb5fcdce17ab6ac4218c97d810f84a49a,b8981147a8219cb46ea7e4cb63ceabb27b8e3a6e..2d1abf52db62185d5a7835d4de934f349d98ffd1
--- 1/neutron/tests/api/base.py
--- 2/neutron/tests/api/base.py
+++ b/neutron/tests/api/base.py
@@@ -87,7 -85,8 +87,9 @@@ class BaseNetworkTest(neutron.tests.tem
          cls.metering_label_rules = []
          cls.fw_rules = []
          cls.fw_policies = []
 +        cls.ipsecpolicies = []
+         cls.qos_rules = []
+         cls.qos_policies = []
          cls.ethertype = "IPv" + str(cls._ip_version)
          cls.address_scopes = []
          cls.admin_address_scopes = []
@@@ -107,14 -102,14 +109,22 @@@
              for fw_rule in cls.fw_rules:
                  cls._try_delete_resource(cls.client.delete_firewall_rule,
                                           fw_rule['id'])
 +            # Clean up ike policies
 +            for ikepolicy in cls.ikepolicies:
 +                cls._try_delete_resource(cls.client.delete_ikepolicy,
 +                                         ikepolicy['id'])
 +            # Clean up vpn services
 +            for vpnservice in cls.vpnservices:
 +                cls._try_delete_resource(cls.client.delete_vpnservice,
 +                                         vpnservice['id'])
+             # Clean up QoS policies
+             for qos_policy in cls.qos_policies:
+                 cls._try_delete_resource(cls.admin_client.delete_qos_policy,
+                                          qos_policy['id'])
+             # Clean up QoS rules
+             for qos_rule in cls.qos_rules:
+                 cls._try_delete_resource(cls.admin_client.delete_qos_rule,
+                                          qos_rule['id'])
              # Clean up floating IPs
              for floating_ip in cls.floating_ips:
                  cls._try_delete_resource(cls.client.delete_floatingip,

diff --cc neutron/tests/functional/agent/test_ovs_lib.py
Simple merge

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