diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-11-01 20:46:39 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-11-01 20:46:39 +0000 |
| commit | baf7916bf916af82ed264381192e9e70eb0817b4 (patch) | |
| tree | c4ee8c21a3b102d8d56495d4a3afdac70ebd8f0f | |
| parent | 71bd02356b41f682c6a196f75e0ed1accc8f5fb6 (diff) | |
Fix empty group_id to be considered invalid
And fix the test suite to actually try an empty group id correctly
Change-Id: I54e61637b9b230d352e35b9b7964ab10c4eb9a25
| -rw-r--r-- | nova/api/openstack/contrib/security_groups.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/contrib/test_security_groups.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/contrib/security_groups.py b/nova/api/openstack/contrib/security_groups.py index 662711951..9072a34ee 100644 --- a/nova/api/openstack/contrib/security_groups.py +++ b/nova/api/openstack/contrib/security_groups.py @@ -251,7 +251,7 @@ class SecurityGroupRulesController(SecurityGroupController): cidr=None, group_id=None): values = {} - if group_id: + if group_id is not None: try: parent_group_id = int(parent_group_id) group_id = int(group_id) diff --git a/nova/tests/api/openstack/contrib/test_security_groups.py b/nova/tests/api/openstack/contrib/test_security_groups.py index 65e60df7f..4a2a7c19c 100644 --- a/nova/tests/api/openstack/contrib/test_security_groups.py +++ b/nova/tests/api/openstack/contrib/test_security_groups.py @@ -887,7 +887,7 @@ class TestSecurityGroupRules(test.TestCase): "ip_protocol": "tcp", "from_port": "22", "to_port": "22", - "group_id": "invalid", + "group_id": "", "parent_group_id": "%s" % self.parent_security_group['id'], } } |