From 52245af444f57e8aba8cdad5adf81577b3cfa818 Mon Sep 17 00:00:00 2001
From: ghanshyam <ghanshyammann@gmail.com>
Date: Fri, 26 May 2017 12:08:00 +0300
Subject: [PATCH] Use plain routes list for os-server-external-events endpoint

This patch adds os-server-external-events related routes
by a plain list, instead of using stevedore. After all the Nova
API endpoints moves to the plain routes list, the usage of stevedore
for API loading will be removed from Nova.

Partial-implement-blueprint api-no-more-extensions-pike

Change-Id: I112f096e74ce363e259b55b7155b6ec738c40e1d
---
 nova/api/openstack/compute/routes.py           |  8 ++++++++
 .../compute/server_external_events.py          | 18 ------------------
 setup.cfg                                      |  1 -
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/nova/api/openstack/compute/routes.py b/nova/api/openstack/compute/routes.py
index 9b776d318a..3f7ce99c89 100644
--- a/nova/api/openstack/compute/routes.py
+++ b/nova/api/openstack/compute/routes.py
@@ -58,6 +58,7 @@ from nova.api.openstack.compute import quota_sets
 from nova.api.openstack.compute import remote_consoles
 from nova.api.openstack.compute import rescue
 from nova.api.openstack.compute import security_groups
+from nova.api.openstack.compute import server_external_events
 from nova.api.openstack.compute import server_metadata
 from nova.api.openstack.compute import server_migrations
 from nova.api.openstack.compute import server_password
@@ -215,6 +216,10 @@ server_controller = functools.partial(_create_controller,
 )
 
 
+server_external_events_controller = functools.partial(_create_controller,
+    server_external_events.ServerExternalEventsController, [], [])
+
+
 server_metadata_controller = functools.partial(_create_controller,
     server_metadata.ServerMetadataController, [], [])
 
@@ -389,6 +394,9 @@ ROUTE_LIST = (
     ('/os-quota-sets/{id}/defaults', {
         'GET': [quota_set_controller, 'defaults']
     }),
+    ('/os-server-external-events', {
+        'POST': [server_external_events_controller, 'create']
+    }),
     ('/os-simple-tenant-usage', {
         'GET': [simple_tenant_usage_controller, 'index']
     }),
diff --git a/nova/api/openstack/compute/server_external_events.py b/nova/api/openstack/compute/server_external_events.py
index 28075d3f62..0af8d0aa61 100644
--- a/nova/api/openstack/compute/server_external_events.py
+++ b/nova/api/openstack/compute/server_external_events.py
@@ -28,7 +28,6 @@ from nova.policies import server_external_events as see_policies
 
 
 LOG = logging.getLogger(__name__)
-ALIAS = 'os-server-external-events'
 
 
 class ServerExternalEventsController(wsgi.Controller):
@@ -128,20 +127,3 @@ class ServerExternalEventsController(wsgi.Controller):
         robj = wsgi.ResponseObject({'events': response_events})
         robj._code = result
         return robj
-
-
-class ServerExternalEvents(extensions.V21APIExtensionBase):
-    """Server External Event Triggers."""
-
-    name = "ServerExternalEvents"
-    alias = ALIAS
-    version = 1
-
-    def get_resources(self):
-        resource = extensions.ResourceExtension(ALIAS,
-                ServerExternalEventsController())
-
-        return [resource]
-
-    def get_controller_extensions(self):
-        return []
diff --git a/setup.cfg b/setup.cfg
index cdb83c62a0..51a9ef02cd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -95,7 +95,6 @@ nova.api.v21.extensions =
     security_group_default_rules = nova.api.openstack.compute.security_group_default_rules:SecurityGroupDefaultRules
     security_groups = nova.api.openstack.compute.security_groups:SecurityGroups
     server_diagnostics = nova.api.openstack.compute.server_diagnostics:ServerDiagnostics
-    server_external_events = nova.api.openstack.compute.server_external_events:ServerExternalEvents
     server_groups = nova.api.openstack.compute.server_groups:ServerGroups
     services = nova.api.openstack.compute.services:Services
     tenant_networks = nova.api.openstack.compute.tenant_networks:TenantNetworks