X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fapi%2Fviews.py;h=c72c85ca9dc57cadb955c7385bd6b00d7305ed11;hb=b7c4d286ffa618be0e95b15f3883e2f6920a3fb1;hp=072354fa306dd917e1811d1098680038c705db9b;hpb=ebc42347105caa2be52a8337372ae4793fe9182c;p=laas.git diff --git a/src/api/views.py b/src/api/views.py index 072354f..c72c85c 100644 --- a/src/api/views.py +++ b/src/api/views.py @@ -18,14 +18,12 @@ from rest_framework import viewsets from rest_framework.authtoken.models import Token from django.views.decorators.csrf import csrf_exempt -import json - -from api.serializers.booking_serializer import * -from api.serializers.old_serializers import NotifierSerializer, UserSerializer +from api.serializers.booking_serializer import BookingSerializer +from api.serializers.old_serializers import UserSerializer from account.models import UserProfile from booking.models import Booking -from notifier.models import Notifier -from api.models import * +from api.models import LabManagerTracker, get_task +from notifier.manager import NotificationHandler class BookingViewSet(viewsets.ModelViewSet): @@ -34,11 +32,6 @@ class BookingViewSet(viewsets.ModelViewSet): filter_fields = ('resource', 'id') -class NotifierViewSet(viewsets.ModelViewSet): - queryset = Notifier.objects.none() - serializer_class = NotifierSerializer - - class UserViewSet(viewsets.ModelViewSet): queryset = UserProfile.objects.all() serializer_class = UserSerializer @@ -87,6 +80,7 @@ def specific_task(request, lab_name="", job_id="", task_id=""): if 'message' in request.POST: task.message = request.POST.get('message') task.save() + NotificationHandler.task_updated(task) d = {} d['task'] = task.config.get_delta() m = {}