diff options
| author | Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> | 2013-02-15 08:19:00 -0500 |
|---|---|---|
| committer | Mauro S. M. Rodrigues <maurosr@linux.vnet.ibm.com> | 2013-03-05 06:56:08 -0500 |
| commit | 481c314d6a54965fe6e0972995c6ad9afa86a908 (patch) | |
| tree | f9aaf06478cd44bf710daefd6a45756ff145b2b4 /nova/utils.py | |
| parent | 71047567ee25bacf664f9b6387d9a5c53c63622e (diff) | |
| download | nova-481c314d6a54965fe6e0972995c6ad9afa86a908.tar.gz nova-481c314d6a54965fe6e0972995c6ad9afa86a908.tar.xz nova-481c314d6a54965fe6e0972995c6ad9afa86a908.zip | |
Standarize ip validation along the code
Details:
- Use the nova/utils.py validations along the code
- refactor ipv4 validator to looks like ipv6 validator
- interprets ip validations exceptions as Invalid IP values
Change-Id: Ia506c00510a066e167d3dcd9dd371a371129a9dd
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nova/utils.py b/nova/utils.py index 764fa9070..5afdf52fd 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -945,14 +945,16 @@ def is_valid_boolstr(val): def is_valid_ipv4(address): """Verify that address represents a valid IPv4 address.""" try: - addr = netaddr.IPAddress(address) - return addr.version == 4 + return netaddr.valid_ipv4(address) except Exception: return False def is_valid_ipv6(address): - return netaddr.valid_ipv6(address) + try: + return netaddr.valid_ipv6(address) + except Exception: + return False def is_valid_ipv6_cidr(address): |