Continued PEP8 code cleanup.

Author: mboersma

api/models.py

@@ -10,6 +10,7 @@
 import importlib
 import json
 
+from celery.canvas import group
 from django.conf import settings
 from django.db import models
 from django.db.models.signals import post_save
@@ -20,15 +21,15 @@
 
 from api import fields
 from celerytasks import controller
-from celery.canvas import group
 
 
 # define custom signals
 scale_signal = Signal(providing_args=['formation', 'user'])
 release_signal = Signal(providing_args=['formation', 'user'])
 
+
 def import_tasks(provider_type):
-    "Return Celery tasks for a given provider type"
+    """Return Celery tasks for a given provider type"""
     try:
         tasks = importlib.import_module('celerytasks.'+provider_type)
     except ImportError as e:
@@ -195,17 +196,19 @@ def publish(self, **kwargs):
         # TODO: add sharing-based key lookup, for now just owner's keys
         for formation in formations:
             keys = databag['formations'][formation.id] = []
-            owner_keys = [ '{0}_{1}'.format(k.owner.username, k.id) for k in formation.owner.key_set.all() ]
+            owner_keys = ['{0}_{1}'.format(k.owner.username, k.id) for k in formation.owner.key_set.all()]
             keys.extend(owner_keys)
         # call a celery task to update gitosis
         if settings.CHEF_ENABLED:
             controller.update_gitosis.delay(databag).wait()  # @UndefinedVariable
 
     def next_container_node(self, formation, container_type='web'):
         count = []
-        backend_nodes = list(Node.objects.filter(formation=formation, type='backend').order_by('created'))
-        container_map = { n: [] for n in backend_nodes }
-        containers = list(Container.objects.filter(formation=formation, type=container_type).order_by('created'))
+        backend_nodes = list(Node.objects.filter(
+            formation=formation, type='backend').order_by('created'))
+        container_map = {n: [] for n in backend_nodes}
+        containers = list(Container.objects.filter(
+            formation=formation, type=container_type).order_by('created'))
         for c in containers:
             container_map[c.node].append(c)
         for n in container_map.keys():
@@ -287,7 +290,7 @@ def _scale_backends(self, requested, **kwargs):
             funcs.append(b.node.launch)
             diff = requested - len(backends)
         # http://docs.celeryproject.org/en/latest/userguide/canvas.html#groups
-        job = [func() for func in funcs ]
+        job = [func() for func in funcs]
         return job
 
     def _scale_proxies(self, requested, **kwargs):
@@ -307,7 +310,7 @@ def _scale_proxies(self, requested, **kwargs):
             funcs.append(p.node.launch)
             diff = requested - len(proxies)
         # http://docs.celeryproject.org/en/latest/userguide/canvas.html#groups
-        job = [ func() for func in funcs ]
+        job = [func() for func in funcs]
         return job
 
     def _scale_containers(self, requested_counts, **kwargs):
@@ -341,7 +344,7 @@ def _scale_containers(self, requested_counts, **kwargs):
                 containers.append(c)
                 container_num += 1
                 diff = requested - len(containers)
-                change +=1
+                change += 1
         return change
 
     def balance(self, **kwargs):
@@ -354,8 +357,9 @@ def balance(self, **kwargs):
     def _balance_containers(self, **kwargs):
         backends = self.backend_set.all().order_by('created')
         if len(backends) < 2:
-            return # there's nothing to balance with 1 backend
-        all_containers = Container.objects.filter(formation=self).order_by('-created')
+            return  # there's nothing to balance with 1 backend
+        all_containers = Container.objects.filter(
+            formation=self).order_by('-created')
         # get the next container number (e.g. web.19)
         container_num = 1 if not all_containers else all_containers[0].num + 1
         changed = False
@@ -384,7 +388,7 @@ def _balance_containers(self, **kwargs):
                                          type=container_type,
                                          num=container_num,
                                          node=b_under.node)
-                container_num +=1
+                container_num += 1
                 # delete the oldest container from the most over-utilized node
                 c = b_over.node.container_set.filter(type=container_type).order_by('created')[0]
                 c.delete()
@@ -419,7 +423,7 @@ def calculate(self):
             d['release']['build']['procfile'] = release.build.procfile
         # calculate proxy
         d['proxy'] = {}
-        d['proxy']['algorithm'] =  'round_robin'
+        d['proxy']['algorithm'] = 'round_robin'
         d['proxy']['port'] = 80
         d['proxy']['backends'] = []
         # calculate container formation
@@ -428,7 +432,8 @@ def calculate(self):
             # all container types get an exposed port starting at 5001
             port = 5000 + c.num
             d['containers'].setdefault(c.type, {})
-            d['containers'][c.type].update({ c.num: "{0}:{1}".format(c.node.id, port) })
+            d['containers'][c.type].update(
+                {c.num: "{0}:{1}".format(c.node.id, port)})
             # only proxy to 'web' containers
             if c.type == 'web':
                 d['proxy']['backends'].append("{0}:{1}".format(c.node.fqdn, port))
@@ -467,9 +472,10 @@ def destroy(self):
         subtasks.extend([b.node.terminate() for b in self.backend_set.all()])
         subtasks.extend([p.node.terminate() for p in self.proxy_set.all()])
         job = group(*subtasks)
-        job.apply_async().join() # block for termination
+        job.apply_async().join()  # block for termination
         # purge other hosting provider infrastructure
-        tasks.cleanup_formation.delay(self.id,
+        tasks.cleanup_formation.delay(
+            self.id,
             self.flavor.provider.creds.copy(),
             self.flavor.params.copy()).wait()
 
@@ -545,19 +551,21 @@ def _prepare_launch_args(self):
             # append to the default run_list
             run_list = chef.setdefault('run_list', [])
             attrs = chef['initial_attributes'] = {}
+            formation_id = self.formation.id
             if self.type == 'backend':
                 run_list.append('role[deis-backend]')
                 attrs.setdefault('deis', {}).setdefault(
-                  'runtime', {}).setdefault('formations', [ self.formation.id ])
+                    'runtime', {}).setdefault('formations', [formation_id])
             elif self.type == 'proxy':
                 run_list.append('role[deis-proxy]')
                 attrs.setdefault('deis', {}).setdefault(
-                  'proxy', {}).setdefault('formations', [ self.formation.id ])
+                    'proxy', {}).setdefault('formations', [formation_id])
         # add the formation's ssh pubkey
         init.setdefault('ssh_authorized_keys', []).append(
-                                self.formation.ssh_public_key)
+            self.formation.ssh_public_key)
         # add all of the owner's SSH keys
-        init['ssh_authorized_keys'].extend([k.public for k in self.formation.owner.key_set.all() ])
+        init['ssh_authorized_keys'].extend(
+            [k.public for k in self.formation.owner.key_set.all()])
         ssh_username = self.formation.ssh_username
         ssh_private_key = self.formation.ssh_private_key
         args = (self.uuid, creds, params, init, ssh_username, ssh_private_key)
@@ -722,7 +730,8 @@ class Build(UuidAuditedModel):
     dockerfile = models.TextField(blank=True)
     config = fields.EnvVarsField(blank=True)
     # slug info, TODO: replace default URL with something more user friendly
-    url = models.URLField('URL', default='https://s3.amazonaws.com/gabrtv-slugs/nodejs.tar.gz')
+    url = models.URLField(
+        'URL', default='https://s3.amazonaws.com/gabrtv-slugs/nodejs.tar.gz')
     size = models.IntegerField(blank=True, null=True)
     checksum = models.CharField(max_length=255, blank=True)
 
@@ -768,7 +777,7 @@ def rollback(self):
 def new_release(sender, **kwargs):
     formation, user = kwargs['formation'], kwargs['user']
     last_release = Release.objects.filter(
-                formation=formation).order_by('-created')[0]
+        formation=formation).order_by('-created')[0]
     image = kwargs.get('image', last_release.image)
     config = kwargs.get('config', last_release.config)
     build = kwargs.get('build', last_release.build)
@@ -787,9 +796,9 @@ def new_release(sender, **kwargs):
                 owner=user, formation=formation, values=new_values)
     # create new release and auto-increment version
     new_version = last_release.version + 1
-    release = Release.objects.create(owner=user, formation=formation,
-        image=image, config=config, build=build, args=args, command=command,
-        version=new_version)
+    release = Release.objects.create(
+        owner=user, formation=formation, image=image, config=config,
+        build=build, args=args, command=command, version=new_version)
     return release
 
 
@@ -847,4 +856,3 @@ def create_auth_token(sender, instance=None, created=False, **kwargs):
     if created:
         # pylint: disable=E1101
         Token.objects.create(user=instance)
-

api/serializers.py

@@ -5,13 +5,11 @@
 
 from __future__ import unicode_literals
 
+from django.contrib.auth.models import User
 from rest_framework import serializers
 
 from api import models, utils
 
-from django.contrib.auth.models import User
-
-
 
 class UserSerializer(serializers.ModelSerializer):
 
@@ -20,8 +18,8 @@ class UserSerializer(serializers.ModelSerializer):
     class Meta:
         """Metadata options for a UserSerializer."""
         model = User
-        read_only_fields = ('is_superuser', 'is_staff', 'groups', 'user_permissions',
-                            'last_login', 'date_joined')
+        read_only_fields = ('is_superuser', 'is_staff', 'groups',
+                            'user_permissions', 'last_login', 'date_joined')
 
     @property
     def data(self):
@@ -63,7 +61,7 @@ class FlavorSerializer(serializers.ModelSerializer):
 
     owner = serializers.Field(source='owner.username')
     provider = serializers.SlugRelatedField(slug_field='id')
-    
+
     class Meta:
         """Metadata options for a FlavorSerializer."""
         model = models.Flavor
@@ -76,9 +74,9 @@ class ConfigSerializer(serializers.ModelSerializer):
 
     owner = serializers.Field(source='owner.username')
     formation = serializers.SlugRelatedField(slug_field='id')
-    values = serializers.ModelField(model_field=models.Config()._meta.get_field('values'),
-                                    required=False)
-    
+    values = serializers.ModelField(
+        model_field=models.Config()._meta.get_field('values'), required=False)
+
     class Meta:
         """Metadata options for a ConfigSerializer."""
         model = models.Config
@@ -91,7 +89,7 @@ class BuildSerializer(serializers.ModelSerializer):
 
     owner = serializers.Field(source='owner.username')
     formation = serializers.SlugRelatedField(slug_field='id')
-    
+
     class Meta:
         """Metadata options for a BuildSerializer."""
         model = models.Build
@@ -106,7 +104,7 @@ class ReleaseSerializer(serializers.ModelSerializer):
     formation = serializers.SlugRelatedField(slug_field='id')
     config = serializers.SlugRelatedField(slug_field='uuid')
     build = serializers.SlugRelatedField(slug_field='uuid', required=False)
-    
+
     class Meta:
         """Metadata options for a ReleaseSerializer."""
         model = models.Release
@@ -121,8 +119,9 @@ class FormationSerializer(serializers.ModelSerializer):
     id = serializers.SlugField(default=utils.generate_app_name)
     flavor = serializers.SlugRelatedField(slug_field='id')
     structure = serializers.ModelField(
-        model_field=models.Formation()._meta.get_field('structure'), required=False)
-                                    
+        model_field=models.Formation()._meta.get_field('structure'),
+        required=False)
+
     class Meta:
         """Metadata options for a FormationSerializer."""
         model = models.Formation
@@ -144,35 +143,35 @@ class NodeSerializer(serializers.ModelSerializer):
 
     owner = serializers.Field(source='owner.username')
     formation = serializers.SlugRelatedField(slug_field='id')
-    
+
     class Meta:
         """Metadata options for a NodeSerializer."""
         model = models.Node
         read_only_fields = ('created', 'updated')
 
 
 class BackendSerializer(serializers.ModelSerializer):
- 
+
     """Serializes a Backend model."""
-    
+
     owner = serializers.Field(source='owner.username')
     formation = serializers.SlugRelatedField(slug_field='id')
     node = serializers.SlugRelatedField(slug_field='uuid')
-    
+
     class Meta:
         """Metadata options for a BackendSerializer."""
         model = models.Backend
         read_only_fields = ('created', 'updated')
 
 
 class ProxySerializer(serializers.ModelSerializer):
- 
+
     """Serializes a Proxy model."""
-    
+
     owner = serializers.Field(source='owner.username')
     formation = serializers.SlugRelatedField(slug_field='id')
     node = serializers.SlugRelatedField(slug_field='uuid')
-    
+
     class Meta:
         """Metadata options for a ProxySerializer."""
         model = models.Proxy
@@ -186,7 +185,7 @@ class ContainerSerializer(serializers.ModelSerializer):
     owner = serializers.Field(source='owner.username')
     formation = serializers.SlugRelatedField(slug_field='id')
     node = serializers.SlugRelatedField(slug_field='uuid')
-    
+
     class Meta:
         """Metadata options for a ContainerSerializer."""
         model = models.Container

api/tests/auth.py

@@ -30,7 +30,7 @@ def test_auth(self):
         username, password = 'newuser', 'password'
         first_name, last_name = 'Otto', 'Test'
         email = 'autotest@deis.io'
-        submit = {'username': username, 'password': password, 
+        submit = {'username': username, 'password': password,
                   'first_name': first_name, 'last_name': last_name,
                   'email': email,
                   # try to abuse superuser/staff level perms
@@ -55,4 +55,4 @@ def test_auth(self):
         url = '/api/flavors'
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['count'], 8) # 8 regions
+        self.assertEqual(response.data['count'], 8) # 8 regions

api/tests/backend.py

@@ -30,7 +30,7 @@ def setUp(self):
                 'params': json.dumps({'region': 'us-west-2', 'instance_size': 'm1.medium'})}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
-        
+
     def test_backend(self):
         url = '/api/formations'
         body = {'id': 'autotest', 'flavor': 'autotest', 'image': 'deis/autotest'}
@@ -67,4 +67,4 @@ def test_backend(self):
         url = '/api/formations/{formation_id}/backends'.format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.data['results']), 0)
+        self.assertEqual(len(response.data['results']), 0)

api/tests/build.py

@@ -33,7 +33,7 @@ def setUp(self):
                 'params': json.dumps({'region': 'us-west-2', 'instance_size': 'm1.medium'})}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
-    
+
     def test_build(self):
         """
         Test that a null build is created on a new formation, and that users
@@ -75,4 +75,3 @@ def test_build(self):
         self.assertEqual(self.client.put(url).status_code, 405)
         self.assertEqual(self.client.patch(url).status_code, 405)
         self.assertEqual(self.client.delete(url).status_code, 405)
-

api/tests/config.py

@@ -33,7 +33,7 @@ def setUp(self):
 
     def test_config(self):
         """
-        Test that config is auto-created during a new formation and that 
+        Test that config is auto-created during a new formation and that
         new versions can be created using a PATCH
         """
         url = '/api/formations'
@@ -92,6 +92,3 @@ def test_config(self):
         self.assertEqual(self.client.put(url).status_code, 405)
         self.assertEqual(self.client.patch(url).status_code, 405)
         self.assertEqual(self.client.delete(url).status_code, 405)
-
-
-        

api/tests/container.py

@@ -33,7 +33,7 @@ def setUp(self):
                 'params': json.dumps({'region': 'us-west-2', 'instance_size': 'm1.medium'})}
         response = self.client.post(url, json.dumps(body), content_type='application/json')
         self.assertEqual(response.status_code, 201)
-    
+
     def test_container_scale(self):
         url = '/api/formations'
         body = {'id': 'autotest', 'flavor': 'autotest', 'image': 'deis/autotest'}