Adding backedn_status info to the monitoring service and tenant REST APIs
Adding e2e tests for monitoring service
Change-Id: I9f60f380318a84e2b13535f638920274c64ac30d
diff --git a/xos/api/service/monitoring/monitoringservice.py b/xos/api/service/monitoring/monitoringservice.py
new file mode 100644
index 0000000..37987cb
--- /dev/null
+++ b/xos/api/service/monitoring/monitoringservice.py
@@ -0,0 +1,79 @@
+from rest_framework.decorators import api_view
+from rest_framework.response import Response
+from rest_framework.reverse import reverse
+from rest_framework import serializers
+from rest_framework import generics
+from rest_framework import viewsets
+from rest_framework import status
+from rest_framework.decorators import detail_route, list_route
+from rest_framework.views import APIView
+from core.models import *
+from django.forms import widgets
+from django.conf.urls import patterns, url
+from api.xosapi_helpers import PlusModelSerializer, XOSViewSet, ReadOnlyField
+from django.shortcuts import get_object_or_404
+from xos.apibase import XOSListCreateAPIView, XOSRetrieveUpdateDestroyAPIView, XOSPermissionDenied
+from xos.exceptions import *
+import json
+import subprocess
+from django.views.decorators.csrf import ensure_csrf_cookie
+from services.monitoring.models import MonitoringChannel, CeilometerService
+
+class CeilometerServiceForApi(CeilometerService):
+ class Meta:
+ proxy = True
+ app_label = "ceilometer"
+
+ @property
+ def related(self):
+ related = {}
+ if self.creator:
+ related["creator"] = self.creator.username
+ instance = self.get_instance()
+ if instance:
+ related["instance_id"] = instance.id
+ related["instance_name"] = instance.name
+ if instance.node:
+ related["compute_node_name"] = instance.node.name
+ return related
+
+
+class CeilometerServiceSerializer(PlusModelSerializer):
+ id = ReadOnlyField()
+ backend_status = ReadOnlyField()
+ humanReadableName = serializers.SerializerMethodField("getHumanReadableName")
+ ceilometer_pub_sub_url = ReadOnlyField()
+ related = serializers.DictField(required=False)
+
+ class Meta:
+ model = CeilometerServiceForApi
+ fields = ('humanReadableName',
+ 'id',
+ 'backend_status',
+ 'ceilometer_pub_sub_url',
+ 'related')
+
+ def getHumanReadableName(self, obj):
+ return obj.__unicode__()
+
+# @ensure_csrf_cookie
+class CeilometerServiceViewSet(XOSViewSet):
+ base_name = "monitoringservice"
+ method_name = None # use the api endpoint /api/service/monitoring/
+ method_kind = "viewset"
+ queryset = CeilometerServiceForApi.get_service_objects().select_related().all()
+ serializer_class = CeilometerServiceSerializer
+
+ @classmethod
+ def get_urlpatterns(self, api_path="^"):
+ patterns = super(CeilometerServiceViewSet, self).get_urlpatterns(api_path=api_path)
+
+ return patterns
+
+ def list(self, request):
+ object_list = self.filter_queryset(self.get_queryset())
+
+ serializer = self.get_serializer(object_list, many=True)
+
+ return Response(serializer.data)
+