diff options
| author | Michael Elkins <melkins@tislabs.com> | 2013-02-20 21:11:52 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2013-02-20 21:11:52 +0000 |
| commit | 505b5c0c90480309109ca56dc8775003fd9bf06e (patch) | |
| tree | d737adbbb235546d4898d0e433a755dd5af18c60 /rpkid/rpki/gui/app/forms.py | |
| parent | 26c5c9c8f20ad6bc07a7e300bb4b0cb82af11d2c (diff) | |
use resource_range_ip.parse_str() rather than calling through resource_range_ipv*()
closes #415
svn path=/trunk/; revision=5048
Diffstat (limited to 'rpkid/rpki/gui/app/forms.py')
| -rw-r--r-- | rpkid/rpki/gui/app/forms.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/rpkid/rpki/gui/app/forms.py b/rpkid/rpki/gui/app/forms.py index 1057ee01..676116cb 100644 --- a/rpkid/rpki/gui/app/forms.py +++ b/rpkid/rpki/gui/app/forms.py @@ -18,8 +18,7 @@ __version__ = '$Id$' from django.contrib.auth.models import User from django import forms -from rpki.resource_set import (resource_range_as, resource_range_ipv4, - resource_range_ipv6) +from rpki.resource_set import (resource_range_as, resource_range_ip) from rpki.gui.app import models from rpki.exceptions import BadIPResource from rpki.gui.app.glue import str_to_resource_range @@ -199,7 +198,7 @@ class ROARequest(forms.Form): mask = p.bits - (8 * (prefixlen / 8)) prefix = prefix + '/' + str(mask) - return str_to_resource_range(prefix) + return resource_range_ip.parse_str(prefix) def clean_asn(self): value = self.cleaned_data.get('asn') @@ -213,7 +212,7 @@ class ROARequest(forms.Form): except: raise forms.ValidationError('invalid IP address') - manager = models.ResourceRangeAddressV4 if isinstance(r, resource_range_ipv4) else models.ResourceRangeAddressV6 + manager = models.ResourceRangeAddressV4 if r.version == 4 else models.ResourceRangeAddressV6 if not manager.objects.filter(cert__conf=self.conf, prefix_min__lte=r.min, prefix_max__gte=r.max).exists(): @@ -333,12 +332,11 @@ class AddNetForm(forms.Form): def clean_address_range(self): address_range = self.cleaned_data.get('address_range') try: - if ':' in address_range: - r = resource_range_ipv6.parse_str(address_range) + r = resource_range_ip.parse_str(address_range) + if r.version == 6: qs = models.ResourceRangeAddressV6 version = 'IPv6' else: - r = resource_range_ipv4.parse_str(address_range) qs = models.ResourceRangeAddressV4 version = 'IPv4' except BadIPResource: |