diff --git a/build/rpc.json b/build/rpc.json index b2636a3..bbea305 100644 --- a/build/rpc.json +++ b/build/rpc.json @@ -14655,7 +14655,7 @@ }, { "name": "CreateNodeIPAddressRequest", - "code": "message CreateNodeIPAddressRequest {\n\tint64 nodeId = 1;\n\tstring role = 2;\n\tstring name = 3;\n\tstring ip = 4;\n\tbool canAccess = 5;\n\tbool isUp = 6;\n}", + "code": "message CreateNodeIPAddressRequest {\n\tint64 nodeId = 1; // 节点ID\n\tstring role = 2; // 角色:node:边缘节点,dns:智能DNS节点\n\tstring name = 3; // 名称\n\tstring ip = 4; // IP地址\n\tbool canAccess = 5; // 是否能够访问\n\tbool isUp = 6; // 是否上线\n\trepeated int64 nodeClusterIds = 7; // 所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群\n}", "doc": "创建IP地址" }, { @@ -14675,7 +14675,7 @@ }, { "name": "CreateNodeIPAddressesRequest", - "code": "message CreateNodeIPAddressesRequest {\n\tint64 nodeId = 1;\n\tstring role = 2;\n\tstring name = 3;\n\trepeated string ipList = 4;\n\tbool canAccess = 5;\n\tbool isUp = 6;\n\tstring groupValue = 7;\n}", + "code": "message CreateNodeIPAddressesRequest {\n\tint64 nodeId = 1;\n\tstring role = 2;\n\tstring name = 3;\n\trepeated string ipList = 4;\n\tbool canAccess = 5;\n\tbool isUp = 6;\n\tstring groupValue = 7;\n\trepeated int64 nodeClusterIds = 8; // 所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群\n}", "doc": "批量创建IP地址" }, { @@ -20115,7 +20115,7 @@ }, { "name": "NodeIPAddress", - "code": "message NodeIPAddress {\n\tint64 id = 1;\n\tint64 nodeId = 2;\n\tstring name = 3;\n\tstring ip = 4;\n\tstring description = 5;\n\tint64 state = 6;\n\tint64 order = 7;\n\tbool canAccess = 8;\n\tbool isOn = 9;\n\tbool isUp = 10;\n\tstring role = 12;\n\tstring backupIP = 13;\n\tbool isHealthy = 14;\n}", + "code": "message NodeIPAddress {\n\tint64 id = 1;\n\tint64 nodeId = 2;\n\tstring name = 3;\n\tstring ip = 4;\n\tstring description = 5;\n\tint64 state = 6;\n\tint64 order = 7;\n\tbool canAccess = 8;\n\tbool isOn = 9;\n\tbool isUp = 10;\n\tstring role = 12;\n\tstring backupIP = 13;\n\tbool isHealthy = 14;\n\n\trepeated NodeCluster nodeClusters = 30;\n}", "doc": "节点地址" }, { @@ -21435,7 +21435,7 @@ }, { "name": "UpdateNodeIPAddressRequest", - "code": "message UpdateNodeIPAddressRequest {\n\tint64 nodeIPAddressId = 1;\n\tstring name = 2;\n\tstring ip = 3;\n\tbool canAccess = 4;\n\tbool isOn = 5;\n\tbool isUp = 6;\n}", + "code": "message UpdateNodeIPAddressRequest {\n\tint64 nodeIPAddressId = 1; // IP地址ID\n\tstring name = 2;\n\tstring ip = 3;\n\tbool canAccess = 4; // 是否能够访问\n\tbool isOn = 5; // 是否启用\n\tbool isUp = 6; // 是否上线\n\trepeated int64 clusterIds = 7; // 所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群\n}", "doc": "修改IP地址" }, { diff --git a/pkg/rpc/pb/model_node_ip_address.pb.go b/pkg/rpc/pb/model_node_ip_address.pb.go index f7d16b0..a3d5c9a 100644 --- a/pkg/rpc/pb/model_node_ip_address.pb.go +++ b/pkg/rpc/pb/model_node_ip_address.pb.go @@ -31,19 +31,20 @@ type NodeIPAddress struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Ip string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"` - Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` - State int64 `protobuf:"varint,6,opt,name=state,proto3" json:"state,omitempty"` - Order int64 `protobuf:"varint,7,opt,name=order,proto3" json:"order,omitempty"` - CanAccess bool `protobuf:"varint,8,opt,name=canAccess,proto3" json:"canAccess,omitempty"` - IsOn bool `protobuf:"varint,9,opt,name=isOn,proto3" json:"isOn,omitempty"` - IsUp bool `protobuf:"varint,10,opt,name=isUp,proto3" json:"isUp,omitempty"` - Role string `protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"` - BackupIP string `protobuf:"bytes,13,opt,name=backupIP,proto3" json:"backupIP,omitempty"` - IsHealthy bool `protobuf:"varint,14,opt,name=isHealthy,proto3" json:"isHealthy,omitempty"` + Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + NodeId int64 `protobuf:"varint,2,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Ip string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"` + Description string `protobuf:"bytes,5,opt,name=description,proto3" json:"description,omitempty"` + State int64 `protobuf:"varint,6,opt,name=state,proto3" json:"state,omitempty"` + Order int64 `protobuf:"varint,7,opt,name=order,proto3" json:"order,omitempty"` + CanAccess bool `protobuf:"varint,8,opt,name=canAccess,proto3" json:"canAccess,omitempty"` + IsOn bool `protobuf:"varint,9,opt,name=isOn,proto3" json:"isOn,omitempty"` + IsUp bool `protobuf:"varint,10,opt,name=isUp,proto3" json:"isUp,omitempty"` + Role string `protobuf:"bytes,12,opt,name=role,proto3" json:"role,omitempty"` + BackupIP string `protobuf:"bytes,13,opt,name=backupIP,proto3" json:"backupIP,omitempty"` + IsHealthy bool `protobuf:"varint,14,opt,name=isHealthy,proto3" json:"isHealthy,omitempty"` + NodeClusters []*NodeCluster `protobuf:"bytes,30,rep,name=nodeClusters,proto3" json:"nodeClusters,omitempty"` } func (x *NodeIPAddress) Reset() { @@ -169,33 +170,45 @@ func (x *NodeIPAddress) GetIsHealthy() bool { return false } +func (x *NodeIPAddress) GetNodeClusters() []*NodeCluster { + if x != nil { + return x.NodeClusters + } + return nil +} + var File_models_model_node_ip_address_proto protoreflect.FileDescriptor var file_models_model_node_ip_address_proto_rawDesc = []byte{ 0x0a, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0xbd, 0x02, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, - 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, - 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, - 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, - 0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x1a, - 0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, - 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, - 0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x1a, 0x1f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, + 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x63, 0x6c, 0x75, 0x73, + 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf2, 0x02, 0x0a, 0x0d, 0x4e, 0x6f, + 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, + 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, + 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x70, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, + 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, + 0x73, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x72, + 0x6f, 0x6c, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, + 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x18, 0x0d, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x69, + 0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, + 0x69, 0x73, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x79, 0x12, 0x33, 0x0a, 0x0c, 0x6e, 0x6f, 0x64, + 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x18, 0x1e, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0f, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, + 0x52, 0x0c, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x73, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -213,13 +226,15 @@ func file_models_model_node_ip_address_proto_rawDescGZIP() []byte { var file_models_model_node_ip_address_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_models_model_node_ip_address_proto_goTypes = []interface{}{ (*NodeIPAddress)(nil), // 0: pb.NodeIPAddress + (*NodeCluster)(nil), // 1: pb.NodeCluster } var file_models_model_node_ip_address_proto_depIdxs = []int32{ - 0, // [0:0] is the sub-list for method output_type - 0, // [0:0] is the sub-list for method input_type - 0, // [0:0] is the sub-list for extension type_name - 0, // [0:0] is the sub-list for extension extendee - 0, // [0:0] is the sub-list for field type_name + 1, // 0: pb.NodeIPAddress.nodeClusters:type_name -> pb.NodeCluster + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_models_model_node_ip_address_proto_init() } @@ -227,6 +242,7 @@ func file_models_model_node_ip_address_proto_init() { if File_models_model_node_ip_address_proto != nil { return } + file_models_model_node_cluster_proto_init() if !protoimpl.UnsafeEnabled { file_models_model_node_ip_address_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*NodeIPAddress); i { diff --git a/pkg/rpc/pb/service_node_ip_address.pb.go b/pkg/rpc/pb/service_node_ip_address.pb.go index 3618a9c..85d592f 100644 --- a/pkg/rpc/pb/service_node_ip_address.pb.go +++ b/pkg/rpc/pb/service_node_ip_address.pb.go @@ -35,12 +35,13 @@ type CreateNodeIPAddressRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` - Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Ip string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"` - CanAccess bool `protobuf:"varint,5,opt,name=canAccess,proto3" json:"canAccess,omitempty"` - IsUp bool `protobuf:"varint,6,opt,name=isUp,proto3" json:"isUp,omitempty"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` // 节点ID + Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` // 角色:node:边缘节点,dns:智能DNS节点 + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` // 名称 + Ip string `protobuf:"bytes,4,opt,name=ip,proto3" json:"ip,omitempty"` // IP地址 + CanAccess bool `protobuf:"varint,5,opt,name=canAccess,proto3" json:"canAccess,omitempty"` // 是否能够访问 + IsUp bool `protobuf:"varint,6,opt,name=isUp,proto3" json:"isUp,omitempty"` // 是否上线 + NodeClusterIds []int64 `protobuf:"varint,7,rep,packed,name=nodeClusterIds,proto3" json:"nodeClusterIds,omitempty"` // 所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群 } func (x *CreateNodeIPAddressRequest) Reset() { @@ -117,6 +118,13 @@ func (x *CreateNodeIPAddressRequest) GetIsUp() bool { return false } +func (x *CreateNodeIPAddressRequest) GetNodeClusterIds() []int64 { + if x != nil { + return x.NodeClusterIds + } + return nil +} + type CreateNodeIPAddressResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -170,13 +178,14 @@ type CreateNodeIPAddressesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` - Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - IpList []string `protobuf:"bytes,4,rep,name=ipList,proto3" json:"ipList,omitempty"` - CanAccess bool `protobuf:"varint,5,opt,name=canAccess,proto3" json:"canAccess,omitempty"` - IsUp bool `protobuf:"varint,6,opt,name=isUp,proto3" json:"isUp,omitempty"` - GroupValue string `protobuf:"bytes,7,opt,name=groupValue,proto3" json:"groupValue,omitempty"` + NodeId int64 `protobuf:"varint,1,opt,name=nodeId,proto3" json:"nodeId,omitempty"` + Role string `protobuf:"bytes,2,opt,name=role,proto3" json:"role,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + IpList []string `protobuf:"bytes,4,rep,name=ipList,proto3" json:"ipList,omitempty"` + CanAccess bool `protobuf:"varint,5,opt,name=canAccess,proto3" json:"canAccess,omitempty"` + IsUp bool `protobuf:"varint,6,opt,name=isUp,proto3" json:"isUp,omitempty"` + GroupValue string `protobuf:"bytes,7,opt,name=groupValue,proto3" json:"groupValue,omitempty"` + NodeClusterIds []int64 `protobuf:"varint,8,rep,packed,name=nodeClusterIds,proto3" json:"nodeClusterIds,omitempty"` // 所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群 } func (x *CreateNodeIPAddressesRequest) Reset() { @@ -260,6 +269,13 @@ func (x *CreateNodeIPAddressesRequest) GetGroupValue() string { return "" } +func (x *CreateNodeIPAddressesRequest) GetNodeClusterIds() []int64 { + if x != nil { + return x.NodeClusterIds + } + return nil +} + type CreateNodeIPAddressesResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -313,12 +329,13 @@ type UpdateNodeIPAddressRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - NodeIPAddressId int64 `protobuf:"varint,1,opt,name=nodeIPAddressId,proto3" json:"nodeIPAddressId,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Ip string `protobuf:"bytes,3,opt,name=ip,proto3" json:"ip,omitempty"` - CanAccess bool `protobuf:"varint,4,opt,name=canAccess,proto3" json:"canAccess,omitempty"` - IsOn bool `protobuf:"varint,5,opt,name=isOn,proto3" json:"isOn,omitempty"` - IsUp bool `protobuf:"varint,6,opt,name=isUp,proto3" json:"isUp,omitempty"` + NodeIPAddressId int64 `protobuf:"varint,1,opt,name=nodeIPAddressId,proto3" json:"nodeIPAddressId,omitempty"` // IP地址ID + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Ip string `protobuf:"bytes,3,opt,name=ip,proto3" json:"ip,omitempty"` + CanAccess bool `protobuf:"varint,4,opt,name=canAccess,proto3" json:"canAccess,omitempty"` // 是否能够访问 + IsOn bool `protobuf:"varint,5,opt,name=isOn,proto3" json:"isOn,omitempty"` // 是否启用 + IsUp bool `protobuf:"varint,6,opt,name=isUp,proto3" json:"isUp,omitempty"` // 是否上线 + ClusterIds []int64 `protobuf:"varint,7,rep,packed,name=clusterIds,proto3" json:"clusterIds,omitempty"` // 所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群 } func (x *UpdateNodeIPAddressRequest) Reset() { @@ -395,6 +412,13 @@ func (x *UpdateNodeIPAddressRequest) GetIsUp() bool { return false } +func (x *UpdateNodeIPAddressRequest) GetClusterIds() []int64 { + if x != nil { + return x.ClusterIds + } + return nil +} + // 修改IP地址所属节点 type UpdateNodeIPAddressNodeIdRequest struct { state protoimpl.MessageState @@ -1149,7 +1173,7 @@ var file_service_node_ip_address_proto_rawDesc = []byte{ 0x6c, 0x5f, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, + 0x74, 0x6f, 0x22, 0xc6, 0x01, 0x0a, 0x1a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6c, @@ -1159,29 +1183,34 @@ var file_service_node_ip_address_proto_rawDesc = []byte{ 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, - 0x73, 0x55, 0x70, 0x22, 0x47, 0x0a, 0x1b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, - 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6e, 0x6f, 0x64, - 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x22, 0xc8, 0x01, 0x0a, - 0x1c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, - 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, - 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, - 0x06, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x69, - 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x4b, 0x0a, 0x1d, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x73, 0x55, 0x70, 0x12, 0x26, 0x0a, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0e, 0x6e, 0x6f, 0x64, + 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x1b, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x6f, + 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x49, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x1c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, + 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, + 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x72, 0x6f, 0x6c, + 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x18, + 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x69, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, + 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, + 0x73, 0x55, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, + 0x1e, 0x0a, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0a, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, + 0x26, 0x0a, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, + 0x73, 0x18, 0x08, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0e, 0x6e, 0x6f, 0x64, 0x65, 0x43, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x4b, 0x0a, 0x1d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, 0x52, 0x10, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x49, 0x64, 0x73, 0x22, 0xb0, 0x01, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, + 0x73, 0x49, 0x64, 0x73, 0x22, 0xd0, 0x01, 0x0a, 0x1a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6e, 0x6f, @@ -1192,7 +1221,9 @@ var file_service_node_ip_address_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x55, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x22, 0x64, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x08, 0x52, 0x04, 0x69, 0x73, 0x55, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6c, 0x75, 0x73, 0x74, + 0x65, 0x72, 0x49, 0x64, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x03, 0x52, 0x0a, 0x63, 0x6c, 0x75, + 0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x64, 0x0a, 0x20, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, diff --git a/pkg/rpc/protos/models/model_node_ip_address.proto b/pkg/rpc/protos/models/model_node_ip_address.proto index 055ad93..b5f9bd2 100644 --- a/pkg/rpc/protos/models/model_node_ip_address.proto +++ b/pkg/rpc/protos/models/model_node_ip_address.proto @@ -3,6 +3,8 @@ option go_package = "./pb"; package pb; +import "models/model_node_cluster.proto"; + // 节点地址 message NodeIPAddress { int64 id = 1; @@ -18,4 +20,6 @@ message NodeIPAddress { string role = 12; string backupIP = 13; bool isHealthy = 14; + + repeated NodeCluster nodeClusters = 30; } \ No newline at end of file diff --git a/pkg/rpc/protos/service_node_ip_address.proto b/pkg/rpc/protos/service_node_ip_address.proto index c1c049e..2f49d78 100644 --- a/pkg/rpc/protos/service_node_ip_address.proto +++ b/pkg/rpc/protos/service_node_ip_address.proto @@ -47,12 +47,13 @@ service NodeIPAddressService { // 创建IP地址 message CreateNodeIPAddressRequest { - int64 nodeId = 1; - string role = 2; - string name = 3; - string ip = 4; - bool canAccess = 5; - bool isUp = 6; + int64 nodeId = 1; // 节点ID + string role = 2; // 角色:node:边缘节点,dns:智能DNS节点 + string name = 3; // 名称 + string ip = 4; // IP地址 + bool canAccess = 5; // 是否能够访问 + bool isUp = 6; // 是否上线 + repeated int64 nodeClusterIds = 7; // 可选项,所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群 } message CreateNodeIPAddressResponse { @@ -68,6 +69,7 @@ message CreateNodeIPAddressesRequest { bool canAccess = 5; bool isUp = 6; string groupValue = 7; + repeated int64 nodeClusterIds = 8; // 可选项,所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群 } message CreateNodeIPAddressesResponse { @@ -76,12 +78,13 @@ message CreateNodeIPAddressesResponse { // 修改IP地址 message UpdateNodeIPAddressRequest { - int64 nodeIPAddressId = 1; + int64 nodeIPAddressId = 1; // IP地址ID string name = 2; string ip = 3; - bool canAccess = 4; - bool isOn = 5; - bool isUp = 6; + bool canAccess = 4; // 是否能够访问 + bool isOn = 5; // 是否启用 + bool isUp = 6; // 是否上线 + repeated int64 clusterIds = 7; // 可选项,所属集群ID列表,如果没有指定,则表示应用于节点所属的所有集群 } // 修改IP地址所属节点