From e272712bc4ff86f172f51b75343fdf1a26eadd3c Mon Sep 17 00:00:00 2001
From: hewei <hewei@cmss.chinamobile.com>
Date: Tue, 26 Mar 2019 20:27:06 +0800
Subject: [PATCH] Modify vitrage api

Synchronize interface of event and topology's http code
 in vitrage_api.rst
Judge None type in get alarm interface

Change-Id: Ia1a7783a67e397c84ab042f091e6d0dbac6138bb
Signed-off-by: hewei <hewei@cmss.chinamobile.com>
---
 doc/source/contributor/vitrage-api.rst |  5 +++--
 vitrage/api/controllers/v1/alarm.py    | 21 +++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)
 mode change 100755 => 100644 vitrage/api/controllers/v1/alarm.py

diff --git a/doc/source/contributor/vitrage-api.rst b/doc/source/contributor/vitrage-api.rst
index e46c9bc73..70248de52 100644
--- a/doc/source/contributor/vitrage-api.rst
+++ b/doc/source/contributor/vitrage-api.rst
@@ -197,7 +197,8 @@ Response Status Code
 ====================
 
 -  200 - OK
--  400 - Bad request
+-  403 - Forbidden
+-  404 - Not Found
 
 Response Body
 =============
@@ -1247,7 +1248,7 @@ Response Status code
 ====================
 
 -  200 - OK
--  400 - Bad request
+-  404 - Not Found
 
 Response Body
 =============
diff --git a/vitrage/api/controllers/v1/alarm.py b/vitrage/api/controllers/v1/alarm.py
old mode 100755
new mode 100644
index 5e054f21e..5a61c4b54
--- a/vitrage/api/controllers/v1/alarm.py
+++ b/vitrage/api/controllers/v1/alarm.py
@@ -57,22 +57,19 @@ class AlarmsController(BaseAlarmsController):
 
         LOG.info('returns show alarm with vitrage id %s', vitrage_id)
 
-        try:
-            return self._show_alarm(vitrage_id)
-        except Exception:
-            LOG.exception('Failed to load JSON.')
-            abort(404, "Failed to show alarm.")
+        return self._show_alarm(vitrage_id)
 
     @staticmethod
     def _show_alarm(vitrage_id):
-        alarm_json = pecan.request.client.call(pecan.request.context,
-                                               'show_alarm',
-                                               vitrage_id=vitrage_id)
-        LOG.info(alarm_json)
-
         try:
-            alarms_list = json.loads(alarm_json)
-            return alarms_list
+            alarm_json = pecan.request.client.call(pecan.request.context,
+                                                   'show_alarm',
+                                                   vitrage_id=vitrage_id)
+            LOG.info(alarm_json)
+            if not alarm_json:
+                abort(404, "Failed to find alarm %s" % vitrage_id)
+
+            return json.loads(alarm_json)
 
         except Exception:
             LOG.exception('Failed to load JSON.')