perf: rename ad to ds

apps/assets/models/asset/__init__.py

@@ -1,9 +1,9 @@
-from .ad import *
 from .cloud import *
 from .common import *
 from .custom import *
 from .database import *
 from .device import *
+from .ds import *
 from .gpt import *
 from .host import *
 from .web import *

apps/assets/models/asset/common.py

@@ -247,10 +247,10 @@ class Asset(NodesRelationMixin, LabeledMixin, AbsConnectivity, JSONFilterMixin,
 
     @property
     def all_accounts(self):
-        if not self.joined_ad_id:
+        if not self.joined_dir_svc_id:
             queryset = self.accounts.all()
         else:
-            queryset = self.accounts.model.objects.filter(asset__in=[self.id, self.joined_ad_id])
+            queryset = self.accounts.model.objects.filter(asset__in=[self.id, self.joined_dir_svc_id])
         return queryset
 
     @lazyproperty
@@ -273,15 +273,15 @@ class Asset(NodesRelationMixin, LabeledMixin, AbsConnectivity, JSONFilterMixin,
         protocol = self.protocols.all().filter(name=protocol).first()
         return protocol.port if protocol else 0
 
-    def is_ad(self):
-        return self.category == const.Category.AD
+    def is_dir_svc(self):
+        return self.category == const.Category.DS
 
     @property
-    def joined_ad_id(self):
-        return self.platform.ad_id
+    def joined_dir_svc_id(self):
+        return self.platform.ds_id
 
     def is_joined_ad(self):
-        if self.joined_ad_id:
+        if self.joined_dir_svc_id:
             return True
         else:
             return False

apps/assets/models/asset/ds.py

@@ -3,11 +3,11 @@ from django.utils.translation import gettext_lazy as _
 
 from .common import Asset
 
-__all__ = ['AD']
+__all__ = ['DirectoryService']
 
 
-class AD(Asset):
+class DirectoryService(Asset):
     domain_name = models.CharField(max_length=128, blank=True, default='', verbose_name=_("Domain name"))
 
     class Meta:
-        verbose_name = _("Active Directory")
+        verbose_name = _("Directory service")

apps/assets/models/platform.py

@@ -102,10 +102,10 @@ class Platform(LabeledMixin, JMSBaseModel):
         max_length=8, verbose_name=_("Charset")
     )
     domain_enabled = models.BooleanField(default=True, verbose_name=_("Gateway enabled"))
-    ad_enabled = models.BooleanField(default=False, verbose_name=_("AD enabled"))
-    ad = models.ForeignKey(
-        'assets.AD', on_delete=models.SET_NULL, null=True, blank=True,
-        verbose_name=_("Active Directory"), related_name='ad_platforms'
+    ds_enabled = models.BooleanField(default=False, verbose_name=_("DS enabled"))
+    ds = models.ForeignKey(
+        'DirectoryService', on_delete=models.SET_NULL, null=True, blank=True,
+        verbose_name=_("Directory service"), related_name='ds_platforms'
     )
     # 账号有关的
     su_enabled = models.BooleanField(default=False, verbose_name=_("Su enabled"))
@@ -121,8 +121,8 @@ class Platform(LabeledMixin, JMSBaseModel):
         return self.assets.count()
 
     def save(self, *args, **kwargs):
-        if not self.ad_enabled:
-            self.ad = None
+        if not self.ds_enabled:
+            self.ds = None
         super().save(*args, **kwargs)
 
     @classmethod