From: Junaid Zulfiqar <junaid.rao21@gmail.com>
Date: Sun, 14 Feb 2016 22:35:56 +0000 (-0800)
Subject: Moved calls to "RequestLibrary.<action> Request" in csit/suites/ (1)
X-Git-Tag: release/beryllium-sr1~70
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F34639%2F3;p=integration%2Ftest.git

Moved calls to "RequestLibrary.<action> Request" in csit/suites/ (1)

+ RequestsLibrary.Get Request
+ RequestsLibrary.Delete Request

Updated RequestLibrary calls in following directories

  csit/suites/armoury/ (removed due to failure)
  csit/suites/bgpcep/
  csit/suites/capwap/
  csit/suites/centinel/
  csit/suites/controller/
  csit/suites/didm/

Change-Id: I5efd4fe53330022809e2ffcf4592b547c21d77a0
Signed-off-by: Junaid Zulfiqar <junaid.rao21@gmail.com>
---

diff --git a/csit/suites/bgpcep/pcepuser/pcepuser.robot b/csit/suites/bgpcep/pcepuser/pcepuser.robot
index eb5609089b..fa1e7625b1 100644
--- a/csit/suites/bgpcep/pcepuser/pcepuser.robot
+++ b/csit/suites/bgpcep/pcepuser/pcepuser.robot
@@ -137,7 +137,7 @@ Compare_Topology
     ${normexp}=    Hsf_Json    ${expected}
     Log    ${normexp}
     Create_File    ${ExpDir}${/}${name}    ${normexp}
-    ${resp}=    RequestsLibrary.Get    ses    topology/pcep-topology
+    ${resp}=    RequestsLibrary.Get Request    ses    topology/pcep-topology
     Log    ${resp}
     Log    ${resp.text}
     ${normresp}=    Hsf_Json    ${resp.text}
diff --git a/csit/suites/capwap/basic/capwap_session.robot b/csit/suites/capwap/basic/capwap_session.robot
index bc534432be..9e294694ce 100644
--- a/csit/suites/capwap/basic/capwap_session.robot
+++ b/csit/suites/capwap/basic/capwap_session.robot
@@ -25,7 +25,7 @@ Get Specific WTP
 
 *** Keywords ***
 Run Test Get Discovered WTP
-    ${resp}    RequestsLibrary.Get    session    ${DISC_WTP_REST}
+    ${resp}    RequestsLibrary.Get Request    session    ${DISC_WTP_REST}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    TO JSON    ${resp.content}
@@ -43,7 +43,7 @@ Run Test Get Specifc WTP
     ${expected_ip_addr}    get simulated wtpip    ${CONTROLLER}
     ${DISC_SPECIFIC_WTP}    catenate    SEPARATOR=    ${DISC_WTP_REST}    discovered-wtps\/    ${expected_ip_addr}    \/
     Log    ${DISC_SPECIFIC_WTP}
-    ${resp}    RequestsLibrary.Get    session    ${DISC_SPECIFIC_WTP}
+    ${resp}    RequestsLibrary.Get Request    session    ${DISC_SPECIFIC_WTP}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    TO JSON    ${resp.content}
diff --git a/csit/suites/centinel/basic/010_Restconf_OK.robot b/csit/suites/centinel/basic/010_Restconf_OK.robot
index 0e3425d521..aa17f2c11a 100644
--- a/csit/suites/centinel/basic/010_Restconf_OK.robot
+++ b/csit/suites/centinel/basic/010_Restconf_OK.robot
@@ -12,7 +12,7 @@ ${REST_CONTEXT}    /restconf/modules
 *** Test Cases ***
 Get Controller Modules
     [Documentation]    Get the controller modules via Restconf
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ietf-restconf
diff --git a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
index b47aa14977..06d841b1fa 100644
--- a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
@@ -80,21 +80,21 @@ Verify Purchases
 
 Delete Cars
     [Documentation]    Remove cars from the datastore
-    ${rsp}=    RequestsLibrary.Delete    session    ${carurl}
+    ${rsp}=    RequestsLibrary.Delete Request    session    ${carurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    session    ${carurl}
     Should Be Equal As Numbers    404    ${rsp.status_code}
 
 Delete People
     [Documentation]    Remove people from the datastore
-    ${rsp}=    RequestsLibrary.Delete    session    ${peopleurl}
+    ${rsp}=    RequestsLibrary.Delete Request    session    ${peopleurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    session    ${peopleurl}
     Should Be Equal As Numbers    404    ${rsp.status_code}
 
 Delete CarPeople
     [Documentation]    Remove car-people entries from the datastore
-    ${rsp}=    RequestsLibrary.Delete    session    ${carpeopleurl}
+    ${rsp}=    RequestsLibrary.Delete Request    session    ${carpeopleurl}
     Should Be Equal As Numbers    200    ${rsp.status_code}
     ${rsp}=    RequestsLibrary.Get Request    session    ${carpeopleurl}
     Should Be Equal As Numbers    404    ${rsp.status_code}
diff --git a/csit/suites/didm/basic/010_Didm.robot b/csit/suites/didm/basic/010_Didm.robot
index 07cc470e56..7af0ca1f45 100644
--- a/csit/suites/didm/basic/010_Didm.robot
+++ b/csit/suites/didm/basic/010_Didm.robot
@@ -25,7 +25,7 @@ ${DEVICE_TYPE}    "mininet-didm:mininet-device-type"
 Verify Device Identification
     [Documentation]    Verification of Device type identification feature with device driver installed.
     [Tags]    DIDM
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${DIDM_ID}
     Should Contain    ${resp.content}    ${DEVICE_TYPE}