Initial Scan Job Template type implementation

awx/main/models/base.py

@@ -27,7 +27,7 @@ __all__ = ['VarsDictProperty', 'BaseModel', 'CreatedModifiedModel',
            'PasswordFieldsModel', 'PrimordialModel', 'CommonModel',
            'CommonModelNameNotUnique',
            'PERM_INVENTORY_ADMIN', 'PERM_INVENTORY_READ',
-           'PERM_INVENTORY_WRITE', 'PERM_INVENTORY_DEPLOY',
+           'PERM_INVENTORY_WRITE', 'PERM_INVENTORY_DEPLOY', 'PERM_INVENTORY_SCAN',
            'PERM_INVENTORY_CHECK', 'PERM_JOBTEMPLATE_CREATE', 'JOB_TYPE_CHOICES',
            'PERMISSION_TYPE_CHOICES', 'CLOUD_INVENTORY_SOURCES']
 
@@ -36,11 +36,13 @@ PERM_INVENTORY_READ   = 'read'
 PERM_INVENTORY_WRITE  = 'write'
 PERM_INVENTORY_DEPLOY = 'run'
 PERM_INVENTORY_CHECK  = 'check'
+PERM_INVENTORY_SCAN   = 'scan'
 PERM_JOBTEMPLATE_CREATE = 'create'
 
 JOB_TYPE_CHOICES = [
     (PERM_INVENTORY_DEPLOY, _('Run')),
     (PERM_INVENTORY_CHECK, _('Check')),
+    (PERM_INVENTORY_SCAN, _('Scan')),
 ]
 
 PERMISSION_TYPE_CHOICES = [
@@ -49,6 +51,7 @@ PERMISSION_TYPE_CHOICES = [
     (PERM_INVENTORY_ADMIN, _('Administrate Inventory')),
     (PERM_INVENTORY_DEPLOY, _('Deploy To Inventory')),
     (PERM_INVENTORY_CHECK, _('Deploy To Inventory (Dry Run)')),
+    (PERM_INVENTORY_SCAN, _('Scan an Inventory')),
     (PERM_JOBTEMPLATE_CREATE, _('Create a Job Template')),
 ]
 

awx/main/models/jobs.py

@@ -52,11 +52,14 @@ class JobOptions(BaseModel):
         'Project',
         related_name='%(class)ss',
         null=True,
+        default=None,
+        blank=True,
         on_delete=models.SET_NULL,
     )
     playbook = models.CharField(
         max_length=1024,
         default='',
+        blank=True,
     )
     credential = models.ForeignKey(
         'Credential',
@@ -142,7 +145,6 @@ class JobOptions(BaseModel):
                     needed.append(pw)
         return needed
 
-
 class JobTemplate(UnifiedJobTemplate, JobOptions):
     '''
     A job template is a reusable job definition for applying a project (with
@@ -1016,7 +1018,6 @@ class SystemJob(UnifiedJob, SystemJobOptions):
     def is_blocked_by(self, obj):
         return True
 
-    
     def handle_extra_data(self, extra_data):
         extra_vars = {}
         if type(extra_data) == dict:
@@ -1037,3 +1038,4 @@ class SystemJob(UnifiedJob, SystemJobOptions):
     @property
     def task_impact(self):
         return 150
+