X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fovsdb%2FOpenstack_Neutron%2F010__ovsdb_flow.robot;h=807bf5a31ba575cccdba922e039ef7a2342d8356;hb=7f994542ae1f79f7eaacb474f33dd96edbb82ea2;hp=6fa7be4ea9a3e74c0d49b5ddcde256ca026fef62;hpb=59e81c38620fa1b61e15771191e35771450b9499;p=integration%2Ftest.git diff --git a/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot index 6fa7be4ea9..807bf5a31b 100644 --- a/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot +++ b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot @@ -2,6 +2,7 @@ Documentation Checking Network created in OVSDB are pushed to OpenDaylight Suite Setup Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} Suite Teardown Delete All Sessions +Test Teardown Collect OVSDB Debugs Library SSHLibrary Library Collections Library OperatingSystem @@ -11,6 +12,7 @@ Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py Resource ../../../libraries/Utils.robot +Resource ../../../libraries/OVSDB.robot *** Variables *** ${ODLREST} /controller/nb/v2/neutron @@ -40,8 +42,8 @@ ${FLOAT_IP1_PORT_ID} 01671703-695e-4497-8a11-b5da989d2dc3 ${FLOAT_IP1_MAC} FA:16:3E:3F:37:BB ${FLOAT_IP1_DEVICE_ID} f013bef4-9468-494d-9417-c9d9e4abb97c ${FLOAT_IP1_ADDRESS} 192.168.111.22 -@{node_list} ovsdb://uuid/ -@{netvirt} 1 +@{node_list} ovsdb://uuid/ +@{netvirt} 1 *** Test Cases *** Add variables to controller custom.properties @@ -68,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 @@ -79,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 @@ -91,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 @@ -101,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 @@ -114,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 @@ -126,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 @@ -138,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 @@ -150,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 @@ -165,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 @@ -175,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 @@ -188,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 @@ -200,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 @@ -215,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 @@ -228,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 @@ -240,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 @@ -254,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