Skip to content

Commit 2400987

Browse files
lTimejlTimej
authored
pref: 节点管理插件增加 【重新注册 Agent_id】选项 #7544 (#7549)
* pref: 节点管理插件增加 【重新注册 Agent_id】选项 #7544 * pref: 节点管理插件增加 【重新注册 Agent_id】选项 #7544
1 parent c5e468c commit 2400987

File tree

3 files changed

+38
-1
lines changed
  • pipeline_plugins

3 files changed

+38
-1
lines changed

‎pipeline_plugins/components/collections/sites/open/nodeman/create_task/v4_0.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ def execute(self, data, parent_data):
122122
auth_params["key"] = auth_key
123123

124124
# 额外配置参数
125-
extra_config_params = {"peer_exchange_switch_for_agent": host.get("peer_exchange_switch_for_agent", 0)}
125+
extra_config_params = {
126+
"peer_exchange_switch_for_agent": host.get("peer_exchange_switch_for_agent", 0),
127+
"force_update_agent_id": host.get("force_update_agent_id", False),
128+
}
126129
speed_limit = host.get("speed_limit")
127130
if speed_limit:
128131
extra_config_params.update({"bt_speed_limit": int(speed_limit)})

‎pipeline_plugins/components/static/components/atoms/nodeman/create_task/v6_0.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,23 @@
320320
]
321321
},
322322
},
323+
{
324+
tag_code: "force_update_agent_id",
325+
type: "radio",
326+
attrs: {
327+
name: gettext("重新注册Agent_id"),
328+
items: [
329+
{value: true, name: gettext("是")},
330+
{value: false, name: gettext("否")}
331+
],
332+
default: false,
333+
validation: [
334+
{
335+
type: "required"
336+
},
337+
]
338+
},
339+
},
323340
];
324341

325342
self.columns = common_columns;

‎pipeline_plugins/tests/components/collections/sites/open/nodeman_test/create_task_test/test_nodeman_v4_create_task.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ def __init__(
249249
"outer_ip": "1.1.1.1",
250250
"login_ip": "1.1.1.1",
251251
"data_ip": "1.1.1.1",
252+
"force_update_agent_id": False,
252253
}
253254
],
254255
}
@@ -341,6 +342,7 @@ def __init__(
341342
"login_ip": "1.1.1.1",
342343
"data_ip": "1.1.1.1",
343344
"bk_host_id": 1,
345+
"force_update_agent_id": False,
344346
},
345347
{
346348
"bk_biz_id": "1",
@@ -358,6 +360,7 @@ def __init__(
358360
"login_ip": "6.6.6.6",
359361
"data_ip": "8.8.8.8",
360362
"bk_host_id": 2,
363+
"force_update_agent_id": False,
361364
},
362365
{
363366
"bk_biz_id": "1",
@@ -375,6 +378,7 @@ def __init__(
375378
"login_ip": "7.7.7.7",
376379
"data_ip": "9.9.9.9",
377380
"bk_host_id": 3,
381+
"force_update_agent_id": False,
378382
},
379383
],
380384
}
@@ -419,6 +423,7 @@ def __init__(
419423
"os_type": "LINUX",
420424
"peer_exchange_switch_for_agent": 0,
421425
"speed_limit": "100",
426+
"force_update_agent_id": False,
422427
},
423428
{
424429
"bk_biz_id": "1",
@@ -428,6 +433,7 @@ def __init__(
428433
"inner_ip": "2.2.2.2,3.3.3.3",
429434
"peer_exchange_switch_for_agent": 0,
430435
"speed_limit": "100",
436+
"force_update_agent_id": False,
431437
},
432438
],
433439
},
@@ -458,6 +464,7 @@ def __init__(
458464
"bt_speed_limit": 100,
459465
"peer_exchange_switch_for_agent": 0, # 不加速
460466
"bk_host_id": 1,
467+
"force_update_agent_id": False,
461468
},
462469
{
463470
"bk_biz_id": "1",
@@ -469,6 +476,7 @@ def __init__(
469476
"bt_speed_limit": 100,
470477
"peer_exchange_switch_for_agent": 0, # 不加速
471478
"bk_host_id": 2,
479+
"force_update_agent_id": False,
472480
},
473481
{
474482
"bk_biz_id": "1",
@@ -480,6 +488,7 @@ def __init__(
480488
"bt_speed_limit": 100,
481489
"peer_exchange_switch_for_agent": 0, # 不加速
482490
"bk_host_id": 3,
491+
"force_update_agent_id": False,
483492
},
484493
],
485494
}
@@ -561,6 +570,7 @@ def __init__(
561570
"login_ip": "1.1.1.1",
562571
"data_ip": "1.1.1.1",
563572
"bk_host_id": 1,
573+
"force_update_agent_id": False,
564574
}
565575
],
566576
}
@@ -749,6 +759,7 @@ def __init__(
749759
"login_ip": "5.5.5.5",
750760
"data_ip": "7.7.7.7",
751761
"bk_host_id": 1,
762+
"force_update_agent_id": False,
752763
},
753764
{
754765
"bk_biz_id": "1",
@@ -766,6 +777,7 @@ def __init__(
766777
"login_ip": "6.6.6.6",
767778
"data_ip": "8.8.8.8",
768779
"bk_host_id": 1,
780+
"force_update_agent_id": False,
769781
},
770782
{
771783
"bk_biz_id": "1",
@@ -783,6 +795,7 @@ def __init__(
783795
"login_ip": "5.5.5.5",
784796
"data_ip": "7.7.7.7",
785797
"bk_host_id": 1,
798+
"force_update_agent_id": False,
786799
},
787800
{
788801
"bk_biz_id": "1",
@@ -798,6 +811,7 @@ def __init__(
798811
"password": "encrypt_auth_key",
799812
"data_ip": "7.7.7.7",
800813
"bk_host_id": 1,
814+
"force_update_agent_id": False,
801815
},
802816
],
803817
}
@@ -882,6 +896,7 @@ def __init__(
882896
"outer_ip": "1.1.1.1",
883897
"login_ip": "1.1.1.1",
884898
"data_ip": "1.1.1.1",
899+
"force_update_agent_id": False,
885900
}
886901
],
887902
}
@@ -1021,6 +1036,7 @@ def __init__(
10211036
"outer_ip": "1.1.1.1",
10221037
"login_ip": "1.1.1.1",
10231038
"data_ip": "1.1.1.1",
1039+
"force_update_agent_id": False,
10241040
},
10251041
{
10261042
"bk_biz_id": "1",
@@ -1037,6 +1053,7 @@ def __init__(
10371053
"outer_ip": "2.2.2.2",
10381054
"login_ip": "2.2.2.2",
10391055
"data_ip": "2.2.2.2",
1056+
"force_update_agent_id": False,
10401057
},
10411058
],
10421059
}

0 commit comments

Comments
 (0)