ref(controller): move limits to Config model

A Release is a Build and a Config, not a Build, Config and a Limit.
Limits make sense as configuration for the Build, so this moves it
over as a Config field.

Author: Matthew Fisher

controller/api/models.py

@@ -134,9 +134,8 @@ def __str__(self):
     def create(self, *args, **kwargs):
         config = Config.objects.create(owner=self.owner, app=self, values={})
         build = Build.objects.create(owner=self.owner, app=self, image=settings.DEFAULT_BUILD)
-        limit = Limit.objects.create(owner=self.owner, app=self, memory={}, cpu={})
         Release.objects.create(version=1, owner=self.owner, app=self,
-                               config=config, build=build, limit=limit)
+                               config=config, build=build)
 
     def delete(self, *args, **kwargs):
         for c in self.container_set.all():
@@ -303,8 +302,10 @@ def _command_announceable(self):
     @transition(field=state, source=INITIALIZED, target=CREATED)
     def create(self):
         image = self.release.image
-        kwargs = {'memory': self.release.limit.memory,
-                  'cpu': self.release.limit.cpu}
+        kwargs = {}
+        if self.release.config.limit is not None:
+            kwargs = {'memory': self.release.config.limit.memory,
+                      'cpu': self.release.config.limit.cpu}
         self._scheduler.create(name=self._job_id,
                                image=image,
                                command=self._command,
@@ -332,8 +333,10 @@ def deploy(self, release):
         new_job_id = self._job_id
         image = self.release.image
         c_type = self.type
-        kwargs = {'memory': self.release.limit.memory,
-                  'cpu': self.release.limit.cpu}
+        kwargs = {}
+        if self.release.config.limit is not None:
+            kwargs = {'memory': self.release.config.limit.memory,
+                      'cpu': self.release.config.limit.cpu}
         self._scheduler.create(name=new_job_id,
                                image=image,
                                command=self._command.format(**locals()),
@@ -424,6 +427,7 @@ class Config(UuidAuditedModel):
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
     app = models.ForeignKey('App')
     values = JSONField(default='{}', blank=True)
+    limit = models.ForeignKey('Limit', null=True)
 
     class Meta:
         get_latest_by = 'created'
@@ -470,7 +474,6 @@ class Release(UuidAuditedModel):
 
     config = models.ForeignKey('Config')
     build = models.ForeignKey('Build')
-    limit = models.ForeignKey('Limit', null=True)
     # NOTE: image contains combined build + config, ready to run
     image = models.CharField(max_length=256, default=settings.DEFAULT_BUILD)
 
@@ -482,8 +485,7 @@ class Meta:
     def __str__(self):
         return "{0}-v{1}".format(self.app.id, self.version)
 
-    def new(self, user, config=None, build=None, limit=None,
-            summary=None, source_version='latest'):
+    def new(self, user, config=None, build=None, summary=None, source_version='latest'):
         """
         Create a new application release using the provided Build and Config
         on behalf of a user.
@@ -494,8 +496,6 @@ def new(self, user, config=None, build=None, limit=None,
             config = self.config
         if not build:
             build = self.build
-        if not limit:
-            limit = self.limit
         # always create a release off the latest image
         source_image = '{}:{}'.format(build.image, source_version)
         # construct fully-qualified target image
@@ -505,8 +505,8 @@ def new(self, user, config=None, build=None, limit=None,
         target_image = '{}'.format(self.app.id)
         # create new release and auto-increment version
         release = Release.objects.create(
-            owner=user, app=self.app, config=config, build=build, limit=limit,
-            version=new_version, image=target_image, summary=summary)
+            owner=user, app=self.app, config=config,
+            build=build, version=new_version, image=target_image, summary=summary)
         # IOW, this image did not come from the builder
         if not build.sha:
             # we assume that the image is not present on our registry,
@@ -547,7 +547,7 @@ 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.limit 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)
@@ -574,7 +574,7 @@ def save(self, *args, **kwargs):  # noqa
                         self.summary += ' and '
                     self.summary += "{} {}".format(self.config.owner, changes)
             # if the limit changes, log the dict diff
-            elif self.limit != old_limit:
+            elif self.config.limit != old_limit:
                 changes = []
                 old_mem = old_limit.memory if old_limit else {}
                 diff = dict_diff(self.limit.memory, old_mem)

…_app_uuid__add_field_release_limit__a.py …imit_app_uuid__add_field_config_limit.pycontroller/api/south_migrations/0012_auto__add_limit__add_unique_limit_app_uuid__add_field_release_limit__a.py renamed to controller/api/south_migrations/0012_auto__add_limit__add_unique_limit_app_uuid__add_field_config_limit.py controller/api/south_migrations/0012_auto__add_limit__add_unique_limit_app_uuid__add_field_release_limit__a.py renamed to controller/api/south_migrations/0012_auto__add_limit__add_unique_limit_app_uuid__add_field_config_limit.py

@@ -23,20 +23,21 @@ def forwards(self, orm):
         # Adding unique constraint on 'Limit', fields ['app', 'uuid']
         db.create_unique(u'api_limit', ['app_id', 'uuid'])
 
-        # Adding field 'Release.limit'
-        db.add_column(u'api_release', 'limit',
+        # Adding field 'Config.limit'
+        db.add_column(u'api_config', 'limit',
                       self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Limit'], null=True),
                       keep_default=False)
 
+
     def backwards(self, orm):
         # Removing unique constraint on 'Limit', fields ['app', 'uuid']
         db.delete_unique(u'api_limit', ['app_id', 'uuid'])
 
         # Deleting model 'Limit'
         db.delete_table(u'api_limit')
 
-        # Deleting field 'Release.limit'
-        db.delete_column(u'api_release', 'limit_id')
+        # Deleting field 'Config.limit'
+        db.delete_column(u'api_config', 'limit_id')
 
 
     models = {
@@ -79,6 +80,7 @@ def backwards(self, orm):
             'Meta': {'ordering': "[u'-created']", 'unique_together': "((u'app', u'uuid'),)", 'object_name': 'Config'},
             'app': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.App']"}),
             'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'limit': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Limit']", 'null': 'True'}),
             'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),
@@ -145,7 +147,6 @@ def backwards(self, orm):
             'config': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Config']"}),
             'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             'image': ('django.db.models.fields.CharField', [], {'default': "u'deis/helloworld'", 'max_length': '256'}),
-            'limit': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Limit']", 'null': 'True'}),
             'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
             'summary': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),

controller/api/tests/test_limit.py

@@ -55,7 +55,7 @@ def test_limit_memory(self):
         response = self.client.get(url, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         self.assertIn('memory', response.data)
-        self.assertEqual(json.loads(response.data['memory']), {})
+        self.assertEqual(json.loads(response.data['memory']), json.dumps({}))
         # set an initial limit
         mem = {'web': '1G'}
         body = {'memory': json.dumps(mem)}
@@ -119,7 +119,7 @@ def test_limit_cpu(self):
         response = self.client.get(url, content_type='application/json')
         self.assertEqual(response.status_code, 200)
         self.assertIn('cpu', response.data)
-        self.assertEqual(json.loads(response.data['memory']), {})
+        self.assertEqual(json.loads(response.data['memory']), json.dumps({}))
         # set an initial limit
         body = {'cpu': json.dumps({'web': '1024'})}
         response = self.client.post(url, json.dumps(body), content_type='application/json')

controller/api/views.py

@@ -404,19 +404,21 @@ class AppLimitViewSet(BaseAppViewSet):
 
     model = models.Limit
     serializer_class = serializers.LimitSerializer
+    permission_classes = (permissions.IsAuthenticated, IsAppUser)
 
     def get_object(self, *args, **kwargs):
         """Return the Limit associated with the App's latest Release."""
         app = get_object_or_404(models.App, id=self.kwargs['id'])
-        user = self.request.user
-        if user == app.owner or user in get_users_with_perms(app):
-            return app.release_set.latest().limit
-        raise PermissionDenied()
+        return app.release_set.latest().config.limit
 
     def post_save(self, limit, created=False):
         if created:
             release = limit.app.release_set.latest()
-            self.release = release.new(self.request.user, limit=limit)
+            config = models.Config.objects.create(owner=release.config.owner,
+                                                  app=release.config.app,
+                                                  values=release.config.values,
+                                                  limit=limit)
+            self.release = release.new(self.request.user, config=config)
             limit.app.deploy(self.release)
 
     def get_success_headers(self, data):
@@ -426,9 +428,6 @@ def get_success_headers(self, data):
 
     def create(self, request, *args, **kwargs):
         request.DATA['app'] = self.kwargs['id']
-        serializer = self.get_serializer(data=request.DATA, files=request.FILES)
-        if not serializer.is_valid():
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
         # special logic to merge values and remove based on null values
         obj = self.get_object()
@@ -475,7 +474,6 @@ def rollback(self, request, *args, **kwargs):
             request.user,
             build=prev.build,
             config=prev.config,
-            limit=prev.limit,
             summary=summary,
             source_version='v{}'.format(version))
         app.deploy(new_release)