ref(*): mock the k8s API interactions and remove Container model

This change removes the Container model as it is redundant and changes around the MockScheduler to instead mock out actual k8s API calls and responses to get real testing of the scheduler code.

Chaos scheduler was ripped temporarily but will be readded in the future (see #412)

More logic needs to go into the mock handling to deal with pod transitions

Fixes #29, #60

Author: helgi

Makefile

@@ -67,12 +67,12 @@ test-style:
 
 test-unit:
 	cd rootfs \
-		&& coverage run manage.py test --noinput registry api \
+		&& coverage run manage.py test --settings=deis.testing --noinput registry api \
 		&& coverage report -m
 
 test-unit-quick:
 	cd rootfs \
-		&& ./manage.py test --noinput --parallel ${TEST_PROCS} --noinput registry api
+		&& ./manage.py test --settings=deis.testing --noinput --parallel ${TEST_PROCS} --noinput registry api
 
 test-functional:
 	@echo "Implement functional tests in _tests directory"

rootfs/.coveragerc

@@ -4,7 +4,7 @@ omit =
     */virtualenv/*
     *tests*
     api/__init__.py
-    scheduler/*
+    scheduler/mock.py
     # osx library files when not running in virtualenv
     /Library/*
     /System/*

rootfs/api/admin.py

@@ -11,7 +11,6 @@
 from .models import App
 from .models import Build
 from .models import Config
-from .models import Container
 from .models import Domain
 from .models import Key
 from .models import Release
@@ -47,16 +46,6 @@ class ConfigAdmin(admin.ModelAdmin):
 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', 'app', 'state')
-    list_filter = ('owner', 'app')
-admin.site.register(Container, ContainerAdmin)
-
-
 class DomainAdmin(admin.ModelAdmin):
     """Set presentation options for :class:`~api.models.Domain` models
     in the Django admin.

rootfs/api/migrations/0007_auto_20160226_2335.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-02-26 23:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0006_auto_20160114_0313'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='container',
+            name='app',
+        ),
+        migrations.RemoveField(
+            model_name='container',
+            name='owner',
+        ),
+        migrations.RemoveField(
+            model_name='container',
+            name='release',
+        ),
+        migrations.DeleteModel(
+            name='Container',
+        ),
+    ]

rootfs/api/models/__init__.py

@@ -54,7 +54,7 @@ class Meta:
     @property
     def _scheduler(self):
         mod = importlib.import_module(settings.SCHEDULER_MODULE)
-        return mod.SchedulerClient(settings.SCHEDULER_URL)
+        return mod.SchedulerClient()
 
     def _fetch_service_config(self, app):
         # Get the service from k8s to attach the domain correctly
@@ -110,7 +110,6 @@ class Meta:
 
 
 from .app import App, validate_id_is_docker_compatible, validate_reserved_names, validate_app_structure  # noqa
-from .container import Container  # noqa
 from .push import Push  # noqa
 from .key import Key, validate_base64  # noqa
 from .certificate import Certificate, validate_certificate  # noqa