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

Change-Id: I1c1fd593235fda1cdd053980f50eff21ca9011b6

diff --cc neutron/agent/common/ovs_lib.py
Simple merge

diff --cc neutron/agent/ovsdb/api.py
Simple merge

diff --cc neutron/agent/ovsdb/impl_idl.py
Simple merge

diff --cc neutron/agent/ovsdb/impl_vsctl.py
Simple merge

diff --cc neutron/agent/ovsdb/native/commands.py
Simple merge

diff --cc neutron/db/migration/alembic_migrations/versions/HEADS
index be4adef8dfb4b74957457020a85d4c8677e170a2,8a0a139d7a96b2ccd57e34bbbcf917f69aa4db0a..aae43e3946faee8acd1bcdf7d1148864b09b3eb9
--- 1/neutron/db/migration/alembic_migrations/versions/HEADS
--- 2/neutron/db/migration/alembic_migrations/versions/HEADS
+++ b/neutron/db/migration/alembic_migrations/versions/HEADS
@@@ -1,3 -1,3 +1,3 @@@
- 8675309a5c4f
 +2a16083502f3
 -4ffceebfada
+ 48153cb5f051
  kilo

diff --cc neutron/db/migration/models/head.py
Simple merge

diff --cc neutron/tests/api/base.py
index 2790240eb5fcdce17ab6ac4218c97d810f84a49a,92979252ab5f93b8501f50c8e70a0d3e8a11bfcd..f23e52826f4cb2a24764a9bbdec8dca15b386a2e
--- 1/neutron/tests/api/base.py
--- 2/neutron/tests/api/base.py
+++ b/neutron/tests/api/base.py
@@@ -88,9 -88,9 +88,11 @@@ class BaseNetworkTest(neutron.tests.tem
          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 = []
  
      @classmethod
      def resource_cleanup(cls):

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

diff --cc setup.cfg
Simple merge