Migrate to Openstack CLI

[integration/test.git] / csit / suites / openstack / connectivity / 03_external_network_tests.robot

diff --git a/csit/suites/openstack/connectivity/03_external_network_tests.robot b/csit/suites/openstack/connectivity/03_external_network_tests.robot
index 49de4b11d4d5a5780d8d21118b9380dc998a95bc..3cd40936581af72eec5d46bfab020e7410e69da2 100644 (file)
--- a/csit/suites/openstack/connectivity/03_external_network_tests.robot
+++ b/csit/suites/openstack/connectivity/03_external_network_tests.robot
@@ -9,6 +9,7 @@ Library           SSHLibrary
 Library           OperatingSystem
 Library           RequestsLibrary
 Resource          ../../../libraries/DevstackUtils.robot
+Resource          ../../../libraries/DataModels.robot
 Resource          ../../../libraries/OpenStackOperations.robot
 Resource          ../../../libraries/SetupUtils.robot
 Resource          ../../../libraries/Utils.robot
@@ -27,7 +28,6 @@ ${external_subnet_allocation_pool}    start=10.10.10.2,end=10.10.10.249
 ${external_internet_addr}    10.9.9.9
 ${external_net_name}    external-net
 ${external_subnet_name}    external-subnet
-${network1_vlan_id}    167
 
 *** Test Cases ***
 Create All Controller Sessions
@@ -78,7 +78,7 @@ Check Vm Instances Have Ip Address
     ...    AND    Get Test Teardown Debugs
 
 Create External Network And Subnet
-    Create Network    ${external_net_name} --router:external --provider:network_type=vlan --provider:physical_network=${PUBLIC_PHYSICAL_NETWORK} --provider:segmentation_id=${network1_vlan_id}
+    Create Network    ${external_net_name}    --external --provider-network-type flat --provider-physical-network ${PUBLIC_PHYSICAL_NETWORK}
     Create Subnet    ${external_net_name}    ${external_subnet_name}    ${external_subnet}    --gateway ${external_gateway} --allocation-pool ${external_subnet_allocation_pool}
 
 Create Router
@@ -131,9 +131,6 @@ Ping External Network PNF from Vm Instance 1
     ${dst_ip}=    Create List    ${external_pnf}
     OpenStackOperations.Test Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{FLOATING_VM_IPS}[0]    ${dst_ip}    ttl=1
 
-Prepare SNAT - Install Netcat On Controller
-    Install Netcat On Controller
-
 SNAT - TCP connection to External Gateway From SNAT VM Instance1
     [Documentation]    Login to the VM instance and test TCP connection to the controller via SNAT
     Test Netcat Operations From Vm Instance    @{NETWORKS_NAME}[0]    @{SNAT_VM_IPS}[0]    ${external_gateway}
@@ -181,3 +178,7 @@ Delete Networks
     : FOR    ${NetworkElement}    IN    @{NETWORKS_NAME}
     \    OpenStackOperations.Delete Network    ${NetworkElement}
     OpenStackOperations.Delete Network    ${external_net_name}
+
+Verify Flows Cleanup
+    [Documentation]    Verify that flows have been cleaned up properly after removing all neutron configurations
+    Verify Flows Are Cleaned Up On All OpenStack Nodes