Change the directory name

Change the name of the directory to make it match with that defined in the CSIT job.

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

diff --git a/test/csit/plans/holmes/sanity-check/setup.sh b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
similarity index 100%
rename from test/csit/plans/holmes/sanity-check/setup.sh
rename to test/csit/plans/holmes-rule-management/sanity-check/setup.sh

diff --git a/test/csit/plans/holmes/sanity-check/teardown.sh b/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh
similarity index 76%
rename from test/csit/plans/holmes/sanity-check/teardown.sh
rename to test/csit/plans/holmes-rule-management/sanity-check/teardown.sh
index 4c457dc..7765227 100644 (file)
--- a/test/csit/plans/holmes/sanity-check/teardown.sh
+++ b/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh
@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-kill-instance.sh i-rulemgt
-kill-instance.sh i-engine-d
-kill-instance.sh msb_internal_apigateway
-kill-instance.sh msb_discovery
-kill-instance.sh msb_consul
-kill-instance.sh mysql-holmes
+#kill-instance.sh i-rulemgt
+#kill-instance.sh i-engine-d
+#kill-instance.sh msb_internal_apigateway
+#kill-instance.sh msb_discovery
+#kill-instance.sh msb_consul
+#kill-instance.sh mysql-holmes
 
 

diff --git a/test/csit/plans/holmes/sanity-check/testplan.txt b/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt
similarity index 100%
rename from test/csit/plans/holmes/sanity-check/testplan.txt
rename to test/csit/plans/holmes-rule-management/sanity-check/testplan.txt

diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot
index b203917..03f8409 100644 (file)
--- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot
@@ -23,9 +23,8 @@ queryConditionRule
     [Arguments]    ${queryParam}    ${codeFlag}=1
     [Documentation]    ${queryParam} : The data type is Json .
     create session    microservices    ${ruleMgtHost}
-    ${param}    set variable    queryrequest\=${queryParam}
-    ${headers}    set variable
-    ${getResponse}    get request    microservices    ${ruleMgtUrl}    ${headers}    ${param}
+    Comment    ${param}    set variable    queryrequest\=${queryParam}
+    ${getResponse}    get request    microservices    ${ruleMgtUrl}?queryrequest\=${queryParam}
     log    ${getResponse.content}
     run keyword if    ${codeFlag}==1    Should be equal as strings    ${getResponse.status_code}    200
     run keyword if    ${codeFlag}!=1    Should be equal as strings    ${getResponse.status_code}    499