diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-02 19:28:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-02 19:28:17 +0000 |
| commit | 54dc193e413a6c258e390bc3bcca714aa5015efe (patch) | |
| tree | 67ed268831b220fc4fb0cd966c5e7fc4a0543e42 /nova/api | |
| parent | 830760b4c79cf9cdc80c6e0047ea206abc21f2c6 (diff) | |
| parent | e79b633e9e6493c8e39b044bb90c74683d48c83b (diff) | |
| download | nova-54dc193e413a6c258e390bc3bcca714aa5015efe.tar.gz nova-54dc193e413a6c258e390bc3bcca714aa5015efe.tar.xz nova-54dc193e413a6c258e390bc3bcca714aa5015efe.zip | |
Merge changes Ib2849f64,I54e61637
* changes:
Drop extra XML tests and remove _json suffix from names
Fix empty group_id to be considered invalid
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/security_groups.py | 2 |
1 files changed, 1 insertions, 1 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) |