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

+ RequestsLibrary.Get Request
+ RequestsLibrary.Delete Request
+ RequestsLibrary.Put Request
+ RequestsLibrary.Post Request

Updated RequestLibrary calls in following directories

  csit/suites/iotdm/
  csit/suites/l2switch/
  csit/suites/lacp/
  csit/suites/lispflowmapping/
  csit/suites/messaging4transport/ (removed due to failure)
  csit/suites/nemo/
  csit/suites/netconf/
  csit/suites/netide/
  csit/suites/nic/

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

diff --git a/csit/suites/iotdm/basic/010_Restconf_OK.robot b/csit/suites/iotdm/basic/010_Restconf_OK.robot
index 16420fc01914ec1685d9b6d09da42877d656312f..ed20cf5b6af206bcf5e5337ca99bf14f55f69d1b 100644 (file)
--- a/csit/suites/iotdm/basic/010_Restconf_OK.robot
+++ b/csit/suites/iotdm/basic/010_Restconf_OK.robot
@@ -13,7 +13,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/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot
index 7c449abfef668a666f6f6c4ff241be6efc08f9e9..391af75233179daa37b1e6b873b388d9fcfd9ede 100644 (file)
--- a/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot
+++ b/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot
@@ -21,7 +21,7 @@ Get list of nodes
 Get nodeconnector for the root node
     [Documentation]    Get the inventory for the root node
     ${TOPO_TREE_FANOUT}    Convert To Integer    ${TOPO_TREE_FANOUT}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/node/openflow:1
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/node/openflow:1
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Wait Until Keyword Succeeds    30s    2s    Check conn loop    ${TOPO_TREE_FANOUT}    1    ${resp.content}
@@ -43,7 +43,7 @@ Get Stats for a node
 *** Keywords ***
 Check Every Nodes
     [Arguments]    ${numnodes}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}
     Should Be Equal As Strings    ${resp.status_code}    200
     : FOR    ${IND}    IN RANGE    1    ${numnodes+1}
     \    Should Contain    ${resp.content}    openflow:${IND}
@@ -51,7 +51,7 @@ Check Every Nodes
 Check Every Nodes Stats
     [Arguments]    ${numnodes}
     : FOR    ${IND}    IN RANGE    1    ${numnodes+1}
-    \    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/node/openflow:${IND}
+    \    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/node/openflow:${IND}
     \    Log    ${resp.content}
     \    Should Be Equal As Strings    ${resp.status_code}    200
     \    Should Contain    ${resp.content}    flow-capable-node-connector-statistics
@@ -60,7 +60,7 @@ Check Every Nodes Stats
 Check Every Nodes Nodeconnector
     [Arguments]    ${numnodes}
     : FOR    ${IND}    IN RANGE    2    ${numnodes+1}
-    \    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/node/openflow:${IND}
+    \    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}/node/openflow:${IND}
     \    Log    ${resp.content}
     \    Should Be Equal As Strings    ${resp.status_code}    200
     \    Check conn loop    ${TOPO_TREE_FANOUT+1}    ${IND}    ${resp.content}

diff --git a/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot
index dab8c7db407b1d62ced67f8b5db20da1cad9b53e..be620b659bf8fe858360437462ed30e98316cbc9 100644 (file)
--- a/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot
+++ b/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot
@@ -30,7 +30,7 @@ Get Links Count
 *** Keywords ***
 Verify Element Count
     [Arguments]    ${URI}    ${xpath_location}    ${expected_count}
-    ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}    headers=${ACCEPT_XML}
+    ${resp}    RequestsLibrary.Get Request    session    ${REST_CONTEXT}    headers=${ACCEPT_XML}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${count}=    Get Element Count    ${resp.content}    xpath=${xpath_location}

diff --git a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
index beec69b8f54d6434481535d1043b870b7442f3c1..cbc062d221ddc78480d465af25d033d85e66d2f0 100644 (file)
--- a/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
+++ b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
@@ -68,7 +68,7 @@ Verify LACP RESTAPI connector associated for aggregator
 
 Verify LACP aggregator data is updated post link down scenario
     [Documentation]    Functionality will verify the node conenctor data on the lacp-agg api after link down scenario
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
     Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI connector associated for aggregator    ${resp.content}    ${node1}    ${agg2-connector-id1}
     Should not Contain    ${resp.content}    ${node1}:${agg2-connector-id2}
@@ -76,7 +76,7 @@ Verify LACP aggregator data is updated post link down scenario
 
 Verify LACP aggregator data is updated post link up scenario
     [Documentation]    Functionality will verify the node connector data on the lacp-agg api after link up scenario
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}/node/${node1}/lacp-aggregators/${agg-id2}
     Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI connector associated for aggregator    ${resp.content}    ${node1}    ${agg2-connector-id1}
     Verify LACP RESTAPI connector associated for aggregator    ${resp.content}    ${node1}    ${agg2-connector-id2}
@@ -84,7 +84,7 @@ Verify LACP aggregator data is updated post link up scenario
 
 Verify LACP Tags Are Formed
     [Documentation]    Fundamental Check That LACP is working
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}
     Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    non-lag-groupid
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    lacp-aggregators

diff --git a/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot b/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot
index 03acf697485ac2b0e4996f3fb0b59ea479ba2983..3a3c98d6d43683e93f0e729c1aeffcd2eccb2b3b 100644 (file)
--- a/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot
+++ b/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot
@@ -52,7 +52,7 @@ Verify LACP RESTAPI Aggregator and Tag Contents
 
 Verify LACP Tags Are Formed
     [Documentation]    Fundamental Check That LACP is working
-    ${resp}    RequestsLibrary.Get    session    ${OPERATIONAL_NODES_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${OPERATIONAL_NODES_API}
     Verify LACP RESTAPI Response Code for node    ${resp}
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    non-lag-groupid
     Verify LACP RESTAPI Aggregator and Tag Contents    ${resp.content}    lacp-aggregators

diff --git a/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot b/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
index ad34b930b6e01683fad1f754db83e5527c0209a4..e6864f372a1fa173b54e398b0c59e1515566075b 100644 (file)
--- a/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
+++ b/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
@@ -55,7 +55,7 @@ Compute And Export Results
 
 *** Keywords ***
 Reset Stats
-    ${resp}=    RequestsLibrary.Post Request   session    ${LFM_SB_RPC_API}:reset-stats
+    ${resp}=    RequestsLibrary.Post Request    session    ${LFM_SB_RPC_API}:reset-stats
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 

diff --git a/csit/suites/nemo/engine/NEMO_ENGINE.robot b/csit/suites/nemo/engine/NEMO_ENGINE.robot
index ffc2f2d09690b16be037d590dbde4b8c285b081c..3b3eb6aa1bcb614aa514db3bbc5db7110e63f2f6 100644 (file)
--- a/csit/suites/nemo/engine/NEMO_ENGINE.robot
+++ b/csit/suites/nemo/engine/NEMO_ENGINE.robot
@@ -21,28 +21,28 @@ Add Pre-define Role
     [Documentation]    Add Pre-define Role
     [Tags]    Put
     ${body}    OperatingSystem.Get File    ${PREDEFINE_ROLE_FILE}
-    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_ROLE_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Put Request    session    ${PREDEFINE_ROLE_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Pre-define Node
     [Documentation]    Add Pre-define Node
     [Tags]    Put
     ${body}    OperatingSystem.Get File    ${PREDEFINE_NODE_FILE}
-    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_NODE_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Put Request    session    ${PREDEFINE_NODE_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Pre-define Connection
     [Documentation]    Add Pre-define Connection
     [Tags]    Put
     ${body}    OperatingSystem.Get File    ${PREDEFINE_CONNECTION_FILE}
-    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_CONNECTION_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Put Request    session    ${PREDEFINE_CONNECTION_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Register Tenant
     [Documentation]    Register Tenant
     [Tags]    Post
     ${body}    OperatingSystem.Get File    ${REGISTER_TENANT_FILE}
-    ${resp}    RequestsLibrary.Post    session    ${REGISTER_TENANT_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Post Request    session    ${REGISTER_TENANT_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 

diff --git a/csit/suites/netide/basic/010_netide_endpoint.robot b/csit/suites/netide/basic/010_netide_endpoint.robot
index 591f4dfcf92102ca1e6c45b2e457ead290087bf8..915d030c3d2e234380eeb78128730f8d2156434d 100644 (file)
--- a/csit/suites/netide/basic/010_netide_endpoint.robot
+++ b/csit/suites/netide/basic/010_netide_endpoint.robot
@@ -8,7 +8,7 @@ Variables         ../../../variables/Variables.py
 *** Test Cases ***
 Get Controller Modules
     [Documentation]    Get the controller modules via Restconf
-    ${resp}    RequestsLibrary.Get    session    ${MODULES_API}
+    ${resp}    RequestsLibrary.Get Request    session    ${MODULES_API}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ietf-restconf

diff --git a/csit/suites/nic/basic/010_Restconf_OK.robot b/csit/suites/nic/basic/010_Restconf_OK.robot
index 4a1630ea64a99d21110c3d1a7a9980b4ea2072a1..0a0738dfcb6b8384b632326a93219c2c7796fd6e 100644 (file)
--- a/csit/suites/nic/basic/010_Restconf_OK.robot
+++ b/csit/suites/nic/basic/010_Restconf_OK.robot
@@ -24,7 +24,7 @@ ${INTENT_CONTEXT}    /restconf/config/intent:intents
 *** 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
@@ -55,7 +55,7 @@ Verify REST Command Add, Update and Remove
 *** Keywords ***
 REST Get List of Intents
     [Documentation]    Get the list of intents configured
-    ${resp}    RequestsLibrary.Get    session    ${INTENT_CONTEXT}
+    ${resp}    RequestsLibrary.Get Request    session    ${INTENT_CONTEXT}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    "intents"
     [Return]    ${resp.content}
@@ -63,7 +63,7 @@ REST Get List of Intents
 REST Get Intent From Id
     [Arguments]    ${id}
     [Documentation]    Get the intent detail from id
-    ${resp}    RequestsLibrary.Get    session    ${INTENT_CONTEXT}/intent/${id}
+    ${resp}    RequestsLibrary.Get Request    session    ${INTENT_CONTEXT}/intent/${id}
     Log Json    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    ${id}
@@ -87,7 +87,7 @@ REST Add Intent
     ${headers}=    Create Dictionary    Content-Type=application/json
     ${id}=    Generate Random UUID
     ${data}=    Catenate    {"intent":{"id": "${id}","subjects":[{"order": 1,"end-point-group": {"name": "${intent_from}"}},{"order": 2,"end-point-group": { "name": "${intent_to}"}}],"actions": [{"order": 1,"${intent_permission}": {}}]}}
-    ${resp}    RequestsLibrary.Post    session    ${INTENT_CONTEXT}    headers=${headers}    data=${data}
+    ${resp}    RequestsLibrary.Post Request    session    ${INTENT_CONTEXT}    headers=${headers}    data=${data}
     Should Be Equal As Strings    ${resp.status_code}    204
     [Return]    ${id}
 
@@ -96,14 +96,14 @@ REST Update Intent By Id
     [Documentation]    Make an Intent and return the id of the new intent
     ${headers}=    Create Dictionary    Content-Type=application/json
     ${data}=    Catenate    {"intent":{"id": "${id}","subjects":[{"order": 1,"end-point-group": {"name": "${intent_from}"}},{"order": 2,"end-point-group": { "name": "${intent_to}"}}],"actions": [{"order": 1,"${intent_permission}": {}}]}}
-    ${resp}    RequestsLibrary.Put    session    ${INTENT_CONTEXT}/intent/${id}    headers=${headers}    data=${data}
+    ${resp}    RequestsLibrary.Put Request    session    ${INTENT_CONTEXT}/intent/${id}    headers=${headers}    data=${data}
     Should Be Equal As Strings    ${resp.status_code}    200
     [Return]    ${resp}
 
 REST Delete All Intents
     [Documentation]    Delete all of the Intents
     ${headers}=    Create Dictionary    Content-Type=application/json
-    ${resp}    RequestsLibrary.Delete    session    ${INTENT_CONTEXT}    headers=${headers}
+    ${resp}    RequestsLibrary.Delete Request    session    ${INTENT_CONTEXT}    headers=${headers}
     Log    ${resp}
     Should Be Equal As Strings    ${resp.status_code}    200
     [Return]    ${resp.content}
@@ -112,7 +112,7 @@ REST Delete Intent By Id
     [Arguments]    ${id}
     [Documentation]    Delete Intent by Id
     ${headers}=    Create Dictionary    Content-Type=application/json
-    ${resp}    RequestsLibrary.Delete    session    ${INTENT_CONTEXT}/intent/${id}    headers=${headers}
+    ${resp}    RequestsLibrary.Delete Request    session    ${INTENT_CONTEXT}/intent/${id}    headers=${headers}
     Log    ${resp}
     Should Be Equal As Strings    ${resp.status_code}    200
     [Return]    ${resp.content}