Fix the CSIT Problem

Change-Id: I7b504b18018f4180543ffe3a6610250a38489957
Issue-ID: HOLMES-76
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>

diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
index 7e62271..bccb0f7 100644 (file)
--- 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 be73842..171c080 100644 (file)
--- 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