diff options
| -rw-r--r-- | rpkid/rpki/gui/app/models.py | 13 | ||||
| -rw-r--r-- | rpkid/rpki/gui/app/views.py | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/rpkid/rpki/gui/app/models.py b/rpkid/rpki/gui/app/models.py index 4d765662..5bfc9e81 100644 --- a/rpkid/rpki/gui/app/models.py +++ b/rpkid/rpki/gui/app/models.py @@ -24,6 +24,7 @@ from django.contrib.auth.models import User import rpki.resource_set import rpki.exceptions import rpki.irdb.models +import rpki.gui.models class TelephoneField(models.CharField): def __init__( self, **kwargs ): @@ -97,25 +98,25 @@ class ResourceRangeAddressV6(rpki.gui.models.PrefixV6): class ResourceRangeAS(rpki.gui.models.ASN): cert = models.ForeignKey(ResourceCert, related_name='asn_ranges') -class RoaRequest(rpki.irdb.models.RoaRequest): +class ROARequest(rpki.irdb.models.ROARequest): class Meta: proxy = True def __unicode__(self): - return u"%s's roa request for AS%d" % (self.issuer.handle, self.asn) + return u"%s's ROA request for AS%d" % (self.issuer.handle, self.asn) -class RoaRequestPrefix(rpki.irdb.models.RoaRequestPrefix): +class ROARequestPrefix(rpki.irdb.models.ROARequestPrefix): class Meta: proxy = True def __unicode__(self): - return u'roa request prefix %s/%d-%d for asn %d' % (self.prefix, self.prefixlen, self.max_prefixlen, self.roa_request.asn) + return u'ROA request prefix %s for asn %d' % (str(self.as_roa_prefix()), self.roa_request.asn) @models.permalink def get_absolute_url(self): return ('rpki.gui.app.views.roa_detail', [str(self.pk)]) -class Ghostbuster(models.Model): +class GhostbusterRequest(models.Model): """ Stores the information require to fill out a vCard entry to populate a ghostbusters record. @@ -143,7 +144,7 @@ class Ghostbuster(models.Model): country = models.CharField(blank=True, null=True, max_length=40) # pointer to the IRDB object matching this ghostbuster request - irdb = models.ForeignKey(rpki.irdb.models.Ghostbuster, related_name='app_ghostbuster') + irdb = models.ForeignKey(rpki.irdb.models.GhostbusterRequest, related_name='app_ghostbusters') def __unicode__(self): return u"%s's GBR: %s" % (self.issuer.handle, self.full_name) diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py index 1e74733d..9a35d6f8 100644 --- a/rpkid/rpki/gui/app/views.py +++ b/rpkid/rpki/gui/app/views.py @@ -106,7 +106,7 @@ def dashboard(request, template_name='app/dashboard.html'): used_asns = resource_set.resource_set_as() # asns used in my roas - roa_asns = set((obj.asn for obj in models.RoaRequest.objects.filter(issuer=conf))) + roa_asns = set((obj.asn for obj in models.ROARequest.objects.filter(issuer=conf))) used_asns.extend((resource_set.resource_range_as(asn, asn) for asn in roa_asns)) # asns given to my children @@ -125,8 +125,8 @@ 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=4))) + used_prefixes_v6.extend((obj.as_resource_range() for obj in models.ROARequestPrefix.objects.filter(roa_request__issuer=conf, version=6))) # 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))) @@ -319,29 +319,29 @@ def login(request): @handle_required def roa_list(request): - "Displays a list of RoaRequestPrefix objects for the current resource handle." + "Displays a list of ROARequestPrefix objects for the current resource handle." log = request.META['wsgi.errors'] conf = request.session['handle'] - return object_list(request, queryset=models.RoaRequestPrefix.objects.filter(roa_request__issuer=conf), + return object_list(request, queryset=models.ROARequestPrefix.objects.filter(roa_request__issuer=conf), template_name='app/roa_request_list.html', extra_context = { 'page_title': 'ROA Requests' }) @handle_required def roa_detail(request, pk): - """Not implemented. This is a placeholder so that models.RoaRequestPrefix.get_absolute_url + """Not implemented. This is a placeholder so that models.ROARequestPrefix.get_absolute_url works. The only reason it exist is so that the /delete URL works.""" pass @handle_required def roa_delete(request, pk): - """Handles deletion of a single RoaRequestPrefix object. + """Handles deletion of a single ROARequestPrefix object. Uses a form for double confirmation, displaying how the route validation status may change as a result.""" log = request.META['wsgi.errors'] conf = request.session['handle'] - obj = get_object_or_404(models.RoaRequestPrefix.objects, roa_request__issuer=conf, pk=pk) + obj = get_object_or_404(models.ROARequestPrefix.objects, roa_request__issuer=conf, pk=pk) if request.method == 'POST': roa = obj.roa_request |