commit 1dd7d62daf474c672e3861787d9528a6a21b7573
author Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> Thu Apr 17 10:15:15 2014 -0400
committer Mauro Rodrigues <maurosr@linux.vnet.ibm.com> Fri May 30 14:06:13 2014 +0000
tree 51a95f95bef2c92253a20924dd97c6f195f15f8e
parent fcd325535e06a7b4a884427c998930cb286b77df

Relax security group rules cleanup

Security groups rules are automatically deleted when we delete the
security group so this is not really necessary, besides that,
nova-network doesn't provide a way to get current status of a rule
(a proof of concept here https://review.openstack.org/#/c/85725/) which
means that we never know if it is really deleted.
Currently it works cause we don't really check the timeouts, but a the
next patch of this series - https://review.openstack.org/#/c/82709/ will
and depends on this to work.

Change-Id: If82d1727b2c5f752e48a2da2c8a029e346f3593e

tempest/api/compute/security_groups/test_security_group_rules.py

diff --git a/tempest/api/compute/security_groups/test_security_group_rules.py b/tempest/api/compute/security_groups/test_security_group_rules.py
index b04ab8a..35f6fc2 100644
--- a/tempest/api/compute/security_groups/test_security_group_rules.py
+++ b/tempest/api/compute/security_groups/test_security_group_rules.py
@@ -75,7 +75,6 @@
                                                    to_port,
                                                    cidr=cidr,
                                                    group_id=group_id)
-        self.addCleanup(self.client.delete_security_group_rule, rule['id'])
         self.assertEqual(200, resp.status)
 
     @test.attr(type='smoke')
@@ -95,8 +94,6 @@
                                                    ip_protocol1,
                                                    from_port1, to_port1)
         rule1_id = rule['id']
-        # Delete the Security Group rule1 at the end of this method
-        self.addCleanup(self.client.delete_security_group_rule, rule1_id)
 
         # Add a second rule to the created Security Group
         ip_protocol2 = 'icmp'

tempest/api/network/test_security_groups.py

diff --git a/tempest/api/network/test_security_groups.py b/tempest/api/network/test_security_groups.py
index 97b3c4b..b98cea1 100644
--- a/tempest/api/network/test_security_groups.py
+++ b/tempest/api/network/test_security_groups.py
@@ -86,9 +86,6 @@
                 direction='ingress'
             )
             self.assertEqual('201', resp['status'])
-            self.addCleanup(self._delete_security_group_rule,
-                            rule_create_body['security_group_rule']['id']
-                            )
 
             # Show details of the created security rule
             resp, show_rule_body = self.client.show_security_group_rule(
@@ -130,9 +127,6 @@
 
         self.assertEqual('201', resp['status'])
         sec_group_rule = rule_create_body['security_group_rule']
-        self.addCleanup(self._delete_security_group_rule,
-                        sec_group_rule['id']
-                        )
 
         self.assertEqual(sec_group_rule['direction'], direction)
         self.assertEqual(sec_group_rule['protocol'], protocol)

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index f83a4b8..3a1a7db 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -285,7 +285,6 @@
         for ruleset in rulesets:
             sg_rule = client.security_group_rules.create(secgroup_id,
                                                          **ruleset)
-            self.set_resource(sg_rule.id, sg_rule)
             rules.append(sg_rule)
         return rules
 
@@ -923,7 +922,6 @@
             client=client,
             **sg_rule['security_group_rule']
         )
-        self.set_resource(sg_rule.id, sg_rule)
         self.assertEqual(secgroup.tenant_id, sg_rule.tenant_id)
         self.assertEqual(secgroup.id, sg_rule.security_group_id)