summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-03-30 00:49:19 +0000
committerGerrit Code Review <review@openstack.org>2012-03-30 00:49:19 +0000
commit75676812e867a36778fa5b1beb3d2dbfcb87bec2 (patch)
tree070d30a492e552695abc1443aec18a04d5ec3050 /nova/tests
parent7bd863faf454a19c8e1caac556cefaf24722887d (diff)
parent1892c2851d33eb2f5e6bb1faf0610c710888cd68 (diff)
Merge "Allow self-referential groups to be created"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_security_groups.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
index a9422cd26..0cf66ec6e 100644
--- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
@@ -784,11 +784,14 @@ class TestSecurityGroupRules(test.TestCase):
req, {'security_group_rule': rule})
def test_create_with_same_group_parent_id_and_group_id(self):
- rule = security_group_rule_template(group_id=2)
+ rule = security_group_rule_template(group_id=1, parent_group_id=1)
req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules')
- self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
- req, {'security_group_rule': rule})
+ res_dict = self.controller.create(req, {'security_group_rule': rule})
+ security_group_rule = res_dict['security_group_rule']
+ self.assertNotEquals(security_group_rule['id'], 0)
+ self.assertEquals(security_group_rule['parent_group_id'], 1)
+ self.assertEquals(security_group_rule['id'], 1)
def _test_create_with_no_ports_and_no_group(self, proto):
rule = {'ip_protocol': proto, 'parent_group_id': '2'}