Merge pull request #1630 from mboersma/1613-limit-is-config

fix(controller): store limit fields on config

Author: mboersma

client/deis.py

@@ -1373,7 +1373,7 @@ def limits_list(self, args):
         app = args.get('--app')
         if not app:
             app = self._session.app
-        response = self._dispatch('get', "/api/apps/{}/limits".format(app))
+        response = self._dispatch('get', "/api/apps/{}/config".format(app))
         if response.status_code == requests.codes.ok:  # @UndefinedVariable
             self._print_limits(app, response.json())
         else:
@@ -1426,7 +1426,7 @@ def limits_set(self, args):
         try:
             progress = TextProgress()
             progress.start()
-            response = self._dispatch('post', "/api/apps/{}/limits".format(app), json.dumps(body))
+            response = self._dispatch('post', "/api/apps/{}/config".format(app), json.dumps(body))
         finally:
             progress.cancel()
             progress.join()
@@ -1472,7 +1472,7 @@ def limits_unset(self, args):
         try:
             progress = TextProgress()
             progress.start()
-            response = self._dispatch('post', "/api/apps/{}/limits".format(app), json.dumps(body))
+            response = self._dispatch('post', "/api/apps/{}/config".format(app), json.dumps(body))
         finally:
             progress.cancel()
             progress.join()
@@ -1483,7 +1483,7 @@ def limits_unset(self, args):
         else:
             raise ResponseError(response)
 
-    def _print_limits(self, app, limit):
+    def _print_limits(self, app, config):
         print("=== {} Limits".format(app))
 
         def write(d):
@@ -1498,9 +1498,9 @@ def write(d):
                 print(("{k:<" + str(width) + "} {v}").format(**locals()))
 
         print("\n--- Memory")
-        write(json.loads(limit.get('memory', '{}')))
+        write(json.loads(config.get('memory', '{}')))
         print("\n--- CPU")
-        write(json.loads(limit.get('cpu', '{}')))
+        write(json.loads(config.get('cpu', '{}')))
 
     def ps(self, args):
         """

controller/api/fields.py

@@ -8,22 +8,6 @@
 from django import forms
 from django.db import models
 
-import json_field
-
-
-class JSONField(json_field.JSONField):
-
-    """
-    A subclass of json_field.JSONField that fixes empty JSON object
-    encoding behavior.
-    """
-
-    def get_db_prep_value(self, value, *args, **kwargs):
-        # if it's one of these values, it's already encoded
-        if value in ['{}', '[]']:
-            return value
-        return super(JSONField, self).get_db_prep_value(value, *args, **kwargs)
-
 
 class UuidField(models.CharField):
     """A univerally unique ID field."""

controller/api/models.py

@@ -21,6 +21,7 @@
 from django.utils.encoding import python_2_unicode_compatible
 from django_fsm import FSMField, transition
 from django_fsm.signals import post_transition
+from json_field.fields import JSONField
 
 from api import fields, tasks
 from registry import publish_release
@@ -87,7 +88,7 @@ class Cluster(UuidAuditedModel):
     domain = models.CharField(max_length=128)
     hosts = models.CharField(max_length=256)
     auth = models.TextField()
-    options = fields.JSONField(default='{}', blank=True)
+    options = JSONField(default={}, blank=True)
 
     def __str__(self):
         return self.id
@@ -122,7 +123,7 @@ class App(UuidAuditedModel):
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
     id = models.SlugField(max_length=64, unique=True)
     cluster = models.ForeignKey('Cluster')
-    structure = fields.JSONField(default='{}', blank=True)
+    structure = JSONField(default={}, blank=True)
 
     class Meta:
         permissions = (('use_app', 'Can use app'),)
@@ -135,7 +136,7 @@ def url(self):
         return self.id + '.' + self.cluster.domain
 
     def create(self, *args, **kwargs):
-        config = Config.objects.create(owner=self.owner, app=self, values={})
+        config = Config.objects.create(owner=self.owner, app=self)
         build = Build.objects.create(owner=self.owner, app=self, image=settings.DEFAULT_BUILD)
         Release.objects.create(version=1, owner=self.owner, app=self, config=config, build=build)
 
@@ -308,10 +309,8 @@ def _command_announceable(self):
     @transition(field=state, source=INITIALIZED, target=CREATED)
     def create(self):
         image = self.release.image
-        kwargs = {}
-        if self.release.config.limit is not None:
-            kwargs = {'memory': self.release.config.limit.memory,
-                      'cpu': self.release.config.limit.cpu}
+        kwargs = {'memory': self.release.config.memory,
+                  'cpu': self.release.config.cpu}
         self._scheduler.create(name=self._job_id,
                                image=image,
                                command=self._command,
@@ -339,10 +338,8 @@ def deploy(self, release):
         new_job_id = self._job_id
         image = self.release.image
         c_type = self.type
-        kwargs = {}
-        if self.release.config.limit is not None:
-            kwargs = {'memory': self.release.config.limit.memory,
-                      'cpu': self.release.config.limit.cpu}
+        kwargs = {'memory': self.release.config.memory,
+                  'cpu': self.release.config.cpu}
         self._scheduler.create(name=new_job_id,
                                image=image,
                                command=self._command.format(**locals()),
@@ -411,7 +408,7 @@ class Build(UuidAuditedModel):
 
     # optional fields populated by builder
     sha = models.CharField(max_length=40, blank=True)
-    procfile = fields.JSONField(default='{}', blank=True)
+    procfile = JSONField(default={}, blank=True)
     dockerfile = models.TextField(blank=True)
 
     class Meta:
@@ -432,29 +429,9 @@ class Config(UuidAuditedModel):
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
     app = models.ForeignKey('App')
-    values = fields.JSONField(default='{}', blank=True)
-    limit = models.ForeignKey('Limit', null=True)
-
-    class Meta:
-        get_latest_by = 'created'
-        ordering = ['-created']
-        unique_together = (('app', 'uuid'),)
-
-    def __str__(self):
-        return "{}-{}".format(self.app.id, self.uuid[:7])
-
-
-@python_2_unicode_compatible
-class Limit(UuidAuditedModel):
-    """
-    Set of resource limits applied by the scheduler
-    during runtime execution of the Application.
-    """
-
-    owner = models.ForeignKey(settings.AUTH_USER_MODEL)
-    app = models.ForeignKey('App')
-    memory = fields.JSONField(default='{}', blank=True)
-    cpu = fields.JSONField(default='{}', blank=True)
+    values = JSONField(default={}, blank=True)
+    memory = JSONField(default={}, blank=True)
+    cpu = JSONField(default={}, blank=True)
 
     class Meta:
         get_latest_by = 'created'
@@ -553,7 +530,6 @@ def save(self, *args, **kwargs):  # noqa
             # compare this build to the previous build
             old_build = prev_release.build if prev_release else None
             old_config = prev_release.config if prev_release else None
-            old_limit = prev_release.config.limit if prev_release else None
             # if the build changed, log it and who pushed it
             if self.version == 1:
                 self.summary += "{} created initial release".format(self.app.owner)
@@ -579,15 +555,14 @@ def save(self, *args, **kwargs):  # noqa
                     if self.summary:
                         self.summary += ' and '
                     self.summary += "{} {}".format(self.config.owner, changes)
-            # if the limit changes, log the dict diff
-            if self.config.limit != old_limit:
+                # if the limits changed (memory or cpu), log the dict diff
                 changes = []
-                old_mem = old_limit.memory if old_limit else {}
-                diff = dict_diff(self.config.limit.memory, old_mem)
+                old_mem = old_config.memory if old_config else {}
+                diff = dict_diff(self.config.memory, old_mem)
                 if diff.get('added') or diff.get('changed') or diff.get('deleted'):
                     changes.append('memory')
-                old_cpu = old_limit.cpu if old_limit else {}
-                diff = dict_diff(self.config.limit.cpu, old_cpu)
+                old_cpu = old_config.cpu if old_config else {}
+                diff = dict_diff(self.config.cpu, old_cpu)
                 if diff.get('added') or diff.get('changed') or diff.get('deleted'):
                     changes.append('cpu')
                 if changes:

controller/api/serializers.py

@@ -100,26 +100,14 @@ class ConfigSerializer(serializers.ModelSerializer):
     app = serializers.SlugRelatedField(slug_field='id')
     values = serializers.ModelField(
         model_field=models.Config()._meta.get_field('values'), required=False)
-
-    class Meta:
-        """Metadata options for a :class:`ConfigSerializer`."""
-        model = models.Config
-        read_only_fields = ('uuid', 'created', 'updated')
-
-
-class LimitSerializer(serializers.ModelSerializer):
-    """Serialize a :class:`~api.models.Limit` model."""
-
-    owner = serializers.Field(source='owner.username')
-    app = serializers.SlugRelatedField(slug_field='id')
     memory = serializers.ModelField(
-        model_field=models.Limit()._meta.get_field('memory'), required=False)
+        model_field=models.Config()._meta.get_field('memory'), required=False)
     cpu = serializers.ModelField(
-        model_field=models.Limit()._meta.get_field('cpu'), required=False)
+        model_field=models.Config()._meta.get_field('cpu'), required=False)
 
     class Meta:
-        """Metadata options for a :class:`LimitSerializer`."""
-        model = models.Limit
+        """Metadata options for a :class:`ConfigSerializer`."""
+        model = models.Config
         read_only_fields = ('uuid', 'created', 'updated')
 
     def validate_memory(self, attrs, source):