From b9a055971e2d2435bbc1766c88c8bb70b9c59475 Mon Sep 17 00:00:00 2001
From: ghanshyam <ghanshyammann@gmail.com>
Date: Fri, 26 May 2017 13:21:38 +0300
Subject: [PATCH] Use plain routes list for os-fping endpoint

This patch adds os-fping 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: Id58263258fe3cc28961fb095b4d758eef234ca47
---
 nova/api/openstack/compute/fping.py  | 17 -----------------
 nova/api/openstack/compute/routes.py | 11 +++++++++++
 setup.cfg                            |  1 -
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/nova/api/openstack/compute/fping.py b/nova/api/openstack/compute/fping.py
index d3347e69a7..9ece098177 100644
--- a/nova/api/openstack/compute/fping.py
+++ b/nova/api/openstack/compute/fping.py
@@ -31,8 +31,6 @@ from nova.i18n import _
 from nova.policies import fping as fping_policies
 from nova import utils
 
-ALIAS = "os-fping"
-
 CONF = nova.conf.CONF
 
 
@@ -136,18 +134,3 @@ class FpingController(wsgi.Controller):
                 "alive": bool(set(ips) & alive_ips),
             }
         }
-
-
-class Fping(extensions.V21APIExtensionBase):
-    """Fping Management Extension."""
-
-    name = "Fping"
-    alias = ALIAS
-    version = 1
-
-    def get_resources(self):
-        res = extensions.ResourceExtension(ALIAS, FpingController())
-        return [res]
-
-    def get_controller_extensions(self):
-        return []
diff --git a/nova/api/openstack/compute/routes.py b/nova/api/openstack/compute/routes.py
index 31426f3b58..716edb8a34 100644
--- a/nova/api/openstack/compute/routes.py
+++ b/nova/api/openstack/compute/routes.py
@@ -45,6 +45,7 @@ from nova.api.openstack.compute import floating_ip_dns
 from nova.api.openstack.compute import floating_ip_pools
 from nova.api.openstack.compute import floating_ips
 from nova.api.openstack.compute import floating_ips_bulk
+from nova.api.openstack.compute import fping
 from nova.api.openstack.compute import hide_server_addresses
 from nova.api.openstack.compute import instance_actions
 from nova.api.openstack.compute import instance_usage_audit_log
@@ -161,6 +162,10 @@ floating_ips_bulk_controller = functools.partial(_create_controller,
     floating_ips_bulk.FloatingIPBulkController, [], [])
 
 
+fping_controller = functools.partial(_create_controller,
+    fping.FpingController, [], [])
+
+
 instance_actions_controller = functools.partial(_create_controller,
     instance_actions.InstanceActionsController, [], [])
 
@@ -381,6 +386,12 @@ ROUTE_LIST = (
         'GET': [floating_ips_bulk_controller, 'show'],
         'PUT': [floating_ips_bulk_controller, 'update']
     }),
+    ('/os-fping', {
+        'GET': [fping_controller, 'index']
+    }),
+    ('/os-fping/{id}', {
+        'GET': [fping_controller, 'show']
+    }),
     ('/os-instance_usage_audit_log', {
         'GET': [instance_usage_audit_log_controller, 'index']
     }),
diff --git a/setup.cfg b/setup.cfg
index 4b512ea854..c4c6e748fa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -79,7 +79,6 @@ nova.api.v21.extensions =
     console_auth_tokens = nova.api.openstack.compute.console_auth_tokens:ConsoleAuthTokens
     consoles = nova.api.openstack.compute.consoles:Consoles
     extension_info = nova.api.openstack.compute.extension_info:ExtensionInfo
-    fping = nova.api.openstack.compute.fping:Fping
     hosts = nova.api.openstack.compute.hosts:Hosts
     hypervisors = nova.api.openstack.compute.hypervisors:Hypervisors
     images = nova.api.openstack.compute.images:Images