components/openstack/neutron/patches/12-remove-unsupported-extensions.patch
author Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
Tue, 29 Nov 2016 14:43:02 -0800
changeset 7403 dc947d165222
permissions -rw-r--r--
25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7403
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     1
Changes to remove neutron extensions that are not currently supported on Solaris.
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     2
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     3
This patch was developed in-house. Since it is Solaris-specific, it is not
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     4
suitable for upstream.
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     5
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     6
--- neutron-8.1.2/neutron/api/extensions.py.orig	2016-11-27 14:03:20.341214148 +0000
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     7
+++ neutron-8.1.2/neutron/api/extensions.py	2016-11-27 14:04:01.947497025 +0000
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     8
@@ -222,6 +222,10 @@
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
     9
 
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    10
     def __init__(self, extension_manager):
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    11
         self.extension_manager = extension_manager
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    12
+        # List of extensions that are not supported currently on Solaris
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    13
+        self.ext_not_supp = ['auto-allocated-topology', 'l3-ha',
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    14
+                             'address-scope', 'extraroute', 'dns-integration',
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    15
+                             'dvr']
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    16
 
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    17
     @staticmethod
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    18
     def _translate(ext):
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    19
@@ -236,6 +240,9 @@
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    20
     def index(self, request):
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    21
         extensions = []
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    22
         for _alias, ext in six.iteritems(self.extension_manager.extensions):
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    23
+            if _alias in self.ext_not_supp:
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    24
+                LOG.debug("Extension '%s' not supported", _alias)
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    25
+                continue
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    26
             extensions.append(self._translate(ext))
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    27
         return dict(extensions=extensions)
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    28
 
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    29
@@ -245,6 +252,11 @@
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    30
         if not ext:
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    31
             raise webob.exc.HTTPNotFound(
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    32
                 _("Extension with alias %s does not exist") % id)
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    33
+
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    34
+        alias = ext.get_alias()
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    35
+        if alias in self.ext_not_supp:
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    36
+            raise webob.exc.HTTPNotFound(
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    37
+                _("Extension '%s' not supported") % alias)
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    38
         return dict(extension=self._translate(ext))
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    39
 
dc947d165222 25107553 neutron ext-list needs to reflect what Solaris cloud actually supports
Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
parents:
diff changeset
    40
     def delete(self, request, id):