NSX|MH: rename qos extension to qos_queue

We need to rename the Qos extension as this causes issues
when using the Neutron Qos extension (which is the end
goal)

In addition to this the patch deletes the nvp_qos extension.
That was marked for deprecation in Kilo.

Change-Id: I4d9d3cf40a83f579b76bf5f0642d045785a271bd

vmware_nsx/db/qos_db.py

@@ -24,7 +24,7 @@ from oslo_utils import uuidutils
 
 from vmware_nsx._i18n import _LI
 from vmware_nsx.db import nsx_models
-from vmware_nsx.extensions import qos
+from vmware_nsx.extensions import qos_queue as qos
 
 LOG = log.getLogger(__name__)
 

vmware_nsx/extensions/nvp_qos.py

@@ -1,36 +0,0 @@
-# Copyright 2013 VMware, Inc.
-#
-# All Rights Reserved
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-#
-# TODO(arosen): This is deprecated in Juno, and
-# to be removed in Kxxxx.
-
-from vmware_nsx.extensions import qos
-
-
-class Nvp_qos(qos.Qos):
-    """(Deprecated) Port Queue extension."""
-
-    @classmethod
-    def get_name(cls):
-        return "nvp-qos"
-
-    @classmethod
-    def get_alias(cls):
-        return "nvp-qos"
-
-    @classmethod
-    def get_description(cls):
-        return "NVP QoS extension (deprecated)."

vmware_nsx/extensions/qos_queue.py

@@ -163,7 +163,7 @@ EXTENDED_ATTRIBUTES_2_0 = {
 }
 
 
-class Qos(extensions.ExtensionDescriptor):
+class Qos_queue(extensions.ExtensionDescriptor):
     """Port Queue extension."""
 
     @classmethod

vmware_nsx/plugins/nsx_mh/plugin.py

@@ -76,7 +76,7 @@ from vmware_nsx.db import qos_db
 from vmware_nsx.dhcp_meta import modes as dhcpmeta_modes
 from vmware_nsx.extensions import maclearning as mac_ext
 from vmware_nsx.extensions import networkgw
-from vmware_nsx.extensions import qos
+from vmware_nsx.extensions import qos_queue as qos
 from vmware_nsx.nsxlib.mh import l2gateway as l2gwlib
 from vmware_nsx.nsxlib.mh import queue as queuelib
 from vmware_nsx.nsxlib.mh import router as routerlib
@@ -116,7 +116,6 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                                    "mac-learning",
                                    "multi-provider",
                                    "network-gateway",
-                                   "nvp-qos",
                                    "port-security",
                                    "provider",
                                    "qos-queue",

vmware_nsx/tests/unit/extensions/test_qosqueues.py

@@ -22,7 +22,7 @@ import webob.exc
 from neutron import context
 from neutron.tests.unit.api import test_extensions
 from vmware_nsx.db import qos_db
-from vmware_nsx.extensions import qos as ext_qos
+from vmware_nsx.extensions import qos_queue as ext_qos
 from vmware_nsx.nsxlib import mh as nsxlib
 from vmware_nsx.tests import unit as vmware
 from vmware_nsx.tests.unit.nsx_mh import test_plugin as test_nsx_plugin
@@ -31,7 +31,7 @@ from vmware_nsx.tests.unit.nsx_mh import test_plugin as test_nsx_plugin
 class QoSTestExtensionManager(object):
 
     def get_resources(self):
-        return ext_qos.Qos.get_resources()
+        return ext_qos.Qos_queue.get_resources()
 
     def get_actions(self):
         return []