resolve conflict: settings/defaults.py

awx/api/filters.py

@@ -14,7 +14,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.utils.encoding import force_text
 
 # Django REST Framework
-from rest_framework.exceptions import ParseError
+from rest_framework.exceptions import ParseError, PermissionDenied
 from rest_framework.filters import BaseFilterBackend
 
 # Ansible Tower
@@ -97,7 +97,10 @@ class FieldLookupBackend(BaseFilterBackend):
 
             new_parts.append(name)
 
-            if name == 'pk':
+            
+            if name in getattr(model, 'PASSWORD_FIELDS', ()):
+                raise PermissionDenied('Filtering on password fields is not allowed.')
+            elif name == 'pk':
                 field = model._meta.pk
             else:
                 field = model._meta.get_field_by_name(name)[0]

awx/api/templates/api/job_template_label_list.md

@@ -2,7 +2,7 @@
 
 Labels not associated with any other resources are deleted. A label can become disassociated with a resource as a result of 3 events.
 
-1. A label is explicitly diassociated with a related job template
+1. A label is explicitly disassociated with a related job template
 2. A job is deleted with labels
 3. A cleanup job deletes a job with labels
 

awx/conf/migrations/0002_v310_copy_tower_settings.py

@@ -69,11 +69,11 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('conf', '0001_initial'),
-        ('main', '0035_v310_jobevent_uuid'),
+        ('main', '0036_v310_jobevent_uuid'),
     ]
 
     run_before = [
-        ('main', '0036_v310_remove_tower_settings'),
+        ('main', '0037_v310_remove_tower_settings'),
     ]
 
     operations = [

awx/main/access.py

@@ -765,7 +765,6 @@ class CredentialAccess(BaseAccess):
                     or (not organization_pk and obj.organization):
                 return False
 
-        print(self.user in obj.admin_role)
         return self.user in obj.admin_role
 
     def can_delete(self, obj):
@@ -1238,17 +1237,32 @@ class JobAccess(BaseAccess):
         if self.user.is_superuser:
             return True
 
-        # If a user can launch the job template then they can relaunch a job from that
+        inventory_access = obj.inventory and self.user in obj.inventory.use_role
-        # job template
+        credential_access = obj.credential and self.user in obj.credential.use_role
+
+        # Check if JT execute access (and related prompts) is sufficient
         if obj.job_template is not None:
-            return self.user in obj.job_template.execute_role
+            prompts_access = True
+            job_fields = {}
+            for fd in obj.job_template._ask_for_vars_dict():
+                job_fields[fd] = getattr(obj, fd)
+            accepted_fields, ignored_fields = obj.job_template._accept_or_ignore_job_kwargs(**job_fields)
+            for fd in ignored_fields:
+                if fd != 'extra_vars' and job_fields[fd] != getattr(obj.job_template, fd):
+                    # Job has field that is not promptable
+                    prompts_access = False
+            if obj.credential != obj.job_template.credential and not credential_access:
+                prompts_access = False
+            if obj.inventory != obj.job_template.inventory and not inventory_access:
+                prompts_access = False
+            if prompts_access and self.user in obj.job_template.execute_role:
+                return True
 
-        inventory_access = self.user in obj.inventory.use_role
-        credential_access = self.user in obj.credential.use_role
 
-        org_access = self.user in obj.inventory.organization.admin_role
+        org_access = obj.inventory and self.user in obj.inventory.organization.admin_role
         project_access = obj.project is None or self.user in obj.project.admin_role
 
+        # job can be relaunched if user could make an equivalent JT
         return inventory_access and credential_access and (org_access or project_access)
 
     def can_cancel(self, obj):

awx/main/consumers.py

@@ -1,20 +1,64 @@
 import json
+import urlparse
 
 from channels import Group
 from channels.sessions import channel_session
 
+from django.contrib.auth.models import User
+from awx.main.models.organization import AuthToken
+
 
 def discard_groups(message):
     if 'groups' in message.channel_session:
         for group in message.channel_session['groups']:
             Group(group).discard(message.reply_channel)
 
+
+def validate_token(token):
+    try:
+        auth_token = AuthToken.objects.get(key=token)
+        if not auth_token.in_valid_tokens:
+            return None
+    except AuthToken.DoesNotExist:
+        return None
+    return auth_token
+
+
+def user_from_token(auth_token):
+    try:
+        return User.objects.get(pk=auth_token.user_id)
+    except User.DoesNotExist:
+        return None
+
+@channel_session
+def ws_connect(message):
+    token = None
+    qs = urlparse.parse_qs(message['query_string'])
+    if 'token' in qs:
+        if len(qs['token']) > 0:
+            token = qs['token'].pop()
+    message.channel_session['token'] = token
+
+
 @channel_session
 def ws_disconnect(message):
     discard_groups(message)
 
+
 @channel_session
 def ws_receive(message):
+    token = message.channel_session.get('token')
+
+    auth_token = validate_token(token)
+    if auth_token is None:
+        message.reply_channel.send({"text": json.dumps({"error": "invalid auth token"})})
+        return None
+
+    user = user_from_token(auth_token)
+    if user is None:
+        message.reply_channel.send({"text": json.dumps({"error": "no valid user"})})
+        return None
+
     raw_data = message.content['text']
     data = json.loads(raw_data)
 
@@ -35,5 +79,4 @@ def ws_receive(message):
 
 
 def emit_channel_notification(group, payload):
-    payload = json.dumps(payload)
     Group(group).send({"text": json.dumps(payload)})

awx/main/management/commands/run_callback_receiver.py

@@ -51,7 +51,6 @@ class CallbackBrokerWorker(ConsumerMixin):
             logger.error('Callback Task Processor Raised Exception: %r', exc)
         message.ack()
 
-
 class Command(NoArgsCommand):
     '''
     Save Job Callback receiver (see awx.plugins.callbacks.job_event_callback)

awx/main/migrations/0033_v303_v245_host_variable_fix.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+from awx.main.migrations import _migration_utils as migration_utils
+
+
+def update_dashed_host_variables(apps, schema_editor):
+    Host = apps.get_model('main', 'Host')
+    for host in Host.objects.filter(variables='---'):
+        host.variables = ''
+        host.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0032_v302_credential_permissions_update'),
+    ]
+
+    operations = [
+        migrations.RunPython(migration_utils.set_current_apps_for_migrations),
+        migrations.RunPython(update_dashed_host_variables),
+    ]

awx/main/migrations/0034_v310_add_workflows.py

@@ -11,7 +11,7 @@ import awx.main.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0032_v302_credential_permissions_update'),
+        ('main', '0033_v303_v245_host_variable_fix'),
     ]
 
     operations = [

awx/main/migrations/0035_v310_modify_ha_instance.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0033_v310_add_workflows'),
+        ('main', '0034_v310_add_workflows'),
     ]
 
     operations = [

awx/main/migrations/0036_v310_jobevent_uuid.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0034_v310_modify_ha_instance'),
+        ('main', '0035_v310_modify_ha_instance'),
     ]
 
     operations = [

awx/main/migrations/0037_v310_remove_tower_settings.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0035_v310_jobevent_uuid'),
+        ('main', '0036_v310_jobevent_uuid'),
     ]
 
     # These settings are now in the separate awx.conf app.

awx/main/migrations/0038_v310_job_allow_simultaneous.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0036_v310_remove_tower_settings'),
+        ('main', '0037_v310_remove_tower_settings'),
     ]
 
     operations = [

awx/main/migrations/0039_v310_workflow_rbac_prompts.py

@@ -10,7 +10,7 @@ import awx.main.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0037_v310_job_allow_simultaneous'),
+        ('main', '0038_v310_job_allow_simultaneous'),
     ]
 
     operations = [

awx/main/migrations/0040_v310_channelgroup.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0038_v310_workflow_rbac_prompts'),
+        ('main', '0039_v310_workflow_rbac_prompts'),
     ]
 
     operations = [

awx/main/migrations/0041_v310_artifacts.py

@@ -8,7 +8,7 @@ import jsonfield.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0039_v310_channelgroup'),
+        ('main', '0040_v310_channelgroup'),
     ]
 
     operations = [

awx/main/migrations/0042_v310_job_timeout.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0040_v310_artifacts'),
+        ('main', '0041_v310_artifacts'),
     ]
 
     operations = [

awx/main/migrations/0043_v310_executionnode.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0041_v310_job_timeout'),
+        ('main', '0042_v310_job_timeout'),
     ]
 
     operations = [

awx/main/migrations/0044_v310_scm_revision.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0042_v310_executionnode'),
+        ('main', '0043_v310_executionnode'),
     ]
 
     operations = [

awx/main/migrations/0045_v310_project_playbook_files.py

@@ -8,7 +8,7 @@ import jsonfield.fields
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0043_v310_scm_revision'),
+        ('main', '0044_v310_scm_revision'),
     ]
 
     operations = [

awx/main/migrations/0046_v310_job_event_stdout.py

@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0044_v310_project_playbook_files'),
+        ('main', '0045_v310_project_playbook_files'),
     ]
 
     operations = [

awx/main/migrations/0047_v310_tower_state.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0046_v310_job_event_stdout'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TowerScheduleState',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('schedule_last_run', models.DateTimeField(auto_now_add=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

awx/main/models/ad_hoc_commands.py

@@ -4,7 +4,6 @@
 # Python
 import datetime
 import hmac
-import json
 import logging
 from urlparse import urljoin
 
@@ -24,7 +23,6 @@ from jsonfield import JSONField
 # AWX
 from awx.main.models.base import * # noqa
 from awx.main.models.unified_jobs import * # noqa
-from awx.main.utils import decrypt_field
 from awx.main.models.notifications import JobNotificationMixin
 
 logger = logging.getLogger('awx.main.models.ad_hoc_commands')
@@ -181,13 +179,6 @@ class AdHocCommand(UnifiedJob, JobNotificationMixin):
     def get_passwords_needed_to_start(self):
         return self.passwords_needed_to_start
 
-    def is_blocked_by(self, obj):
-        from awx.main.models import InventoryUpdate
-        if type(obj) == InventoryUpdate:
-            if self.inventory == obj.inventory_source.inventory:
-                return True
-        return False
-
     @property
     def task_impact(self):
         # NOTE: We sorta have to assume the host count matches and that forks default to 5
@@ -195,35 +186,6 @@ class AdHocCommand(UnifiedJob, JobNotificationMixin):
         count_hosts = Host.objects.filter( enabled=True, inventory__ad_hoc_commands__pk=self.pk).count()
         return min(count_hosts, 5 if self.forks == 0 else self.forks) * 10
 
-    def generate_dependencies(self, active_tasks):
-        from awx.main.models import InventoryUpdate
-        if not self.inventory:
-            return []
-        inventory_sources = self.inventory.inventory_sources.filter( update_on_launch=True)
-        inventory_sources_found = []
-        dependencies = []
-        for obj in active_tasks:
-            if type(obj) == InventoryUpdate:
-                if obj.inventory_source in inventory_sources:
-                    inventory_sources_found.append(obj.inventory_source)
-        # Skip updating any inventory sources that were already updated before
-        # running this job (via callback inventory refresh).
-        try:
-            start_args = json.loads(decrypt_field(self, 'start_args'))
-        except Exception:
-            start_args = None
-        start_args = start_args or {}
-        inventory_sources_already_updated = start_args.get('inventory_sources_already_updated', [])
-        if inventory_sources_already_updated:
-            for source in inventory_sources.filter(pk__in=inventory_sources_already_updated):
-                if source not in inventory_sources_found:
-                    inventory_sources_found.append(source)
-        if inventory_sources.count(): # and not has_setup_failures?  Probably handled as an error scenario in the task runner
-            for source in inventory_sources:
-                if source not in inventory_sources_found and source.needs_update_on_launch:
-                    dependencies.append(source.create_inventory_update(launch_type='dependency'))
-        return dependencies
-
     def copy(self):
         data = {}
         for field in ('job_type', 'inventory_id', 'limit', 'credential_id',

awx/main/models/ha.py

@@ -5,13 +5,15 @@ from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
+from solo.models import SingletonModel
+
 from awx.main.managers import InstanceManager
 from awx.main.models.inventory import InventoryUpdate
 from awx.main.models.jobs import Job
 from awx.main.models.projects import ProjectUpdate
 from awx.main.models.unified_jobs import UnifiedJob
 
-__all__ = ('Instance', 'JobOrigin')
+__all__ = ('Instance', 'JobOrigin', 'TowerScheduleState',)
 
 
 class Instance(models.Model):
@@ -33,6 +35,8 @@ class Instance(models.Model):
         # NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing
         return "tower"
 
+class TowerScheduleState(SingletonModel):
+    schedule_last_run = models.DateTimeField(auto_now_add=True)
 
 class JobOrigin(models.Model):
     """A model representing the relationship between a unified job and

awx/main/models/inventory.py

@@ -22,7 +22,6 @@ from awx.main.constants import CLOUD_PROVIDERS
 from awx.main.fields import AutoOneToOneField, ImplicitRoleField
 from awx.main.managers import HostManager
 from awx.main.models.base import * # noqa
-from awx.main.models.jobs import Job
 from awx.main.models.unified_jobs import * # noqa
 from awx.main.models.mixins import ResourceMixin
 from awx.main.models.notifications import (
@@ -1089,7 +1088,7 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions):
     def _get_unified_job_field_names(cls):
         return ['name', 'description', 'source', 'source_path', 'source_script', 'source_vars', 'schedule',
                 'credential', 'source_regions', 'instance_filters', 'group_by', 'overwrite', 'overwrite_vars',
-                'timeout']
+                'timeout', 'launch_type',]
 
     def save(self, *args, **kwargs):
         # If update_fields has been specified, add our field names to it,
@@ -1250,15 +1249,6 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin):
     def get_ui_url(self):
         return urljoin(settings.TOWER_URL_BASE, "/#/inventory_sync/{}".format(self.pk))
 
-    def is_blocked_by(self, obj):
-        if type(obj) == InventoryUpdate:
-            if self.inventory_source.inventory == obj.inventory_source.inventory:
-                return True
-        if type(obj) == Job:
-            if self.inventory_source.inventory == obj.inventory:
-                return True
-        return False
-
     @property
     def task_impact(self):
         return 50

awx/main/models/jobs.py

@@ -33,7 +33,7 @@ from awx.main.models.notifications import (
     NotificationTemplate,
     JobNotificationMixin,
 )
-from awx.main.utils import decrypt_field, ignore_inventory_computed_fields
+from awx.main.utils import ignore_inventory_computed_fields
 from awx.main.redact import PlainTextCleaner
 from awx.main.fields import ImplicitRoleField
 from awx.main.models.mixins import ResourceMixin
@@ -646,29 +646,6 @@ class Job(UnifiedJob, JobOptions, JobNotificationMixin):
         kwargs['job_host_summaries__job__pk'] = self.pk
         return Host.objects.filter(**kwargs)
 
-    def is_blocked_by(self, obj):
-        from awx.main.models import InventoryUpdate, ProjectUpdate
-        if type(obj) == Job:
-            if obj.job_template is not None and obj.inventory is not None:
-                if obj.job_template == self.job_template and \
-                   obj.inventory == self.inventory:
-                    if self.allow_simultaneous:
-                        return False
-                    if obj.launch_type == 'callback' and self.launch_type == 'callback' and \
-                       obj.limit != self.limit:
-                        return False
-                    return True
-            return False
-        if type(obj) == InventoryUpdate:
-            if self.inventory == obj.inventory_source.inventory:
-                return True
-            return False
-        if type(obj) == ProjectUpdate:
-            if obj.project == self.project:
-                return True
-            return False
-        return False
-
     @property
     def task_impact(self):
         # NOTE: We sorta have to assume the host count matches and that forks default to 5
@@ -707,39 +684,6 @@ class Job(UnifiedJob, JobOptions, JobNotificationMixin):
     def processed_hosts(self):
         return self._get_hosts(job_host_summaries__processed__gt=0)
 
-    def generate_dependencies(self, active_tasks):
-        from awx.main.models import InventoryUpdate, ProjectUpdate
-        inventory_sources = self.inventory.inventory_sources.filter(update_on_launch=True)
-        project_found = False
-        inventory_sources_found = []
-        dependencies = []
-        for obj in active_tasks:
-            if type(obj) == ProjectUpdate and self.project is not None:
-                if obj.project == self.project:
-                    project_found = True
-            if type(obj) == InventoryUpdate:
-                if obj.inventory_source in inventory_sources:
-                    inventory_sources_found.append(obj.inventory_source)
-        # Skip updating any inventory sources that were already updated before
-        # running this job (via callback inventory refresh).
-        try:
-            start_args = json.loads(decrypt_field(self, 'start_args'))
-        except Exception:
-            start_args = None
-        start_args = start_args or {}
-        inventory_sources_already_updated = start_args.get('inventory_sources_already_updated', [])
-        if inventory_sources_already_updated:
-            for source in inventory_sources.filter(pk__in=inventory_sources_already_updated):
-                if source not in inventory_sources_found:
-                    inventory_sources_found.append(source)
-        if not project_found and self.project is not None and self.project.needs_update_on_launch:
-            dependencies.append(self.project.create_project_update(launch_type='dependency'))
-        if inventory_sources.count(): # and not has_setup_failures?  Probably handled as an error scenario in the task runner
-            for source in inventory_sources:
-                if source not in inventory_sources_found and source.needs_update_on_launch:
-                    dependencies.append(source.create_inventory_update(launch_type='dependency'))
-        return dependencies
-
     def notification_data(self, block=5):
         data = super(Job, self).notification_data()
         all_hosts = {}
@@ -1210,7 +1154,7 @@ class JobEvent(CreatedModifiedModel):
             if isinstance(invocation, dict) and verbosity == 0 and 'module_args' in invocation:
                 event_data['res']['invocation']['module_args'] = ''
                 self.event_data = event_data
-                update_fields.add('event_data')
+                updated_fields.add('event_data')
         if self.event == 'playbook_on_stats':
             try:
                 failures_dict = event_data.get('failures', {})
@@ -1526,9 +1470,6 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
     def get_ui_url(self):
         return urljoin(settings.TOWER_URL_BASE, "/#/management_jobs/{}".format(self.pk))
 
-    def is_blocked_by(self, obj):
-        return True
-
     def handle_extra_data(self, extra_data):
         extra_vars = {}
         if isinstance(extra_data, dict):

awx/main/models/projects.py

@@ -22,7 +22,6 @@ from django.utils.timezone import now, make_aware, get_default_timezone
 
 # AWX
 from awx.main.models.base import * # noqa
-from awx.main.models.jobs import Job
 from awx.main.models.notifications import (
     NotificationTemplate,
     JobNotificationMixin,
@@ -275,7 +274,7 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
     def _get_unified_job_field_names(cls):
         return ['name', 'description', 'local_path', 'scm_type', 'scm_url',
                 'scm_branch', 'scm_clean', 'scm_delete_on_update',
-                'credential', 'schedule', 'timeout']
+                'credential', 'schedule', 'timeout', 'launch_type',]
 
     def save(self, *args, **kwargs):
         new_instance = not bool(self.pk)
@@ -424,15 +423,6 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin):
         from awx.main.tasks import RunProjectUpdate
         return RunProjectUpdate
 
-    def is_blocked_by(self, obj):
-        if type(obj) == ProjectUpdate:
-            if self.project == obj.project:
-                return True
-        if type(obj) == Job:
-            if self.project == obj.project:
-                return True
-        return False
-
     def websocket_emit_data(self):
         return dict(project_id=self.project.id)
 

awx/main/models/unified_jobs.py

@@ -13,7 +13,7 @@ from StringIO import StringIO
 
 # Django
 from django.conf import settings
-from django.db import models
+from django.db import models, connection
 from django.core.exceptions import NON_FIELD_ERRORS
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
@@ -778,10 +778,6 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
     def task_impact(self):
         raise NotImplementedError # Implement in subclass.
 
-    def is_blocked_by(self, task_object):
-        ''' Given another task object determine if this task would be blocked by it '''
-        raise NotImplementedError # Implement in subclass.
-
     def websocket_emit_data(self):
         ''' Return extra data that should be included when submitting data to the browser over the websocket connection '''
         return {}
@@ -792,11 +788,6 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
         status_data['group_name'] = 'jobs'
         emit_channel_notification('jobs-status_changed', status_data)
 
-    def generate_dependencies(self, active_tasks):
-        ''' Generate any tasks that the current task might be dependent on given a list of active
-            tasks that might preclude creating one'''
-        return []
-
     def notification_data(self):
         return dict(id=self.id,
                     name=self.name,
@@ -835,14 +826,17 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
 
         return (True, opts)
 
+    def start_celery_task(self, opts, error_callback, success_callback):
+        task_class = self._get_task_class()
+        task_class().apply_async((self.pk,), opts, link_error=error_callback, link=success_callback)
+
     def start(self, error_callback, success_callback, **kwargs):
         '''
         Start the task running via Celery.
         '''
-        task_class = self._get_task_class()
         (res, opts) = self.pre_start(**kwargs)
         if res:
-            task_class().apply_async((self.pk,), opts, link_error=error_callback, link=success_callback)
+            self.start_celery_task(opts, error_callback, success_callback)
         return res
 
     def signal_start(self, **kwargs):
@@ -871,7 +865,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
         self.websocket_emit_status("pending")
 
         from awx.main.scheduler.tasks import run_job_launch
-        run_job_launch.delay(self.id)
+        connection.on_commit(lambda: run_job_launch.delay(self.id))
 
         # Each type of unified job has a different Task class; get the
         # appropirate one.

awx/main/models/workflow.py

@@ -393,11 +393,6 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, JobNotificationMixin, Workflow
     def _get_parent_field_name(cls):
         return 'workflow_job_template'
 
-    @classmethod
-    def _get_task_class(cls):
-        from awx.main.tasks import RunWorkflowJob
-        return RunWorkflowJob
-
     def _has_failed(self):
         return False
 
@@ -411,9 +406,6 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, JobNotificationMixin, Workflow
     #def get_ui_url(self):
     #    return urlparse.urljoin(tower_settings.TOWER_URL_BASE, "/#/workflow_jobs/{}".format(self.pk))
 
-    def is_blocked_by(self, obj):
-        return True
-
     @property
     def task_impact(self):
         return 0
@@ -426,11 +418,9 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, JobNotificationMixin, Workflow
     def get_notification_friendly_name(self):
         return "Workflow Job"
 
-    def start(self, *args, **kwargs):
+    '''
-        (res, opts) = self.pre_start(**kwargs)
+    A WorkflowJob is a virtual job. It doesn't result in a celery task.
-        if res: 
+    '''
-                self.status = 'running'
+    def start_celery_task(self, opts, error_callback, success_callback):
-                self.save()
+        return None
-                self.websocket_emit_status("running")
-        return res
 

awx/main/routing.py

@@ -2,6 +2,7 @@ from channels.routing import route
 
 
 channel_routing = [
+    route("websocket.connect", "awx.main.consumers.ws_connect", path=r'^/websocket/$'),
     route("websocket.disconnect", "awx.main.consumers.ws_disconnect", path=r'^/websocket/$'),
     route("websocket.receive", "awx.main.consumers.ws_receive", path=r'^/websocket/$'),
 ]

awx/main/scheduler/__init__.py

@@ -2,256 +2,356 @@
 # All Rights Reserved
 
 # Python
-import datetime
+from datetime import timedelta
 import logging
+from sets import Set
 
 # Django
 from django.conf import settings
-from django.db import transaction
+from django.db import transaction, connection
+from django.db.utils import DatabaseError
 
 # AWX
 from awx.main.models import * # noqa
-from awx.main.utils import get_system_task_capacity
+#from awx.main.scheduler.dag_simple import SimpleDAG
-from awx.main.scheduler.dag_simple import SimpleDAG
 from awx.main.scheduler.dag_workflow import WorkflowDAG
 
+from awx.main.scheduler.dependency_graph import DependencyGraph
+from awx.main.scheduler.partial import (
+    JobDict, 
+    ProjectUpdateDict, 
+    ProjectUpdateLatestDict,
+    InventoryUpdateDict,
+    InventoryUpdateLatestDict,
+    InventorySourceDict,
+    SystemJobDict,
+    AdHocCommandDict,
+    WorkflowJobDict,
+)
+
 # Celery
 from celery.task.control import inspect
 
 logger = logging.getLogger('awx.main.scheduler')
 
-def get_tasks():
+class TaskManager():
-    """Fetch all Tower tasks that are relevant to the task management
+    def __init__(self):
-    system.
+        self.graph = DependencyGraph()
-    """
+        self.capacity_total = 200
-    RELEVANT_JOBS = ('pending', 'waiting', 'running')
+        self.capacity_used = 0
-    # TODO: Replace this when we can grab all objects in a sane way.
-    graph_jobs = [j for j in Job.objects.filter(status__in=RELEVANT_JOBS)]
-    graph_ad_hoc_commands = [ahc for ahc in AdHocCommand.objects.filter(status__in=RELEVANT_JOBS)]
-    graph_inventory_updates = [iu for iu in
-                               InventoryUpdate.objects.filter(status__in=RELEVANT_JOBS)]
-    graph_project_updates = [pu for pu in
-                             ProjectUpdate.objects.filter(status__in=RELEVANT_JOBS)]
-    graph_system_jobs = [sj for sj in
-                         SystemJob.objects.filter(status__in=RELEVANT_JOBS)]
-    graph_workflow_jobs = [wf for wf in
-                           WorkflowJob.objects.filter(status__in=RELEVANT_JOBS)]
-    all_actions = sorted(graph_jobs + graph_ad_hoc_commands + graph_inventory_updates +
-                         graph_project_updates + graph_system_jobs +
-                         graph_workflow_jobs,
-                         key=lambda task: task.created)
-    return all_actions
 
-def get_running_workflow_jobs():
+    def get_tasks(self):
-    graph_workflow_jobs = [wf for wf in
+        status_list = ('pending', 'waiting', 'running')
-                           WorkflowJob.objects.filter(status='running')]
-    return graph_workflow_jobs
 
-def spawn_workflow_graph_jobs(workflow_jobs):
+        jobs = JobDict.filter_partial(status=status_list)
-    # TODO: Consider using transaction.atomic
+        inventory_updates = InventoryUpdateDict.filter_partial(status=status_list)
-    for workflow_job in workflow_jobs:
+        project_updates = ProjectUpdateDict.filter_partial(status=status_list)
-        dag = WorkflowDAG(workflow_job)
+        system_jobs = SystemJobDict.filter_partial(status=status_list)
-        spawn_nodes = dag.bfs_nodes_to_run()
+        ad_hoc_commands = AdHocCommandDict.filter_partial(status=status_list)
-        for spawn_node in spawn_nodes:
+        workflow_jobs = WorkflowJobDict.filter_partial(status=status_list)
-            kv = spawn_node.get_job_kwargs()
-            job = spawn_node.unified_job_template.create_unified_job(**kv)
-            spawn_node.job = job
-            spawn_node.save()
-            can_start = job.signal_start(**kv)
-            if not can_start:
-                job.status = 'failed'
-                job.job_explanation = "Workflow job could not start because it was not in the right state or required manual credentials"
-                job.save(update_fields=['status', 'job_explanation'])
-                job.websocket_emit_status("failed")
 
-            # TODO: should we emit a status on the socket here similar to tasks.py tower_periodic_scheduler() ?
+        all_actions = sorted(jobs + project_updates + inventory_updates + system_jobs + ad_hoc_commands + workflow_jobs,
-            #emit_websocket_notification('/socket.io/jobs', '', dict(id=))
+                             key=lambda task: task['created'])
+        return all_actions
 
-# See comment in tasks.py::RunWorkflowJob::run()
+    '''
-def process_finished_workflow_jobs(workflow_jobs):
+    Tasks that are running and SHOULD have a celery task.
-    for workflow_job in workflow_jobs:
+    '''
-        dag = WorkflowDAG(workflow_job)
+    def get_running_tasks(self):
-        if dag.is_workflow_done():
+        status_list = ('running',)
-            with transaction.atomic():
+
+        jobs = JobDict.filter_partial(status=status_list)
+        inventory_updates = InventoryUpdateDict.filter_partial(status=status_list)
+        project_updates = ProjectUpdateDict.filter_partial(status=status_list)
+        system_jobs = SystemJobDict.filter_partial(status=status_list)
+        ad_hoc_commands = AdHocCommandDict.filter_partial(status=status_list)
+
+        all_actions = sorted(jobs + project_updates + inventory_updates + system_jobs + ad_hoc_commands,
+                             key=lambda task: task['created'])
+        return all_actions
+
+    # TODO: Consider a database query for this logic
+    def get_latest_project_update_tasks(self, all_sorted_tasks):
+        project_ids = Set()
+        for task in all_sorted_tasks:
+            if type(task) == JobDict:
+                project_ids.add(task['project_id'])
+
+        return ProjectUpdateLatestDict.filter_partial(list(project_ids))
+
+    # TODO: Consider a database query for this logic
+    def get_latest_inventory_update_tasks(self, all_sorted_tasks):
+        inventory_ids = Set()
+        for task in all_sorted_tasks:
+            if type(task) == JobDict:
+                inventory_ids.add(task['inventory_id'])
+
+        return InventoryUpdateLatestDict.filter_partial(list(inventory_ids))
+
+
+    def get_running_workflow_jobs(self):
+        graph_workflow_jobs = [wf for wf in
+                               WorkflowJob.objects.filter(status='running')]
+        return graph_workflow_jobs
+
+    # TODO: Consider a database query for this logic
+    def get_inventory_source_tasks(self, all_sorted_tasks):
+        inventory_ids = Set()
+        results = []
+        for task in all_sorted_tasks:
+            if type(task) is JobDict:
+                inventory_ids.add(task['inventory_id'])
+        
+        for inventory_id in inventory_ids:
+            results.append((inventory_id, InventorySourceDict.filter_partial(inventory_id)))
+
+        return results
+
+    def spawn_workflow_graph_jobs(self, workflow_jobs):
+        for workflow_job in workflow_jobs:
+            dag = WorkflowDAG(workflow_job)
+            spawn_nodes = dag.bfs_nodes_to_run()
+            for spawn_node in spawn_nodes:
+                kv = spawn_node.get_job_kwargs()
+                job = spawn_node.unified_job_template.create_unified_job(**kv)
+                spawn_node.job = job
+                spawn_node.save()
+                can_start = job.signal_start(**kv)
+                if not can_start:
+                    job.status = 'failed'
+                    job.job_explanation = "Workflow job could not start because it was not in the right state or required manual credentials"
+                    job.save(update_fields=['status', 'job_explanation'])
+                    connection.on_commit(lambda: job.websocket_emit_status('failed'))
+
+                # TODO: should we emit a status on the socket here similar to tasks.py tower_periodic_scheduler() ?
+                #emit_websocket_notification('/socket.io/jobs', '', dict(id=))
+
+    # See comment in tasks.py::RunWorkflowJob::run()
+    def process_finished_workflow_jobs(self, workflow_jobs):
+        for workflow_job in workflow_jobs:
+            dag = WorkflowDAG(workflow_job)
+            if dag.is_workflow_done():
                 if workflow_job._has_failed():
                     workflow_job.status = 'failed'
                 else:
                     workflow_job.status = 'successful'
                 workflow_job.save()
-                workflow_job.websocket_emit_status(workflow_job.status)
+                connection.on_commit(lambda: workflow_job.websocket_emit_status(workflow_job.status))
 
-def rebuild_graph():
+    def get_active_tasks(self):
-    """Regenerate the task graph by refreshing known tasks from Tower, purging
+        inspector = inspect()
-    orphaned running tasks, and creating dependencies for new tasks before
+        if not hasattr(settings, 'IGNORE_CELERY_INSPECTOR'):
-    generating directed edge relationships between those tasks.
+            active_task_queues = inspector.active()
-    """
+        else:
-    '''
+            logger.warn("Ignoring celery task inspector")
-    # Sanity check: Only do this on the primary node.
+            active_task_queues = None
-    if Instance.objects.my_role() == 'secondary':
-        return None
-    '''
 
-    inspector = inspect()
+        active_tasks = set()
-    if not hasattr(settings, 'IGNORE_CELERY_INSPECTOR'):
+        if active_task_queues is not None:
-        active_task_queues = inspector.active()
+            for queue in active_task_queues:
-    else:
+                map(lambda at: active_tasks.add(at['id']), active_task_queues[queue])
-        logger.warn("Ignoring celery task inspector")
+        else:
-        active_task_queues = None
+            if not hasattr(settings, 'CELERY_UNIT_TEST'):
+                return None
 
-    all_sorted_tasks = get_tasks()
+        return active_tasks
-    if not len(all_sorted_tasks):
-        return None
 
-    active_tasks = []
+    def start_task(self, task, dependent_tasks=[]):
-    if active_task_queues is not None:
+        from awx.main.tasks import handle_work_error, handle_work_success
-        for queue in active_task_queues:
-            active_tasks += [at['id'] for at in active_task_queues[queue]]
-    else:
-        logger.error("Could not communicate with celery!")
-        # TODO: Something needs to be done here to signal to the system
-        #       as a whole that celery appears to be down.
-        if not hasattr(settings, 'CELERY_UNIT_TEST'):
-            return None
 
-    running_tasks = filter(lambda t: t.status == 'running', all_sorted_tasks)
+        task_actual = {
-    running_celery_tasks = filter(lambda t: type(t) != WorkflowJob, running_tasks)
+            'type':task.get_job_type_str(),
-    waiting_tasks = filter(lambda t: t.status != 'running', all_sorted_tasks)
+            'id': task['id'],
-    new_tasks = filter(lambda t: t.status == 'pending', all_sorted_tasks)
+        }
+        dependencies = [{'type': t.get_job_type_str(), 'id': t['id']} for t in dependent_tasks]
+        
+        error_handler = handle_work_error.s(subtasks=[task_actual] + dependencies)
+        success_handler = handle_work_success.s(task_actual=task_actual)
+        
+        job_obj = task.get_full()
+        job_obj.status = 'waiting'
 
-    # Check running tasks and make sure they are active in celery
+        (start_status, opts) = job_obj.pre_start()
-    logger.debug("Active celery tasks: " + str(active_tasks))
+        if not start_status:
-    for task in list(running_celery_tasks):
+            job_obj.status = 'failed'
-        if (task.celery_task_id not in active_tasks and not hasattr(settings, 'IGNORE_CELERY_INSPECTOR')):
+            if job_obj.job_explanation:
-            # NOTE: Pull status again and make sure it didn't finish in
+                job_obj.job_explanation += ' '
-            #       the meantime?
+            job_obj.job_explanation += 'Task failed pre-start check.'
-            task.status = 'failed'
+            job_obj.save()
-            task.job_explanation += ' '.join((
+            # TODO: run error handler to fail sub-tasks and send notifications
-                'Task was marked as running in Tower but was not present in',
+        else:
-                'Celery, so it has been marked as failed.',
+            if type(job_obj) is WorkflowJob:
-            ))
+                job_obj.status = 'running'
-            task.save()
-            task.websocket_emit_status("failed")
-            running_tasks.pop(running_tasks.index(task))
-            logger.error("Task %s appears orphaned... marking as failed" % task)
 
-    # Create and process dependencies for new tasks
+            job_obj.save()
-    for task in new_tasks:
-        logger.debug("Checking dependencies for: %s" % str(task))
-        try:
-            task_dependencies = task.generate_dependencies(running_tasks + waiting_tasks)
-        except Exception, e:
-            logger.error("Failed processing dependencies for {}: {}".format(task, e))
-            task.status = 'failed'
-            task.job_explanation += 'Task failed to generate dependencies: {}'.format(e)
-            task.save()
-            task.websocket_emit_status("failed")
-            continue
-        logger.debug("New dependencies: %s" % str(task_dependencies))
-        for dep in task_dependencies:
-            # We recalculate the created time for the moment to ensure the
-            # dependencies are always sorted in the right order relative to
-            # the dependent task.
-            time_delt = len(task_dependencies) - task_dependencies.index(dep)
-            dep.created = task.created - datetime.timedelta(seconds=1 + time_delt)
-            dep.status = 'waiting'
-            dep.save()
-            waiting_tasks.insert(waiting_tasks.index(task), dep)
-        if not hasattr(settings, 'UNIT_TEST_IGNORE_TASK_WAIT'):
-            task.status = 'waiting'
-            task.save()
 
-    # Rebuild graph
+            self.consume_capacity(task)
-    graph = SimpleDAG()
-    for task in running_tasks:
-        graph.add_node(task)
-    for wait_task in waiting_tasks[:50]:
-        node_dependencies = []
-        for node in graph:
-            if wait_task.is_blocked_by(node['node_object']):
-                node_dependencies.append(node['node_object'])
-        graph.add_node(wait_task)
-        for dependency in node_dependencies:
-            graph.add_edge(wait_task, dependency)
-    if settings.DEBUG:
-        graph.generate_graphviz_plot()
-    return graph
 
-def process_graph(graph, task_capacity):
+        def post_commit():
-    """Given a task dependency graph, start and manage tasks given their
+            job_obj.websocket_emit_status(job_obj.status)
-    priority and weight.
+            if job_obj.status != 'failed':
-    """
+                job_obj.start_celery_task(opts, error_callback=error_handler, success_callback=success_handler)
-    from awx.main.tasks import handle_work_error, handle_work_success
+        
+        connection.on_commit(post_commit)
 
-    leaf_nodes = graph.get_leaf_nodes()
+    def process_runnable_tasks(self, runnable_tasks):
-    running_nodes = filter(lambda x: x['node_object'].status == 'running', leaf_nodes)
+        map(lambda task: self.graph.add_job(task), runnable_tasks)
-    running_impact = sum([t['node_object'].task_impact for t in running_nodes])
-    ready_nodes = filter(lambda x: x['node_object'].status != 'running', leaf_nodes)
-    remaining_volume = task_capacity - running_impact
-    logger.info('Running Nodes: %s; Capacity: %s; Running Impact: %s; '
-                'Remaining Capacity: %s' %
-                (str(running_nodes), str(task_capacity),
-                 str(running_impact), str(remaining_volume)))
-    logger.info("Ready Nodes: %s" % str(ready_nodes))
-    for task_node in ready_nodes:
-        node_obj = task_node['node_object']
-        # NOTE: This could be used to pass metadata through the task system
-        # node_args = task_node['metadata']
-        impact = node_obj.task_impact
-        if impact <= remaining_volume or running_impact == 0:
-            node_dependencies = graph.get_dependents(node_obj)
-            # Allow other tasks to continue if a job fails, even if they are
-            # other jobs.
 
-            node_type = graph.get_node_type(node_obj)
+    def create_project_update(self, task):
-            if node_type == 'job':
+        dep = Project.objects.get(id=task['project_id']).create_project_update(launch_type='dependency')
-                # clear dependencies because a job can block (not necessarily
-                # depend) on other jobs that share the same job template
-                node_dependencies = []
 
-            # Make the workflow_job look like it's started by setting status to
+        # Project created 1 seconds behind
-            # running, but don't make a celery Task for it.
+        dep.created = task['created'] - timedelta(seconds=1)
-            # Introduce jobs from the workflow so they are candidates to run.
+        dep.status = 'pending'
-            # Call process_graph() again to allow choosing for run, the
+        dep.save()
-            # created candidate jobs.
-            elif node_type == 'workflow_job':
-                node_obj.start()
-                spawn_workflow_graph_jobs([node_obj])
-                return process_graph(graph, task_capacity)
 
-            dependent_nodes = [{'type': graph.get_node_type(node_obj), 'id': node_obj.id}] + \
+        project_task = ProjectUpdateDict.get_partial(dep.id)
-                              [{'type': graph.get_node_type(n['node_object']),
-                                'id': n['node_object'].id} for n in node_dependencies]
-            error_handler = handle_work_error.s(subtasks=dependent_nodes)
-            success_handler = handle_work_success.s(task_actual={'type': graph.get_node_type(node_obj),
-                                                                 'id': node_obj.id})
-            with transaction.atomic():
-                start_status = node_obj.start(error_callback=error_handler, success_callback=success_handler)
-                if not start_status:
-                    node_obj.status = 'failed'
-                    if node_obj.job_explanation:
-                        node_obj.job_explanation += ' '
-                    node_obj.job_explanation += 'Task failed pre-start check.'
-                    node_obj.save()
-                    continue
-            remaining_volume -= impact
-            running_impact += impact
-            logger.info('Started Node: %s (capacity hit: %s) '
-                        'Remaining Capacity: %s' %
-                        (str(node_obj), str(impact), str(remaining_volume)))
 
-def schedule():
+        return project_task
-    with transaction.atomic():
-        # Lock
-        Instance.objects.select_for_update().all()[0]
 
-        task_capacity = get_system_task_capacity()
+    def create_inventory_update(self, task, inventory_source_task):
+        dep = InventorySource.objects.get(id=inventory_source_task['id']).create_inventory_update(launch_type='dependency')
 
-        workflow_jobs = get_running_workflow_jobs()
+        dep.created = task['created'] - timedelta(seconds=2)
-        process_finished_workflow_jobs(workflow_jobs)
+        dep.status = 'pending'
-        spawn_workflow_graph_jobs(workflow_jobs)
+        dep.save()
+
+        inventory_task = InventoryUpdateDict.get_partial(dep.id)
+
+        return inventory_task
+
+    def generate_dependencies(self, task):
+        dependencies = []
+        # TODO: What if the project is null ?
+        if type(task) is JobDict:
+            if task['project__scm_update_on_launch'] is True and \
+                    self.graph.should_update_related_project(task):
+                project_task = self.create_project_update(task)
+                dependencies.append(project_task)
+                # Inventory created 2 seconds behind job
+
+            for inventory_source_task in self.graph.get_inventory_sources(task['inventory_id']):
+                if self.graph.should_update_related_inventory_source(task, inventory_source_task['id']):
+                    inventory_task = self.create_inventory_update(task, inventory_source_task)
+                    dependencies.append(inventory_task)
+        return dependencies
+
+    def process_latest_project_updates(self, latest_project_updates):
+        map(lambda task: self.graph.add_latest_project_update(task), latest_project_updates)
+
+    def process_latest_inventory_updates(self, latest_inventory_updates):
+        map(lambda task: self.graph.add_latest_inventory_update(task), latest_inventory_updates)
+
+    def process_inventory_sources(self, inventory_id_sources):
+        map(lambda (inventory_id, inventory_sources): self.graph.add_inventory_sources(inventory_id, inventory_sources), inventory_id_sources)
+
+    def process_dependencies(self, dependent_task, dependency_tasks):
+        for task in dependency_tasks:
+            # ProjectUpdate or InventoryUpdate may be blocked by another of
+            # the same type.
+            if not self.graph.is_job_blocked(task):
+                self.graph.add_job(task)
+                if not self.would_exceed_capacity(task):
+                    self.start_task(task, [dependent_task])
+            else:
+                self.graph.add_job(task)
+
+    def process_pending_tasks(self, pending_tasks):
+        for task in pending_tasks:
+            # Stop processing tasks if we know we are out of capacity
+            if self.get_remaining_capacity() <= 0:
+                return
+
+            if not self.graph.is_job_blocked(task):
+                dependencies = self.generate_dependencies(task)
+                self.process_dependencies(task, dependencies)
+                
+                # Spawning deps might have blocked us
+                if not self.graph.is_job_blocked(task):
+                    self.graph.add_job(task)
+                    if not self.would_exceed_capacity(task):
+                        self.start_task(task)
+                else:
+                    self.graph.add_job(task)
+
+    def process_celery_tasks(self, active_tasks, all_running_sorted_tasks):
+        '''
+        Rectify tower db <-> celery inconsistent view of jobs state
+        '''
+        for task in all_running_sorted_tasks:
+
+            if (task['celery_task_id'] not in active_tasks and not hasattr(settings, 'IGNORE_CELERY_INSPECTOR')):
+                # NOTE: Pull status again and make sure it didn't finish in 
+                #       the meantime?
+                # TODO: try catch the getting of the job. The job COULD have been deleted
+                task_obj = task.get_full()
+                task_obj.status = 'failed'
+                task_obj.job_explanation += ' '.join((
+                    'Task was marked as running in Tower but was not present in',
+                    'Celery, so it has been marked as failed.',
+                ))
+                task_obj.save()
+                print("Going to fail %s" % task_obj.id)
+                connection.on_commit(lambda: task_obj.websocket_emit_status('failed'))
+
+                logger.error("Task %s appears orphaned... marking as failed" % task)
+
+
+    def calculate_capacity_used(self, tasks):
+        self.capacity_used = 0
+        for t in tasks:
+            self.capacity_used += t.task_impact()
+
+    def would_exceed_capacity(self, task):
+        return (task.task_impact() + self.capacity_used > self.capacity_total)
+
+    def consume_capacity(self, task):
+        self.capacity_used += task.task_impact()
+
+    def get_remaining_capacity(self):
+        return (self.capacity_total - self.capacity_used)
+
+    def process_tasks(self, all_sorted_tasks):
+
+        running_tasks = filter(lambda t: t['status'] == 'running', all_sorted_tasks)
+        runnable_tasks = filter(lambda t: t['status'] in ['waiting', 'running'], all_sorted_tasks)
+
+        self.calculate_capacity_used(running_tasks)
+
+        self.process_runnable_tasks(runnable_tasks)
+
+        pending_tasks = filter(lambda t: t['status'] in 'pending', all_sorted_tasks)
+        self.process_pending_tasks(pending_tasks)
+
+    def _schedule(self):
+        all_sorted_tasks = self.get_tasks()
+        if len(all_sorted_tasks) > 0:
+            #self.process_celery_tasks(active_tasks, all_sorted_tasks)
+
+            latest_project_updates = self.get_latest_project_update_tasks(all_sorted_tasks)
+            self.process_latest_project_updates(latest_project_updates)
+
+            latest_inventory_updates = self.get_latest_inventory_update_tasks(all_sorted_tasks)
+            self.process_latest_inventory_updates(latest_inventory_updates)
+            
+            inventory_id_sources = self.get_inventory_source_tasks(all_sorted_tasks)
+            self.process_inventory_sources(inventory_id_sources)
+
+            running_workflow_tasks = self.get_running_workflow_jobs()
+            self.process_finished_workflow_jobs(running_workflow_tasks)
+
+            self.spawn_workflow_graph_jobs(running_workflow_tasks)
+
+            self.process_tasks(all_sorted_tasks)
+
+    def schedule(self):
+        with transaction.atomic():
+            # Lock
+            try:
+                Instance.objects.select_for_update(nowait=True).all()[0]
+            except DatabaseError:
+                return
+
+            self._schedule()
 
-        graph = rebuild_graph()
-        if graph:
-            process_graph(graph, task_capacity)
 
-        # Unlock, due to transaction ending

awx/main/scheduler/dag_workflow.py

@@ -33,14 +33,14 @@ class WorkflowDAG(SimpleDAG):
             # Job is about to run or is running. Hold our horses and wait for
             # the job to finish. We can't proceed down the graph path until we
             # have the job result.
-            elif job.status not in ['failed', 'error', 'successful']:
+            elif job.status not in ['failed', 'successful']:
                 continue
-            elif job.status in ['failed', 'error']:
+            elif job.status == 'failed':
                 children_failed = self.get_dependencies(obj, 'failure_nodes')
                 children_always = self.get_dependencies(obj, 'always_nodes')
                 children_all = children_failed + children_always
                 nodes.extend(children_all)
-            elif job.status in ['successful']:
+            elif job.status == 'successful':
                 children_success = self.get_dependencies(obj, 'success_nodes')
                 children_always = self.get_dependencies(obj, 'always_nodes')
                 children_all = children_success + children_always
@@ -60,14 +60,16 @@ class WorkflowDAG(SimpleDAG):
             # Job is about to run or is running. Hold our horses and wait for
             # the job to finish. We can't proceed down the graph path until we
             # have the job result.
-            elif job.status not in ['failed', 'error', 'successful']:
+            elif job.status in ['canceled', 'error']:
+                continue
+            elif job.status not in ['failed', 'successful']:
                 return False
-            elif job.status in ['failed', 'error']:
+            elif job.status == 'failed':
                 children_failed = self.get_dependencies(obj, 'failure_nodes')
                 children_always = self.get_dependencies(obj, 'always_nodes')
                 children_all = children_failed + children_always
                 nodes.extend(children_all)
-            elif job.status in ['successful']:
+            elif job.status == 'successful':
                 children_success = self.get_dependencies(obj, 'success_nodes')
                 children_always = self.get_dependencies(obj, 'always_nodes')
                 children_all = children_success + children_always

awx/main/scheduler/dependency_graph.py

@@ -0,0 +1,203 @@
+from datetime import timedelta
+from django.utils.timezone import now as tz_now
+
+from awx.main.scheduler.partial import (
+    JobDict,
+    ProjectUpdateDict,
+    InventoryUpdateDict,
+    SystemJobDict,
+    AdHocCommandDict,
+    WorkflowJobDict,
+)
+class DependencyGraph(object):
+    PROJECT_UPDATES = 'project_updates'
+    INVENTORY_UPDATES = 'inventory_updates'
+    JOB_TEMPLATE_JOBS = 'job_template_jobs'
+    SYSTEM_JOB = 'system_job'
+    INVENTORY_SOURCE_UPDATES = 'inventory_source_updates'
+    WORKFLOW_JOB_TEMPLATES_JOBS = 'workflow_job_template_jobs'
+
+    LATEST_PROJECT_UPDATES = 'latest_project_updates'
+    LATEST_INVENTORY_UPDATES = 'latest_inventory_updates'
+
+    INVENTORY_SOURCES = 'inventory_source_ids'
+
+    def __init__(self, *args, **kwargs):
+        self.data = {}
+        # project_id -> True / False
+        self.data[self.PROJECT_UPDATES] = {}
+        # inventory_id -> True / False
+        self.data[self.INVENTORY_UPDATES] = {}
+        # job_template_id -> True / False
+        self.data[self.JOB_TEMPLATE_JOBS] = {}
+        # inventory_source_id -> True / False
+        self.data[self.INVENTORY_SOURCE_UPDATES] = {}
+        # True / False
+        self.data[self.SYSTEM_JOB] = True
+        # workflow_job_template_id -> True / False
+        self.data[self.WORKFLOW_JOB_TEMPLATES_JOBS] = {}
+
+        # project_id -> latest ProjectUpdateLatestDict
+        self.data[self.LATEST_PROJECT_UPDATES] = {}
+        # inventory_source_id -> latest InventoryUpdateLatestDict
+        self.data[self.LATEST_INVENTORY_UPDATES] = {}
+
+        # inventory_id -> [inventory_source_ids]
+        self.data[self.INVENTORY_SOURCES] = {}
+
+    def add_latest_project_update(self, job):
+        self.data[self.LATEST_PROJECT_UPDATES][job['project_id']] = job
+
+    def add_latest_inventory_update(self, job):
+        self.data[self.LATEST_INVENTORY_UPDATES][job['inventory_source_id']] = job
+
+    def add_inventory_sources(self, inventory_id, inventory_sources):
+        self.data[self.INVENTORY_SOURCES][inventory_id] = inventory_sources
+
+    def get_inventory_sources(self, inventory_id):
+        return self.data[self.INVENTORY_SOURCES].get(inventory_id, [])
+
+    def get_now(self):
+        return tz_now()
+
+    '''
+    JobDict
+    
+    Presume that job is related to a project that is update on launch
+    '''
+    def should_update_related_project(self, job):
+        now = self.get_now()
+        latest_project_update = self.data[self.LATEST_PROJECT_UPDATES].get(job['project_id'], None)
+        if not latest_project_update:
+            return True
+
+        # TODO: Other finished, failed cases? i.e. error ?
+        if latest_project_update['status'] in ['failed', 'canceled']:
+            return True
+
+        '''
+        This is a bit of fuzzy logic.
+        If the latest project update has a created time == job_created_time-1 
+        then consider the project update found. This is so we don't enter an infinite loop
+        of updating the project when cache timeout is 0.
+        '''
+        if latest_project_update['project__scm_update_cache_timeout'] == 0 and \
+                latest_project_update['launch_type'] == 'dependency' and \
+                latest_project_update['created'] == job['created'] - timedelta(seconds=1):
+            return False
+
+        '''
+        Normal, expected, cache timeout logic
+        '''
+        timeout_seconds = timedelta(seconds=latest_project_update['project__scm_update_cache_timeout'])
+        if (latest_project_update['finished'] + timeout_seconds) < now:
+            return True
+
+        return False
+
+    def should_update_related_inventory_source(self, job, inventory_source_id):
+        now = self.get_now()
+        latest_inventory_update = self.data[self.LATEST_INVENTORY_UPDATES].get(inventory_source_id, None)
+        if not latest_inventory_update:
+            return True
+
+        # TODO: Other finished, failed cases? i.e. error ?
+        if latest_inventory_update['status'] in ['failed', 'canceled']:
+            return True
+
+        '''
+        This is a bit of fuzzy logic.
+        If the latest inventory update has a created time == job_created_time-2
+        then consider the inventory update found. This is so we don't enter an infinite loop
+        of updating the project when cache timeout is 0.
+        '''
+        if latest_inventory_update['inventory_source__update_cache_timeout'] == 0 and \
+                latest_inventory_update['launch_type'] == 'dependency' and \
+                latest_inventory_update['created'] == job['created'] - timedelta(seconds=2):
+            return False
+
+        '''
+        Normal, expected, cache timeout logic
+        '''
+        timeout_seconds = timedelta(seconds=latest_inventory_update['inventory_source__update_cache_timeout'])
+        if (latest_inventory_update['finished'] + timeout_seconds) < now:
+            return True
+        
+        return False
+
+    def mark_system_job(self):
+        self.data[self.SYSTEM_JOB] = False
+
+    def mark_project_update(self, job):
+        self.data[self.PROJECT_UPDATES][job['project_id']] = False
+
+    def mark_inventory_update(self, inventory_id):
+        self.data[self.INVENTORY_UPDATES][inventory_id] = False
+
+    def mark_inventory_source_update(self, inventory_source_id):
+        self.data[self.INVENTORY_SOURCE_UPDATES][inventory_source_id] = False
+
+    def mark_job_template_job(self, job):
+        self.data[self.INVENTORY_UPDATES][job['inventory_id']] = False
+        self.data[self.PROJECT_UPDATES][job['project_id']] = False
+        self.data[self.JOB_TEMPLATE_JOBS][job['job_template_id']] = False
+
+    def mark_workflow_job(self, job):
+        self.data[self.WORKFLOW_JOB_TEMPLATES_JOBS][job['workflow_job_template_id']] = False
+
+    def can_project_update_run(self, job):
+        return self.data[self.PROJECT_UPDATES].get(job['project_id'], True)
+
+    def can_inventory_update_run(self, job):
+        return self.data[self.INVENTORY_SOURCE_UPDATES].get(job['inventory_source_id'], True)
+
+    def can_job_run(self, job):
+        if self.can_project_update_run(job) is True and \
+                self.data[self.INVENTORY_UPDATES].get(job['inventory_id'], True) is True:
+            if job['allow_simultaneous'] is False:
+                return self.data[self.JOB_TEMPLATE_JOBS].get(job['job_template_id'], True)
+            else:
+                return True
+        return False
+
+    def can_workflow_job_run(self, job):
+        return self.data[self.WORKFLOW_JOB_TEMPLATES_JOBS].get(job['workflow_job_template_id'], True)
+
+    def can_system_job_run(self):
+        return self.data[self.SYSTEM_JOB]
+
+    def can_ad_hoc_command_run(self, job):
+        return self.data[self.INVENTORY_UPDATES].get(job['inventory_id'], True)
+
+    def is_job_blocked(self, job):
+        if type(job) is ProjectUpdateDict:
+            return not self.can_project_update_run(job)
+        elif type(job) is InventoryUpdateDict:
+            return not self.can_inventory_update_run(job)
+        elif type(job) is JobDict:
+            return not self.can_job_run(job)
+        elif type(job) is SystemJobDict:
+            return not self.can_system_job_run()
+        elif type(job) is AdHocCommandDict:
+            return not self.can_ad_hoc_command_run(job)
+        elif type(job) is WorkflowJobDict:
+            return not self.can_workflow_job_run(job)
+
+    def add_job(self, job):
+        if type(job) is ProjectUpdateDict:
+            self.mark_project_update(job)
+        elif type(job) is InventoryUpdateDict:
+            self.mark_inventory_update(job['inventory_source__inventory_id'])
+            self.mark_inventory_source_update(job['inventory_source_id'])
+        elif type(job) is JobDict:
+            self.mark_job_template_job(job)
+        elif type(job) is WorkflowJobDict:
+            self.mark_workflow_job(job)
+        elif type(job) is SystemJobDict:
+            self.mark_system_job()
+        elif type(job) is AdHocCommandDict:
+            self.mark_inventory_update(job['inventory_id'])
+
+    def add_jobs(self, jobs):
+        map(lambda j: self.add_job(j), jobs)
+ 

awx/main/scheduler/partial.py

@@ -0,0 +1,220 @@
+
+# AWX
+from awx.main.models import (
+    Job,
+    ProjectUpdate,
+    InventoryUpdate,
+    InventorySource,
+    SystemJob,
+    AdHocCommand,
+    WorkflowJob,
+)
+
+class PartialModelDict(object):
+    FIELDS = ()
+    model = None
+    data = None
+
+    def __init__(self, data):
+        if type(data) is not dict:
+            raise RuntimeError("Expected data to be of type dict not %s" % type(data))
+        self.data = data
+
+    def __getitem__(self, index):
+        return self.data[index]
+
+    def __setitem__(self, key, value):
+        self.data[key] = value
+
+    def get(self, key, **kwargs):
+        return self.data.get(key, **kwargs)
+
+    def get_full(self):
+        return self.model.objects.get(id=self.data['id'])
+
+    def refresh_partial(self):
+        return self.__class__(self.model.objects.filter(id=self.data['id']).values(*self.__class__.get_db_values())[0])
+
+    @classmethod
+    def get_partial(cls, id):
+        return cls(cls.model.objects.filter(id=id).values(*cls.get_db_values())[0])
+
+    @classmethod
+    def get_db_values(cls):
+        return cls.FIELDS
+
+    @classmethod
+    def filter_partial(cls, status=[]):
+        kv = {
+            'status__in': status
+        }
+        return [cls(o) for o in cls.model.objects.filter(**kv).values(*cls.get_db_values())]
+
+    def get_job_type_str(self):
+        raise RuntimeError("Inherit and implement me")
+    
+    def task_impact(self):
+        raise RuntimeError("Inherit and implement me")
+
+class JobDict(PartialModelDict):
+    FIELDS = (
+        'id', 'status', 'job_template_id', 'inventory_id', 'project_id', 
+        'launch_type', 'limit', 'allow_simultaneous', 'created', 
+        'job_type', 'celery_task_id', 'project__scm_update_on_launch',
+        'forks', 'inventory__inventory_sources',
+    )
+    model = Job
+
+    def get_job_type_str(self):
+        return 'job'
+
+    def task_impact(self):
+        return (5 if self.data['forks'] == 0 else self.data['forks']) * 10
+
+class ProjectUpdateDict(PartialModelDict):
+    FIELDS = (
+        'id', 'status', 'project_id', 'created', 'celery_task_id', 
+        'launch_type', 'project__scm_update_cache_timeout', 
+        'project__scm_update_on_launch',
+    )
+    model = ProjectUpdate
+    
+    def get_job_type_str(self):
+        return 'project_update'
+    
+    def task_impact(self):
+        return 10
+
+    @classmethod
+    def filter_partial(cls, status=[]):
+        kv = {
+            'status__in': status,
+            'job_type': 'check',
+        }
+        return [cls(o) for o in cls.model.objects.filter(**kv).values(*cls.get_db_values())]
+
+class ProjectUpdateLatestDict(ProjectUpdateDict):
+    FIELDS = (
+        'id', 'status', 'project_id', 'created', 'finished', 
+        'project__scm_update_cache_timeout', 
+        'launch_type', 'project__scm_update_on_launch',
+    )
+    model = ProjectUpdate
+
+    @classmethod
+    def filter_partial(cls, project_ids):
+        # TODO: This can shurley be made more efficient
+        # * shouldn't have to do a query per inventory_id
+        # * shouldn't have to call .values() on all the results, only to get the first result
+        results = []
+        for project_id in project_ids:
+            qs = cls.model.objects.filter(project_id=project_id, status__in=['waiting', 'successful', 'failed']).order_by('-finished', '-started', '-created',)
+            if qs.count() > 0:
+                results.append(cls(cls.model.objects.filter(id=qs[0].id).values(*cls.get_db_values())[0]))
+        return results
+
+class InventoryUpdateDict(PartialModelDict):
+    #'inventory_source__update_on_launch', 
+    #'inventory_source__update_cache_timeout',
+    FIELDS = (
+        'id', 'status', 'created', 'celery_task_id', 'inventory_source_id', 'inventory_source__inventory_id',
+    )
+    model = InventoryUpdate
+
+    def get_job_type_str(self):
+        return 'inventory_update'
+
+    def task_impact(self):
+        return 20
+
+class InventoryUpdateLatestDict(InventoryUpdateDict):
+    #'inventory_source__update_on_launch', 
+    #'inventory_source__update_cache_timeout',
+    FIELDS = (
+        'id', 'status', 'created', 'celery_task_id', 'inventory_source_id', 
+        'finished', 'inventory_source__update_cache_timeout', 'launch_type',
+    )
+    model = InventoryUpdate
+
+    @classmethod
+    def filter_partial(cls, inventory_ids):
+        # TODO: This can shurley be made more efficient
+        # * shouldn't have to do a query per inventory_id nor per inventory_source_id
+        # * shouldn't have to call .values() on all the results, only to get the first result
+        results = []
+        for inventory_id in inventory_ids:
+            inventory_source_ids = InventorySource.objects.filter(inventory_id=inventory_id,
+                                                                  update_on_launch=True).values_list('id', flat=True)
+            # Find the most recent inventory update for each inventory source
+            for inventory_source_id in inventory_source_ids:
+                qs = cls.model.objects.filter(inventory_source_id=inventory_source_id, 
+                                              status__in=['waiting', 'successful', 'failed'],
+                                              inventory_source__update_on_launch=True).order_by('-finished', '-started', '-created')
+                if qs.count() > 0:
+                    results.append(cls(cls.model.objects.filter(id=qs[0].id).values(*cls.get_db_values())[0]))
+        return results
+
+class InventorySourceDict(PartialModelDict):
+    FIELDS = (
+        'id',
+    )
+    model = InventorySource
+
+    def get_job_type_str(self):
+        return 'inventory_source'
+
+    def task_impact(self):
+        return 20
+
+    @classmethod
+    # TODO: Optimize this to run the query once
+    def filter_partial(cls, inventory_id):
+        kv = {
+            'inventory_id': inventory_id,
+            'update_on_launch': True,
+        }
+        return [cls(o) for o in cls.model.objects.filter(**kv).values(*cls.get_db_values())]
+
+class SystemJobDict(PartialModelDict):
+    FIELDS = (
+        'id', 'created', 'status',
+    )
+    model = SystemJob
+
+    def get_job_type_str(self):
+        return 'system_job'
+
+    def task_impact(self):
+        return 20
+
+    @classmethod
+    def filter_partial(cls, status=[]):
+        kv = {
+            'status__in': status
+        }
+        return [cls(o) for o in cls.model.objects.filter(**kv).values(*cls.get_db_values())]
+
+class AdHocCommandDict(PartialModelDict):
+    FIELDS = (
+        'id', 'created', 'status', 'inventory_id',
+    )
+    model = AdHocCommand
+
+    def get_job_type_str(self):
+        return 'ad_hoc_command'
+
+    def task_impact(self):
+        return 20
+
+class WorkflowJobDict(PartialModelDict):
+    FIELDS = (
+        'id', 'created', 'status', 'workflow_job_template_id',
+    )
+    model = WorkflowJob
+
+    def get_job_type_str(self):
+        return 'workflow_job'
+
+    def task_impact(self):
+        return 10
+

awx/main/scheduler/tasks.py

@@ -1,14 +1,17 @@
 
 # Python
 import logging
-import time
+
+# Django
+from django.db import transaction
+from django.db.utils import DatabaseError
 
 # Celery
 from celery import task
 
 # AWX
-from awx.main.models import UnifiedJob
+from awx.main.models import Instance
-from awx.main.scheduler import schedule
+from awx.main.scheduler import TaskManager 
 
 logger = logging.getLogger('awx.main.scheduler')
 
@@ -18,62 +21,31 @@ logger = logging.getLogger('awx.main.scheduler')
 
 @task
 def run_job_launch(job_id):
-    # Wait for job to exist.
+    TaskManager().schedule()
-    # The job is created in a transaction then the message is created, but
-    # the transaction may not have completed.
-
-    # FIXME: We could generate the message in a Django signal handler.
-    # OR, we could call an explicit commit in the view and then send the 
-    # message.
-
-    retries = 10
-    retry = 0
-    while not UnifiedJob.objects.filter(id=job_id).exists():
-        time.sleep(0.3)
-        
-        if retry >= retries:
-            logger.error("Failed to process 'job_launch' message for job %d" % job_id)
-            # ack the message so we don't build up the queue.
-            #
-            # The job can still be chosen to run during tower startup or 
-            # when another job is started or completes
-            return
-        retry += 1
-
-    # "Safe" to get the job now since it exists.
-    # Really, there is a race condition from exists to get
-
-    # TODO: while not loop should call get wrapped in a try except
-    #job = UnifiedJob.objects.get(id=job_id)
-
-    schedule()
 
 @task
 def run_job_complete(job_id):
-    # TODO: use list of finished status from jobs.py or unified_jobs.py
+    TaskManager().schedule()
-    finished_status = ['successful', 'error', 'failed', 'completed']
-    q = UnifiedJob.objects.filter(id=job_id)
 
-    # Ensure that the job is updated in the database before we call to
+@task
-    # schedule the next job.
+def run_task_manager():
-    retries = 10
+    TaskManager().schedule()
-    retry = 0
-    while True:
-        # Job not found, most likely deleted. That's fine
-        if not q.exists():
-            logger.warn("Failed to find job '%d' while processing 'job_complete' message. Presume that it was deleted." % job_id)
-            break
 
-        job = q[0]
+@task
-        if job.status in finished_status:
+def run_fail_inconsistent_running_jobs():
-            break
+    with transaction.atomic():
+        # Lock
+        try:
+            Instance.objects.select_for_update(nowait=True).all()[0]
+            scheduler = TaskManager()
+            active_tasks = scheduler.get_active_tasks()
 
-        time.sleep(0.3)
+            if active_tasks is None:
-        
+                # TODO: Failed to contact celery. We should surface this.
-        if retry >= retries:
+                return None
-            logger.error("Expected job status '%s' to be one of '%s' while processing 'job_complete' message." % (job.status, finished_status))
+
+            all_running_sorted_tasks = scheduler.get_running_tasks()
+            scheduler.process_celery_tasks(active_tasks, all_running_sorted_tasks)
+        except DatabaseError:
             return
-        retry += 1
-
-    schedule()
 

awx/main/tasks.py

@@ -21,7 +21,6 @@ import traceback
 import urlparse
 import uuid
 from distutils.version import LooseVersion as Version
-import dateutil.parser
 import yaml
 try:
     import psutil
@@ -138,30 +137,12 @@ def cluster_node_heartbeat(self):
 
 @task(bind=True, queue='default')
 def tower_periodic_scheduler(self):
-    def get_last_run():
-        if not os.path.exists(settings.SCHEDULE_METADATA_LOCATION):
-            return None
-        fd = open(settings.SCHEDULE_METADATA_LOCATION)
-        try:
-            last_run = dateutil.parser.parse(fd.read())
-            return last_run
-        except Exception as exc:
-            logger.error("get_last_run failed: {}".format(exc))
-            return None
-
-    def write_last_run(last_run):
-        fd = open(settings.SCHEDULE_METADATA_LOCATION, 'w')
-        fd.write(last_run.isoformat())
-        fd.close()
-
     run_now = now()
-    last_run = get_last_run()
+    state = TowerScheduleState.get_solo()
-    if not last_run:
+    last_run = state.schedule_last_run
-        logger.debug("First run time")
-        write_last_run(run_now)
-        return
     logger.debug("Last run was: %s", last_run)
-    write_last_run(run_now)
+    state.schedule_last_run = run_now
+    state.save()
 
     old_schedules = Schedule.objects.enabled().before(last_run)
     for schedule in old_schedules:
@@ -181,6 +162,7 @@ def tower_periodic_scheduler(self):
             new_unified_job.save(update_fields=['status', 'job_explanation'])
             new_unified_job.websocket_emit_status("failed")
         emit_channel_notification('schedules-changed', dict(id=schedule.id, group_name="schedules"))
+    state.save()
 
 def _send_notification_templates(instance, status_str):
     if status_str not in ['succeeded', 'failed']:
@@ -552,7 +534,7 @@ class BaseTask(Task):
                                      output_replacements=output_replacements)
         job_start = time.time()
         while child.isalive():
-            result_id = child.expect(expect_list, timeout=pexpect_timeout)
+            result_id = child.expect(expect_list, timeout=pexpect_timeout, searchwindowsize=100)
             if result_id in expect_passwords:
                 child.sendline(expect_passwords[result_id])
             if logfile_pos != logfile.tell():
@@ -1757,7 +1739,7 @@ class RunAdHocCommand(BaseTask):
         '''
         Hook for actions to run after ad hoc command has completed.
         '''
-        super(RunAdHocCommand, self).post_run_hook(ad_hoc_command, **kwargs)
+        super(RunAdHocCommand, self).post_run_hook(ad_hoc_command, status, **kwargs)
 
 
 class RunSystemJob(BaseTask):

awx/main/tests/functional/test_jobs.py

@@ -2,40 +2,6 @@ from awx.main.models import Job
 
 import pytest
 
-@pytest.mark.django_db
-def test_job_blocking(get, post, job_template, inventory, inventory_factory):
-    j1 = Job.objects.create(job_template=job_template,
-                            inventory=inventory)
-    j2 = Job.objects.create(job_template=job_template,
-                            inventory=inventory)
-    assert j1.is_blocked_by(j2)
-    j2.inventory = inventory_factory(name='test-different-inventory')
-    assert not j1.is_blocked_by(j2)
-    j_callback_1 = Job.objects.create(job_template=job_template,
-                                      inventory=inventory,
-                                      launch_type='callback',
-                                      limit='a')
-    j_callback_2 = Job.objects.create(job_template=job_template,
-                                      inventory=inventory,
-                                      launch_type='callback',
-                                      limit='a')
-    assert j_callback_1.is_blocked_by(j_callback_2)
-    j_callback_2.limit = 'b'
-    assert not j_callback_1.is_blocked_by(j_callback_2)
-
-@pytest.mark.django_db
-def test_job_blocking_allow_simul(get, post, job_template, inventory):
-    job_template.allow_simultaneous = True
-    j1 = Job.objects.create(job_template=job_template,
-                            inventory=inventory)
-    j2 = Job.objects.create(job_template=job_template,
-                            inventory=inventory)
-    assert not j1.is_blocked_by(j2)
-    assert not j2.is_blocked_by(j1)
-    job_template.allow_simultaneous = False
-    assert j1.is_blocked_by(j2)
-    assert j2.is_blocked_by(j1)
-
 @pytest.mark.django_db
 def test_orphan_unified_job_creation(instance, inventory):
     job = Job.objects.create(job_template=None, inventory=inventory, name='hi world')

awx/main/tests/functional/test_partial.py

@@ -0,0 +1,120 @@
+
+# Python
+import pytest
+from django.utils.timezone import now as tz_now
+from datetime import timedelta
+
+# AWX
+from awx.main.models import (
+    Organization,
+    Inventory,
+    Group,
+    Project,
+    ProjectUpdate,
+    InventoryUpdate,
+    InventorySource,
+)
+from awx.main.scheduler.partial import (
+    ProjectUpdateLatestDict,
+    InventoryUpdateDict,
+    InventoryUpdateLatestDict,
+)
+
+@pytest.fixture
+def org():
+    return Organization.objects.create(name="org1")
+
+class TestProjectUpdateLatestDictDict():
+    @pytest.fixture
+    def successful_project_update(self):
+        p = Project.objects.create(name="proj1")
+        pu = ProjectUpdate.objects.create(project=p, status='successful', finished=tz_now() - timedelta(seconds=20))
+
+        return (p, pu)
+    
+    # Failed project updates newer than successful ones
+    @pytest.fixture
+    def multiple_project_updates(self):
+        p = Project.objects.create(name="proj1")
+
+        epoch = tz_now()
+
+        successful_pus = [ProjectUpdate.objects.create(project=p,
+                                                       status='successful', 
+                                                       finished=epoch - timedelta(seconds=100 + i)) for i in xrange(0, 5)]
+        failed_pus = [ProjectUpdate.objects.create(project=p, 
+                                                   status='failed',
+                                                   finished=epoch - timedelta(seconds=100 - len(successful_pus) + i)) for i in xrange(0, 5)]
+        return (p, failed_pus, successful_pus)
+
+
+    @pytest.mark.django_db
+    class TestFilterPartial():
+        def test_project_update_successful(self, successful_project_update):
+            (project, project_update) = successful_project_update
+
+            tasks = ProjectUpdateLatestDict.filter_partial(project_ids=[project.id])
+
+            assert 1 == len(tasks)
+            assert project_update.id == tasks[0]['id']
+
+        def test_correct_project_update(self, multiple_project_updates):
+            (project, failed_pus, successful_pus) = multiple_project_updates
+
+            tasks = ProjectUpdateLatestDict.filter_partial(project_ids=[project.id])
+
+            assert 1 == len(tasks)
+            assert failed_pus[0].id == tasks[0]['id']
+
+
+class TestInventoryUpdateDict():
+    @pytest.fixture
+    def waiting_inventory_update(self, org):
+        i = Inventory.objects.create(name='inv1', organization=org)
+        g = Group.objects.create(name='group1', inventory=i)
+        #Inventory.groups.add(g)
+        inv_src = InventorySource.objects.create(group=g)
+        iu = InventoryUpdate.objects.create(inventory_source=inv_src, status='waiting')
+        return iu
+
+    @pytest.mark.django_db
+    class TestFilterPartial():
+        def test_simple(self, waiting_inventory_update):
+            tasks = InventoryUpdateDict.filter_partial(status=['waiting'])
+
+            assert 1 == len(tasks)
+            assert waiting_inventory_update.id == tasks[0]['id']
+
+class TestInventoryUpdateLatestDict():
+    @pytest.fixture
+    def inventory(self, org):
+        i = Inventory.objects.create(name='inv1', organization=org)
+        return i
+
+    @pytest.fixture
+    def inventory_updates(self, inventory):
+        g1 = Group.objects.create(name='group1', inventory=inventory)
+        g2 = Group.objects.create(name='group2', inventory=inventory)
+        g3 = Group.objects.create(name='group3', inventory=inventory)
+
+        inv_src1 = InventorySource.objects.create(group=g1, update_on_launch=True, inventory=inventory)
+        inv_src2 = InventorySource.objects.create(group=g2, update_on_launch=False, inventory=inventory)
+        inv_src3 = InventorySource.objects.create(group=g3, update_on_launch=True, inventory=inventory)
+
+        iu1 = InventoryUpdate.objects.create(inventory_source=inv_src1, status='successful')
+        iu2 = InventoryUpdate.objects.create(inventory_source=inv_src2, status='waiting')
+        iu3 = InventoryUpdate.objects.create(inventory_source=inv_src3, status='waiting')
+        return [iu1, iu2, iu3]
+
+    @pytest.mark.django_db
+    def test_filter_partial(self, inventory, inventory_updates):
+        
+        tasks = InventoryUpdateLatestDict.filter_partial([inventory.id])
+
+        inventory_updates_expected = [inventory_updates[0], inventory_updates[2]]
+
+        assert 2 == len(tasks)
+        for i, inventory_update in enumerate(inventory_updates_expected):
+            assert inventory_update.id == tasks[i]['id']
+
+    

awx/main/tests/functional/test_rbac_job_start.py

@@ -2,11 +2,7 @@ import pytest
 
 from awx.main.models.inventory import Inventory
 from awx.main.models.credential import Credential
-from awx.main.models.jobs import JobTemplate
+from awx.main.models.jobs import JobTemplate, Job
-
-@pytest.fixture
-def machine_credential():
-    return Credential.objects.create(name='machine-cred', kind='ssh', username='test_user', password='pas4word')
 
 @pytest.mark.django_db
 @pytest.mark.job_permissions
@@ -45,3 +41,52 @@ def test_inventory_use_access(inventory, user):
     inventory.use_role.members.add(common_user)
 
     assert common_user.can_access(Inventory, 'use', inventory)
+
+@pytest.mark.django_db
+class TestJobRelaunchAccess:
+    @pytest.fixture
+    def job_no_prompts(self, machine_credential, inventory):
+        jt = JobTemplate.objects.create(name='test-job_template', credential=machine_credential, inventory=inventory)
+        return jt.create_unified_job()
+
+    @pytest.fixture
+    def job_with_prompts(self, machine_credential, inventory, organization):
+        jt = JobTemplate.objects.create(
+            name='test-job-template-prompts', credential=machine_credential, inventory=inventory,
+            ask_tags_on_launch=True, ask_variables_on_launch=True, ask_skip_tags_on_launch=True,
+            ask_limit_on_launch=True, ask_job_type_on_launch=True, ask_inventory_on_launch=True,
+            ask_credential_on_launch=True)
+        new_cred = Credential.objects.create(name='new-cred', kind='ssh', username='test_user', password='pas4word')
+        new_inv = Inventory.objects.create(name='new-inv', organization=organization)
+        return jt.create_unified_job(credential=new_cred, inventory=new_inv)
+
+    def test_normal_relaunch_via_job_template(self, job_no_prompts, rando):
+        "Has JT execute_role, job unchanged relative to JT"
+        job_no_prompts.job_template.execute_role.members.add(rando)
+        assert rando.can_access(Job, 'start', job_no_prompts)
+
+    def test_no_relaunch_without_prompted_fields_access(self, job_with_prompts, rando):
+        "Has JT execute_role but no use_role on inventory & credential - deny relaunch"
+        job_with_prompts.job_template.execute_role.members.add(rando)
+        assert not rando.can_access(Job, 'start', job_with_prompts)
+
+    def test_can_relaunch_with_prompted_fields_access(self, job_with_prompts, rando):
+        "Has use_role on the prompted inventory & credential - allow relaunch"
+        job_with_prompts.job_template.execute_role.members.add(rando)
+        job_with_prompts.credential.use_role.members.add(rando)
+        job_with_prompts.inventory.use_role.members.add(rando)
+        assert rando.can_access(Job, 'start', job_with_prompts)
+
+    def test_no_relaunch_after_limit_change(self, job_no_prompts, rando):
+        "State of the job contradicts the JT state - deny relaunch"
+        job_no_prompts.job_template.execute_role.members.add(rando)
+        job_no_prompts.limit = 'webservers'
+        job_no_prompts.save()
+        assert not rando.can_access(Job, 'start', job_no_prompts)
+
+    def test_can_relaunch_if_limit_was_prompt(self, job_with_prompts, rando):
+        "Job state differs from JT, but only on prompted fields - allow relaunch"
+        job_with_prompts.job_template.execute_role.members.add(rando)
+        job_with_prompts.limit = 'webservers'
+        job_with_prompts.save()
+        assert not rando.can_access(Job, 'start', job_with_prompts)

awx/main/tests/unit/api/test_filters.py

@@ -1,7 +1,8 @@
 import pytest
 
+from rest_framework.exceptions import PermissionDenied
 from awx.api.filters import FieldLookupBackend
-from awx.main.models import JobTemplate
+from awx.main.models import Credential, JobTemplate
 
 @pytest.mark.parametrize(u"empty_value", [u'', ''])
 def test_empty_in(empty_value):
@@ -15,3 +16,21 @@ def test_valid_in(valid_value):
     field_lookup = FieldLookupBackend()
     value, new_lookup = field_lookup.value_to_python(JobTemplate, 'project__in', valid_value)
     assert 'foo' in value
+
+@pytest.mark.parametrize('lookup_suffix', ['', 'contains', 'startswith', 'in'])
+@pytest.mark.parametrize('password_field', Credential.PASSWORD_FIELDS)
+def test_filter_on_password_field(password_field, lookup_suffix):
+    field_lookup = FieldLookupBackend()
+    lookup = '__'.join(filter(None, [password_field, lookup_suffix]))
+    with pytest.raises(PermissionDenied) as excinfo:
+        field, new_lookup = field_lookup.get_field_from_lookup(Credential, lookup)
+    assert 'not allowed' in str(excinfo.value)
+
+@pytest.mark.parametrize('lookup_suffix', ['', 'contains', 'startswith', 'in'])
+@pytest.mark.parametrize('password_field', Credential.PASSWORD_FIELDS)
+def test_filter_on_related_password_field(password_field, lookup_suffix):
+    field_lookup = FieldLookupBackend()
+    lookup = '__'.join(filter(None, ['credential', password_field, lookup_suffix]))
+    with pytest.raises(PermissionDenied) as excinfo:
+        field, new_lookup = field_lookup.get_field_from_lookup(JobTemplate, lookup)
+    assert 'not allowed' in str(excinfo.value)

awx/main/tests/unit/scheduler/conftest.py

@@ -0,0 +1,240 @@
+
+# Python
+import pytest
+from datetime import timedelta
+
+# Django
+from django.utils.timezone import now as tz_now
+
+# awx
+from awx.main.scheduler.partial import (
+    JobDict,
+    ProjectUpdateDict,
+    InventoryUpdateDict,
+    InventorySourceDict,
+)
+from awx.main.scheduler import TaskManager
+
+
+@pytest.fixture
+def epoch():
+    return tz_now()
+
+@pytest.fixture
+def scheduler_factory(mocker, epoch):
+    def fn(tasks=[], inventory_sources=[], latest_project_updates=[], latest_inventory_updates=[], create_project_update=None, create_inventory_update=None):
+        sched = TaskManager()
+        sched.capacity_total = 999999999
+
+        sched.graph.get_now = lambda: epoch
+
+        def no_create_inventory_update(task, ignore):
+            raise RuntimeError("create_inventory_update should not be called")
+
+        def no_create_project_update(task):
+            raise RuntimeError("create_project_update should not be called")
+
+        mocker.patch.object(sched, 'get_tasks', return_value=tasks)
+        mocker.patch.object(sched, 'get_running_workflow_jobs', return_value=[])
+        mocker.patch.object(sched, 'get_inventory_source_tasks', return_value=inventory_sources)
+        mocker.patch.object(sched, 'get_latest_project_update_tasks', return_value=latest_project_updates)
+        mocker.patch.object(sched, 'get_latest_inventory_update_tasks', return_value=latest_inventory_updates)
+        create_project_update_mock = mocker.patch.object(sched, 'create_project_update', return_value=create_project_update)
+        create_inventory_update_mock = mocker.patch.object(sched, 'create_inventory_update', return_value=create_inventory_update)
+        mocker.patch.object(sched, 'start_task')
+
+        if not create_project_update:
+            create_project_update_mock.side_effect = no_create_project_update
+        if not create_inventory_update:
+            create_inventory_update_mock.side_effect = no_create_inventory_update
+        return sched
+    return fn
+
+@pytest.fixture
+def project_update_factory(epoch):
+    def fn():
+        return ProjectUpdateDict({
+            'id': 1,
+            'created': epoch - timedelta(seconds=100),
+            'project_id': 1,
+            'project__scm_update_cache_timeout': 0,
+            'celery_task_id': '',
+            'launch_type': 'dependency',
+            'project__scm_update_on_launch': True,
+        })
+    return fn
+
+@pytest.fixture
+def pending_project_update(project_update_factory):
+    project_update = project_update_factory()
+    project_update['status'] = 'pending'
+    return project_update
+
+@pytest.fixture
+def waiting_project_update(epoch, project_update_factory):
+    project_update = project_update_factory()
+    project_update['status'] = 'waiting'
+    return project_update
+
+@pytest.fixture
+def running_project_update(epoch, project_update_factory):
+    project_update = project_update_factory()
+    project_update['status'] = 'running'
+    return project_update
+
+@pytest.fixture
+def successful_project_update(epoch, project_update_factory):
+    project_update = project_update_factory()
+    project_update['finished'] = epoch - timedelta(seconds=90)
+    project_update['status'] = 'successful'
+    return project_update
+
+@pytest.fixture
+def successful_project_update_cache_expired(epoch, project_update_factory):
+    project_update = project_update_factory()
+
+    project_update['status'] = 'successful'
+    project_update['created'] = epoch - timedelta(seconds=120)
+    project_update['finished'] = epoch - timedelta(seconds=110)
+    project_update['project__scm_update_cache_timeout'] = 1
+    return project_update
+
+@pytest.fixture
+def failed_project_update(epoch, project_update_factory):
+    project_update = project_update_factory()
+    project_update['finished'] = epoch - timedelta(seconds=90)
+    project_update['status'] = 'failed'
+    return project_update
+
+@pytest.fixture
+def inventory_update_factory(epoch):
+    def fn():
+        return InventoryUpdateDict({
+            'id': 1,
+            'created': epoch - timedelta(seconds=101),
+            'inventory_id': 1,
+            'celery_task_id': '',
+            'status': 'pending',
+            'launch_type': 'dependency',
+            'inventory_source_id': 1,
+            'inventory_source__inventory_id': 1,
+        })
+    return fn
+
+@pytest.fixture
+def inventory_update_latest_factory(epoch):
+    def fn():
+        return InventoryUpdateDict({
+            'id': 1,
+            'created': epoch - timedelta(seconds=101),
+            'inventory_id': 1,
+            'celery_task_id': '',
+            'status': 'pending',
+            'launch_type': 'dependency',
+            'inventory_source_id': 1,
+            'finished': None,
+        })
+    return fn
+
+@pytest.fixture
+def inventory_update_latest(inventory_update_latest_factory):
+    return inventory_update_latest_factory()
+
+@pytest.fixture
+def successful_inventory_update_latest(inventory_update_latest_factory):
+    iu = inventory_update_latest_factory()
+    iu['status'] = 'successful'
+    iu['finished'] = iu['created'] + timedelta(seconds=10)
+    return iu
+
+@pytest.fixture
+def failed_inventory_update_latest(inventory_update_latest_factory):
+    iu = inventory_update_latest_factory()
+    iu['status'] = 'failed'
+    return iu
+
+@pytest.fixture
+def pending_inventory_update(epoch, inventory_update_factory):
+    inventory_update = inventory_update_factory()
+    inventory_update['status'] = 'pending'
+    return inventory_update
+
+@pytest.fixture
+def waiting_inventory_update(epoch, inventory_update_factory):
+    inventory_update = inventory_update_factory()
+    inventory_update['status'] = 'waiting'
+    return inventory_update
+
+@pytest.fixture
+def failed_inventory_update(epoch, inventory_update_factory):
+    inventory_update = inventory_update_factory()
+    inventory_update['status'] = 'failed'
+    return inventory_update
+
+@pytest.fixture
+def running_inventory_update(epoch, inventory_update_factory):
+    inventory_update = inventory_update_factory()
+    inventory_update['status'] = 'running'
+    return inventory_update
+
+@pytest.fixture
+def successful_inventory_update(epoch, inventory_update_factory):
+    inventory_update = inventory_update_factory()
+    inventory_update['finished'] = epoch - timedelta(seconds=90)
+    inventory_update['status'] = 'successful'
+    return inventory_update
+
+'''
+Job
+'''
+@pytest.fixture
+def job_factory(epoch):
+    def fn(project__scm_update_on_launch=True, inventory__inventory_sources=[]):
+        return JobDict({ 
+            'id': 1, 
+            'status': 'pending', 
+            'job_template_id': 1, 
+            'project_id': 1, 
+            'inventory_id': 1,
+            'launch_type': 'manual', 
+            'allow_simultaneous': False, 
+            'created': epoch - timedelta(seconds=99), 
+            'celery_task_id': '', 
+            'project__scm_update_on_launch': project__scm_update_on_launch, 
+            'inventory__inventory_sources': inventory__inventory_sources,
+            'forks': 5 
+        })
+    return fn
+
+@pytest.fixture
+def pending_job(job_factory):
+    job = job_factory()
+    job['status'] = 'pending'
+    return job
+
+@pytest.fixture
+def running_job(job_factory):
+    job = job_factory()
+    job['status'] = 'running'
+    return job
+
+'''
+Inventory id -> [InventorySourceDict, ...]
+'''
+@pytest.fixture
+def inventory_source_factory():
+    def fn(id=1):
+        return InventorySourceDict({
+            'id': id,
+        })
+    return fn
+
+@pytest.fixture
+def inventory_id_sources(inventory_source_factory):
+    return [
+        (1, [
+            inventory_source_factory(id=1),
+            inventory_source_factory(id=2),
+        ]),
+    ]
+

awx/main/tests/unit/scheduler/test_dependency_graph.py

@@ -0,0 +1,121 @@
+
+# Python
+import pytest
+from datetime import timedelta
+
+# Django
+from django.utils.timezone import now as tz_now
+
+# AWX
+from awx.main.scheduler.dependency_graph import DependencyGraph
+from awx.main.scheduler.partial import ProjectUpdateDict
+
+@pytest.fixture
+def graph():
+    return DependencyGraph()
+
+@pytest.fixture
+def job():
+    return dict(project_id=1)
+
+@pytest.fixture
+def unsuccessful_last_project(graph, job):
+    pu = ProjectUpdateDict(dict(id=1, 
+                                project__scm_update_cache_timeout=999999, 
+                                project_id=1, 
+                                status='failed', 
+                                created='3', 
+                                finished='3',))
+
+    graph.add_latest_project_update(pu)
+
+    return graph
+
+@pytest.fixture
+def last_dependent_project(graph):
+    now = tz_now()
+
+    job = {
+        'project_id': 1,
+        'created': now,
+    }
+    pu = ProjectUpdateDict(dict(id=1, project_id=1, status='waiting', 
+                                project__scm_update_cache_timeout=0, 
+                                launch_type='dependency', 
+                                created=now - timedelta(seconds=1),))
+    
+    graph.add_latest_project_update(pu)
+
+    return (graph, job)
+
+@pytest.fixture
+def timedout_project_update(graph, job):
+    now = tz_now()
+
+    job = {
+        'project_id': 1,
+        'created': now,
+    }
+    pu = ProjectUpdateDict(dict(id=1, project_id=1, status='successful', 
+                                project__scm_update_cache_timeout=10, 
+                                launch_type='dependency', 
+                                created=now - timedelta(seconds=100), 
+                                finished=now - timedelta(seconds=11),))
+    
+    graph.add_latest_project_update(pu)
+
+    return (graph, job)
+
+@pytest.fixture
+def not_timedout_project_update(graph, job):
+    now = tz_now()
+
+    job = {
+        'project_id': 1,
+        'created': now,
+    }
+    pu = ProjectUpdateDict(dict(id=1, project_id=1, status='successful', 
+                                project__scm_update_cache_timeout=3600, 
+                                launch_type='dependency', 
+                                created=now - timedelta(seconds=100), 
+                                finished=now - timedelta(seconds=11),))
+    
+    graph.add_latest_project_update(pu)
+
+    return (graph, job)
+
+
+class TestShouldUpdateRelatedProject():
+
+    def test_no_project_updates(self, graph, job):
+        actual = graph.should_update_related_project(job)
+
+        assert True is actual
+
+    def test_timedout_project_update(self, timedout_project_update):
+        (graph, job) = timedout_project_update
+
+        actual = graph.should_update_related_project(job)
+
+        assert True is actual
+
+    def test_not_timedout_project_update(self, not_timedout_project_update):
+        (graph, job) = not_timedout_project_update
+
+        actual = graph.should_update_related_project(job)
+
+        assert False is actual
+
+    def test_unsuccessful_last_project(self, unsuccessful_last_project, job):
+        graph = unsuccessful_last_project 
+
+        actual = graph.should_update_related_project(job)
+
+        assert True is actual
+
+    def test_last_dependent_project(self, last_dependent_project):
+        (graph, job) = last_dependent_project
+        
+        actual = graph.should_update_related_project(job)
+        assert False is actual
+        

awx/main/tests/unit/scheduler/test_scheduler_inventory_update.py

@@ -0,0 +1,85 @@
+
+# Python
+import pytest
+from datetime import timedelta
+
+@pytest.fixture
+def pending_job(job_factory):
+    return job_factory(project__scm_update_on_launch=False, inventory__inventory_sources=['1'])
+
+@pytest.fixture
+def successful_inventory_update_latest(inventory_update_latest_factory):
+    iu = inventory_update_latest_factory()
+    iu['inventory_source__update_cache_timeout'] = 100
+    iu['status'] = 'successful'
+    iu['finished'] = iu['created'] + timedelta(seconds=10)
+    return iu
+
+@pytest.fixture
+def successful_inventory_update_latest_cache_expired(inventory_update_latest_factory):
+    iu = inventory_update_latest_factory()
+    iu['inventory_source__update_cache_timeout'] = 1
+    iu['finished'] = iu['created'] + timedelta(seconds=2)
+    return iu
+
+class TestStartInventoryUpdate():
+    def test_pending(self, scheduler_factory, pending_inventory_update):
+        scheduler = scheduler_factory(tasks=[pending_inventory_update])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(pending_inventory_update)
+
+class TestInventoryUpdateBlocked():
+    def test_running_inventory_update(self, epoch, scheduler_factory, running_inventory_update, pending_inventory_update):
+        running_inventory_update['created'] = epoch - timedelta(seconds=100)
+        pending_inventory_update['created'] = epoch - timedelta(seconds=90)
+
+        scheduler = scheduler_factory(tasks=[running_inventory_update, pending_inventory_update])
+
+        scheduler._schedule()
+
+    def test_waiting_inventory_update(self, epoch, scheduler_factory, waiting_inventory_update, pending_inventory_update):
+        waiting_inventory_update['created'] = epoch - timedelta(seconds=100)
+        pending_inventory_update['created'] = epoch - timedelta(seconds=90)
+
+        scheduler = scheduler_factory(tasks=[waiting_inventory_update, pending_inventory_update])
+
+        scheduler._schedule()
+
+class TestCreateDependentInventoryUpdate():
+
+    def test(self, scheduler_factory, pending_job, waiting_inventory_update, inventory_id_sources):
+        scheduler = scheduler_factory(tasks=[pending_job], 
+                                      create_inventory_update=waiting_inventory_update,
+                                      inventory_sources=inventory_id_sources)
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(waiting_inventory_update, [pending_job])
+
+    def test_cache_hit(self, scheduler_factory, pending_job, successful_inventory_update, successful_inventory_update_latest):
+        scheduler = scheduler_factory(tasks=[successful_inventory_update, pending_job], 
+                                      latest_inventory_updates=[successful_inventory_update_latest])
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(pending_job)
+
+    def test_cache_miss(self, scheduler_factory, pending_job, successful_inventory_update, successful_inventory_update_latest_cache_expired, waiting_inventory_update, inventory_id_sources):
+        scheduler = scheduler_factory(tasks=[successful_inventory_update, pending_job], 
+                                      latest_inventory_updates=[successful_inventory_update_latest_cache_expired], 
+                                      create_inventory_update=waiting_inventory_update,
+                                      inventory_sources=inventory_id_sources)
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(waiting_inventory_update, [pending_job])
+
+    def test_last_update_failed(self, scheduler_factory, pending_job, failed_inventory_update, failed_inventory_update_latest, waiting_inventory_update, inventory_id_sources):
+        scheduler = scheduler_factory(tasks=[failed_inventory_update, pending_job], 
+                                      latest_inventory_updates=[failed_inventory_update_latest], 
+                                      create_inventory_update=waiting_inventory_update,
+                                      inventory_sources=inventory_id_sources)
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(waiting_inventory_update, [pending_job])
+

awx/main/tests/unit/scheduler/test_scheduler_job.py

@@ -0,0 +1,56 @@
+
+# Python
+import pytest
+from datetime import timedelta
+
+class TestJobBlocked():
+    def test_inventory_update_waiting(self, scheduler_factory, waiting_inventory_update, pending_job):
+        scheduler = scheduler_factory(tasks=[waiting_inventory_update, pending_job])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_not_called()
+
+    def test_inventory_update_running(self, scheduler_factory, running_inventory_update, pending_job, inventory_source_factory, inventory_id_sources):
+        scheduler = scheduler_factory(tasks=[running_inventory_update, pending_job],
+                                      inventory_sources=inventory_id_sources)
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_not_called()
+
+    def test_project_update_running(self, scheduler_factory, pending_job, running_project_update):
+        scheduler = scheduler_factory(tasks=[running_project_update, pending_job])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_not_called()
+        assert scheduler.create_project_update.call_count == 0
+
+    def test_project_update_waiting(self, scheduler_factory, pending_job, waiting_project_update):
+        scheduler = scheduler_factory(tasks=[waiting_project_update, pending_job],
+                                      latest_project_updates=[waiting_project_update])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_not_called()
+        assert scheduler.create_project_update.call_count == 0
+
+class TestJob():
+    @pytest.fixture
+    def successful_project_update(self, project_update_factory):
+        project_update = project_update_factory() 
+        project_update['status'] = 'successful'
+        project_update['finished'] = project_update['created'] + timedelta(seconds=10)
+        project_update['project__scm_update_cache_timeout'] = 3600
+        return project_update
+
+    def test_existing_dependencies_finished(self, scheduler_factory, successful_project_update, successful_inventory_update_latest, pending_job):
+        scheduler = scheduler_factory(tasks=[successful_project_update, pending_job],
+                                      latest_project_updates=[successful_project_update],
+                                      latest_inventory_updates=[successful_inventory_update_latest])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(pending_job)
+

awx/main/tests/unit/scheduler/test_scheduler_project_update.py

@@ -0,0 +1,75 @@
+
+# TODO: wherever get_latest_rpoject_update_task() is stubbed and returns a
+# ProjectUpdateDict. We should instead return a ProjectUpdateLatestDict()
+# For now, this is ok since the fields on deviate that much.
+
+class TestStartProjectUpdate():
+    def test(self, scheduler_factory, pending_project_update):
+        scheduler = scheduler_factory(tasks=[pending_project_update])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(pending_project_update)
+        assert scheduler.create_project_update.call_count == 0
+
+    '''
+    Explicit project update should always run. They should not use cache logic.
+    '''
+    def test_cache_oblivious(self, scheduler_factory, successful_project_update, pending_project_update):
+        scheduler = scheduler_factory(tasks=[pending_project_update],
+                                      latest_project_updates=[successful_project_update])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(pending_project_update)
+        assert scheduler.create_project_update.call_count == 0
+
+
+class TestCreateDependentProjectUpdate():
+
+    def test(self, scheduler_factory, pending_job, waiting_project_update):
+        scheduler = scheduler_factory(tasks=[pending_job], 
+                                      create_project_update=waiting_project_update)
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(waiting_project_update, [pending_job])
+
+    def test_cache_hit(self, scheduler_factory, pending_job, successful_project_update):
+        scheduler = scheduler_factory(tasks=[successful_project_update, pending_job], 
+                                      latest_project_updates=[successful_project_update])
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(pending_job)
+
+    def test_cache_miss(self, scheduler_factory, pending_job, successful_project_update_cache_expired, waiting_project_update):
+        scheduler = scheduler_factory(tasks=[successful_project_update_cache_expired, pending_job], 
+                                      latest_project_updates=[successful_project_update_cache_expired], 
+                                      create_project_update=waiting_project_update)
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(waiting_project_update, [pending_job])
+
+    def test_last_update_failed(self, scheduler_factory, pending_job, failed_project_update, waiting_project_update):
+        scheduler = scheduler_factory(tasks=[failed_project_update, pending_job], 
+                                      latest_project_updates=[failed_project_update], 
+                                      create_project_update=waiting_project_update)
+        scheduler._schedule()
+
+        scheduler.start_task.assert_called_with(waiting_project_update, [pending_job])
+
+class TestProjectUpdateBlocked():
+    def test_projct_update_running(self, scheduler_factory, running_project_update, pending_project_update):
+        scheduler = scheduler_factory(tasks=[running_project_update, pending_project_update])
+        scheduler._schedule()
+
+        scheduler.start_task.assert_not_called()
+        assert scheduler.create_project_update.call_count == 0
+
+    def test_job_running(self, scheduler_factory, running_job, pending_project_update):
+        scheduler = scheduler_factory(tasks=[running_job, pending_project_update])
+
+        scheduler._schedule()
+
+        scheduler.start_task.assert_not_called()
+

awx/main/tests/unit/test_access.py

@@ -9,6 +9,15 @@ from awx.main.access import (
     check_superuser,
     JobTemplateAccess,
     WorkflowJobTemplateAccess,
+    SystemJobTemplateAccess,
+)
+
+from awx.main.models import (
+    Credential,
+    Inventory,
+    Project,
+    Role,
+    Organization,
 )
 from awx.conf.license import LicenseForbids
 from awx.main.models import Credential, Inventory, Project, Role, Organization, Instance
@@ -124,7 +133,6 @@ def test_jt_can_add_bad_data(user_unit):
     access = JobTemplateAccess(user_unit)
     assert not access.can_add({'asdf': 'asdf'})
 
-
 class TestWorkflowAccessMethods:
     @pytest.fixture
     def workflow(self, workflow_job_template_factory):
@@ -172,3 +180,12 @@ def test_user_capabilities_method():
         'copy': 'foobar'
     }
 
+def test_system_job_template_can_start(mocker):
+    user = mocker.MagicMock(spec=User, id=1, is_system_auditor=True, is_superuser=False)
+    assert user.is_system_auditor
+    access = SystemJobTemplateAccess(user)
+    assert not access.can_start(None)
+
+    user.is_superuser = True
+    access = SystemJobTemplateAccess(user)
+    assert access.can_start(None)

awx/main/tests/unit/test_settings.py

@@ -0,0 +1,11 @@
+from split_settings.tools import include
+
+def test_postprocess_auth_basic_enabled():
+    locals().update({'__file__': __file__})
+
+    include('../../../settings/defaults.py', scope=locals())
+    assert 'awx.api.authentication.LoggedBasicAuthentication' in locals()['REST_FRAMEWORK']['DEFAULT_AUTHENTICATION_CLASSES']
+
+    locals().update({'AUTH_BASIC_ENABLED': False})
+    include('../../../settings/postprocess.py', scope=locals())
+    assert 'awx.api.authentication.LoggedBasicAuthentication' not in locals()['REST_FRAMEWORK']['DEFAULT_AUTHENTICATION_CLASSES']

awx/plugins/inventory/azure_rm.ini.example

@@ -1,5 +1,5 @@
 #
-# Configuration file for azure_rm_invetory.py
+# Configuration file for azure_rm.py
 # 
 [azure]
 # Control which resource groups are included. By default all resources groups are included.
@@ -9,11 +9,14 @@
 # Control which tags are included. Set tags to a comma separated list of keys or key:value pairs
 #tags=
 
+# Control which locations are included. Set locations to a comma separated list (e.g. eastus,eastus2,westus)
+#locations=
+
 # Include powerstate. If you don't need powerstate information, turning it off improves runtime performance.
 include_powerstate=yes
 
 # Control grouping with the following boolean flags. Valid values: yes, no, true, false, True, False, 0, 1.
 group_by_resource_group=yes
 group_by_location=yes
-group_by_security_group=no
+group_by_security_group=yes
 group_by_tag=yes

awx/plugins/inventory/azure_rm.py

@@ -76,7 +76,7 @@ required. For a specific host, this script returns the following variables:
     "version": "latest"
   },
   "location": "westus",
-  "mac_address": "00-0D-3A-31-2C-EC",
+  "mac_address": "00-00-5E-00-53-FE",
   "name": "object-name",
   "network_interface": "interface-name",
   "network_interface_id": "/subscriptions/subscription-id/resourceGroups/galaxy-production/providers/Microsoft.Network/networkInterfaces/object-name1",
@@ -115,7 +115,7 @@ When run in --list mode, instances are grouped by the following categories:
  - tag key
  - tag key_value
 
-Control groups using azure_rm_inventory.ini or set environment variables:
+Control groups using azure_rm.ini or set environment variables:
 
 AZURE_GROUP_BY_RESOURCE_GROUP=yes
 AZURE_GROUP_BY_LOCATION=yes
@@ -130,6 +130,10 @@ Select hosts for specific tag key by assigning a comma separated list of tag key
 
 AZURE_TAGS=key1,key2,key3
 
+Select hosts for specific locations:
+
+AZURE_LOCATIONS=eastus,westus,eastus2
+
 Or, select hosts for specific tag key:value pairs by assigning a comma separated list key:value pairs to:
 
 AZURE_TAGS=key1:value1,key2:value2
@@ -137,12 +141,14 @@ AZURE_TAGS=key1:value1,key2:value2
 If you don't need the powerstate, you can improve performance by turning off powerstate fetching:
 AZURE_INCLUDE_POWERSTATE=no
 
-azure_rm_inventory.ini
+azure_rm.ini
-----------------------
+------------
-As mentioned above you can control execution using environment variables or an .ini file. A sample
+As mentioned above, you can control execution using environment variables or a .ini file. A sample
-azure_rm_inventory.ini is included. The name of the .ini file is the basename of the inventory script (in this case
+azure_rm.ini is included. The name of the .ini file is the basename of the inventory script (in this case
-'azure_rm_inventory') with a .ini extension. This provides you with the flexibility of copying and customizing this
+'azure_rm') with a .ini extension. It also assumes the .ini file is alongside the script. To specify
-script and having matching .ini files. Go forth and customize your Azure inventory!
+a different path for the .ini file, define the AZURE_INI_PATH environment variable:
+
+  export AZURE_INI_PATH=/path/to/custom.ini
 
 Powerstate:
 -----------
@@ -152,13 +158,13 @@ up. If the value is anything other than 'running', the machine is down, and will
 Examples:
 ---------
   Execute /bin/uname on all instances in the galaxy-qa resource group
-  $ ansible -i azure_rm_inventory.py galaxy-qa -m shell -a "/bin/uname -a"
+  $ ansible -i azure_rm.py galaxy-qa -m shell -a "/bin/uname -a"
 
   Use the inventory script to print instance specific information
-  $ contrib/inventory/azure_rm_inventory.py --host my_instance_host_name --pretty
+  $ contrib/inventory/azure_rm.py --host my_instance_host_name --pretty
 
   Use with a playbook
-  $ ansible-playbook -i contrib/inventory/azure_rm_inventory.py my_playbook.yml --limit galaxy-qa
+  $ ansible-playbook -i contrib/inventory/azure_rm.py my_playbook.yml --limit galaxy-qa
 
 
 Insecure Platform Warning
@@ -180,11 +186,13 @@ Version: 1.0.0
 
 import argparse
 import ConfigParser
-import json 
+import json
 import os
 import re
 import sys
 
+from distutils.version import LooseVersion
+
 from os.path import expanduser
 
 HAS_AZURE = True
@@ -195,12 +203,9 @@ try:
     from azure.mgmt.compute import __version__ as azure_compute_version
     from azure.common import AzureMissingResourceHttpError, AzureHttpError
     from azure.common.credentials import ServicePrincipalCredentials, UserPassCredentials
-    from azure.mgmt.network.network_management_client import NetworkManagementClient,\
+    from azure.mgmt.network.network_management_client import NetworkManagementClient
-                                                             NetworkManagementClientConfiguration
+    from azure.mgmt.resource.resources.resource_management_client import ResourceManagementClient
-    from azure.mgmt.resource.resources.resource_management_client import ResourceManagementClient,\
+    from azure.mgmt.compute.compute_management_client import ComputeManagementClient
-                                                                         ResourceManagementClientConfiguration
-    from azure.mgmt.compute.compute_management_client import ComputeManagementClient,\
-                                                             ComputeManagementClientConfiguration
 except ImportError as exc:
     HAS_AZURE_EXC = exc
     HAS_AZURE = False
@@ -219,6 +224,7 @@ AZURE_CREDENTIAL_ENV_MAPPING = dict(
 AZURE_CONFIG_SETTINGS = dict(
     resource_groups='AZURE_RESOURCE_GROUPS',
     tags='AZURE_TAGS',
+    locations='AZURE_LOCATIONS',
     include_powerstate='AZURE_INCLUDE_POWERSTATE',
     group_by_resource_group='AZURE_GROUP_BY_RESOURCE_GROUP',
     group_by_location='AZURE_GROUP_BY_LOCATION',
@@ -226,7 +232,7 @@ AZURE_CONFIG_SETTINGS = dict(
     group_by_tag='AZURE_GROUP_BY_TAG'
 )
 
-AZURE_MIN_VERSION = "2016-03-30"
+AZURE_MIN_VERSION = "0.30.0rc5"
 
 
 def azure_id_to_dict(id):
@@ -362,8 +368,7 @@ class AzureRM(object):
     def network_client(self):
         self.log('Getting network client')
         if not self._network_client:
-            self._network_client = NetworkManagementClient(
+            self._network_client = NetworkManagementClient(self.azure_credentials, self.subscription_id)
-                NetworkManagementClientConfiguration(self.azure_credentials, self.subscription_id))
             self._register('Microsoft.Network')
         return self._network_client
 
@@ -371,16 +376,14 @@ class AzureRM(object):
     def rm_client(self):
         self.log('Getting resource manager client')
         if not self._resource_client:
-            self._resource_client = ResourceManagementClient(
+            self._resource_client = ResourceManagementClient(self.azure_credentials, self.subscription_id)
-                ResourceManagementClientConfiguration(self.azure_credentials, self.subscription_id))
         return self._resource_client
 
     @property
     def compute_client(self):
         self.log('Getting compute client')
         if not self._compute_client:
-            self._compute_client = ComputeManagementClient(
+            self._compute_client = ComputeManagementClient(self.azure_credentials, self.subscription_id)
-                ComputeManagementClientConfiguration(self.azure_credentials, self.subscription_id))
             self._register('Microsoft.Compute')
         return self._compute_client
 
@@ -403,6 +406,7 @@ class AzureInventory(object):
 
         self.resource_groups = []
         self.tags = None
+        self.locations = None
         self.replace_dash_in_groups = False
         self.group_by_resource_group = True
         self.group_by_location = True
@@ -425,6 +429,9 @@ class AzureInventory(object):
         if self._args.tags:
             self.tags = self._args.tags.split(',')
 
+        if self._args.locations:
+            self.locations = self._args.locations.split(',')
+
         if self._args.no_powerstate:
             self.include_powerstate = False
 
@@ -462,6 +469,8 @@ class AzureInventory(object):
                             help='Return inventory for comma separated list of resource group names')
         parser.add_argument('--tags', action='store',
                             help='Return inventory for comma separated list of tag key:value pairs')
+        parser.add_argument('--locations', action='store',
+                            help='Return inventory for comma separated list of locations')
         parser.add_argument('--no-powerstate', action='store_true', default=False,
                             help='Do not include the power state of each virtual host')
         return parser.parse_args()
@@ -487,7 +496,7 @@ class AzureInventory(object):
             except Exception as exc:
                 sys.exit("Error: fetching virtual machines - {0}".format(str(exc)))
 
-            if self._args.host or self.tags > 0:
+            if self._args.host or self.tags or self.locations:
                 selected_machines = self._selected_machines(virtual_machines)
                 self._load_machines(selected_machines)
             else:
@@ -524,7 +533,7 @@ class AzureInventory(object):
                 resource_group=resource_group,
                 mac_address=None,
                 plan=(machine.plan.name if machine.plan else None),
-                virtual_machine_size=machine.hardware_profile.vm_size.value,
+                virtual_machine_size=machine.hardware_profile.vm_size,
                 computer_name=machine.os_profile.computer_name,
                 provisioning_state=machine.provisioning_state,
             )
@@ -576,7 +585,7 @@ class AzureInventory(object):
                     host_vars['mac_address'] = network_interface.mac_address
                     for ip_config in network_interface.ip_configurations:
                         host_vars['private_ip'] = ip_config.private_ip_address
-                        host_vars['private_ip_alloc_method'] = ip_config.private_ip_allocation_method.value
+                        host_vars['private_ip_alloc_method'] = ip_config.private_ip_allocation_method
                         if ip_config.public_ip_address:
                             public_ip_reference = self._parse_ref_id(ip_config.public_ip_address.id)
                             public_ip_address = self._network_client.public_ip_addresses.get(
@@ -585,7 +594,7 @@ class AzureInventory(object):
                             host_vars['ansible_host'] = public_ip_address.ip_address
                             host_vars['public_ip'] = public_ip_address.ip_address
                             host_vars['public_ip_name'] = public_ip_address.name
-                            host_vars['public_ip_alloc_method'] = public_ip_address.public_ip_allocation_method.value
+                            host_vars['public_ip_alloc_method'] = public_ip_address.public_ip_allocation_method
                             host_vars['public_ip_id'] = public_ip_address.id
                             if public_ip_address.dns_settings:
                                 host_vars['fqdn'] = public_ip_address.dns_settings.fqdn
@@ -599,6 +608,8 @@ class AzureInventory(object):
                 selected_machines.append(machine)
             if self.tags and self._tags_match(machine.tags, self.tags):
                 selected_machines.append(machine)
+            if self.locations and machine.location in self.locations:
+                selected_machines.append(machine)
         return selected_machines
 
     def _get_security_groups(self, resource_group):
@@ -676,17 +687,17 @@ class AzureInventory(object):
         file_settings = self._load_settings()
         if file_settings:
             for key in AZURE_CONFIG_SETTINGS:
-                if key in ('resource_groups', 'tags') and file_settings.get(key, None) is not None:
+                if key in ('resource_groups', 'tags', 'locations') and file_settings.get(key):
                     values = file_settings.get(key).split(',')
                     if len(values) > 0:
                         setattr(self, key, values)
-                elif file_settings.get(key, None) is not None:
+                elif file_settings.get(key):
                     val = self._to_boolean(file_settings[key])
                     setattr(self, key, val)
         else:
             env_settings = self._get_env_settings()
             for key in AZURE_CONFIG_SETTINGS:
-                if key in('resource_groups', 'tags') and env_settings.get(key, None) is not None:
+                if key in('resource_groups', 'tags', 'locations') and env_settings.get(key):
                     values = env_settings.get(key).split(',')
                     if len(values) > 0:
                         setattr(self, key, values)
@@ -719,7 +730,8 @@ class AzureInventory(object):
 
     def _load_settings(self):
         basename = os.path.splitext(os.path.basename(__file__))[0]
-        path = basename + '.ini'
+        default_path = os.path.join(os.path.dirname(__file__), (basename + '.ini'))
+        path = os.path.expanduser(os.path.expandvars(os.environ.get('AZURE_INI_PATH', default_path)))
         config = None
         settings = None
         try:
@@ -774,11 +786,11 @@ class AzureInventory(object):
 
 def main():
     if not HAS_AZURE:
-        sys.exit("The Azure python sdk is not installed (try 'pip install azure') - {0}".format(HAS_AZURE_EXC))
+        sys.exit("The Azure python sdk is not installed (try 'pip install azure==2.0.0rc5') - {0}".format(HAS_AZURE_EXC))
 
-    if azure_compute_version < AZURE_MIN_VERSION:
+    if LooseVersion(azure_compute_version) != LooseVersion(AZURE_MIN_VERSION):
-        sys.exit("Expecting azure.mgmt.compute.__version__ to be >= {0}. Found version {1} "
+        sys.exit("Expecting azure.mgmt.compute.__version__ to be {0}. Found version {1} "
-                 "Do you have Azure >= 2.0.0rc2 installed?".format(AZURE_MIN_VERSION, azure_compute_version))
+                 "Do you have Azure == 2.0.0rc5 installed?".format(AZURE_MIN_VERSION, azure_compute_version))
 
     AzureInventory()
 

awx/plugins/inventory/rax.py

@@ -155,8 +155,6 @@ import ConfigParser
 
 from six import iteritems
 
-from ansible.constants import get_config, mk_boolean
-
 try:
     import json
 except ImportError:
@@ -166,11 +164,12 @@ try:
     import pyrax
     from pyrax.utils import slugify
 except ImportError:
-    print('pyrax is required for this module')
+    sys.exit('pyrax is required for this module')
-    sys.exit(1)
 
 from time import time
 
+from ansible.constants import get_config, mk_boolean
+
 
 NON_CALLABLES = (basestring, bool, dict, int, list, type(None))
 
@@ -227,12 +226,21 @@ def _list_into_cache(regions):
 
     prefix = get_config(p, 'rax', 'meta_prefix', 'RAX_META_PREFIX', 'meta')
 
-    networks = get_config(p, 'rax', 'access_network', 'RAX_ACCESS_NETWORK',
-                          'public', islist=True)
     try:
-        ip_versions = map(int, get_config(p, 'rax', 'access_ip_version',
+        # Ansible 2.3+
-                                          'RAX_ACCESS_IP_VERSION', 4,
+        networks = get_config(p, 'rax', 'access_network',
-                                          islist=True))
+                'RAX_ACCESS_NETWORK', 'public', value_type='list')
+    except TypeError:
+        # Ansible 2.2.x and below
+        networks = get_config(p, 'rax', 'access_network',
+                'RAX_ACCESS_NETWORK', 'public', islist=True)
+    try:
+        try:
+            ip_versions = map(int, get_config(p, 'rax', 'access_ip_version',
+                'RAX_ACCESS_IP_VERSION', 4, value_type='list'))
+        except TypeError:
+            ip_versions = map(int, get_config(p, 'rax', 'access_ip_version',
+                'RAX_ACCESS_IP_VERSION', 4, islist=True))
     except:
         ip_versions = [4]
     else:
@@ -406,10 +414,9 @@ def setup():
         if os.path.isfile(default_creds_file):
             creds_file = default_creds_file
         elif not keyring_username:
-            sys.stderr.write('No value in environment variable %s and/or no '
+            sys.exit('No value in environment variable %s and/or no '
-                             'credentials file at %s\n'
+                     'credentials file at %s'
-                             % ('RAX_CREDS_FILE', default_creds_file))
+                     % ('RAX_CREDS_FILE', default_creds_file))
-            sys.exit(1)
 
     identity_type = pyrax.get_setting('identity_type')
     pyrax.set_setting('identity_type', identity_type or 'rackspace')
@@ -422,23 +429,28 @@ def setup():
         else:
             pyrax.set_credential_file(creds_file, region=region)
     except Exception as e:
-        sys.stderr.write("%s: %s\n" % (e, e.message))
+        sys.exit("%s: %s" % (e, e.message))
-        sys.exit(1)
 
     regions = []
     if region:
         regions.append(region)
     else:
-        region_list = get_config(p, 'rax', 'regions', 'RAX_REGION', 'all',
+        try:
-                                 islist=True)
+            # Ansible 2.3+
+            region_list = get_config(p, 'rax', 'regions', 'RAX_REGION', 'all',
+                    value_type='list')
+        except TypeError:
+            # Ansible 2.2.x and below
+            region_list = get_config(p, 'rax', 'regions', 'RAX_REGION', 'all',
+                    islist=True)
+
         for region in region_list:
             region = region.strip().upper()
             if region == 'ALL':
                 regions = pyrax.regions
                 break
             elif region not in pyrax.regions:
-                sys.stderr.write('Unsupported region %s' % region)
+                sys.exit('Unsupported region %s' % region)
-                sys.exit(1)
             elif region not in regions:
                 regions.append(region)
 

awx/settings/defaults.py

@@ -211,6 +211,7 @@ INSTALLED_APPS = (
     'awx.ui',
     'awx.fact',
     'awx.sso',
+    'solo',
 )
 
 INTERNAL_IPS = ('127.0.0.1',)
@@ -402,6 +403,14 @@ CELERYBEAT_SCHEDULE = {
         'task': 'awx.main.tasks.cluster_node_heartbeat',
         'schedule': timedelta(seconds=60)
     },
+    'task_manager': {
+        'task': 'awx.main.scheduler.tasks.run_task_manager',
+        'schedule': timedelta(seconds=20)
+    },
+    'task_fail_inconsistent_running_jobs': {
+        'task': 'awx.main.scheduler.tasks.run_fail_inconsistent_running_jobs',
+        'schedule': timedelta(seconds=30)
+    },
 }
 
 # Django Caching Configuration
@@ -504,6 +513,9 @@ AWX_TASK_ENV = {}
 # before it recycles
 JOB_EVENT_RECYCLE_THRESHOLD = 3000
 
+# Number of workers used to proecess job events in parallel
+JOB_EVENT_WORKERS = 4
+
 # Maximum number of job events that can be waiting on a single worker queue before
 # it can be skipped as too busy
 JOB_EVENT_MAX_QUEUE_SIZE = 100
@@ -602,6 +614,7 @@ INV_ENV_VARIABLE_BLACKLIST = ("HOME", "USER", "_", "TERM")
 # http://docs.aws.amazon.com/general/latest/gr/rande.html#ec2_region
 EC2_REGION_NAMES = {
     'us-east-1': _('US East (Northern Virginia)'),
+    'us-east-2': _('US East (Ohio)'),
     'us-west-2': _('US West (Oregon)'),
     'us-west-1': _('US West (Northern California)'),
     'eu-central-1': _('EU (Frankfurt)'),
@@ -610,6 +623,7 @@ EC2_REGION_NAMES = {
     'ap-southeast-2': _('Asia Pacific (Sydney)'),
     'ap-northeast-1': _('Asia Pacific (Tokyo)'),
     'ap-northeast-2': _('Asia Pacific (Seoul)'),
+    'ap-south-1': _('Asia Pacific (Mumbai)'),
     'sa-east-1': _('South America (Sao Paulo)'),
     'us-gov-west-1': _('US West (GovCloud)'),
     'cn-north-1': _('China (Beijing)'),
@@ -749,7 +763,7 @@ OPENSTACK_INSTANCE_ID_VAR = 'openstack.id'
 # ----- Foreman -----
 # ---------------------
 SATELLITE6_ENABLED_VAR = 'foreman.enabled'
-SATELLITE6_ENABLED_VALUE = 'true'
+SATELLITE6_ENABLED_VALUE = 'True'
 SATELLITE6_GROUP_FILTER = r'^.+$'
 SATELLITE6_HOST_FILTER = r'^.+$'
 SATELLITE6_EXCLUDE_EMPTY_GROUPS = True

awx/ui/client/src/controllers/Projects.js

@@ -267,7 +267,7 @@ ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log', '$statePara
 
 export function ProjectsAdd($scope, $rootScope, $compile, $location, $log,
     $stateParams, GenerateForm, ProjectsForm, Rest, Alert, ProcessErrors,
-    GetBasePath, GetProjectPath, GetChoices, Wait, $state, CreateSelect2) {
+    GetBasePath, GetProjectPath, GetChoices, Wait, $state, CreateSelect2, i18n) {
 
     var form = ProjectsForm(),
         base = $location.path().replace(/^\//, '').split('/')[0],
@@ -414,7 +414,7 @@ ProjectsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
 
 
 export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
-    $stateParams, ProjectsForm, Rest, Alert, ProcessErrors,
+    $stateParams, ProjectsForm, Rest, Alert, ProcessErrors, GenerateForm,
     Prompt, ClearScope, GetBasePath, GetProjectPath, Authorization,
     GetChoices, Empty, DebugForm, Wait, ProjectUpdate, $state, CreateSelect2, ToggleNotification, i18n) {
 
@@ -438,6 +438,16 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
         }
     });
 
+    if ($scope.pathsReadyRemove) {
+        $scope.pathsReadyRemove();
+    }
+    $scope.pathsReadyRemove = $scope.$on('pathsReady', function () {
+        CreateSelect2({
+            element: '#local-path-select',
+            multiple: false
+        });
+    });
+
     // After the project is loaded, retrieve each related set
     if ($scope.projectLoadedRemove) {
         $scope.projectLoadedRemove();
@@ -455,6 +465,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
             $scope.project_local_paths = opts;
             $scope.local_path = $scope.project_local_paths[0];
             $scope.base_dir = 'You do not have access to view this property';
+            $scope.$emit('pathsReady');
         }
 
         $scope.pathRequired = ($scope.scm_type.value === 'manual') ? true : false;
@@ -524,11 +535,6 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
                     multiple: false
                 });
 
-                CreateSelect2({
-                    element: '#local-path-select',
-                    multiple: false
-                });
-
                 $scope.scmBranchLabel = ($scope.scm_type.value === 'svn') ? 'Revision #' : 'SCM Branch';
                 $scope.scm_update_tooltip = "Start an SCM update";
                 $scope.scm_type_class = "";
@@ -581,7 +587,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
     // Save changes to the parent
     $scope.formSave = function() {
         var fld, i, params;
-        //generator.clearApiErrors();
+        GenerateForm.clearApiErrors($scope);
         Wait('start');
         $rootScope.flashMessage = null;
         params = {};

awx/ui/client/src/controllers/Teams.js

@@ -105,8 +105,7 @@ export function TeamsAdd($scope, $rootScope, $stateParams, TeamForm, GenerateFor
 
     // Inject dynamic view
     var defaultUrl = GetBasePath('teams'),
-        form = TeamForm,
+        form = TeamForm;
-        generator = GenerateForm;
 
     init();
 
@@ -120,7 +119,7 @@ export function TeamsAdd($scope, $rootScope, $stateParams, TeamForm, GenerateFor
     // Save
     $scope.formSave = function() {
         var fld, data;
-        generator.clearApiErrors();
+        GenerateForm.clearApiErrors($scope);
         Wait('start');
         Rest.setUrl(defaultUrl);
         data = {};
@@ -216,7 +215,6 @@ export function TeamsEdit($scope, $rootScope, $stateParams,
     $scope.formSave = function() {
         $rootScope.flashMessage = null;
         if ($scope[form.name + '_form'].$valid) {
-            Rest.setUrl(defaultUrl + id + '/');
             var data = processNewData(form.fields);
             Rest.put(data).success(function() {
                     $state.go($state.current, null, { reload: true });

awx/ui/client/src/forms/Credentials.js

@@ -51,7 +51,6 @@ export default
                     list: 'OrganizationList',
                     sourceModel: 'organization',
                     sourceField: 'name',
-                    ngClick: 'lookUpOrganization()',
                     awPopOver: i18n._("<p>If no organization is given, the credential can only be used by the user that creates the credential.  Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.</p>"),
                     dataTitle: i18n._('Organization') + ' ',
                     dataPlacement: 'bottom',

awx/ui/client/src/forms/Projects.js

@@ -181,7 +181,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 }]
             },
             scm_update_cache_timeout: {
-                label: i18n._('Cache Timeout<span class=\"small-text\"> (seconds)</span>'),
+                label: i18n._(`Cache Timeout<span class="small-text"> (seconds)</span>`),
                 id: 'scm-cache-timeout',
                 type: 'number',
                 integer: true,

awx/ui/client/src/forms/Users.js

@@ -157,7 +157,7 @@ export default
                     open: false,
                     index: false,
                     actions: {},
-
+                    emptyListText: 'This user is not a member of any teams',
                     fields: {
                         name: {
                             key: true,

awx/ui/client/src/helpers/ProjectPath.js

@@ -80,6 +80,7 @@ export default
                                 // trigger display of alert block when scm_type == manual
                                 scope.showMissingPlaybooksAlert = true;
                             }
+                            scope.$emit('pathsReady');
                         })
                         .error(function (data, status) {
                             ProcessErrors(scope, data, status, null, { hdr: 'Error!',

awx/ui/client/src/inventories/main.js

@@ -182,11 +182,13 @@ angular.module('inventory', [
                         edit: 'HostEditController'
                     },
                     resolve: {
-                        host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) {
+                        edit: {
-                            return HostManageService.get({ id: $stateParams.host_id }).then(function(res) {
+                            host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) {
-                                return res.data.results[0];
+                                return HostManageService.get({ id: $stateParams.host_id }).then(function(res) {
-                            });
+                                    return res.data.results[0];
-                        }]
+                                });
+                            }]
+                        }
                     },
                     ncyBreadcrumb: {
                         label: "{{host.name}}",

awx/ui/client/src/inventories/manage/adhoc/adhoc.controller.js

@@ -202,7 +202,7 @@ function adhocController($q, $scope, $location, $stateParams,
             "privilege_escalation": ""
         };
 
-        GenerateForm.clearApiErrors();
+        GenerateForm.clearApiErrors($scope);
 
         // populate data with the relevant form values
         for (fld in adhocForm.fields) {

awx/ui/client/src/inventories/manage/groups/groups-add.controller.js

@@ -5,14 +5,14 @@
  *************************************************/
 
 export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList', 'ParseTypeChange', 'GenerateForm', 'inventoryData',
-    'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'rbacUiControlService',
+                'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'rbacUiControlService', 'ToJSON',
-    function($state, $stateParams, $scope, GroupForm, CredentialList,  ParseTypeChange, GenerateForm, inventoryData,
+                function($state, $stateParams, $scope, GroupForm, CredentialList,  ParseTypeChange, GenerateForm, inventoryData,
-        GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, rbacUiControlService) {
+                         GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, rbacUiControlService, ToJSON) {
-        var form = GroupForm();
+                    var generator = GenerateForm,
-
+                        form = GroupForm();
         init();
 
-        function init() {
+        function init() {n
             // apply form definition's default field values
             GenerateForm.applyDefaults(form, $scope);
 
@@ -46,9 +46,10 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList
 
         $scope.formSave = function() {
             var params, source;
+            json_data = ToJSON($scope.parseType, $scope.variables, true);
             // group fields
             var group = {
-                variables: $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
+                variables: json_data,
                 name: $scope.name,
                 description: $scope.description,
                 inventory: inventoryData.id

awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js

@@ -5,9 +5,9 @@
  *************************************************/
 
 export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'ParseVariableString',
-    'ParseTypeChange', 'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'groupData', 'inventorySourceData',
+                'ParseTypeChange', 'GroupManageService', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'groupData', 'inventorySourceData', 'ToJSON',
-    function($state, $stateParams, $scope, ToggleNotification, ParseVariableString,
+                function($state, $stateParams, $scope, ToggleNotification, ParseVariableString,
-        ParseTypeChange, GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, groupData, inventorySourceData) {
+                         ParseTypeChange, GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, groupData, inventorySourceData, ToJSON) {
 
         init();
 
@@ -58,9 +58,10 @@ export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'Parse
         };
         $scope.formSave = function() {
             var params, source;
+            json_data = ToJSON($scope.parseType, $scope.variables, true);
             // group fields
             var group = {
-                variables: $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
+                variables: json_data,
                 name: $scope.name,
                 description: $scope.description,
                 inventory: $scope.inventory,

awx/ui/client/src/inventories/manage/hosts/hosts-add.controller.js

@@ -5,9 +5,9 @@
  *************************************************/
 
 export default ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange',
-    'GenerateForm', 'HostManageService', 'rbacUiControlService', 'GetBasePath',
+                'GenerateForm', 'HostManageService', 'rbacUiControlService', 'GetBasePath', 'ToJSON',
-    function($state, $stateParams, $scope, HostForm, ParseTypeChange,
+                function($state, $stateParams, $scope, HostForm, ParseTypeChange,
-        GenerateForm, HostManageService, rbacUiControlService, GetBasePath) {
+                         GenerateForm, HostManageService, rbacUiControlService, GetBasePath, ToJSON) {
 
         init();
 
@@ -36,9 +36,10 @@ export default ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange
         $scope.toggleHostEnabled = function() {
             $scope.host.enabled = !$scope.host.enabled;
         };
-        $scope.formSave = function() {
+        $scope.formSave = function(){
-            var params = {
+            var json_data = ToJSON($scope.parseType, $scope.variables, true),
-                variables: $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
+            params = {
+                variables: json_data,// $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
                 name: $scope.name,
                 description: $scope.description,
                 enabled: $scope.host.enabled,

awx/ui/client/src/inventories/manage/hosts/hosts-edit.controller.js

@@ -5,8 +5,8 @@
  *************************************************/
 
  export default
-    ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange', 'HostManageService', 'host',
+     ['$state', '$stateParams', '$scope', 'HostForm', 'ParseTypeChange', 'HostManageService', 'host', 'ToJSON',
-    function($state, $stateParams, $scope, HostForm, ParseTypeChange, HostManageService, host){
+     function($state, $stateParams, $scope, HostForm, ParseTypeChange, HostManageService, host, ToJSON){
 
         init();
 
@@ -34,9 +34,10 @@
             $scope.host.enabled = !$scope.host.enabled;
         };
         $scope.formSave = function(){
-            var host = {
+            var json_data = ToJSON($scope.parseType, $scope.variables, true),
+            host = {
                 id: $scope.host.id,
-                variables: $scope.variables === '---' || $scope.variables === '{}' ? null : $scope.variables,
+                variables: json_data,
                 name: $scope.name,
                 description: $scope.description,
                 enabled: $scope.host.enabled

awx/ui/client/src/inventories/manage/hosts/main.js

@@ -10,50 +10,4 @@ import HostsEditController from './hosts-edit.controller';
 export default
 angular.module('manageHosts', [])
     .controller('HostsAddController', HostsAddController)
-    .controller('HostEditController', HostsEditController)
+    .controller('HostEditController', HostsEditController);
-    .config(['$stateProvider', 'stateDefinitionsProvider',
-        function($stateProvider, stateDefinitionsProvider) {
-            let addHost, editHost,
-                stateDefinitions = stateDefinitionsProvider.$get();
-            addHost = {
-                name: 'inventoryManage.addHost',
-                url: '/add-host',
-                lazyLoad: () => stateDefinitions.generateTree({
-                    url: '/add-host',
-                    name: 'inventoryManage.addHost',
-                    modes: ['add'],
-                    form: 'HostForm',
-                    controllers: {
-                        add: 'HostsAddController'
-                    }
-                })
-            };
-
-            editHost = {
-                name: 'inventoryManage.editHost',
-                url: '/edit-host/:host_id',
-                ncyBreadcrumb: {
-                    label: '{{host.name}}',
-                },
-                lazyLoad: () => stateDefinitions.generateTree({
-                    url: '/edit-host/:host_id',
-                    name: 'inventoryManage.editHost',
-                    modes: ['edit'],
-                    form: 'HostForm',
-                    controllers: {
-                        edit: 'HostEditController'
-                    },
-                    resolve: {
-                        host: ['$stateParams', 'HostManageService', function($stateParams, HostManageService) {
-                            return HostManageService.get({ id: $stateParams.host_id }).then(function(res) {
-                                return res.data.results[0];
-                            });
-                        }]
-                    }
-                })
-            };
-
-            $stateProvider.state(addHost);
-            $stateProvider.state(editHost);
-        }
-    ]);

awx/ui/client/src/inventory-scripts/edit/edit.controller.js

@@ -50,7 +50,7 @@ export default ['Rest', 'Wait',
         }
 
         $scope.formSave = function() {
-            generator.clearApiErrors();
+            generator.clearApiErrors($scope);
             Wait('start');
             Rest.setUrl(url + id + '/');
             Rest.put({

awx/ui/client/src/job-detail/host-event/host-event.block.less

@@ -125,6 +125,8 @@
 	.OnePlusTwo-left--detailsRow;
 }
 .HostEvent-field--content{
+	word-wrap: break-word;
+	max-width: 13em;
 	flex: 0 1 13em;
 }
 .HostEvent-details--left, .HostEvent-details--right{
@@ -138,6 +140,7 @@
 		flex: 0 1 25em;
 	}
 	.HostEvent-field--content{
+		max-width: 15em;
 		flex: 0 1 15em;
 		align-self: flex-end;
 	}

awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js

@@ -130,12 +130,20 @@ export default
                                 goToJobDetails('managementJobStdout');
                             }
                             else if(_.has(data, 'project_update')) {
-                                if($state.current.name !== 'projects') {
+                                // If we are on the projects list or any child state of that list
+                                // then we want to stay on that page.  Otherwise go to the stdout
+                                // view.
+                                if(!$state.includes('projects')) {
                                     goToJobDetails('scmUpdateStdout');
                                 }
                             }
                             else if(_.has(data, 'inventory_update')) {
-                                goToJobDetails('inventorySyncStdout');
+                                // If we are on the inventory manage page or any child state of that
+                                // page then we want to stay on that page.  Otherwise go to the stdout
+                                // view.
+                                if(!$state.includes('inventoryManage')) {
+                                    goToJobDetails('inventorySyncStdout');
+                                }
                             }
                         }
                         if(scope.clearDialog) {

awx/ui/client/src/job-templates/add/job-templates-add.controller.js

@@ -54,7 +54,10 @@
                     default_val: false
                 });
                 CallbackHelpInit({ scope: $scope });
-                ParseTypeChange({ scope: $scope, field_id: 'job_template_variables', onChange: callback });
+                SurveyControllerInit({
+                    scope: $scope,
+                    parent_scope: $scope
+                });
             }
 
             callback = function() {
@@ -62,10 +65,6 @@
                 $scope[form.name + '_form'].$setDirty();
             };
 
-            SurveyControllerInit({
-                scope: $scope,
-                parent_scope: $scope
-            });
 
             var selectCount = 0;
 
@@ -73,6 +72,7 @@
                 $scope.removeChoicesReady();
             }
             $scope.removeChoicesReady = $scope.$on('choicesReadyVerbosity', function () {
+                ParseTypeChange({ scope: $scope, field_id: 'job_template_variables', onChange: callback });
                 selectCount++;
                 if (selectCount === 3) {
                     var verbosity;
@@ -120,8 +120,6 @@
                         element:'#job_template_verbosity',
                         multiple: false
                     });
-
-                    $scope.$emit('lookUpInitialize');
                 }
             });
 
@@ -282,7 +280,7 @@
 
 
             function saveCompleted(id) {
-                $state.go('jobTemplates.edit', {id: id}, {reload: true});
+                $state.go('jobTemplates.edit', {job_template_id: id}, {reload: true});
             }
 
             if ($scope.removeTemplateSaveSuccess) {
@@ -421,7 +419,7 @@
                     $scope.survey_enabled = false;
                 }
 
-                generator.clearApiErrors();
+                generator.clearApiErrors($scope);
 
                 Wait('start');
 
@@ -503,6 +501,7 @@
 
                 } catch (err) {
                     Wait('stop');
+                    console.log(err)
                     Alert("Error", "Error parsing extra variables. " +
                         "Parser returned: " + err);
                 }

awx/ui/client/src/job-templates/copy/job-templates-copy.service.js

@@ -5,39 +5,56 @@
  *************************************************/
 
  export default
- 	['$rootScope', 'Rest', 'ProcessErrors', 'GetBasePath', 'moment',
+    ['$rootScope', 'Rest', 'ProcessErrors', 'GetBasePath', 'moment',
- 	function($rootScope, Rest, ProcessErrors, GetBasePath, moment){
+    function($rootScope, Rest, ProcessErrors, GetBasePath, moment){
- 		return {
+        return {
- 			get: function(id){
+            get: function(id){
-	 			var defaultUrl = GetBasePath('job_templates') + '?id=' + id;
+                var defaultUrl = GetBasePath('job_templates') + '?id=' + id;
-	 			Rest.setUrl(defaultUrl);
+                Rest.setUrl(defaultUrl);
-	 			return Rest.get()
+                return Rest.get()
-	 			 	.success(function(res){
+                    .success(function(res){
-	 			 		return res;
+                        return res;
-	 			 	})
+                    })
-	 			 	.error(function(res, status){
+                    .error(function(res, status){
-	                    ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
+                        ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
-	                    msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
+                        msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
-	                });
+                    });
- 			},
+            },
- 			set: function(data){
+            getSurvey: function(endpoint){
-	 			var defaultUrl = GetBasePath('job_templates');
+                Rest.setUrl(endpoint);
-	 			Rest.setUrl(defaultUrl);
+                return Rest.get();
-	 			var name = this.buildName(data.results[0].name);
+            },
-	 			data.results[0].name = name + ' @ ' + moment().format('h:mm:ss a'); // 2:49:11 pm
+            copySurvey: function(source, target){
-	 			return Rest.post(data.results[0])
+                return this.getSurvey(source.related.survey_spec).success( (data) => {
-	 				.success(function(res){
+                    Rest.setUrl(target.related.survey_spec);
-	 					return res;
+                    return Rest.post(data);
-	 				})
+                });
-	 				.error(function(res, status){
+            },
-						ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
+            set: function(data){
-	                	msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
+                var defaultUrl = GetBasePath('job_templates');
-	 				});
+                var self = this;
- 			},
+                Rest.setUrl(defaultUrl);
- 			buildName: function(name){
+                var name = this.buildName(data.results[0].name);
- 				var result = name.split('@')[0];
+                data.results[0].name = name + ' @ ' + moment().format('h:mm:ss a'); // 2:49:11 pm
- 				return result;
+                return Rest.post(data.results[0])
- 			}
+                    .success(function(job_template_res){
- 		};
+                        // also copy any associated survey_spec
- 	}
+                        if (data.results[0].related.survey_spec){
- 	];
+                            return self.copySurvey(data.results[0], job_template_res).success( () => job_template_res);
+                        }
+                        else{
+                            return job_template_res;
+                        }
+                    })
+                    .error(function(res, status){
+                        ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
+                        msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
+                    });
+            },
+            buildName: function(name){
+                var result = name.split('@')[0];
+                return result;
+            }
+        };
+    }
+    ];

awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js

@@ -542,7 +542,7 @@ export default
                     $scope.survey_enabled = false;
                 }
 
-                generator.clearApiErrors();
+                generator.clearApiErrors($scope);
 
                 Wait('start');
 

awx/ui/client/src/login/authenticationServices/pendo.service.js

@@ -13,6 +13,7 @@ export default
        return {
             setPendoOptions: function (config) {
                 var tower_version = config.version.split('-')[0],
+                trial = (config.trial) ? config.trial : false,
                 options = {
                     visitor: {
                       id: null,
@@ -24,7 +25,7 @@ export default
                       planLevel: config.license_type,
                       planPrice: config.instance_count,
                       creationDate: config.license_date,
-                      trial: config.trial,
+                      trial: trial,
                       tower_version: tower_version,
                       ansible_version: config.ansible_version
                     }
@@ -92,49 +93,18 @@ export default
                 return deferred.promise;
             },
 
-            getConfig: function () {
-                var config = ConfigService.get(),
-                deferred = $q.defer();
-                if(_.isEmpty(config)){
-                    var url = GetBasePath('config');
-                    Rest.setUrl(url);
-                    var promise = Rest.get();
-                    promise.then(function (response) {
-                        config = response.data.license_info;
-                        config.analytics_status = response.data.analytics_status;
-                        config.version = response.data.version;
-                        config.ansible_version = response.data.ansible_version;
-                        if(config.analytics_status === 'detailed' || config.analytics_status === 'anonymous'){
-                            $pendolytics.bootstrap();
-                            deferred.resolve(config);
-                        }
-                        else {
-                            deferred.reject('Pendo is turned off.');
-                        }
-                    });
-                    promise.catch(function (response) {
-                        ProcessErrors($rootScope, response.data, response.status, null, {
-                            hdr: 'Error!',
-                            msg: 'Failed to get inventory name. GET returned status: ' +
-                            response.status });
-                        deferred.reject('Could not resolve pendo config.');
-                    });
-                }
-                else if(config.analytics_status === 'detailed' || config.analytics_status === 'anonymous'){
-                    $pendolytics.bootstrap();
-                    deferred.resolve(config);
-                }
-                else {
-                    deferred.reject('Pendo is turned off.');
-                }
-                return deferred.promise;
-            },
-
             issuePendoIdentity: function () {
-                var that = this;
+                var config,
-                this.getConfig().then(function(config){
+                    options,
-                    var options = that.setPendoOptions(config);
+                    c = ConfigService.get(),
-                    that.setRole(options).then(function(options){
+                config = c.license_info;
+                config.analytics_status = c.analytics_status;
+                config.version = c.version;
+                config.ansible_version = c.ansible_version;
+                if(config.analytics_status === 'detailed' || config.analytics_status === 'anonymous'){
+                    $pendolytics.bootstrap();
+                    options = this.setPendoOptions(config);
+                    this.setRole(options).then(function(options){
                         $log.debug('Pendo status is '+ config.analytics_status + '. Object below:');
                         $log.debug(options);
                         $pendolytics.identify(options);
@@ -142,10 +112,10 @@ export default
                         // reject function for setRole
                         $log.debug(reason);
                     });
-                }, function(reason){
+                }
-                    // reject function for getConfig
+                else {
-                    $log.debug(reason);
+                    $log.debug('Pendo is turned off.')
-                });
+                }
              }
         };
    }

awx/ui/client/src/notifications/add/add.controller.js

@@ -120,7 +120,7 @@ export default ['$rootScope', 'Rest', 'Wait', 'NotificationsFormObject',
             var params,
                 v = $scope.notification_type.value;
 
-            generator.clearApiErrors();
+            generator.clearApiErrors($scope);
             params = {
                 "name": $scope.name,
                 "description": $scope.description,

awx/ui/client/src/notifications/edit/edit.controller.js

@@ -197,7 +197,7 @@ export default ['Rest', 'Wait',
             var params,
                 v = $scope.notification_type.value;
 
-            generator.clearApiErrors();
+            generator.clearApiErrors($scope);
             params = {
                 "name": $scope.name,
                 "description": $scope.description,

awx/ui/client/src/organizations/linkout/organizations-linkout.route.js

@@ -54,17 +54,15 @@ export default [{
             squash: true
         }
     },
+    ncyBreadcrumb: {
+        parent: "organizations.edit",
+        label: "USERS"
+    },
+
     data: {
         activityStream: true,
         activityStreamTarget: 'organization'
     },
-    ncyBreadcrumb: {
-        parent: function($scope) {
-            $scope.$parent.$emit("ReloadOrgListView");
-            return "organizations.edit";
-        },
-        label: "USERS"
-    },
     resolve: {
         features: ['FeaturesService', function(FeaturesService) {
             return FeaturesService.get();
@@ -129,10 +127,7 @@ export default [{
         activityStreamTarget: 'organization'
     },
     ncyBreadcrumb: {
-        parent: function($scope) {
+        parent: "organizations.edit",
-            $scope.$parent.$emit("ReloadOrgListView");
-            return "organizations.edit";
-        },
         label: "TEAMS"
     },
     resolve: {
@@ -178,10 +173,7 @@ export default [{
         activityStreamTarget: 'organization'
     },
     ncyBreadcrumb: {
-        parent: function($scope) {
+        parent: "organizations.edit",
-            $scope.$parent.$emit("ReloadOrgListView");
-            return "organizations.edit";
-        },
         label: "INVENTORIES"
     },
     resolve: {
@@ -232,10 +224,7 @@ export default [{
         },
     },
     ncyBreadcrumb: {
-        parent: function($scope) {
+        parent: "organizations.edit",
-            $scope.$parent.$emit("ReloadOrgListView");
-            return "organizations.edit";
-        },
         label: "PROJECTS"
     },
     resolve: {
@@ -293,10 +282,7 @@ export default [{
         }
     },
     ncyBreadcrumb: {
-        parent: function($scope) {
+        parent: "organizations.edit",
-            $scope.$parent.$emit("ReloadOrgListView");
-            return "organizations.edit";
-        },
         label: "JOB TEMPLATES"
     },
     resolve: {
@@ -367,10 +353,7 @@ export default [{
         activityStreamTarget: 'organization'
     },
     ncyBreadcrumb: {
-        parent: function($scope) {
+        parent: "organizations.edit",
-            $scope.$parent.$emit("ReloadOrgListView");
-            return "organizations.edit";
-        },
         label: "ADMINS"
     },
     resolve: {

awx/ui/client/src/organizations/list/organizations-list.controller.js

@@ -12,7 +12,6 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
         $log, $compile, Rest, OrganizationList, Alert, Prompt, ClearScope,
         ProcessErrors, GetBasePath, Wait, $state, rbacUiControlService, $filter, Dataset) {
 
-
         ClearScope();
 
         var defaultUrl = GetBasePath('organizations'),
@@ -85,6 +84,27 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
                 });
                 return val;
             });
+        };
+
+        $scope.$on("ReloadOrgListView", function() {
+            Rest.setUrl($scope.current_url);
+            Rest.get()
+                .success((data) => $scope.organizations = data.results)
+                .error(function(data, status) {
+                    ProcessErrors($scope, data, status, null, {
+                        hdr: 'Error!',
+                        msg: 'Call to ' + defaultUrl + ' failed. DELETE returned status: ' + status
+                    });
+            });
+        });
+
+
+        $scope.$watchCollection('organizations', function(value){
+            $scope.orgCards = parseCardData(value);
+        });
+
+        if ($scope.removePostRefresh) {
+            $scope.removePostRefresh();
         }
 
         $scope.$watchCollection(`${list.iterator}_dataset`, function(data) {
@@ -129,5 +149,50 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
                 actionText: 'DELETE'
             });
         };
+        var init = function(){
+            // Pagination depends on html appended by list generator
+            view.inject(list, {
+                id: 'organizations-list',
+                scope: $scope,
+                mode: 'edit'
+            });
+            // grab the pagination elements, move, destroy list generator elements
+            $('#organization-pagination').appendTo('#OrgCards');
+            $('#organizations tag-search').appendTo('.OrgCards-search');
+            $('#organizations-list').remove();
+
+            PaginateInit({
+                scope: $scope,
+                list: list,
+                url: defaultUrl,
+                pageSize: pageSize,
+            });
+            SearchInit({
+                scope: $scope,
+                list: list,
+                url: defaultUrl,
+                set: 'organizations'
+            });
+
+            $scope.list = list;
+            $rootScope.flashMessage = null;
+
+            $scope.search(list.iterator);
+            var getOrgCount = function() {
+                Rest.setUrl(defaultUrl);
+                Rest.get()
+                    .success(function(data) {
+                        $scope.orgCount = data.count;
+                    })
+                    .error(function(data, status) {
+                        ProcessErrors($scope, data, status, null, {
+                            hdr: 'Error!',
+                            msg: 'Call to ' + defaultUrl + ' failed. DELETE returned status: ' + status
+                        });
+                    });
+            };
+            getOrgCount();
+        };
+        init();
     }
 ];

awx/ui/client/src/shared/Utilities.js

@@ -517,7 +517,6 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
     function($rootScope) {
 
         return function(directive) {
-            /* @todo re-enable
             var docw, doch, spinnyw, spinnyh;
             if (directive === 'start' && !$rootScope.waiting) {
                 $rootScope.waiting = true;
@@ -538,7 +537,6 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
                     $rootScope.waiting = false;
                 });
             }
-            */
         };
     }
 ])

awx/ui/client/src/shared/form-generator.js

@@ -303,21 +303,21 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                 return html;
             },
 
-            clearApiErrors: function () {
+            clearApiErrors: function (scope) {
                 for (var fld in this.form.fields) {
                     if (this.form.fields[fld].sourceModel) {
-                        this.scope[this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField + '_api_error'] = '';
+                        scope[this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField + '_api_error'] = '';
                         $('[name="' + this.form.fields[fld].sourceModel + '_' + this.form.fields[fld].sourceField + '"]').removeClass('ng-invalid');
                     } else if (this.form.fields[fld].realName) {
                         this.scope[this.form.fields[fld].realName + '_api_error'] = '';
                         $('[name="' + this.form.fields[fld].realName + '"]').removeClass('ng-invalid');
                     } else {
-                        this.scope[fld + '_api_error'] = '';
+                        scope[fld + '_api_error'] = '';
                         $('[name="' + fld + '"]').removeClass('ng-invalid');
                     }
                 }
-                if (!this.scope.$$phase) {
+                if (!scope.$$phase) {
-                    this.scope.$digest();
+                    scope.$digest();
                 }
             },
 

awx/ui/client/src/shared/socket/socket.service.js

@@ -5,8 +5,8 @@
  *************************************************/
 import ReconnectingWebSocket from 'reconnectingwebsocket';
 export default
-['$rootScope', '$location', '$log','$state', '$q', 'i18n',
+['$rootScope', '$location', '$log','$state', '$q', 'i18n', 'Authorization',
-    function ($rootScope, $location, $log, $state, $q, i18n) {
+    function ($rootScope, $location, $log, $state, $q, i18n, Authorization) {
         var needsResubscribing = false,
         socketPromise = $q.defer();
         return {
@@ -14,7 +14,8 @@ export default
                 var self = this,
                     host = window.location.host,
                     protocol,
-                    url;
+                    url,
+                    token = Authorization.getToken();
 
                 if($location.protocol() === 'http'){
                     protocol = 'ws';
@@ -26,6 +27,7 @@ export default
 
                 if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) {
                     // We have a valid session token, so attempt socket connection
+                    url = `${url}?token=${token}`;
                     $log.debug('Socket connecting to: ' + url);
 
                     self.socket = new ReconnectingWebSocket(url, null, {
@@ -73,9 +75,6 @@ export default
                 // Function called when messages are received on by the UI from
                 // the API over the websocket. This will route each message to
                 // the appropriate controller for the current $state.
-                e.data = e.data.replace(/\\/g, '');
-                e.data = e.data.substr(0, e.data.length-1);
-                e.data = e.data.substr(1);
                 $log.debug('Received From Server: ' + e.data);
 
                 var data = JSON.parse(e.data), str = "";

awx/ui/client/src/shared/stateDefinitions.factory.js

@@ -363,7 +363,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat
             function buildFieldDefinition(field) {
                 let state = $stateExtender.buildDefinition({
                     searchPrefix: field.sourceModel,
-                    squashSearchUrl: true,
+                    //squashSearchUrl: true, @issue enable
                     name: `${formStateDefinition.name}.${field.sourceModel}`,
                     url: `/${field.sourceModel}`,
                     // a lookup field's basePath takes precedence over generic list definition's basePath, if supplied
@@ -391,6 +391,7 @@ export default ['$injector', '$stateExtender', '$log', function($injector, $stat
                     },
                     resolve: {
                         ListDefinition: [field.list, function(list) {
+                            list.iterator = field.sourceModel;
                             return list;
                         }],
                         Dataset: ['ListDefinition', 'QuerySet', '$stateParams', 'GetBasePath', '$interpolate', '$rootScope', '$state',

docs/task_manager_system.md

@@ -0,0 +1,57 @@
+# Task Manager Overview
+
+The task manager is responsible for deciding when jobs should be introduced to celery for running. When choosing a task to run the considerations are: (1) creation time, (2) job dependency, (3) capacity.
+
+Independent jobs are ran in order of creation time, earliest first. Jobs with dependencies are also ran in creation time order within the group of job dependencies. Capacity is the final consideration when deciding to release a job to be ran by celery.
+
+## Task Manager Architecture
+
+The task manager has a single entry point, `Scheduler().schedule()`. The method may be called in parallel, at any time, as many times as the user wants. The `schedule()` function tries to aquire a single, global, lock using the Instance table first record in the database. If the lock can not be aquired the method returns. The failure to aquire the lock indicates that there is another instance currently running `schedule()`.
+
+### Hybrid Scheduler: Periodic + Event 
+The `schedule()` function is ran (a) periodically by a celery task and (b) on job creation or completion. The task manager system would behave correctly if ran, exclusively, via (a) or (b). We chose to trigger `schedule()` via both mechanisms because of the nice properties I will now mention. (b) reduces the time from launch to running, resulting a better user experience. (a) is a fail-safe in case we miss code-paths, in the present and future, that change the 3 scheduling considerations for which we should call `schedule()` (i.e. adding new nodes to tower changes the capacity, obscure job error handling that fails a job)
+ Emperically, the periodic task manager has served us well in the past and we will continue to rely on it with the added event-triggered `schedule()`.
+ 
+ ### Scheduler Algorithm
+ * Get all non-completed jobs, `all_tasks`
+ * Generate the hash tables from `all_tasks`:
+   * `<job_template_id, True/False>` indicates a job is running
+   * `<project_id, True/False>` indicates a project update is running
+   * `<inventory_id, True/False>` indicates a job template or inventory update is running
+   * `<inventory_source_id, True/False>` indiciates an inventory update is running
+   * `<workflow_job_template_id, True/False>` indiciates a workflow job is running
+   * `<project_id, latest_project_update_partial>` used to determine cache timeout
+   * `<inventory_id, [ inventory_source_partial, ... ]>`  used to determine cache timeout and dependencies to spawn
+   * `<inventory_source_id, latest_inventory_update_partial>` used to determine cache timeout
+ * Detect finished workflow jobs
+ * Spawn next workflow jobs if needed
+ * For each pending jobs; start with oldest created job and stop when no capacity == 0
+   * If job is not blocked, determined using generated hash tables, and there is capacity, then mark the as `waiting` and submit the job to celery.
+ 
+### Job Lifecycle
+| Job Status |                                                       State                                                      |
+|:----------:|:------------------------------------------------------------------------------------------------------------------:|
+| pending    | Job launched.  <br>1. Hasn't yet been seen by the scheduler <br>2. Is blocked by another task <br>3. Not enough capacity |
+| waiting    | Job submitted to celery.                                                                                           |
+| running    | Job running in celery.                                                                                             |
+| successful | Job finished with ansible-playbook return code 0.                                                                  |
+| failed     | Job finished with ansible-playbook return code other than 0.                                                       |
+| error      | System failure.                                                                                                    |
+
+## todo
+ 
+## Code Composition
+* partials
+* 
+
+## Acceptance Tests
+* assemelate with .md and trim the fat https://docs.google.com/a/redhat.com/document/d/1AOvKiTMSV0A2RHykHW66BZKBuaJ_l0SJ-VbMwvu-5Gk/edit?usp=sharing
+
+
+
+
+
+
+
+
+

requirements/requirements.txt

@@ -2,17 +2,17 @@ git+https://github.com/chrismeyersfsu/ansiconv.git@tower_1.0.0#egg=ansiconv
 amqp==1.4.9
 anyjson==0.3.3
 appdirs==1.4.0
-azure==2.0.0rc2
+azure==2.0.0rc5
 Babel==2.2.0
 baron==0.6.2
 billiard==3.3.0.16
-boto==2.40.0
+boto==2.43.0
 celery==3.1.23
 cliff==1.15.0
 cmd2==0.6.8
 d2to1==0.2.11   # TODO: Still needed?
 defusedxml==0.4.1
-Django==1.8.15
+Django==1.8.16
 debtcollector==1.2.0
 decorator==4.0.6
 django-auth-ldap==1.2.6
@@ -24,7 +24,9 @@ django-polymorphic==0.7.2
 django-radius==1.0.0
 djangorestframework==3.3.2
 djangorestframework-yaml==1.0.2
+django-solo==1.1.2
 django-split-settings==0.1.1
+django-transaction-hooks==0.2
 django-taggit==0.17.6
 git+https://github.com/matburt/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding
 dogpile.core==0.4.1
@@ -116,7 +118,7 @@ rax-default-network-flags-python-novaclient-ext==0.3.2
 rax-scheduled-images-python-novaclient-ext==0.3.1
 redbaron==0.6.1
 requests-oauthlib==0.5.0
-requests==2.9.1
+requests==2.11.0
 requestsexceptions==1.1.1
 rply==0.7.4
 shade==1.4.0

requirements/requirements_ansible.txt

@@ -3,7 +3,7 @@ apache-libcloud==0.20.1
 appdirs==1.4.0
 azure==2.0.0rc5
 Babel==2.2.0
-boto==2.40.0
+boto==2.43.0
 cliff==1.15.0
 cmd2==0.6.8
 cryptography==1.3.2