Fixed #38 -- enabled Django admin for Deis API models.

Author: mboersma

api/admin.py

@@ -0,0 +1,121 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+"""
+Django admin app configuration for Deis API models.
+"""
+
+from __future__ import unicode_literals
+
+from django.contrib import admin
+
+from .models import Build
+from .models import Config
+from .models import Container
+from .models import Flavor
+from .models import Formation
+from .models import Key
+from .models import Layer
+from .models import Node
+from .models import Provider
+from .models import Release
+
+
+class BuildAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Build` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('sha', 'owner', 'formation')
+    list_filter = ('owner', 'formation')
+admin.site.register(Build, BuildAdmin)
+
+
+class ConfigAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Config` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('version', 'owner', 'formation')
+    list_filter = ('owner', 'formation')
+admin.site.register(Config, ConfigAdmin)
+
+
+class ContainerAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Container` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('short_name', 'owner', 'formation', 'status')
+    list_filter = ('owner', 'formation', 'status')
+admin.site.register(Container, ContainerAdmin)
+
+
+class FlavorAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Flavor` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('id', 'owner', 'provider')
+    list_filter = ('owner', 'provider')
+admin.site.register(Flavor, FlavorAdmin)
+
+
+class FormationAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Formation` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('id', 'owner')
+    list_filter = ('owner',)
+admin.site.register(Formation, FormationAdmin)
+
+
+class KeyAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Key` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('id', 'owner', '__str__')
+    list_filter = ('owner',)
+admin.site.register(Key, KeyAdmin)
+
+
+class LayerAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Layer` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('id', 'owner', 'formation', 'flavor', 'level', 'run_list')
+    list_filter = ('owner', 'formation', 'flavor')
+admin.site.register(Layer, LayerAdmin)
+
+
+class NodeAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Node` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('id', 'owner', 'formation', 'fqdn')
+    list_filter = ('owner', 'formation')
+admin.site.register(Node, NodeAdmin)
+
+
+class ProviderAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Provider` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('id', 'owner', 'type')
+    list_filter = ('owner', 'type')
+admin.site.register(Provider, ProviderAdmin)
+
+
+class ReleaseAdmin(admin.ModelAdmin):
+    """Set presentation options for :class:`~api.models.Release` models
+    in the Django admin.
+    """
+    date_hierarchy = 'created'
+    list_display = ('owner', 'formation', 'version')
+    list_filter = ('owner', 'formation')
+admin.site.register(Release, ReleaseAdmin)

api/models.py

@@ -77,10 +77,9 @@ class Meta:
         unique_together = (('owner', 'id'))
 
     def __str__(self):
-        return "{0} : {1}".format(self.owner.username, self.id)
+        return "{}...{}".format(self.public[:18], self.public[-31:])
 
 
-@python_2_unicode_compatible
 class ProviderManager(models.Manager):
     """Manage database interactions for :class:`Provider`."""
 
@@ -117,8 +116,10 @@ class Provider(UuidAuditedModel):
     class Meta:
         unique_together = (('owner', 'id'),)
 
+    def __str__(self):
+        return "{}-{}".format(self.id, self.get_type_display())
+
 
-@python_2_unicode_compatible
 class FlavorManager(models.Manager):
     """Manage database interactions for :class:`Flavor`."""
 
@@ -193,7 +194,6 @@ class ScalingError(Exception):
     pass
 
 
-@python_2_unicode_compatible
 class FormationManager(models.Manager):
     """Manage database interactions for :class:`Formation`."""
 
@@ -507,7 +507,6 @@ def destroy(self, async=False):
         group(layer_tasks).apply_async().join()
 
 
-@python_2_unicode_compatible
 class NodeManager(models.Manager):
 
     def new(self, formation, layer):
@@ -638,10 +637,12 @@ class Container(UuidAuditedModel):
     # TODO: add celery beat tasks for monitoring node health
     status = models.CharField(max_length=64, default='up')
 
+    def short_name(self):
+        return "{}.{}".format(self.type, self.num)
+    short_name.short_description = 'Name'
+
     def __str__(self):
-        if self.id:
-            return self.id
-        return "{0} {1}.{2}".format(self.formation.id, self.type, self.num)
+        return "{0} {1}".format(self.formation.id, self.short_name())
 
     class Meta:
         get_latest_by = '-created'
@@ -698,7 +699,7 @@ class Meta:
         unique_together = (('formation', 'uuid'),)
 
     def __str__(self):
-        return "{0}-v{1}".format(self.formation.id, self.version)
+        return "{0}-{1}".format(self.formation.id, self.sha)
 
     @classmethod
     def push(cls, push):

deis/settings.py

@@ -107,6 +107,7 @@
     "django.core.context_processors.tz",
     "django.contrib.messages.context_processors.messages",
     "allauth.account.context_processors.account",
+    "allauth.socialaccount.context_processors.socialaccount",
 )
 
 MIDDLEWARE_CLASSES = (
@@ -133,6 +134,7 @@
 )
 
 INSTALLED_APPS = (
+    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.messages',
@@ -142,6 +144,7 @@
     # Third-party apps
     'allauth',
     'allauth.account',
+    'allauth.socialaccount',
     'djcelery',
     'json_field',
     'rest_framework',

deis/urls.py

@@ -18,6 +18,7 @@
 urlpatterns = patterns(
     '',
     url(r'^accounts/', include('allauth.urls')),
+    url(r'^admin/', include(admin.site.urls)),
     url(r'^api/', include('api.urls')),
     url(r'^', include('web.urls')),
 )

docs/server/api.admin.rst

@@ -0,0 +1,14 @@
+:description: Python API Reference for the Deis api.admin module
+:keywords: deis, api.admin, python, api
+
+=========
+api.admin
+=========
+
+.. contents::
+    :local:
+.. currentmodule:: api.admin
+
+.. automodule:: api.admin
+    :members:
+    :undoc-members:

docs/server/index.rst

@@ -14,6 +14,7 @@ Server Reference
 
     rest
 
+    api.admin
     api.fields
     api.models
     api.routers