summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-15 06:56:12 +0000
committerGerrit Code Review <review@openstack.org>2013-06-15 06:56:12 +0000
commit8e405732da7c13a474d75b10bbe94f0daab167bc (patch)
tree8b30d53de0396910235b8d8efae3ff86cf1d0290
parent63ff1c98610249367bc3f6feef04c6f7bd0f3436 (diff)
parentdb95ffa55cbb668e6854e25b215a7e2048e20349 (diff)
downloadnova-8e405732da7c13a474d75b10bbe94f0daab167bc.tar.gz
nova-8e405732da7c13a474d75b10bbe94f0daab167bc.tar.xz
nova-8e405732da7c13a474d75b10bbe94f0daab167bc.zip
Merge "translates empty remote_ip_prefix to valid cidr for nova"
-rw-r--r--nova/network/security_group/quantum_driver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/security_group/quantum_driver.py b/nova/network/security_group/quantum_driver.py
index c77625529..7709da970 100644
--- a/nova/network/security_group/quantum_driver.py
+++ b/nova/network/security_group/quantum_driver.py
@@ -109,7 +109,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
nova_rule['from_port'] = rule.get('port_range_min')
nova_rule['to_port'] = rule.get('port_range_max')
nova_rule['group_id'] = rule['remote_group_id']
- nova_rule['cidr'] = rule['remote_ip_prefix']
+ nova_rule['cidr'] = self.parse_cidr(rule.get('remote_ip_prefix'))
return nova_rule
def get(self, context, name=None, id=None, map_exception=False):