fix ovsdb clustering failures

- use more specific URIs for neutron northbound
- use POST instead of PUT
- cleaned up URI variables for suite that is not used in
  production, but brings it up to standard variable use

Change-Id: If750dae2f8b3041e08fdbf5664ff258ae3b82d18
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
use more specific URIs for neutron northbound

Change-Id: Iafe6e6829dd809655a0c714d098aadc8e7fac555
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/ClusterKeywords.robot b/csit/libraries/ClusterKeywords.robot
index 011ce420fa1b44e9030ae89e62cb9c1db5c4908c..4f9cab6c5843e895b520ba0f81985e0be8fc7e24 100644 (file)
--- a/csit/libraries/ClusterKeywords.robot
+++ b/csit/libraries/ClusterKeywords.robot
@@ -121,11 +121,22 @@ Check Item Occurrence At URI In Cluster
 
 Put And Check At URI In Cluster
     [Arguments]    ${controller_index_list}    ${controller_index}    ${uri}    ${body}
-    [Documentation]    Send a PUT with the supplied ${uri} and ${body} (json string) to a ${controller_index}
-    ...    and check the data is replicated in all instances in ${controller_index_list}.
+    [Documentation]    Wrapper keyword for "Create Data And Check At URI In Cluster" using PUT
+    Create Data And Check At URI In Cluster    ${controller_index_list}    ${controller_index}    ${uri}    ${body}    PUT
+
+Post And Check At URI In Cluster
+    [Arguments]    ${controller_index_list}    ${controller_index}    ${uri}    ${body}
+    [Documentation]    Wrapper keyword for "Create Data And Check At URI In Cluster" using POST
+    Create Data And Check At URI In Cluster    ${controller_index_list}    ${controller_index}    ${uri}    ${body}    POST
+
+Create Data And Check At URI In Cluster
+    [Arguments]    ${controller_index_list}    ${controller_index}    ${uri}    ${body}    ${create_method}=PUT
+    [Documentation]    Send a ${create_method} REST call with the supplied ${uri} and ${body} (json string) to a
+    ...    ${controller_index} and check the data is replicated in all instances in ${controller_index_list}.
     ${expected_body}=    Hsf Json    ${body}
     Log    ${body}
-    ${resp}    RequestsLibrary.Put Request    controller${controller_index}    ${uri}    data=${body}    headers=${HEADERS_YANG_JSON}
+    ${resp}    Run Keyword If    "${create_method}" == "POST"    RequestsLibrary.Post Request    controller${controller_index}    ${uri}    data=${body}    headers=${HEADERS}
+    ...    ELSE    RequestsLibrary.Put Request    controller${controller_index}    ${uri}    data=${body}    headers=${HEADERS_YANG_JSON}
     Log    ${resp.content}
     Log    ${resp.status_code}
     ${status_code}=    Convert To String    ${resp.status_code}

diff --git a/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot b/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
index 9651b52468dc0fef8af9aa57a6672e131961f7a9..2e1b54859336b82180790fcb64447072bd1d974f 100644 (file)
--- a/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
+++ b/csit/suites/netvirt/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot
@@ -57,7 +57,7 @@ Check External Net for Tenant
     [Documentation]    Check External Net for Tenant
     [Tags]    OpenStack Call Flow
     ${resp}=    Create Dictionary    "networks" : [ ]=1
-    Check Item Occurrence At URI In Cluster    ${original_cluster_list}    ${resp}    ${ODLREST}/networks
+    Check Item Occurrence At URI In Cluster    ${original_cluster_list}    ${resp}    ${NEUTRON_NETWORKS_API}
 
 Create External Net for Tenant
     [Documentation]    Create External Net for Tenant
@@ -66,4 +66,4 @@ Create External Net for Tenant
     ${Data}    Replace String    ${Data}    {netId}    ${EXT_NET1_ID}
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     Log    ${Data}
-    Put And Check At URI In Cluster    ${original_cluster_list}    1    ${ODLREST}/networks    ${Data}
+    Post And Check At URI In Cluster    ${original_cluster_list}    1    ${NEUTRON_NETWORKS_API}    ${Data}

diff --git a/csit/suites/netvirt/Openstack_Neutron/010__ovsdb_flow.robot b/csit/suites/netvirt/Openstack_Neutron/010__ovsdb_flow.robot
index 4ef821371a30cf9b246937f0a0031e97d7999a63..e3c0fccd635c2d032c63b2d47b38b5a905ca1aec 100644 (file)
--- a/csit/suites/netvirt/Openstack_Neutron/010__ovsdb_flow.robot
+++ b/csit/suites/netvirt/Openstack_Neutron/010__ovsdb_flow.robot
@@ -15,7 +15,6 @@ Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/OVSDB.robot
 
 *** Variables ***
-${ODLREST}        /controller/nb/v2/neutron
 ${OVSDB_CONFIG_DIR}    ${CURDIR}/../../../variables/ovsdb
 ${TNT1_ID}        cde2563ead464ffa97963c59e002c0cf
 ${EXT_NET1_ID}    7da709ff-397f-4778-a0e8-994811272fdb
@@ -70,7 +69,7 @@ Ensure netvirt is loaded
 Check External Net for Tenant
     [Documentation]    Check External Net for Tenant
     [Tags]    OpenStack Call Flow
-    ${resp}    RequestsLibrary.Get Request    session    ${ODLREST}/networks
+    ${resp}    RequestsLibrary.Get Request    session    ${NEUTRON_NB_API}/networks
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
@@ -81,7 +80,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 Request    session    ${ODLREST}/networks    data=${Data}    headers=${HEADERS}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/networks    data=${Data}    headers=${HEADERS}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    201
 
@@ -93,7 +92,7 @@ Create External Subnet
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     ${Data}    Replace String    ${Data}    {subnetId}    ${EXT_SUBNET1_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/subnets    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/subnets    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Tenant Router
@@ -103,7 +102,7 @@ Create Tenant Router
     ${Data}    Replace String    ${Data}    {tntId}    ${TNT1_ID}
     ${Data}    Replace String    ${Data}    {rtrId}    ${TNT1_RTR_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Post Request    session    ${ODLREST}/routers    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/routers    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Set Router Gateway
@@ -116,7 +115,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 Request    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Update Router Port Gateway
@@ -128,7 +127,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 Request    session    ${ODLREST}/routers/${TNT1_RTR_ID}    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${NEUTRON_NB_API}/routers/${TNT1_RTR_ID}    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Create Tenant Internal Net
@@ -140,7 +139,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 Request    session    ${ODLREST}/networks    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/networks    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Tenant Internal Subnet
@@ -152,7 +151,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 Request    session    ${ODLREST}/subnets    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/subnets    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Port DHCP
@@ -167,7 +166,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 Request    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Update Port DHCP
@@ -177,7 +176,7 @@ Update Port DHCP
     ${Data}    Replace String    ${Data}    {BIND_HOST_ID}    ${ODL_SYSTEM_IP}
     ${Data}    Replace String    ${Data}    {dhcpDeviceId}    ${TNT1_NET1_DHCP_DEVICE_ID}
     Log    ${Data}
-    ${resp}    RequestsLibrary.Put Request    session    ${ODLREST}/ports/${TNT1_NET1_DHCP_PORT_ID}    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${NEUTRON_NB_API}/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 +189,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 Request    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Update Router Interface on Tenant Internal Subnet
@@ -202,7 +201,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 Request    session    ${ODLREST}/routers/${TNT1_RTR_ID}/add_router_interface    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${NEUTRON_NB_API}/routers/${TNT1_RTR_ID}/add_router_interface    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Create Port VM
@@ -217,7 +216,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 Request    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Port Floating IP
@@ -230,7 +229,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 Request    session    ${ODLREST}/ports    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/ports    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Create Floating IP
@@ -242,7 +241,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 Request    session    ${ODLREST}/floatingips    ${Data}
+    ${resp}    RequestsLibrary.Post Request    session    ${NEUTRON_NB_API}/floatingips    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    201
 
 Associate the Floating IP with Tenant VM
@@ -256,5 +255,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 Request    session    ${ODLREST}/floatingips/${FLOAT_IP1_ID}    ${Data}
+    ${resp}    RequestsLibrary.Put Request    session    ${NEUTRON_NB_API}/floatingips/${FLOAT_IP1_ID}    ${Data}
     Should Be Equal As Strings    ${resp.status_code}    200

diff --git a/csit/variables/ovsdb/create_ext_net.json b/csit/variables/ovsdb/create_ext_net.json
index 9b0e6f94595dedc20b5da1735d204fb8b275c993..3ab7d9308d407c6a6f8a96394efc31717c4b49a2 100644 (file)
--- a/csit/variables/ovsdb/create_ext_net.json
+++ b/csit/variables/ovsdb/create_ext_net.json
@@ -1,11 +1,11 @@
 {
-  "network": [
+  "networks": [
     {
+      "status": "ACTIVE",
+      "segments": [],
       "provider:physical_network": "physnetext1",
-      "port_security_enabled": true,
       "provider:network_type": "flat",
       "id": "{netId}",
-      "provider:segmentation_id": null,
       "router:external": true,
       "name": "ext1",
       "admin_state_up": true,