From a09a3af84ba91461a14b2c72c25a72ee17a830de Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Mon, 13 Sep 2021 10:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=8A=82=E7=82=B9=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=87=E6=8D=A2=E5=88=B0=E5=A4=87=E7=94=A8IP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/rpc/pb/model_node_ip_address.pb.go | 16 +++++++++--- pkg/rpc/pb/model_node_ip_address_log.pb.go | 26 +++++++++++++------ .../protos/models/model_node_ip_address.proto | 1 + .../models/model_node_ip_address_log.proto | 1 + 4 files changed, 33 insertions(+), 11 deletions(-) diff --git a/pkg/rpc/pb/model_node_ip_address.pb.go b/pkg/rpc/pb/model_node_ip_address.pb.go index d35efd2..b0763f7 100644 --- a/pkg/rpc/pb/model_node_ip_address.pb.go +++ b/pkg/rpc/pb/model_node_ip_address.pb.go @@ -42,6 +42,7 @@ type NodeIPAddress struct { 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"` } func (x *NodeIPAddress) Reset() { @@ -153,12 +154,19 @@ func (x *NodeIPAddress) GetRole() string { return "" } +func (x *NodeIPAddress) GetBackupIP() string { + if x != nil { + return x.BackupIP + } + return "" +} + 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, 0x83, 0x02, 0x0a, 0x0d, 0x4e, 0x6f, 0x64, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22, 0x9f, 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, @@ -174,8 +182,10 @@ var file_models_model_node_ip_address_proto_rawDesc = []byte{ 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, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/rpc/pb/model_node_ip_address_log.pb.go b/pkg/rpc/pb/model_node_ip_address_log.pb.go index 897bfae..23bed42 100644 --- a/pkg/rpc/pb/model_node_ip_address_log.pb.go +++ b/pkg/rpc/pb/model_node_ip_address_log.pb.go @@ -36,6 +36,7 @@ type NodeIPAddressLog struct { IsUp bool `protobuf:"varint,4,opt,name=isUp,proto3" json:"isUp,omitempty"` IsOn bool `protobuf:"varint,5,opt,name=isOn,proto3" json:"isOn,omitempty"` CanAccess bool `protobuf:"varint,6,opt,name=canAccess,proto3" json:"canAccess,omitempty"` + BackupIP string `protobuf:"bytes,7,opt,name=backupIP,proto3" json:"backupIP,omitempty"` NodeIPAddress *NodeIPAddress `protobuf:"bytes,30,opt,name=nodeIPAddress,proto3" json:"nodeIPAddress,omitempty"` Admin *Admin `protobuf:"bytes,31,opt,name=admin,proto3" json:"admin,omitempty"` } @@ -114,6 +115,13 @@ func (x *NodeIPAddressLog) GetCanAccess() bool { return false } +func (x *NodeIPAddressLog) GetBackupIP() string { + if x != nil { + return x.BackupIP + } + return "" +} + func (x *NodeIPAddressLog) GetNodeIPAddress() *NodeIPAddress { if x != nil { return x.NodeIPAddress @@ -137,7 +145,7 @@ var file_models_model_node_ip_address_log_proto_rawDesc = []byte{ 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, 0x1a, 0x18, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x82, 0x02, 0x0a, 0x10, 0x4e, + 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9e, 0x02, 0x0a, 0x10, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x4c, 0x6f, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, @@ -148,13 +156,15 @@ var file_models_model_node_ip_address_log_proto_rawDesc = []byte{ 0x73, 0x55, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x6e, 0x41, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x63, 0x61, 0x6e, 0x41, - 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x37, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, - 0x62, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, - 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1f, - 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x70, 0x62, 0x2e, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, + 0x50, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x49, + 0x50, 0x12, 0x37, 0x0a, 0x0d, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x70, 0x62, 0x2e, 0x4e, 0x6f, + 0x64, 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0d, 0x6e, 0x6f, 0x64, + 0x65, 0x49, 0x50, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x2e, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x2f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/rpc/protos/models/model_node_ip_address.proto b/pkg/rpc/protos/models/model_node_ip_address.proto index efe87a1..5410e98 100644 --- a/pkg/rpc/protos/models/model_node_ip_address.proto +++ b/pkg/rpc/protos/models/model_node_ip_address.proto @@ -16,4 +16,5 @@ message NodeIPAddress { bool isOn = 9; bool isUp = 10; string role = 12; + string backupIP = 13; } \ No newline at end of file diff --git a/pkg/rpc/protos/models/model_node_ip_address_log.proto b/pkg/rpc/protos/models/model_node_ip_address_log.proto index 6ba238d..b9a8d06 100644 --- a/pkg/rpc/protos/models/model_node_ip_address_log.proto +++ b/pkg/rpc/protos/models/model_node_ip_address_log.proto @@ -13,6 +13,7 @@ message NodeIPAddressLog { bool isUp = 4; bool isOn = 5; bool canAccess = 6; + string backupIP = 7; NodeIPAddress nodeIPAddress = 30; Admin admin = 31;