diff --git a/validations_libs/cli/common.py b/validations_libs/cli/common.py index bc837f5b..5701729c 100644 --- a/validations_libs/cli/common.py +++ b/validations_libs/cli/common.py @@ -26,12 +26,9 @@ try: except ImportError: JUNIT_XML_FOUND = False -from validations_libs import constants from validations_libs import utils as v_utils from validations_libs.cli import colors -GROUP_FILE = constants.VALIDATION_GROUPS_INFO - def print_dict(data): """Print table from python dict with PrettyTable""" diff --git a/validations_libs/cli/show.py b/validations_libs/cli/show.py index 163f8fe1..e8801c5a 100644 --- a/validations_libs/cli/show.py +++ b/validations_libs/cli/show.py @@ -15,6 +15,7 @@ # under the License. from cliff.show import ShowOne +from cliff.lister import Lister from validations_libs.validation_actions import ValidationActions from validations_libs import constants @@ -50,30 +51,26 @@ class Show(ShowOne): return data.keys(), data.values() -class ShowGroup(ShowOne): +class ShowGroup(Lister): """Validation Show group client implementation class""" def get_parser(self, parser): """Argument parser for validation show group""" parser = super(ShowGroup, self).get_parser(parser) - parser.add_argument('--validation-dir', dest='validation_dir', - default=constants.ANSIBLE_VALIDATION_DIR, - help=("Path where the validation playbooks " - "are located.")) - parser.add_argument('--group', '-g', - metavar='', - dest="group", - help=("Show a specific group.")) + + parser.add_argument('--group_file', '-g', + metavar='', + dest="group", + default=constants.VALIDATION_GROUPS_INFO, + help=("Show a specific group.")) + return parser def take_action(self, parsed_args): """Take validation action""" - # Get parameters: - validation_dir = parsed_args.validation_dir - group = parsed_args.group - v_actions = ValidationActions(validation_path=validation_dir) - return v_actions.group_information(group) + v_actions = ValidationActions(constants.ANSIBLE_VALIDATION_DIR) + return v_actions.group_information(parsed_args.groups) class ShowParameter(ShowOne): diff --git a/validations_libs/tests/cli/test_show.py b/validations_libs/tests/cli/test_show.py index 5730901d..789ee9a2 100644 --- a/validations_libs/tests/cli/test_show.py +++ b/validations_libs/tests/cli/test_show.py @@ -48,21 +48,20 @@ class TestShowGroup(BaseCommand): @mock.patch('yaml.safe_load', return_value=fakes.GROUP) @mock.patch('six.moves.builtins.open') def test_show_validations_group_info(self, mock_open, mock_yaml, mock_actions): - arglist = ['--group', 'group.yaml'] - verifylist = [('group', 'group.yaml')] + arglist = [] mock_info = mock.MagicMock() mock_info.group_information = mock.MagicMock(return_value='foo') mock_actions.return_value = mock_info - parsed_args = self.check_parser(self.cmd, arglist, verifylist) + parsed_args = self.check_parser(self.cmd, arglist, []) group_info = self.cmd.take_action(parsed_args) mock_actions.assert_called_once_with( validation_path=fakes.FAKE_VALIDATIONS_PATH) - mock_info.group_information.assert_called_once_with('group.yaml') + mock_info.group_information.assert_called_once() self.assertEqual('foo', group_info)