openstack/vitrage
Code Issues Proposed changes

fix for running nosetests locally on devstack

Browse Source 
Change-Id: Icf6fa3352826fc6c3f826dfbdbacf10d60637037
This commit is contained in:
Alexey Weyl 2017-03-14 13:16:01 +00:00
parent 60cdf65033
commit e025a0acf7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/vitrage-api.rst
View File

@ -135,7 +135,7 @@ Consists of a topology request definition which has the following properties:
* depth - (int, optional) the depth of the topology graph. defaults to max depth * depth - (int, optional) the depth of the topology graph. defaults to max depth
* graph_type-(string, optional) can be either tree or graph. defaults to graph * graph_type-(string, optional) can be either tree or graph. defaults to graph
* query - (string, optional) a json query filter to filter the graph components. defaults to return all the graph * query - (string, optional) a json query filter to filter the graph components. defaults to return all the graph
* all_tenants - * all_tenants - shows the entities of all the tenants in the graph (in case the user has the permissions).
query expression query expression
================ ================

7
vitrage_tempest_tests/tests/api/topology/test_topology.py
View File

@ -50,9 +50,10 @@ class TestTopology(BaseTopologyTest):
This test validate correctness of topology graph: This test validate correctness of topology graph:
cli via api cli via api
""" """
api_graph = self.vitrage_client.topology.get() api_graph = self.vitrage_client.topology.get(all_tenants=True)
cli_graph = utils.run_vitrage_command('vitrage topology show', cli_graph = utils.run_vitrage_command(
self.conf) 'vitrage topology show --all-tenants',
self.conf)
self._compare_graphs(api_graph, cli_graph) self._compare_graphs(api_graph, cli_graph)
@utils.tempest_logger @utils.tempest_logger

3
vitrage_tempest_tests/tests/utils.py
View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from functools import wraps
import socket import socket
from oslo_config import cfg from oslo_config import cfg
@ -115,6 +117,7 @@ def uni2str(text):
def tempest_logger(func): def tempest_logger(func):
func_name = func.func_name func_name = func.func_name
@wraps(func)
def func_name_print_func(*args, **kwargs): def func_name_print_func(*args, **kwargs):
LOG.info('Test Start: ' + func_name) LOG.info('Test Start: ' + func_name)
result = func(*args, **kwargs) result = func(*args, **kwargs)