diff --git a/fuelclient/commands/graph.py b/fuelclient/commands/graph.py index f65044c5..80c2299b 100644 --- a/fuelclient/commands/graph.py +++ b/fuelclient/commands/graph.py @@ -321,7 +321,7 @@ class GraphList(base.BaseListCommand): '--plugins', dest='filters', action='append_const', - const='plugins', + const='plugin', help='Include plugins-specific graphs' ) parser.add_argument( diff --git a/fuelclient/tests/unit/v2/cli/test_deployment_graph.py b/fuelclient/tests/unit/v2/cli/test_deployment_graph.py index c3ec41c2..31157ed2 100644 --- a/fuelclient/tests/unit/v2/cli/test_deployment_graph.py +++ b/fuelclient/tests/unit/v2/cli/test_deployment_graph.py @@ -347,9 +347,9 @@ class TestGraphActions(test_engine.BaseCLITest): self.exec_command('graph list') 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=['plugins']), + mock.call(env_id=None, filters=['plugin']), mock.call(env_id=None, filters=['cluster']), mock.call(env_id=None, filters=None) ]) diff --git a/fuelclient/tests/unit/v2/lib/test_deployment_graph.py b/fuelclient/tests/unit/v2/lib/test_deployment_graph.py index 03023ca0..472bc333 100644 --- a/fuelclient/tests/unit/v2/lib/test_deployment_graph.py +++ b/fuelclient/tests/unit/v2/lib/test_deployment_graph.py @@ -274,7 +274,7 @@ class TestDeploymentGraphFacade(test_api.BaseLibTest): self.assertItemsEqual( enabled_plugin_graphs, - self.client.list(env_id, filters=['plugins']) + self.client.list(env_id, filters=['plugin']) ) self.assertItemsEqual( diff --git a/fuelclient/v1/graph.py b/fuelclient/v1/graph.py index 27bf5a99..9992dbe8 100644 --- a/fuelclient/v1/graph.py +++ b/fuelclient/v1/graph.py @@ -245,7 +245,7 @@ class GraphClient(base_v1.BaseV1Client): # we cannot use dict here, because order is important handlers = ( ('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) )