feat: 完成剩余流程, 修改部分模型

apps/ops/models/adhoc.py

@@ -1,21 +1,18 @@
 # ~*~ coding: utf-8 ~*~
-import os.path
 import uuid
 
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from common.db.models import BaseCreateUpdateModel
 from common.utils import get_logger
-from .base import BaseAnsibleJob, BaseAnsibleExecution
-from ..ansible import AdHocRunner
+from orgs.mixins.models import JMSOrgBaseModel
 
-__all__ = ["AdHoc", "AdHocExecution"]
+__all__ = ["AdHoc"]
 
 logger = get_logger(__file__)
 
 
-class AdHoc(BaseCreateUpdateModel):
+class AdHoc(JMSOrgBaseModel):
     class Modules(models.TextChoices):
         shell = 'shell', _('Shell')
         winshell = 'win_shell', _('Powershell')
@@ -26,7 +23,7 @@ class AdHoc(BaseCreateUpdateModel):
     module = models.CharField(max_length=128, choices=Modules.choices, default=Modules.shell,
                               verbose_name=_('Module'))
     args = models.CharField(max_length=1024, default='', verbose_name=_('Args'))
-    owner = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
+    creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
 
     @property
     def row_count(self):
@@ -41,28 +38,3 @@ class AdHoc(BaseCreateUpdateModel):
 
     def __str__(self):
         return "{}: {}".format(self.module, self.args)
-
-
-class AdHocExecution(BaseAnsibleExecution):
-    """
-    AdHoc running history.
-    """
-    task = models.ForeignKey('AdHoc', verbose_name=_("Adhoc"), related_name='executions', on_delete=models.CASCADE)
-
-    def get_runner(self):
-        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
-
-    def task_display(self):
-        return str(self.task)
-
-    class Meta:
-        db_table = "ops_adhoc_execution"
-        get_latest_by = 'date_start'
-        verbose_name = _("AdHoc execution")

apps/ops/models/job.py

@@ -45,6 +45,7 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
     runas = models.CharField(max_length=128, default='root', verbose_name=_('Runas'))
     runas_policy = models.CharField(max_length=128, choices=RunasPolicies.choices, default=RunasPolicies.skip,
                                     verbose_name=_('Runas policy'))
+    use_parameter_define = models.BooleanField(default=False, verbose_name=(_('Use Parameter Define')))
     parameters_define = models.JSONField(default=dict, verbose_name=_('Parameters define'))
     comment = models.CharField(max_length=1024, default='', verbose_name=_('Comment'), null=True, blank=True)
 
@@ -77,9 +78,9 @@ class Job(JMSOrgBaseModel, PeriodTaskModelMixin):
         return total_cost / finished_count if finished_count else 0
 
     def get_register_task(self):
-        from ..tasks import run_ops_job
+        from ..tasks import run_ops_job_execution
         name = "run_ops_job_period_{}".format(str(self.id)[:8])
-        task = run_ops_job.name
+        task = run_ops_job_execution.name
         args = (str(self.id),)
         kwargs = {}
         return name, task, args, kwargs
@@ -108,6 +109,10 @@ class JobExecution(JMSOrgBaseModel):
     date_start = models.DateTimeField(null=True, verbose_name=_('Date start'), db_index=True)
     date_finished = models.DateTimeField(null=True, verbose_name=_("Date finished"))
 
+    @property
+    def job_type(self):
+        return self.job.type
+
     def get_runner(self):
         inv = self.job.inventory
         inv.write_to_file(self.inventory_path)

apps/ops/models/playbook.py

@@ -5,14 +5,14 @@ from django.conf import settings
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
-from common.db.models import BaseCreateUpdateModel
+from orgs.mixins.models import JMSOrgBaseModel
 
 
-class Playbook(BaseCreateUpdateModel):
+class Playbook(JMSOrgBaseModel):
     id = models.UUIDField(default=uuid.uuid4, primary_key=True)
     name = models.CharField(max_length=128, verbose_name=_('Name'), null=True)
     path = models.FileField(upload_to='playbooks/')
-    owner = models.ForeignKey('users.User', verbose_name=_("Owner"), on_delete=models.SET_NULL, null=True)
+    creator = models.ForeignKey('users.User', verbose_name=_("Creator"), on_delete=models.SET_NULL, null=True)
 
     @property
     def work_path(self):