From 534910894514cce492d17b2f91096b388093b5a9 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Thu, 13 Mar 2014 23:15:19 -0700 Subject: [PATCH] add access and site maps to hpc --- planetstack/hpc/admin.py | 14 ++++++++++++++ planetstack/hpc/models.py | 17 +++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/planetstack/hpc/admin.py b/planetstack/hpc/admin.py index efd9eb3..f574ec1 100644 --- a/planetstack/hpc/admin.py +++ b/planetstack/hpc/admin.py @@ -61,9 +61,23 @@ class CDNPrefixAdmin(admin.ModelAdmin): form = CDNPrefixForm list_display = ['prefix','contentProvider'] +class SiteMapAdmin(admin.ModelAdmin): + model = SiteMap + verbose_name = "Site Map" + verbose_name_plural = "Site Map" + list_display = ("name", "contentProvider", "serviceProvider") + +class AccessMapAdmin(admin.ModelAdmin): + model = AccessMap + verbose_name = "Access Map" + verbose_name_plural = "Access Map" + list_display = ("name", "contentProvider") + admin.site.register(ServiceProvider, ServiceProviderAdmin) admin.site.register(ContentProvider, ContentProviderAdmin) admin.site.register(CDNPrefix, CDNPrefixAdmin) admin.site.register(OriginServer,OriginServerAdmin) admin.site.register(HpcService) +admin.site.register(SiteMap, SiteMapAdmin) +admin.site.register(AccessMap, AccessMapAdmin) diff --git a/planetstack/hpc/models.py b/planetstack/hpc/models.py index 9f5f165..1b80cc6 100644 --- a/planetstack/hpc/models.py +++ b/planetstack/hpc/models.py @@ -70,3 +70,20 @@ class CDNPrefix(PlCoreBase): def __unicode__(self): return u'%s' % (self.prefix) +class AccessMap(models.Model): + contentProvider = models.ForeignKey(ContentProvider) + name = models.CharField(max_length=64, help_text="Name of the Access Map") + description = models.TextField(null=True, blank=True,max_length=130) + map = models.FileField(upload_to="maps/", help_text="specifies which client requests are allowed") + + def __unicode__(self): return self.name + +class SiteMap(models.Model): + """ can be bound to a ContentProvider, ServiceProvider, or neither """ + contentProvider = models.ForeignKey(ContentProvider, blank=True, null=True) + serviceProvider = models.ForeignKey(ServiceProvider, blank=True, null=True) + name = models.CharField(max_length=64, help_text="Name of the Site Map") + description = models.TextField(null=True, blank=True,max_length=130) + map = models.FileField(upload_to="maps/", help_text="specifies how to map requests to hpc instances") + + def __unicode__(self): return self.name -- 2.43.0