diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-01 00:44:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-01 00:44:33 +0000 |
| commit | 68063ae67ebdb7dfaa487b659b5565fac52e848f (patch) | |
| tree | 92d68252fe2d462a6051c6de0fd3ae2550705025 | |
| parent | 3ae1d43bdbd802c4b764fb5bd5e70700e4a9929d (diff) | |
| parent | 649bcc536a0c3957cf8d691ff69113dcbe78a6e0 (diff) | |
| download | nova-68063ae67ebdb7dfaa487b659b5565fac52e848f.tar.gz | |
Merge "Fixes bug 957708." into milestone-proposed
| -rw-r--r-- | nova/utils.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/utils.py b/nova/utils.py index ef2b329baf..819929a81d 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -1219,6 +1219,10 @@ def is_valid_cidr(address): netaddr.IPNetwork(address) except netaddr.core.AddrFormatError: return False + except UnboundLocalError: + # NOTE(MotoKen): work around bug in netaddr 0.7.5 (see detail in + # https://github.com/drkjam/netaddr/issues/2) + return False # Prior validation partially verify /xx part # Verify it here |