From 43e37bdd794012b0039f1844858f854348d412b2 Mon Sep 17 00:00:00 2001
From: Eyal <eyal.bar-ilan@nokia.com>
Date: Tue, 22 Mar 2016 14:21:55 +0200
Subject: [PATCH] move mock flag to oslo config

Change-Id: Icd78df814329f7dce0ac6a3726838dc87becd055
---
 vitrage/api/__init__.py                | 3 +++
 vitrage/api/controllers/v1/__init__.py | 1 -
 vitrage/api/controllers/v1/alarms.py   | 3 +--
 vitrage/api/controllers/v1/rca.py      | 3 +--
 vitrage/api/controllers/v1/topology.py | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/vitrage/api/__init__.py b/vitrage/api/__init__.py
index bc319e189..63f3763a7 100644
--- a/vitrage/api/__init__.py
+++ b/vitrage/api/__init__.py
@@ -34,4 +34,7 @@ OPTS = [
 
     cfg.BoolOpt('pecan_debug', default=False,
                 help='Toggle Pecan Debug Middleware.'),
+
+    cfg.BoolOpt('use_mock_file', default=False,
+                help='Toggle mock file for debugging.'),
 ]
diff --git a/vitrage/api/controllers/v1/__init__.py b/vitrage/api/controllers/v1/__init__.py
index 2d58bae77..bf07874fd 100644
--- a/vitrage/api/controllers/v1/__init__.py
+++ b/vitrage/api/controllers/v1/__init__.py
@@ -15,5 +15,4 @@
 from vitrage.common.constants import EntityCategory
 from vitrage.common.constants import VertexProperties as VProps
 
-mock_file = False
 RCA_QUERY = {'==': {VProps. CATEGORY: EntityCategory.ALARM}}
diff --git a/vitrage/api/controllers/v1/alarms.py b/vitrage/api/controllers/v1/alarms.py
index 35fabf657..91cba0145 100644
--- a/vitrage/api/controllers/v1/alarms.py
+++ b/vitrage/api/controllers/v1/alarms.py
@@ -19,7 +19,6 @@ from oslo_log import log
 from pecan.core import abort
 
 from vitrage.api.controllers.rest import RootRestController
-from vitrage.api.controllers.v1 import mock_file
 from vitrage.api.policy import enforce
 # noinspection PyProtectedMember
 from vitrage.i18n import _LI
@@ -43,7 +42,7 @@ class AlarmsController(RootRestController):
                  vitrage_id)
 
         try:
-            if mock_file:
+            if pecan.request.cfg.use_mock_file:
                 return self.get_mock_data('alarms.sample.json')
             else:
                 return self.get_alarms(vitrage_id)
diff --git a/vitrage/api/controllers/v1/rca.py b/vitrage/api/controllers/v1/rca.py
index 802d15d19..abb50a327 100644
--- a/vitrage/api/controllers/v1/rca.py
+++ b/vitrage/api/controllers/v1/rca.py
@@ -19,7 +19,6 @@ import pecan
 from oslo_log import log
 from pecan.core import abort
 from vitrage.api.controllers.rest import RootRestController
-from vitrage.api.controllers.v1 import mock_file
 from vitrage.api.policy import enforce
 
 # noinspection PyProtectedMember
@@ -36,7 +35,7 @@ class RCAController(RootRestController):
                 pecan.request.enforcer, {})
 
         LOG.info(_LI('received show rca with alarm id %s') % alarm_id)
-        if mock_file:
+        if pecan.request.cfg.use_mock_file:
             return self.get_mock_data('rca.sample.json')
         else:
             return self.get_rca(alarm_id)
diff --git a/vitrage/api/controllers/v1/topology.py b/vitrage/api/controllers/v1/topology.py
index f020d04b7..726dd13ca 100644
--- a/vitrage/api/controllers/v1/topology.py
+++ b/vitrage/api/controllers/v1/topology.py
@@ -20,7 +20,6 @@ import pecan
 from pecan.core import abort
 
 from vitrage.api.controllers.rest import RootRestController
-from vitrage.api.controllers.v1 import mock_file
 from vitrage.api.policy import enforce
 
 # noinspection PyProtectedMember
@@ -46,7 +45,7 @@ class TopologyController(RootRestController):
 
         LOG.info(_LI("query is %s") % query)
 
-        if mock_file:
+        if pecan.request.cfg.use_mock_file:
             return self.get_mock_data('graph.sample.json', graph_type)
         else:
             return self.get_graph(graph_type, depth, query, root)