fix(backend): redis主从禁用启用单据修复 #6473

TencentBlueKing · Aug 27, 2024 · b7bc488 · b7bc488
1 parent 5794e33
commit b7bc488
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/dbm-ui/backend/ticket/builders/doris/doris_apply.py b/dbm-ui/backend/ticket/builders/doris/doris_apply.py
@@ -9,6 +9,8 @@
 specific language governing permissions and limitations under the License.
 """
 import logging
+import random
+import string
 
 from django.utils.crypto import get_random_string
 from django.utils.translation import ugettext_lazy as _
@@ -84,7 +86,8 @@ def format_ticket_data(self):
         """ """
         self.ticket_data.update(
             {
-                "username": get_random_string(8),
+                # doris 用户名首位需要字母
+                "username": random.choice(string.ascii_letters) + get_random_string(7),
                 "password": get_random_string(16),
                 "domain": f"doris.{self.ticket_data['cluster_name']}.{self.ticket_data['db_app_abbr']}.db",
             }

diff --git a/dbm-ui/backend/ticket/builders/redis/redis_close.py b/dbm-ui/backend/ticket/builders/redis/redis_close.py
@@ -57,11 +57,11 @@ class RedisInstanceCloseDetailSerializer(SkipToRepresentationMixin, serializers.
 
 
 class RedisInstanceCloseFlowParamBuilder(builders.FlowParamBuilder):
-    controller = RedisController.fake_scene
+    controller = RedisController.redis_ins_open_close_scene
 
 
 @builders.BuilderFactory.register(
-    TicketType.REDIS_INSTANCE_PROXY_CLOSE, phase=ClusterPhase.OFFLINE, iam=ActionEnum.REDIS_OPEN_CLOSE
+    TicketType.REDIS_INSTANCE_CLOSE, phase=ClusterPhase.OFFLINE, iam=ActionEnum.REDIS_OPEN_CLOSE
 )
 class RedisInstanceCloseFlowBuilder(BaseRedisTicketFlowBuilder):
     serializer = RedisInstanceCloseDetailSerializer

diff --git a/dbm-ui/backend/ticket/builders/redis/redis_open.py b/dbm-ui/backend/ticket/builders/redis/redis_open.py
@@ -54,11 +54,11 @@ class RedisInstanceOpenDetailSerializer(SkipToRepresentationMixin, serializers.S
 
 
 class RedisInstanceOpenFlowParamBuilder(builders.FlowParamBuilder):
-    controller = RedisController.fake_scene
+    controller = RedisController.redis_ins_open_close_scene
 
 
 @builders.BuilderFactory.register(
-    TicketType.REDIS_INSTANCE_PROXY_OPEN, phase=ClusterPhase.ONLINE, iam=ActionEnum.REDIS_OPEN_CLOSE
+    TicketType.REDIS_INSTANCE_OPEN, phase=ClusterPhase.ONLINE, iam=ActionEnum.REDIS_OPEN_CLOSE
 )
 class RedisInstanceCloseFlowBuilder(BaseRedisTicketFlowBuilder):
     serializer = RedisInstanceOpenDetailSerializer

diff --git a/dbm-ui/backend/ticket/constants.py b/dbm-ui/backend/ticket/constants.py
@@ -294,8 +294,6 @@ def get_db_type_by_ticket(cls, ticket_type, raise_exception=False):
     REDIS_INSTANCE_OPEN = TicketEnumField("REDIS_INSTANCE_OPEN", _("Redis 主从启用"), register_iam=False)
     REDIS_INSTANCE_CLOSE = TicketEnumField("REDIS_INSTANCE_CLOSE", _("Redis 主从禁用"), register_iam=False)
     REDIS_DESTROY = TicketEnumField("REDIS_DESTROY", _("Redis 集群删除"), _("集群管理"))
-    REDIS_INSTANCE_PROXY_OPEN = TicketEnumField("REDIS_INSTANCE_PROXY_OPEN", _("Redis 主从集群启用"), register_iam=False)
-    REDIS_INSTANCE_PROXY_CLOSE = TicketEnumField("REDIS_INSTANCE_PROXY_CLOSE", _("Redis 主从集群禁用"), register_iam=False) # noqa
     REDIS_INSTANCE_DESTROY = TicketEnumField("REDIS_INSTANCE_DESTROY", _("Redis 主从集群删除"), _("集群管理"))
     REDIS_PURGE = TicketEnumField("REDIS_PURGE", _("Redis 集群清档"), _("集群管理"))