Skip to content

Commit 4e8bc7f

Browse files
feat(backend): mysql和tendbcluster接入clb #10422
1 parent 942f0e8 commit 4e8bc7f

File tree

5 files changed

+13
-6
lines changed

5 files changed

+13
-6
lines changed

dbm-ui/backend/db_meta/api/cluster/tendbcluster/detail.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,21 @@ def build_spider_entry_relations(role, spider_group_name, entry_group_id, entry_
4646

4747
# clbDNS肯定指向clb
4848
elif spider_entry.cluster_entry_type == ClusterEntryType.CLBDNS:
49-
clb_dns_entry_group = Group(node_id="clb_dns_entry_group", group_name=_("访问入口(CLB域名)"))
49+
if role == TenDBClusterSpiderRole.SPIDER_MASTER:
50+
clb_dns_entry_group = Group(node_id="clb_master_dns_entry_group", group_name=_("访问入口(CLB域名)"))
51+
else:
52+
clb_dns_entry_group = Group(node_id="clb_slave_dns_entry_group", group_name=_("访问入口(CLB域名)"))
5053
dummy_be_node, clb_dns_entry_group = graph.add_node(spider_entry, to_group=clb_dns_entry_group)
5154
graph.add_line(source=clb_dns_entry_group, target=clb_entry_group, label=LineLabel.Bind)
5255

5356
# dns默认指向proxy 指向clb之后不再指向proxy
5457
elif spider_entry.cluster_entry_type == ClusterEntryType.DNS:
5558
if spider_entry.forward_to:
56-
dns_entry_group = Group(node_id="dns_entry_group", group_name=_("访问入口(主域名)"))
59+
if role == TenDBClusterSpiderRole.SPIDER_MASTER:
60+
dns_entry_group = Group(node_id="dns_master_entry_group", group_name=_("访问入口(主)(主域名)"))
61+
62+
else:
63+
dns_entry_group = Group(node_id="dns_slave_entry_group", group_name=_("访问入口(从)(主域名)"))
5764
dummy_be_node, dns_entry_group = graph.add_node(spider_entry, to_group=dns_entry_group)
5865
graph.add_line(source=dns_entry_group, target=clb_entry_group, label=LineLabel.Bind)
5966

dbm-ui/backend/ticket/builders/es/es_create_polaris.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def format_ticket_data(self):
2828
super().format_ticket_data()
2929

3030

31-
@builders.BuilderFactory.register(TicketType.ES_CREATE_CLB)
31+
@builders.BuilderFactory.register(TicketType.ES_CREATE_POLARIS)
3232
class EsCreatePolarisFlowBuilder(BaseEsTicketFlowBuilder):
3333
serializer = EsCreatePolarisDetailSerializer
3434
inner_flow_builder = EsCreatePolarisFlowParamBuilder

dbm-ui/backend/ticket/builders/es/es_delete_polaris.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def format_ticket_data(self):
2828
super().format_ticket_data()
2929

3030

31-
@builders.BuilderFactory.register(TicketType.ES_CREATE_CLB)
31+
@builders.BuilderFactory.register(TicketType.ES_DELETE_POLARIS)
3232
class EsDeletePolarisFlowBuilder(BaseEsTicketFlowBuilder):
3333
serializer = EsDeletePolarisDetailSerializer
3434
inner_flow_builder = EsDeletePolarisFlowParamBuilder

dbm-ui/backend/ticket/builders/es/es_dns_bind_clb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def format_ticket_data(self):
2828
super().format_ticket_data()
2929

3030

31-
@builders.BuilderFactory.register(TicketType.ES_CREATE_CLB)
31+
@builders.BuilderFactory.register(TicketType.ES_DNS_BIND_CLB)
3232
class EsDnsBindCLBFlowBuilder(BaseEsTicketFlowBuilder):
3333
serializer = EsDnsBindCLBDetailSerializer
3434
inner_flow_builder = EsDnsBindCLBFlowParamBuilder

dbm-ui/backend/ticket/builders/es/es_dns_unbind_clb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def format_ticket_data(self):
2828
super().format_ticket_data()
2929

3030

31-
@builders.BuilderFactory.register(TicketType.ES_CREATE_CLB)
31+
@builders.BuilderFactory.register(TicketType.ES_DNS_UNBIND_CLB)
3232
class EsDnsUnBindCLBFlowBuilder(BaseEsTicketFlowBuilder):
3333
serializer = EsDnsUnBindCLBDetailSerializer
3434
inner_flow_builder = EsDnsUnBindCLBFlowParamBuilder

0 commit comments

Comments
 (0)