From: Guangrong Fu <fu.guangrong@zte.com.cn>
Date: Thu, 21 Sep 2017 02:00:46 +0000 (+0800)
Subject: Regularize the DELETE Http Call
X-Git-Tag: 1.0.0-Amsterdam~271
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=80c347bb3b3f8478dd61f27b08354b11f118db04;p=integration.git

Regularize the DELETE Http Call

Invoke the API using path params.

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

diff --git a/test/csit/tests/holmes/testcase/CommonKeywords/HttpRequest.robot b/test/csit/tests/holmes/testcase/CommonKeywords/HttpRequest.robot
index 5b8417404..45bec5ef5 100644
--- a/test/csit/tests/holmes/testcase/CommonKeywords/HttpRequest.robot
+++ b/test/csit/tests/holmes/testcase/CommonKeywords/HttpRequest.robot
@@ -30,8 +30,8 @@ httpPost
     [Return]    ${postResponse}
 
 httpDelete
-    [Arguments]    ${restHost}    ${restUrl}    ${data}
+    [Arguments]    ${restHost}    ${restUrl}
     ${headers}    create dictionary    Content-Type=application/json    Accept=application/json
     create session    microservices    ${restHost}    ${headers}
-    ${deleteResponse}    delete request    microservices    ${restUrl}    ${data}
+    ${deleteResponse}    delete request    microservices    ${restUrl}
     [Return]    ${deleteResponse}
diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot
index 03f840904..182737f54 100644
--- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot
@@ -72,8 +72,8 @@ modifyRule
     [Return]    ${response}
 
 deleteRule
-    [Arguments]    ${jsonParam}    ${codeFlag}=1
-    ${response}    httpDelete    ${ruleMgtHost}    ${ruleMgtUrl}    ${jsonParam}
+    [Arguments]    ${ruleId}    ${codeFlag}=1
+    ${response}    httpDelete    ${ruleMgtHost}    ${ruleMgtUrl}/${ruleId}
     log    ${response.content}
     run keyword if    ${codeFlag}==1    Should be equal as strings    ${response.status_code}    200
     run keyword if    ${codeFlag}!=1    Should be equal as strings    ${response.status_code}    499
diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
index 03ee70849..ad2a540fd 100644
--- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
+++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Mgt.robot
@@ -120,8 +120,8 @@ modify_rule_with_description
 delete_existing_rule
     [Documentation]    Delete an existing rule.
     should not be empty    ${RULEID}
-    deleteRule    {"ruleid":"${RULEID}"}
+    deleteRule    ${RULEID}
 
 delete_non_existing_rule
     [Documentation]    Delete a non-existing rule.
-    deleteRule    {"ruleid":"${RULEID}"}    -1
+    deleteRule    ${RULEID}    -1