openstack/vitrage
Code Issues Proposed changes

move mock flag to oslo config

Browse Source 
Change-Id: Icd78df814329f7dce0ac6a3726838dc87becd055
This commit is contained in:
Eyal 2016-03-22 14:21:55 +02:00
parent cc6fb67cb9
commit 43e37bdd79
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vitrage/api/__init__.py
View File

@ -34,4 +34,7 @@ OPTS = [
cfg.BoolOpt('pecan_debug', default=False, cfg.BoolOpt('pecan_debug', default=False,
help='Toggle Pecan Debug Middleware.'), help='Toggle Pecan Debug Middleware.'),
cfg.BoolOpt('use_mock_file', default=False,
help='Toggle mock file for debugging.'),
] ]

1
vitrage/api/controllers/v1/__init__.py
View File

@ -15,5 +15,4 @@
from vitrage.common.constants import EntityCategory from vitrage.common.constants import EntityCategory
from vitrage.common.constants import VertexProperties as VProps from vitrage.common.constants import VertexProperties as VProps
mock_file = False
RCA_QUERY = {'==': {VProps. CATEGORY: EntityCategory.ALARM}} RCA_QUERY = {'==': {VProps. CATEGORY: EntityCategory.ALARM}}

3
vitrage/api/controllers/v1/alarms.py
View File

@ -19,7 +19,6 @@ from oslo_log import log
from pecan.core import abort from pecan.core import abort
from vitrage.api.controllers.rest import RootRestController from vitrage.api.controllers.rest import RootRestController
from vitrage.api.controllers.v1 import mock_file
from vitrage.api.policy import enforce from vitrage.api.policy import enforce
# noinspection PyProtectedMember # noinspection PyProtectedMember
from vitrage.i18n import _LI from vitrage.i18n import _LI
@ -43,7 +42,7 @@ class AlarmsController(RootRestController):
vitrage_id) vitrage_id)
try: try:
if mock_file: if pecan.request.cfg.use_mock_file:
return self.get_mock_data('alarms.sample.json') return self.get_mock_data('alarms.sample.json')
else: else:
return self.get_alarms(vitrage_id) return self.get_alarms(vitrage_id)

3
vitrage/api/controllers/v1/rca.py
View File

@ -19,7 +19,6 @@ import pecan
from oslo_log import log from oslo_log import log
from pecan.core import abort from pecan.core import abort
from vitrage.api.controllers.rest import RootRestController from vitrage.api.controllers.rest import RootRestController
from vitrage.api.controllers.v1 import mock_file
from vitrage.api.policy import enforce from vitrage.api.policy import enforce
# noinspection PyProtectedMember # noinspection PyProtectedMember
@ -36,7 +35,7 @@ class RCAController(RootRestController):
pecan.request.enforcer, {}) pecan.request.enforcer, {})
LOG.info(_LI('received show rca with alarm id %s') % alarm_id) 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') return self.get_mock_data('rca.sample.json')
else: else:
return self.get_rca(alarm_id) return self.get_rca(alarm_id)

3
vitrage/api/controllers/v1/topology.py
View File

@ -20,7 +20,6 @@ import pecan
from pecan.core import abort from pecan.core import abort
from vitrage.api.controllers.rest import RootRestController from vitrage.api.controllers.rest import RootRestController
from vitrage.api.controllers.v1 import mock_file
from vitrage.api.policy import enforce from vitrage.api.policy import enforce
# noinspection PyProtectedMember # noinspection PyProtectedMember
@ -46,7 +45,7 @@ class TopologyController(RootRestController):
LOG.info(_LI("query is %s") % query) 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) return self.get_mock_data('graph.sample.json', graph_type)
else: else:
return self.get_graph(graph_type, depth, query, root) return self.get_graph(graph_type, depth, query, root)