summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-16 14:14:29 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-16 14:14:29 +0000
commitdd42cd54553f51e1aa6294d678b814ffed2b740e (patch)
tree5c353e4d7e69d2bdd474db90fd8648c0e298f8bd
parentb2cd27a0a1d94a2866fd790e1e0a8d52f73b2ae4 (diff)
parentbc08dfd808491e92df3385d1dcfeee371229a1ad (diff)
Merge "Fix the CSIT Problem"
-rw-r--r--test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot16
-rw-r--r--test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot2
2 files changed, 9 insertions, 9 deletions
diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
index 7e62271be..bccb0f72d 100644
--- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
@@ -86,19 +86,19 @@ query_rule_with_combinational_fields
${response} queryConditionRule ${paramJson}
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalcount
- run keyword if ${count}<1 fail Can't find the rules with the combination of different fields.
- ... ELSE traversalRuleAttribute ${respJson} ${dic}
+ run keyword if ${count}<1 fail Can't find the rules with the combination of different fields. ELSE traversalRuleAttribute ${respJson}
+ ... ${dic}
modify_rule_with_status
[Documentation] modify the rule with a valid status.
- ${dic} create dictionary ruleid=${RULEID} enabled=0 content=package rule03140002
+ ${dic} create dictionary ruleid=${RULEID} enabled=0 content=package rule03140002 loopcontrolname=closedControlLoop
${modifyParam} encode ${dic}
${modifyResp} modifyRule ${modifyParam}
${response} queryConditionRule {"ruleid":"${RULEID}"}
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalcount
- run keyword if ${count}!=1 fail query rule fails! (can't find the rule modified!)
- ... ELSE traversalRuleAttribute ${respJson} ${dic}
+ run keyword if ${count}!=1 fail query rule fails! (can't find the rule modified!) ELSE traversalRuleAttribute ${respJson}
+ ... ${dic}
modify_rule_with_invalid_status
[Documentation] modify the rule with an invalid status.
@@ -108,14 +108,14 @@ modify_rule_with_invalid_status
modify_rule_with_description
[Documentation] modify the description of the rule with the new string.
- ${dic} create dictionary ruleid=${RULEID} description=now, i modifying the description of the rule. content=package rule03140002
+ ${dic} create dictionary ruleid=${RULEID} description=now, i modifying the description of the rule. content=package rule03140002 loopcontrolname=closedControlLoop
${modifyParam} encode ${dic}
${modifyResp} modifyRule ${modifyParam}
${response} queryConditionRule {"ruleid":"${RULEID}"} 1
${respJson} to json ${response.content}
${count} get from dictionary ${respJson} totalcount
- run keyword if ${count}!=1 fail query rule fails!
- ... ELSE traversalRuleAttribute ${respJson} ${dic}
+ run keyword if ${count}!=1 fail query rule fails! ELSE traversalRuleAttribute ${respJson}
+ ... ${dic}
delete_existing_rule
[Documentation] Delete an existing rule.
diff --git a/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot b/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot
index be7384206..171c08057 100644
--- a/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/RuleAddr.robot
@@ -1,3 +1,3 @@
*** Variables ***
-${ruleMgtHost} http://${MSB_IP}
+${ruleMgtHost} http://{MSB_IP}
${ruleMgtUrl} /api/holmes-rule-mgmt/v1/rule