JSONHandler renamed to BaseHandler

Change-Id: Id4d1db64d24d624cae83d7ef6f0f1fd937ebe702

nailgun/nailgun/api/handlers/base.py

@@ -63,7 +63,7 @@ def build_json_response(data):
     return data
 
 
-class JSONHandler(object):
+class BaseHandler(object):
     validator = BasicValidator
     serializer = BasicSerializer
 

nailgun/nailgun/api/handlers/capacity.py

@@ -20,9 +20,9 @@ import tempfile
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import build_json_response
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 from nailgun.db import db
 from nailgun.db.sqlalchemy.models import CapacityLog
@@ -33,7 +33,7 @@ Capacity audit handlers
 """
 
 
-class CapacityLogHandler(JSONHandler):
+class CapacityLogHandler(BaseHandler):
     """Task single handler
     """
 

nailgun/nailgun/api/handlers/cluster.py

@@ -22,8 +22,8 @@ import json
 import traceback
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 from nailgun.api.serializers.network_configuration \
     import NeutronNetworkConfigurationSerializer
@@ -42,7 +42,7 @@ from nailgun.task.manager import ApplyChangesTaskManager
 from nailgun.task.manager import ClusterDeletionManager
 
 
-class ClusterHandler(JSONHandler):
+class ClusterHandler(BaseHandler):
     """Cluster single handler
     """
 
@@ -134,7 +134,7 @@ class ClusterHandler(JSONHandler):
         )
 
 
-class ClusterCollectionHandler(JSONHandler):
+class ClusterCollectionHandler(BaseHandler):
     """Cluster collection handler
     """
 
@@ -221,7 +221,7 @@ class ClusterCollectionHandler(JSONHandler):
             raise web.badrequest(e.message)
 
 
-class ClusterChangesHandler(JSONHandler):
+class ClusterChangesHandler(BaseHandler):
     """Cluster changes handler
     """
 
@@ -271,7 +271,7 @@ class ClusterChangesHandler(JSONHandler):
         return TaskHandler.render(task)
 
 
-class ClusterAttributesHandler(JSONHandler):
+class ClusterAttributesHandler(BaseHandler):
     """Cluster attributes handler
     """
 
@@ -324,7 +324,7 @@ class ClusterAttributesHandler(JSONHandler):
         return {"editable": cluster.attributes.editable}
 
 
-class ClusterAttributesDefaultsHandler(JSONHandler):
+class ClusterAttributesDefaultsHandler(BaseHandler):
     """Cluster default attributes handler
     """
 
@@ -380,7 +380,7 @@ class ClusterAttributesDefaultsHandler(JSONHandler):
         return {"editable": cluster.attributes.editable}
 
 
-class ClusterGeneratedData(JSONHandler):
+class ClusterGeneratedData(BaseHandler):
     """Cluster generated data
     """
 

nailgun/nailgun/api/handlers/disks.py

@@ -21,8 +21,8 @@ Handlers dealing with disks
 import traceback
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.validators.node import NodeDisksValidator
 from nailgun.db import db
 from nailgun.db.sqlalchemy.models import Node
@@ -32,7 +32,7 @@ from nailgun.logger import logger
 from nailgun.volumes.manager import DisksFormatConvertor
 
 
-class NodeDisksHandler(JSONHandler):
+class NodeDisksHandler(BaseHandler):
     """Node disks handler
     """
 
@@ -75,7 +75,7 @@ class NodeDisksHandler(JSONHandler):
             node.attributes.volumes)
 
 
-class NodeDefaultsDisksHandler(JSONHandler):
+class NodeDefaultsDisksHandler(BaseHandler):
     """Node default disks handler
     """
 
@@ -95,7 +95,7 @@ class NodeDefaultsDisksHandler(JSONHandler):
         return volumes
 
 
-class NodeVolumesInformationHandler(JSONHandler):
+class NodeVolumesInformationHandler(BaseHandler):
     """Node volumes information handler
     """
 

nailgun/nailgun/api/handlers/logs.py

@@ -27,8 +27,8 @@ import time
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 from nailgun.db import db
 from nailgun.db.sqlalchemy.models import Node
@@ -70,7 +70,7 @@ def read_backwards(file, bufsize=4096):
             return
 
 
-class LogEntryCollectionHandler(JSONHandler):
+class LogEntryCollectionHandler(BaseHandler):
     """Log entry collection handler
     """
 
@@ -307,7 +307,7 @@ class LogPackageHandler(object):
         return TaskHandler.render(task)
 
 
-class LogSourceCollectionHandler(JSONHandler):
+class LogSourceCollectionHandler(BaseHandler):
     """Log source collection handler
     """
 
@@ -319,7 +319,7 @@ class LogSourceCollectionHandler(JSONHandler):
         return settings.LOGS
 
 
-class LogSourceByNodeCollectionHandler(JSONHandler):
+class LogSourceByNodeCollectionHandler(BaseHandler):
     """Log source by node collection handler
     """
 

nailgun/nailgun/api/handlers/network_configuration.py

@@ -22,9 +22,9 @@ import json
 import traceback
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import build_json_response
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 
 from nailgun.api.serializers.network_configuration \
@@ -49,7 +49,7 @@ from nailgun.task.manager import CheckNetworksTaskManager
 from nailgun.task.manager import VerifyNetworksTaskManager
 
 
-class ProviderHandler(JSONHandler):
+class ProviderHandler(BaseHandler):
     """Base class for network configuration handlers
     """
 

nailgun/nailgun/api/handlers/node.py

@@ -26,8 +26,8 @@ from sqlalchemy.orm import joinedload
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.validators.network import NetAssignmentValidator
 from nailgun.api.validators.node import NodeValidator
 from nailgun.db import db
@@ -42,7 +42,7 @@ from nailgun.network.topology import TopoChecker
 from nailgun import notifier
 
 
-class NodeHandler(JSONHandler):
+class NodeHandler(BaseHandler):
     fields = ('id', 'name', 'meta', 'progress', 'roles', 'pending_roles',
               'status', 'mac', 'fqdn', 'ip', 'manufacturer', 'platform_name',
               'pending_addition', 'pending_deletion', 'os_platform',
@@ -54,7 +54,7 @@ class NodeHandler(JSONHandler):
     def render(cls, instance, fields=None):
         json_data = None
         try:
-            json_data = JSONHandler.render(instance, fields=cls.fields)
+            json_data = BaseHandler.render(instance, fields=cls.fields)
             json_data['network_data'] = NetworkManager.get_node_networks(
                 instance.id)
         except Exception:
@@ -152,7 +152,7 @@ class NodeHandler(JSONHandler):
         )
 
 
-class NodeCollectionHandler(JSONHandler):
+class NodeCollectionHandler(BaseHandler):
     """Node collection handler
     """
 
@@ -171,7 +171,7 @@ class NodeCollectionHandler(JSONHandler):
         networks_grouped = network_manager.get_networks_grouped_by_cluster()
         for node in nodes:
             try:
-                json_data = JSONHandler.render(node, fields=cls.fields)
+                json_data = BaseHandler.render(node, fields=cls.fields)
 
                 json_data['network_data'] = network_manager.\
                     get_node_networks_optimized(
@@ -449,7 +449,7 @@ class NodeCollectionHandler(JSONHandler):
         return self.render(nodes)
 
 
-class NodeNICsHandler(JSONHandler):
+class NodeNICsHandler(BaseHandler):
     """Node network interfaces handler
     """
 
@@ -491,7 +491,7 @@ class NodeNICsHandler(JSONHandler):
         return map(self.render, node.interfaces)
 
 
-class NodeCollectionNICsHandler(JSONHandler):
+class NodeCollectionNICsHandler(BaseHandler):
     """Node collection network interfaces handler
     """
 
@@ -522,7 +522,7 @@ class NodeCollectionNICsHandler(JSONHandler):
         ]
 
 
-class NodeNICsDefaultHandler(JSONHandler):
+class NodeNICsDefaultHandler(BaseHandler):
     """Node default network interfaces handler
     """
 
@@ -574,7 +574,7 @@ class NodeCollectionNICsDefaultHandler(NodeNICsDefaultHandler):
         return map(self.render, nodes)
 
 
-class NodeNICsVerifyHandler(JSONHandler):
+class NodeNICsVerifyHandler(BaseHandler):
     """Node NICs verify handler
     Class is proof of concept. Not ready for use.
     """

nailgun/nailgun/api/handlers/notifications.py

@@ -20,15 +20,15 @@ Handlers dealing with notifications
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.validators.notification import NotificationValidator
 from nailgun.db import db
 from nailgun.db.sqlalchemy.models import Notification
 from nailgun.settings import settings
 
 
-class NotificationHandler(JSONHandler):
+class NotificationHandler(BaseHandler):
     """Notification single handler
     """
 
@@ -46,7 +46,7 @@ class NotificationHandler(JSONHandler):
 
     @classmethod
     def render(cls, instance, fields=None):
-        json_data = JSONHandler.render(instance, fields=cls.fields)
+        json_data = BaseHandler.render(instance, fields=cls.fields)
         json_data["time"] = ":".join([
             instance.datetime.strftime("%H"),
             instance.datetime.strftime("%M"),
@@ -84,7 +84,7 @@ class NotificationHandler(JSONHandler):
         return self.render(notification)
 
 
-class NotificationCollectionHandler(JSONHandler):
+class NotificationCollectionHandler(BaseHandler):
 
     validator = NotificationValidator
 

nailgun/nailgun/api/handlers/orchestrator.py

@@ -18,8 +18,8 @@ import traceback
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 from nailgun.api.validators.node import NodesFilterValidator
 
@@ -57,7 +57,7 @@ class NodesFilterMixin(object):
         return self.get_default_nodes(cluster)
 
 
-class DefaultOrchestratorInfo(NodesFilterMixin, JSONHandler):
+class DefaultOrchestratorInfo(NodesFilterMixin, BaseHandler):
     """Base class for default orchestrator data.
     Need to redefine serializer variable
     """
@@ -76,7 +76,7 @@ class DefaultOrchestratorInfo(NodesFilterMixin, JSONHandler):
         return self._serializer.serialize(cluster, nodes)
 
 
-class OrchestratorInfo(JSONHandler):
+class OrchestratorInfo(BaseHandler):
     """Base class for replaced data."""
 
     def get_orchestrator_info(self, cluster):
@@ -165,7 +165,7 @@ class DeploymentInfo(OrchestratorInfo):
         return cluster.replaced_deployment_info
 
 
-class SelectedNodesBase(NodesFilterMixin, JSONHandler):
+class SelectedNodesBase(NodesFilterMixin, BaseHandler):
     """Base class for running task manager on selected nodes."""
 
     @content_json

nailgun/nailgun/api/handlers/plugin.py

@@ -22,13 +22,13 @@ Handlers dealing with plugins
 import json
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 from nailgun.plugin.manager import PluginManager
 
 
-class PluginCollectionHandler(JSONHandler):
+class PluginCollectionHandler(BaseHandler):
 
     @content_json
     def GET(self):
@@ -43,7 +43,7 @@ class PluginCollectionHandler(JSONHandler):
         return TaskHandler.render(task)
 
 
-class PluginHandler(JSONHandler):
+class PluginHandler(BaseHandler):
 
     @content_json
     def GET(self, plugin_id):

nailgun/nailgun/api/handlers/redhat.py

@@ -20,9 +20,9 @@ import traceback
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import build_json_response
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.handlers.tasks import TaskHandler
 from nailgun.api.validators.redhat import RedHatAccountValidator
 from nailgun.db import db
@@ -32,7 +32,7 @@ from nailgun.logger import logger
 from nailgun.task.manager import RedHatSetupTaskManager
 
 
-class RedHatAccountHandler(JSONHandler):
+class RedHatAccountHandler(BaseHandler):
     """Red Hat account handler
     """
 
@@ -86,7 +86,7 @@ class RedHatAccountHandler(JSONHandler):
         return self.render(account)
 
 
-class RedHatSetupHandler(JSONHandler):
+class RedHatSetupHandler(BaseHandler):
     """Red Hat setup handler
     """
 

nailgun/nailgun/api/handlers/registration.py

@@ -22,12 +22,12 @@ import base64
 import json
 
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.settings import settings
 
 
-class FuelKeyHandler(JSONHandler):
+class FuelKeyHandler(BaseHandler):
     """ Fuel key handler"""
 
     @content_json

nailgun/nailgun/api/handlers/release.py

@@ -22,14 +22,14 @@ import json
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.api.validators.release import ReleaseValidator
 from nailgun.db import db
 from nailgun.db.sqlalchemy.models import Release
 
 
-class ReleaseHandler(JSONHandler):
+class ReleaseHandler(BaseHandler):
     """Release single handler
     """
 
@@ -95,7 +95,7 @@ class ReleaseHandler(JSONHandler):
         )
 
 
-class ReleaseCollectionHandler(JSONHandler):
+class ReleaseCollectionHandler(BaseHandler):
     """Release collection handler
     """
 

nailgun/nailgun/api/handlers/tasks.py

@@ -16,8 +16,8 @@
 
 import web
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.db import db
 from nailgun.db.sqlalchemy.models import Task
 
@@ -26,7 +26,7 @@ Handlers dealing with tasks
 """
 
 
-class TaskHandler(JSONHandler):
+class TaskHandler(BaseHandler):
     """Task single handler
     """
 
@@ -70,7 +70,7 @@ class TaskHandler(JSONHandler):
         )
 
 
-class TaskCollectionHandler(JSONHandler):
+class TaskCollectionHandler(BaseHandler):
     """Task collection handler
     """
 

nailgun/nailgun/api/handlers/version.py

@@ -18,12 +18,12 @@
 Product info handlers
 """
 
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.handlers.base import content_json
-from nailgun.api.handlers.base import JSONHandler
 from nailgun.settings import settings
 
 
-class VersionHandler(JSONHandler):
+class VersionHandler(BaseHandler):
     """Version info handler
     """
 

nailgun/nailgun/autoapidoc.py

@@ -17,7 +17,7 @@
 import inspect
 import json
 
-from nailgun.api.handlers.base import JSONHandler
+from nailgun.api.handlers.base import BaseHandler
 from nailgun.api.urls.v1 import urls
 from nailgun.test.base import reverse
 
@@ -37,12 +37,12 @@ class SampleGenerator(object):
 
     @classmethod
     def _ishandler(cls, obj):
-            return inspect.isclass(obj) and issubclass(obj, JSONHandler) and \
+            return inspect.isclass(obj) and issubclass(obj, BaseHandler) and \
                 obj.__name__ in urls[::2]
 
     @classmethod
     def _ishandlermethod(cls, obj):
-        return inspect.ismethod(obj) and issubclass(obj.im_class, JSONHandler)
+        return inspect.ismethod(obj) and issubclass(obj.im_class, BaseHandler)
 
     @classmethod
     def generate_handler_url_doc(cls, handler):