diff options
| author |   Parker Berberian <pberberian@iol.unh.edu> | 2018-04-13 18:24:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-13 18:24:29 +0000 |
| commit | 1adcec9a31257403e587c6e414033eb829f046b5 (patch) | |
| tree | ef167b06f4e4d4aafefc90c799962516ff9b3dfd /dashboard | |
| parent | 104e45c7494d114ce3dd068e35501ed93d527dd2 (diff) | |
| parent | 350e21a65b0bbdab86808f984ebc4949eaac5a8b (diff) | |
Merge "Gracefully Handle Missing Jenkins Utilization for Dev Pod"
Diffstat (limited to 'dashboard')
| -rw-r--r-- | dashboard/src/dashboard/views.py | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/dashboard/src/dashboard/views.py b/dashboard/src/dashboard/views.py index 62a9f83..4bab036 100644 --- a/dashboard/src/dashboard/views.py +++ b/dashboard/src/dashboard/views.py @@ -120,22 +120,27 @@ class JenkinsUtilizationJSON(View): def get(self, request, *args, **kwargs): resource = get_object_or_404(Resource, id=kwargs['resource_id']) weeks = int(kwargs['weeks']) - utilization = resource.slave.get_utilization(timedelta(weeks=weeks)) - utilization = [ - { - 'label': 'Offline', - 'data': utilization['offline'], - 'color': '#d9534f' - }, - { - 'label': 'Online', - 'data': utilization['online'], - 'color': '#5cb85c' - }, - { - 'label': 'Idle', - 'data': utilization['idle'], - 'color': '#5bc0de' - }, - ] - return JsonResponse({'data': utilization}) + try: + utilization = resource.slave.get_utilization(timedelta(weeks=weeks)) + utilization = [ + { + 'label': 'Offline', + 'data': utilization['offline'], + 'color': '#d9534f' + }, + { + 'label': 'Online', + 'data': utilization['online'], + 'color': '#5cb85c' + }, + { + 'label': 'Idle', + 'data': utilization['idle'], + 'color': '#5bc0de' + }, + ] + jutilization = JsonResponse({'data': utilization}) + except AttributeError: + return JsonResponse({'data': ''}) + if jutilization: + return jutilization |