diff --git a/setup.cfg b/setup.cfg index 771d0b7..33046b9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,7 +54,6 @@ openstack.infra_optim.v1 = optimize_actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan optimize_actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan - optimize_actionplan_create = watcherclient.v1.action_plan_shell:CreateActionPlan optimize_actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan optimize_actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan optimize_actionplan_cancel = watcherclient.v1.action_plan_shell:CancelActionPlan @@ -91,7 +90,6 @@ watcherclient.v1 = actionplan_show = watcherclient.v1.action_plan_shell:ShowActionPlan actionplan_list = watcherclient.v1.action_plan_shell:ListActionPlan - actionplan_create = watcherclient.v1.action_plan_shell:CreateActionPlan actionplan_update = watcherclient.v1.action_plan_shell:UpdateActionPlan actionplan_start = watcherclient.v1.action_plan_shell:StartActionPlan actionplan_delete = watcherclient.v1.action_plan_shell:DeleteActionPlan diff --git a/watcherclient/tests/functional/v1/test_action_plan.py b/watcherclient/tests/functional/v1/test_action_plan.py index f38c02d..fa60fd6 100644 --- a/watcherclient/tests/functional/v1/test_action_plan.py +++ b/watcherclient/tests/functional/v1/test_action_plan.py @@ -94,52 +94,3 @@ class ActionPlanTests(base.TestCase): duration=600, sleep_for=2 )) - - -class ActionPlanActiveTests(base.TestCase): - - audit_uuid = None - audit_template_name = 'b' + uuidutils.generate_uuid() - - list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy'] - detailed_list_fields = list_fields + ['Created At', 'Deleted At', - 'Strategy', 'Efficacy indicators'] - - def _delete_action_plan(self): - self.assertTrue(test_utils.call_until_true( - func=functools.partial( - self.has_audit_created, self.audit_uuid), - duration=600, - sleep_for=2 - )) - output = self.parse_show( - self.watcher('actionplan list --audit %s' % self.audit_uuid)) - action_plan_uuid = list(output[0])[0] - raw_output = self.watcher('actionplan delete %s' % action_plan_uuid) - self.assertOutput('', raw_output) - - def _delete_audit(self): - raw_output = self.watcher('audit delete %s' % self.audit_uuid) - self.assertOutput('', raw_output) - - def _delete_audit_template(self): - raw_output = self.watcher( - 'audittemplate delete %s' % self.audit_template_name) - self.assertOutput('', raw_output) - - def _create_audit_template(self): - template_raw_output = self.watcher( - 'audittemplate create %s dummy -s dummy' - % self.audit_template_name) - template_output = self.parse_show_as_object(template_raw_output) - return template_output - - def test_action_plan_create(self): - template_output = self._create_audit_template() - action_plan = self.watcher( - 'actionplan create -a %s' % template_output['Name']) - self.audit_uuid = self.parse_show_as_object(action_plan)['UUID'] - self.assert_table_structure([action_plan], self.detailed_list_fields) - self._delete_action_plan() - self._delete_audit() - self._delete_audit_template() diff --git a/watcherclient/v1/action_plan_shell.py b/watcherclient/v1/action_plan_shell.py index eb3448e..5a4586f 100644 --- a/watcherclient/v1/action_plan_shell.py +++ b/watcherclient/v1/action_plan_shell.py @@ -200,47 +200,6 @@ class ListActionPlan(command.Lister): (utils.get_item_properties(item, fields) for item in data)) -class CreateActionPlan(command.ShowOne): - """Create new audit.""" - - def get_parser(self, prog_name): - parser = super(CreateActionPlan, self).get_parser(prog_name) - parser.add_argument( - '-a', '--audit-template', - required=True, - dest='audit_template_uuid', - metavar='', - help=_('Audit template used for this audit (name or uuid).')) - parser.add_argument( - '-t', '--audit_type', - dest='audit_type', - metavar='', - default='ONESHOT', - choices=['ONESHOT', 'CONTINUOUS'], - help=_("Audit type. It must be ONESHOT or CONTINUOUS. " - "Default is ONESHOT.")) - - return parser - - def take_action(self, parsed_args): - client = getattr(self.app.client_manager, "infra-optim") - - field_list = ['audit_template_uuid', 'audit_type'] - fields = dict((k, v) for (k, v) in vars(parsed_args).items() - if k in field_list and v is not None) - if fields.get('audit_template_uuid'): - if not uuidutils.is_uuid_like(fields['audit_template_uuid']): - fields['audit_template_uuid'] = client.audit_template.get( - fields['audit_template_uuid']).uuid - - audit = client.audit.create(**fields) - - columns = res_fields.ACTION_PLAN_FIELDS - column_headers = res_fields.ACTION_PLAN_FIELD_LABELS - - return column_headers, utils.get_item_properties(audit, columns) - - class UpdateActionPlan(command.ShowOne): """Update action plan command."""