openstack
/
python-fuelclient
Code Issues Proposed changes

Align plugins filtering for 'fuel2 graph list' command 

Change-Id: Iba533f795f78bcd74d5989eff9ed9342c66d05b0
Closes-Bug: 1638605
This commit is contained in:
tivaliy 2016-11-03 07:39:13 +02:00 committed by Vitalii Kulanov
parent 735ec78c4c
commit 57bbc76a78
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelclient/commands/graph.py
View File

@ -320,7 +320,7 @@ class GraphList(base.BaseListCommand):
'--plugins', '--plugins',
dest='filters', dest='filters',
action='append_const', action='append_const',
const='plugins', const='plugin',
help='Include plugins-specific graphs' help='Include plugins-specific graphs'
) )
parser.add_argument( parser.add_argument(

4
fuelclient/tests/unit/v2/cli/test_deployment_graph.py
View File

@ -328,9 +328,9 @@ class TestGraphActions(test_engine.BaseCLITest):
self.exec_command('graph list') self.exec_command('graph list')
self.m_client.list.assert_has_calls([ self.m_client.list.assert_has_calls([
mock.call(env_id=1, filters=['release', 'plugins', 'cluster']), mock.call(env_id=1, filters=['release', 'plugin', 'cluster']),
mock.call(env_id=None, filters=['release']), mock.call(env_id=None, filters=['release']),
mock.call(env_id=None, filters=['plugins']), mock.call(env_id=None, filters=['plugin']),
mock.call(env_id=None, filters=['cluster']), mock.call(env_id=None, filters=['cluster']),
mock.call(env_id=None, filters=None) mock.call(env_id=None, filters=None)
]) ])

2
fuelclient/tests/unit/v2/lib/test_deployment_graph.py
View File

@ -274,7 +274,7 @@ class TestDeploymentGraphFacade(test_api.BaseLibTest):
self.assertItemsEqual( self.assertItemsEqual(
enabled_plugin_graphs, enabled_plugin_graphs,
self.client.list(env_id, filters=['plugins']) self.client.list(env_id, filters=['plugin'])
) )
self.assertItemsEqual( self.assertItemsEqual(

2
fuelclient/v1/graph.py
View File

@ -245,7 +245,7 @@ class GraphClient(base_v1.BaseV1Client):
# we cannot use dict here, because order is important # we cannot use dict here, because order is important
handlers = ( handlers = (
('release', self.get_env_release_graphs_list), ('release', self.get_env_release_graphs_list),
('plugins', self.get_env_plugins_graphs_list), ('plugin', self.get_env_plugins_graphs_list),
('cluster', self.get_env_cluster_graphs_list) ('cluster', self.get_env_cluster_graphs_list)
) )