diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-01-18 01:22:56 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-01-18 01:22:56 +0000 |
| commit | 7735c9840baedceff3a5aa6c4d5a4b8fef400a3e (patch) | |
| tree | cf89bad34a083413311e224af107654e4c24be98 | |
| parent | f48dcad3345788e711faee9d532239641d6a0b5a (diff) | |
IP version in ChildNet is stored as a string; update filter
svn path=/branches/tk161/; revision=4222
| -rw-r--r-- | rpkid/rpki/gui/app/views.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index 4926d787..b61c846d 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -125,12 +125,12 @@ def dashboard(request, template_name='app/dashboard.html'): used_prefixes_v6 = resource_set.resource_set_ipv6() # prefixes used in my roas - used_prefixes.extend((obj.as_resource_range() for obj in models.ROARequestPrefix.objects.filter(roa_request__issuer=conf, version=4))) - used_prefixes_v6.extend((obj.as_resource_range() for obj in models.ROARequestPrefix.objects.filter(roa_request__issuer=conf, version=6))) + used_prefixes.extend((obj.as_resource_range() for obj in models.ROARequestPrefix.objects.filter(roa_request__issuer=conf, version='IPv4'))) + used_prefixes_v6.extend((obj.as_resource_range() for obj in models.ROARequestPrefix.objects.filter(roa_request__issuer=conf, version='IPv6'))) # prefixes given to my children - used_prefixes.extend((obj.as_resource_range() for obj in rpki.irdb.models.ChildNet(child__in=conf.children.all(), version=4))) - used_prefixes_v6.extend((obj.as_resource_range() for obj in rpki.irdb.models.ChildNet(child__in=conf.children.all(), version=6))) + used_prefixes.extend((obj.as_resource_range() for obj in rpki.irdb.models.ChildNet.objects.filter(child__in=conf.children.all(), version='IPv4'))) + used_prefixes_v6.extend((obj.as_resource_range() for obj in rpki.irdb.models.ChildNet.objects.filter(child__in=conf.children.all(), version='IPv6'))) used_prefixes.canonize() used_prefixes_v6.canonize() |