Fix periodic task execution on templates without inventory.

Author: onegreyonewhite

doc/api_schema.yaml

@@ -65,9 +65,9 @@ info:
   x-versions:
     application: 1.8.0
     library: 1.8.0
-    vstutils: 3.5.0
-    django: 2.2.12
-    ansible: 2.9.9
+    vstutils: 4.0.14
+    django: 2.2.14
+    ansible: 2.9.6
   version: v2
   x-user-id: 1
 host: localhost:8080
@@ -8119,6 +8119,7 @@ definitions:
             MODULE: hidden
             PLAYBOOK: hidden
             TEMPLATE: autocomplete
+        x-nullable: true
       enabled:
         title: Enabled
         type: boolean
@@ -8201,6 +8202,7 @@ definitions:
             MODULE: hidden
             PLAYBOOK: hidden
             TEMPLATE: autocomplete
+        x-nullable: true
       enabled:
         title: Enabled
         type: boolean

polemarch/__init__.py

@@ -31,6 +31,6 @@
     "VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
 }
 
-__version__ = "1.8.0"
+__version__ = "1.8.1"
 
 prepare_environment(**default_settings)

polemarch/api/v2/serializers.py

@@ -553,7 +553,11 @@ class PeriodictaskSerializer(_WithVariablesSerializer):
     )
 
     template_opt = vst_fields.DependEnumField(
-        allow_blank=True, required=False, field='kind', types={
+        allow_blank=True,
+        required=False,
+        allow_null=True,
+        field='kind',
+        types={
             'PLAYBOOK': 'hidden',
             'MODULE': 'hidden',
             'TEMPLATE': 'autocomplete',

polemarch/main/models/tasks.py

@@ -77,6 +77,8 @@ def get_data(self) -> Dict:
     @property
     def inventory_object(self) -> InvOrString:
         try:
+            if 'inventory' not in self.data:
+                return None
             return self.project.inventories.get(pk=int(self.data['inventory']))
         except (ValueError, Inventory.DoesNotExist):
             self.project.check_path(self.data['inventory'])

polemarch/main/tests/executions.py

@@ -1825,3 +1825,30 @@ def test_periodic_task_edit(self):
         self.assertEqual(results[10]['data']['inventory'], '')
         self.assertEqual(results[12]['data']['inventory'], './localhost, ')
         self.assertEqual(results[-2]['data']['status'], 'OK')
+
+    def test_periodic_task_without_inventory(self):
+        template_data = self.template_playbook
+        del template_data['data']['inventory']
+        periodic_task = {
+            "name": "WithoutInventory",
+            "kind": "TEMPLATE",
+            "mode": "",
+            "inventory": "",
+            "save_result": True,
+            "template": "<<2[data][id]>>",
+            "template_opt": None,
+            "enabled": True,
+            "type": "CRONTAB",
+            "schedule": "56 9 * * 1-6",
+            "notes": ""
+        }
+        results = self.bulk([
+            {'method': 'post', 'path': ['project'], 'data': dict(name='test_pt_errors', repo_type='MANUAL')},
+            {'method': 'post', 'path': ['project', '<<0[data][id]>>', 'sync']},
+            {'method': 'post', 'path': ['project', '<<0[data][id]>>', 'template'], 'data': template_data},
+            {'method': 'post', 'path': ['project', '<<0[data][id]>>', 'periodic_task'], 'data': periodic_task},
+            {'method': 'post', 'path': ['project', '<<0[data][id]>>', 'periodic_task', '<<3[data][id]>>', 'execute']},
+            {'method': 'delete', 'path': ['project', '<<0[data][id]>>']},
+        ])
+        self.assertEqual(len(tuple(filter(lambda x: x['status'] not in (201, 200, 204), results))), 0, results)
+        self.assertIn('history_id', results[4]['data'].keys())

requirements-doc.txt

@@ -1,2 +1,2 @@
 # Docs
-vstutils[doc]~=4.0.0
+vstutils[doc]~=4.0.14

requirements.txt

@@ -1,5 +1,5 @@
 # Main
-vstutils[rpc,ldap,doc,prod]~=4.0.0
+vstutils[rpc,ldap,doc,prod]~=4.0.14
 docutils~=0.16.0
 markdown2==2.3.9