From 4e35d912ccf4ce89a02bb68c9078322ba67028d1 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 24 Jun 2014 23:57:31 +0200 Subject: [PATCH] add support for listing and deleting rules in test script --- tests/scripts/cmdmgr.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/scripts/cmdmgr.py b/tests/scripts/cmdmgr.py index 384403db..da3d430a 100755 --- a/tests/scripts/cmdmgr.py +++ b/tests/scripts/cmdmgr.py @@ -16,7 +16,8 @@ methods = {'List supported Vendors': 'list_vendors', 'Execute an action': 'execute_action', 'See a device`s states': 'list_device_states', 'Add a rule': 'add_rule', - 'List rules': 'list_rules'} + 'List rules': 'list_rules', + 'Remove rule': 'remove_rule'} def get_selection(title, options): @@ -289,7 +290,7 @@ def remove_device(): if response['params']['success']: print "Successfully deleted device" else: - print "Error deleting device %s" % deviceId + print "Error deleting device: %s" % response['params']['errorMessage'] def select_actionType(deviceClassId): actions = get_action_types(deviceClassId) @@ -401,6 +402,18 @@ def list_rules(): print "got rules", result +def select_rule(): + ruleIds = send_command("Rules.GetRules", {})['params']['ruleIds'] + selection = get_selection("Please select rule:", ruleIds) + return ruleIds[selection] + +def remove_rule(): + ruleId = select_rule() + params = {} + params['ruleId'] = ruleId + response = send_command("Rules.RemoveRule", params) + print "removeRule response", response + import sys if len(sys.argv) > 1: