diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-22 17:41:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-22 17:41:32 +0000 |
| commit | ad0e030103ba34f2ac50ffe3bc09d8a1d1c22d46 (patch) | |
| tree | 69ac2291da1b60e5a0d245243b19d8ba70f64c02 /nova/api | |
| parent | 60cec0a7f54a9e7ae1c3b32fb39c7e7ee24dfde2 (diff) | |
| parent | 3dc539bcb0d9031f81076ac2e1870918400150ed (diff) | |
Merge "Don't allow EC2 removal of security group in use."
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 5e44502be..3d5e74e7c 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -785,6 +785,8 @@ class CloudController(object): security_group = db.security_group_get(context, group_id) if not security_group: raise notfound(security_group_id=group_id) + if db.security_group_in_use(context, security_group.id): + raise exception.InvalidGroup(reason="In Use") LOG.audit(_("Delete security group %s"), group_name, context=context) db.security_group_destroy(context, security_group.id) |