From 147b88b56f88998c580d7809f9948a227c4dcd60 Mon Sep 17 00:00:00 2001
From: Aaron Rosen <aaronorosen@gmail.com>
Date: Mon, 16 Jun 2014 15:41:04 -0700
Subject: [PATCH] NSX: revert queue extension name change

The following patch: d7aa2dfcb14b84e2ef3242fb0787200d852d6103 renamed the
nvp-qos extension to qos-queue which breaks the integration with nova as
nova checks for the nvp-qos extension to be loaded and now it's called
qos-queue. This patch adds back nvp-qos for trunk chasers and another
patch will migrate nova from nvp-qos to qos-queue.

Change-Id: I563aed6b6c4551489989f846a619d54020d0b5ee
closes-bug: 1329071
---
 neutron/plugins/vmware/extensions/nvp_qos.py | 40 ++++++++++++++++++++
 neutron/plugins/vmware/plugins/base.py       |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 neutron/plugins/vmware/extensions/nvp_qos.py

diff --git a/neutron/plugins/vmware/extensions/nvp_qos.py b/neutron/plugins/vmware/extensions/nvp_qos.py
new file mode 100644
index 00000000000..470f267b5a2
--- /dev/null
+++ b/neutron/plugins/vmware/extensions/nvp_qos.py
@@ -0,0 +1,40 @@
+# 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 neutron.plugins.vmware.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)."
+
+    @classmethod
+    def get_namespace(cls):
+        return "http://docs.openstack.org/ext/nvp-qos/api/v2.0"
diff --git a/neutron/plugins/vmware/plugins/base.py b/neutron/plugins/vmware/plugins/base.py
index 5de62233b1f..4870983b052 100644
--- a/neutron/plugins/vmware/plugins/base.py
+++ b/neutron/plugins/vmware/plugins/base.py
@@ -107,6 +107,7 @@ class NsxPluginV2(addr_pair_db.AllowedAddressPairsMixin,
                                    "mac-learning",
                                    "multi-provider",
                                    "network-gateway",
+                                   "nvp-qos",
                                    "port-security",
                                    "provider",
                                    "qos-queue",