perf: 基本完成 adhoc runner

apps/ops/models/__init__.py

@@ -3,3 +3,4 @@
 
 from .adhoc import *
 from .celery import *
+from .playbook import *

apps/ops/models/adhoc.py

@@ -1,5 +1,5 @@
 # ~*~ coding: utf-8 ~*~
-
+import os.path
 
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
@@ -18,7 +18,12 @@ class AdHoc(BaseAnsibleTask):
     pattern = models.CharField(max_length=1024, verbose_name=_("Pattern"), default='all')
     module = models.CharField(max_length=128, default='shell', verbose_name=_('Module'))
     args = models.CharField(max_length=1024, default='', verbose_name=_('Args'))
-    last_execution = models.ForeignKey('AdHocExecution', verbose_name=_("Last execution"), on_delete=models.SET_NULL, null=True, blank=True)
+    last_execution = models.ForeignKey('AdHocExecution', verbose_name=_("Last execution"),
+                                       on_delete=models.SET_NULL, null=True, blank=True)
+
+    def get_register_task(self):
+        from ops.tasks import run_adhoc
+        return "run_adhoc_{}".format(self.id), run_adhoc, (str(self.id),), {}
 
     def __str__(self):
         return "{}: {}".format(self.module, self.args)
@@ -31,10 +36,14 @@ class AdHocExecution(BaseAnsibleExecution):
     task = models.ForeignKey('AdHoc', verbose_name=_("Adhoc"), related_name='executions', on_delete=models.CASCADE)
 
     def get_runner(self):
-        return AdHocRunner(
-            self.task.inventory, self.task.module, self.task.args,
+        inv = self.task.inventory
+        inv.write_to_file(self.inventory_path)
+
+        runner = AdHocRunner(
+            self.inventory_path, self.task.module, module_args=self.task.args,
             pattern=self.task.pattern, project_dir=self.private_dir
         )
+        return runner
 
     class Meta:
         db_table = "ops_adhoc_execution"

apps/ops/models/base.py

@@ -1,5 +1,6 @@
 import os.path
 import uuid
+import logging
 
 from django.db import models
 from django.utils.translation import gettext_lazy as _
@@ -25,7 +26,7 @@ class BaseAnsibleTask(PeriodTaskModelMixin, JMSOrgBaseModel):
     @property
     def inventory(self):
         inv = JMSInventory(self.assets.all(), self.account, self.account_policy)
-        return inv.generate()
+        return inv
 
     def get_register_task(self):
         raise NotImplemented
@@ -33,11 +34,19 @@ class BaseAnsibleTask(PeriodTaskModelMixin, JMSOrgBaseModel):
     def to_json(self):
         raise NotImplemented
 
+    def create_execution(self):
+        execution = self.executions.create()
+        return execution
+
+    def run(self, *args, **kwargs):
+        execution = self.create_execution()
+        return execution.start()
+
 
 class BaseAnsibleExecution(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4)
     status = models.CharField(max_length=16, verbose_name=_('Status'), default='running')
-    task = models.ForeignKey(BaseAnsibleTask, on_delete=models.CASCADE, null=True)
+    task = models.ForeignKey(BaseAnsibleTask, on_delete=models.CASCADE, related_name='executions', null=True)
     result = models.JSONField(blank=True, null=True, verbose_name=_('Result'))
     summary = models.JSONField(default=dict, verbose_name=_('Summary'))
     creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
@@ -52,13 +61,40 @@ class BaseAnsibleExecution(models.Model):
     def __str__(self):
         return str(self.id)
 
+    @property
     def private_dir(self):
         uniq = self.date_created.strftime('%Y%m%d_%H%M%S') + '_' + self.short_id
         return os.path.join(settings.ANSIBLE_DIR, self.task.name, uniq)
 
+    @property
+    def inventory_path(self):
+        return os.path.join(self.private_dir, 'inventory', 'hosts')
+
     def get_runner(self):
         raise NotImplemented
 
+    def finish_task(self):
+        self.date_finished = timezone.now()
+        self.save(update_fields=['result', 'status', 'summary', 'date_finished'])
+        self.update_task()
+
+    def set_error(self, error):
+        this = self.__class__.objects.get(id=self.id)  # 重新获取一次，避免数据库超时连接超时
+        this.status = 'failed'
+        this.summary['error'] = str(error)
+        this.finish_task()
+
+    def set_result(self, cb):
+        status_mapper = {
+            'successful': 'succeeded',
+        }
+        this = self.__class__.objects.get(id=self.id)
+        this.status = status_mapper.get(cb.status, cb.status)
+        this.summary = cb.summary
+        this.result = cb.result
+        this.finish_task()
+        print("Finished")
+
     def update_task(self):
         self.task.last_execution = self
         self.task.date_last_run = timezone.now()
@@ -68,16 +104,11 @@ class BaseAnsibleExecution(models.Model):
         runner = self.get_runner()
         try:
             cb = runner.run(**kwargs)
-            self.status = cb.status
-            self.summary = cb.summary
-            self.result = cb.result
-            self.date_finished = timezone.now()
+            self.set_result(cb)
+            return cb
         except Exception as e:
-            self.status = 'failed'
-            self.summary = {'error': str(e)}
-        finally:
-            self.save()
-            self.update_task()
+            logging.error(e, exc_info=True)
+            self.set_error(e)
 
     @property
     def is_finished(self):

apps/ops/models/playbook.py

@@ -27,7 +27,11 @@ class Playbook(BaseAnsibleTask):
     last_execution = models.ForeignKey('PlaybookExecution', verbose_name=_("Last execution"), on_delete=models.SET_NULL, null=True, blank=True)
 
     def get_register_task(self):
-        pass
+        name = "automation_strategy_period_{}".format(str(self.id)[:8])
+        task = execute_automation_strategy.name
+        args = (str(self.id), Trigger.timing)
+        kwargs = {}
+        return name, task, args, kwargs
 
 
 class PlaybookExecution(BaseAnsibleExecution):