Moved calls to "RequestLibrary.<action> Request" in suites/ovsdb/

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

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

diff --git a/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
index 14f615936d924e72e35cefe0d21dd44b0075e908..807bf5a31ba575cccdba922e039ef7a2342d8356 100644 (file)
--- a/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
+++ b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
@@ -70,7 +70,7 @@ Ensure netvirt is loaded
 Check External Net for Tenant
     [Documentation]    Check External Net for Tenant
     [Tags]    OpenStack Call Flow
-    ${resp}    RequestsLibrary.Get    session    ${ODLREST}/networks
+    ${resp}    RequestsLibrary.Get Request    session    ${ODLREST}/networks
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
@@ -81,7 +81,7 @@ Create External Net for Tenant
     ${Data}    Replace String    ${Data}    {netId}    ${EXT_NET1_ID}
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/networks    data=${Data}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/networks    data=${Data}    headers=${HEADERS}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    201
 
@@ -93,7 +93,7 @@ Create External Subnet
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     ${Data}    Replace String    ${Data}    {subnetId}    ${EXT_SUBNET1_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/subnets    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/subnets    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Tenant Router
@@ -103,7 +103,7 @@ Create Tenant Router
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     ${Data}    Replace String    ${Data}    {rtrId}    ${TNT1_RTR_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/routers    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/routers    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Set Router Gateway
@@ -116,7 +116,7 @@ Set Router Gateway
     ${Data}    Replace String    ${Data}    {subnetId}    ${EXT_SUBNET1_ID}
     ${Data}    Replace String    ${Data}    {portId}    ${NEUTRON_PORT_TNT1_RTR_GW}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Update Router Port Gateway
@@ -128,7 +128,7 @@ Update Router Port Gateway
     ${Data}    Replace String    ${Data}    {subnetId}    ${EXT_SUBNET1_ID}
     ${Data}    Replace String    ${Data}    {portId}    ${NEUTRON_PORT_TNT1_RTR_GW}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Put    session    ${ODLREST}/routers/${TNT1_RTR_ID}    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${ODLREST}/routers/${TNT1_RTR_ID}    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Create Tenant Internal Net
@@ -140,7 +140,7 @@ Create Tenant Internal Net
     ${Data}    Replace String    ${Data}    {netName}    ${TNT1_NET1_NAME}
     ${Data}    Replace String    ${Data}    {netSegm}    ${TNT1_NET1_SEGM}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/networks    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/networks    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Tenant Internal Subnet
@@ -152,7 +152,7 @@ Create Tenant Internal Subnet
     ${Data}    Replace String    ${Data}    {subnetId}    ${TNT1_SUBNET1_ID}
     ${Data}    Replace String    ${Data}    {subnetName}    ${TNT1_SUBNET1_NAME}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/subnets    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/subnets    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Port DHCP
@@ -167,7 +167,7 @@ Create Port DHCP
     ${Data}    Replace String    ${Data}    {dhcpMac}    ${TNT1_NET1_DHCP_MAC}
     ${Data}    Replace String    ${Data}    {dhcpId}    ${TNT1_NET1_DHCP_PORT_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Update Port DHCP
@@ -177,7 +177,7 @@ Update Port DHCP
     ${Data}    Replace String    ${Data}    {BIND_HOST_ID}    ${CONTROLLER}
     ${Data}    Replace String    ${Data}    {dhcpDeviceId}    ${TNT1_NET1_DHCP_DEVICE_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Put    session    ${ODLREST}/ports/${TNT1_NET1_DHCP_PORT_ID}    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${ODLREST}/ports/${TNT1_NET1_DHCP_PORT_ID}    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Create Router Interface on Tenant Internal Subnet
@@ -190,7 +190,7 @@ Create Router Interface on Tenant Internal Subnet
     ${Data}    Replace String    ${Data}    {subnetId}    ${TNT1_SUBNET1_ID}
     ${Data}    Replace String    ${Data}    {portId}    ${NEUTRON_PORT_TNT1_RTR_NET1}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Update Router Interface on Tenant Internal Subnet
@@ -202,7 +202,7 @@ Update Router Interface on Tenant Internal Subnet
     ${Data}    Replace String    ${Data}    {subnetId}    ${TNT1_SUBNET1_ID}
     ${Data}    Replace String    ${Data}    {portId}    ${NEUTRON_PORT_TNT1_RTR_NET1}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Put    session    ${ODLREST}/routers/${TNT1_RTR_ID}/add_router_interface    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${ODLREST}/routers/${TNT1_RTR_ID}/add_router_interface    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Create Port VM
@@ -217,7 +217,7 @@ Create Port VM
     ${Data}    Replace String    ${Data}    {macAddr}    ${TNT1_VM1_MAC}
     ${Data}    Replace String    ${Data}    {deviceId}    ${TNT1_VM1_DEVICE_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Port Floating IP
@@ -230,7 +230,7 @@ Create Port Floating IP
     ${Data}    Replace String    ${Data}    {macAddress}    ${FLOAT_IP1_MAC}
     ${Data}    Replace String    ${Data}    {deviceId}    ${FLOAT_IP1_DEVICE_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Floating IP
@@ -242,7 +242,7 @@ Create Floating IP
     ${Data}    Replace String    ${Data}    {floatIpId}    ${FLOAT_IP1_ID}
     ${Data}    Replace String    ${Data}    {floatIpAddress}    ${FLOAT_IP1_ADDRESS}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post    session    ${ODLREST}/floatingips    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/floatingips    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Associate the Floating IP with Tenant VM
@@ -256,5 +256,5 @@ Associate the Floating IP with Tenant VM
     ${Data}    Replace String    ${Data}    {floatIpAddress}    ${FLOAT_IP1_ADDRESS}
     ${Data}    Replace String    ${Data}    {vmPortId}    ${TNT1_VM1_PORT_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Put    session    ${ODLREST}/floatingips/${FLOAT_IP1_ID}    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${ODLREST}/floatingips/${FLOAT_IP1_ID}    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200

diff --git a/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
index b2e1f295cf893c8bfd1a54bd38897f23c8dca14b..1108a82710fe597cd5714573ae8ee1e0664beb16 100644 (file)
--- a/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
+++ b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
@@ -32,7 +32,7 @@ Connect to OVSDB Node
     ${sample1}    Replace String    ${sample}    127.0.0.1    ${TOOLS_SYSTEM_IP}
     ${body}    Replace String    ${sample1}    61644    ${OVSDB_PORT}
     Log    URL is ${SOUTHBOUND_CONFIG_API}
-    ${resp}    RequestsLibrary.Put    session    ${SOUTHBOUND_CONFIG_API}    data=${body}
+    ${resp}    RequestsLibrary.Put Request    session    ${SOUTHBOUND_CONFIG_API}    data=${body}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
@@ -113,7 +113,7 @@ Get Operational Topology with Port
 
 Delete the Port1
     [Documentation]    This request will delete the port node from the bridge node and data store.
-    ${resp}    RequestsLibrary.Delete    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE}/termination-point/vx1/
+    ${resp}    RequestsLibrary.Delete Request    session    ${SOUTHBOUND_CONFIG_API}%2Fbridge%2F${BRIDGE}/termination-point/vx1/
     Should Be Equal As Strings    ${resp.status_code}    200    Response    status code error
 
 Get Operational Topology after deletion of Port1