Add OpenStack grenade

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

diff --git a/csit/suites/openstack/connectivity/security_group.robot b/csit/suites/openstack/connectivity/security_group.robot
index 9bdbe44672a0f233344e6663b4009ecf9f4f43fb..c4c2cd7226cc0d1c6b11c78d64e7933af4860014 100644 (file)
--- a/csit/suites/openstack/connectivity/security_group.robot
+++ b/csit/suites/openstack/connectivity/security_group.robot
@@ -5,7 +5,7 @@ Documentation     Test suite to verify security groups basic and advanced functi
 ...               a false failure. The real value of this suite will be in stateful mode.
 Suite Setup       BuiltIn.Run Keywords    SetupUtils.Setup_Utils_For_Setup_And_Teardown
 ...               AND    DevstackUtils.Devstack Suite Setup
-Suite Teardown    Suite Teardown
+Suite Teardown    OpenStackOperations.OpenStack Suite Teardown
 Test Setup        SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
 Test Teardown     OpenStackOperations.Get Test Teardown Debugs
 Force Tags        skip_if_${SECURITY_GROUP_MODE}
@@ -225,17 +225,3 @@ Delete Vm Instances In net_1
 Delete Security Groups
     OpenStackOperations.Delete SecurityGroup    additional-sg
     OpenStackOperations.Delete SecurityGroup    ${SECURITY_GROUP}
-
-*** Keywords ***
-Suite Teardown
-    : FOR    ${vm}    IN    @{NET_1_VMS}
-    \    OpenStackOperations.Delete Vm Instance    ${vm}
-    : FOR    ${vm}    IN    @{NET_2_VMS}
-    \    OpenStackOperations.Delete Vm Instance    ${vm}
-    : FOR    ${subnet}    IN    @{SUBNETS}
-    \    BuiltIn.Run Keyword And Ignore Error    OpenStackOperations.Delete SubNet    ${subnet}
-    : FOR    ${network}    IN    @{NETWORKS}
-    \    BuiltIn.Run Keyword And Ignore Error    OpenStackOperations.Delete Network    ${network}
-    BuiltIn.Run Keyword And Ignore Error    OpenStackOperations.Delete SecurityGroup    additional-sg
-    BuiltIn.Run Keyword And Ignore Error    OpenStackOperations.Delete SecurityGroup    ${SECURITY_GROUP}
-    SSHLibrary.Close All Connections