Skip to content

Commit bf9bb1b

Browse files
ibuleribuler
committed
[Update] 修改ops task运行
1 parent 30efec1 commit bf9bb1b

22 files changed

Lines changed: 493 additions & 442 deletions

File tree

‎apps/assets/api.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
get_user_granted_assets
2626
from .models import AssetGroup, Asset, Cluster, SystemUser, AdminUser
2727
from . import serializers
28-
from .tasks import update_assets_hardware_info, test_admin_user_connectability, \
29-
test_admin_user_connectability_manual, push_system_user_to_cluster_assets, \
30-
test_system_user_connectability
28+
from .tasks import update_assets_hardware_info_manual, test_admin_user_connectability_util, \
29+
test_asset_connectability_manual, push_system_user_to_cluster_assets_manual, \
30+
test_system_user_connectability_manual
3131

3232

3333
class AssetViewSet(IDInFilterMixin, BulkModelViewSet):
@@ -222,7 +222,7 @@ class AssetRefreshHardwareApi(generics.RetrieveAPIView):
222222
def retrieve(self, request, *args, **kwargs):
223223
asset_id = kwargs.get('pk')
224224
asset = get_object_or_404(Asset, pk=asset_id)
225-
summary = update_assets_hardware_info([asset])
225+
summary = update_assets_hardware_info_manual([asset])
226226
if summary.get('dark'):
227227
return Response(summary['dark'].values(), status=501)
228228
else:
@@ -239,7 +239,7 @@ class AssetAdminUserTestApi(generics.RetrieveAPIView):
239239
def retrieve(self, request, *args, **kwargs):
240240
asset_id = kwargs.get('pk')
241241
asset = get_object_or_404(Asset, pk=asset_id)
242-
ok, msg = test_admin_user_connectability_manual(asset)
242+
ok, msg = test_asset_connectability_manual(asset)
243243
if ok:
244244
return Response({"msg": "pong"})
245245
else:
@@ -255,7 +255,7 @@ class AdminUserTestConnectiveApi(generics.RetrieveAPIView):
255255

256256
def retrieve(self, request, *args, **kwargs):
257257
admin_user = self.get_object()
258-
test_admin_user_connectability.delay(admin_user, force=True)
258+
test_admin_user_connectability_util.delay(admin_user, force=True)
259259
return Response({"msg": "Task created"})
260260

261261

@@ -268,7 +268,7 @@ class SystemUserPushApi(generics.RetrieveAPIView):
268268

269269
def retrieve(self, request, *args, **kwargs):
270270
system_user = self.get_object()
271-
push_system_user_to_cluster_assets.delay(system_user, force=True)
271+
push_system_user_to_cluster_assets_manual.delay(system_user, force=True)
272272
return Response({"msg": "Task created"})
273273

274274

@@ -281,5 +281,5 @@ class SystemUserTestConnectiveApi(generics.RetrieveAPIView):
281281

282282
def retrieve(self, request, *args, **kwargs):
283283
system_user = self.get_object()
284-
test_system_user_connectability.delay(system_user, force=True)
284+
test_system_user_connectability_manual.delay(system_user, force=True)
285285
return Response({"msg": "Task created"})

‎apps/assets/const.py‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,20 @@
22
#
33
from django.utils.translation import ugettext as _
44

5-
PUSH_SYSTEM_USER_PERIOD_LOCK_KEY = "PUSH_SYSTEM_USER_PERIOD_KEY"
6-
PUSH_SYSTEM_USER_PERIOD_TASK_NAME = _("PUSH SYSTEM USER TO CLUSTER PERIOD TASK")
5+
# PUSH_SYSTEM_USER_PERIOD_LOCK_KEY = "PUSH_SYSTEM_USER_PERIOD_KEY"
6+
PUSH_SYSTEM_USER_PERIOD_TASK_NAME = _("PUSH SYSTEM USER TO CLUSTER PERIOD: {}")
7+
PUSH_SYSTEM_USER_MANUAL_TASK_NAME = _("PUSH SYSTEM USER TO CLUSTER MANUALLY: {}")
78
PUSH_SYSTEM_USER_TASK_NAME = _("PUSH SYSTEM USER TO CLUSTER: {}")
8-
PUSH_SYSTEM_USER_LOCK_KEY = "PUSH_SYSTEM_USER_TO_CLUSTER_LOCK_{}"
9+
# PUSH_SYSTEM_USER_LOCK_KEY = "PUSH_SYSTEM_USER_TO_CLUSTER_LOCK_{}"
10+
PUSH_SYSTEM_USER_ON_CHANGE_TASK_NAME = _("PUSH SYSTEM USER ON CHANGE: {}")
11+
PUSH_SYSTEM_USER_ON_CREATE_TASK_NAME = _("PUSH SYSTEM USER ON CREATE: {}")
12+
PUSH_SYSTEM_USERS_ON_ASSET_CREATE_TASK_NAME = _("PUSH SYSTEM USERS ON ASSET CREAT: {}")
913

1014

1115
UPDATE_ASSETS_HARDWARE_TASK_NAME = _('UPDATE ASSETS HARDWARE INFO')
12-
UPDATE_ASSETS_HARDWARE_PERIOD_LOCK_KEY = "UPDATE_ASSETS_HARDWARE_PERIOD_LOCK_KEY"
16+
UPDATE_ASSETS_HARDWARE_MANUAL_TASK_NAME = _('UPDATE ASSETS HARDWARE INFO MANUALLY')
17+
UPDATE_ASSETS_HARDWARE_ON_CREATE_TASK_NAME = _('UPDATE ASSETS HARDWARE INFO ON CREATE')
18+
# UPDATE_ASSETS_HARDWARE_PERIOD_LOCK_KEY = "UPDATE_ASSETS_HARDWARE_PERIOD_LOCK_KEY"
1319
UPDATE_ASSETS_HARDWARE_PERIOD_TASK_NAME = _('UPDATE ASSETS HARDWARE INFO PERIOD')
1420
UPDATE_ASSETS_HARDWARE_TASKS = [
1521
{
@@ -20,10 +26,10 @@
2026
}
2127
]
2228

23-
TEST_ADMIN_USER_CONN_PERIOD_LOCK_KEY = "TEST_ADMIN_USER_CONN_PERIOD_KEY"
24-
TEST_ADMIN_USER_CONN_PERIOD_TASK_NAME = _("TEST ADMIN USER CONN PERIOD TASK")
29+
# TEST_ADMIN_USER_CONN_PERIOD_LOCK_KEY = "TEST_ADMIN_USER_CONN_PERIOD_KEY"
30+
TEST_ADMIN_USER_CONN_PERIOD_TASK_NAME = _("TEST ADMIN USER CONN PERIOD: {}")
31+
TEST_ADMIN_USER_CONN_MANUAL_TASK_NAME = _("TEST ADMIN USER CONN MANUALLY: {}")
2532
TEST_ADMIN_USER_CONN_TASK_NAME = _("TEST ADMIN USER CONN: {}")
26-
TEST_ADMIN_USER_CONN_LOCK_KEY = TEST_ADMIN_USER_CONN_TASK_NAME
2733
ADMIN_USER_CONN_CACHE_KEY = "ADMIN_USER_CONN_{}"
2834
TEST_ADMIN_USER_CONN_TASKS = [
2935
{
@@ -38,10 +44,8 @@
3844
TEST_ASSET_CONN_TASK_NAME = _("ASSET CONN TEST MANUAL")
3945

4046
TEST_SYSTEM_USER_CONN_PERIOD_LOCK_KEY = "TEST_SYSTEM_USER_CONN_PERIOD_KEY"
41-
TEST_SYSTEM_USER_CONN_PERIOD_TASK_NAME = _("TEST SYSTEM USER CONN PERIOD TASK")
42-
TEST_SYSTEM_USER_CONN_CACHE_KEY_PREFIX = "SYSTEM_USER_CONN_"
43-
TEST_SYSTEM_USER_CONN_TASK_NAME = _("TEST SYSTEM USER CONN: {}")
44-
TEST_SYSTEM_USER_CONN_LOCK_KEY = "TEST_SYSTEM_USER_CONN_{}"
47+
TEST_SYSTEM_USER_CONN_PERIOD_TASK_NAME = _("TEST SYSTEM USER CONN PERIOD: {}")
48+
TEST_SYSTEM_USER_CONN_MANUAL_TASK_NAME = _("TEST SYSTEM USER CONN MANUALLY: {}")
4549
SYSTEM_USER_CONN_CACHE_KEY = "SYSTEM_USER_CONN_{}"
4650
TEST_SYSTEM_USER_CONN_TASKS = [
4751
{

‎apps/assets/models/user.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
from django.utils.translation import ugettext_lazy as _
1414
from django.conf import settings
1515

16-
from common.utils import signer, ssh_key_string_to_obj, ssh_key_gen
16+
from common.utils import get_signer, ssh_key_string_to_obj, ssh_key_gen
1717
from .utils import private_key_validator
1818
from ..const import SYSTEM_USER_CONN_CACHE_KEY
1919

2020

2121
__all__ = ['AdminUser', 'SystemUser',]
2222
logger = logging.getLogger(__name__)
23+
signer = get_signer()
2324

2425

2526
class AssetUser(models.Model):

0 commit comments

Comments
 (0)