实现最基本的域名服务节点管理

pkg/rpc/protos/models/model_ns_cluster.proto

@@ -8,4 +8,5 @@ message NSCluster {
 	int64 id = 1;
 	bool isOn = 2;
 	string name = 3;
+	string installDir = 4;
 }

pkg/rpc/protos/models/model_ns_node.proto

@@ -4,6 +4,7 @@ option go_package = "./pb";
 package pb;
 
 import "models/model_ns_cluster.proto";
+import "models/model_node_install_status.proto";
 
 // 域名服务节点
 message NSNode {
@@ -12,10 +13,14 @@ message NSNode {
 	bool isOn = 3;
 	string uniqueId = 4;
 	string secret = 5;
+	bytes statusJSON = 6;
+	bool isInstalled = 7;
+	string installDir = 9;
+	bool isUp = 8;
 
 	NSCluster nsCluster = 32;
 	//NodeLogin login = 33;
-	//NodeInstallStatus installStatus = 34;
+	NodeInstallStatus installStatus = 34;
 	//repeated NodeIPAddress ipAddresses = 35;
 	//NodeGroup nodeGroup = 36;
 	//NodeRegion region = 37;

pkg/rpc/protos/service_node.proto

@@ -17,7 +17,7 @@ service NodeService {
 	// 注册集群节点
 	rpc registerClusterNode (RegisterClusterNodeRequest) returns (RegisterClusterNodeResponse);
 
-	// 节点数量
+	// 所有可用的节点数量
 	rpc countAllEnabledNodes (CountAllEnabledNodesRequest) returns (RPCCountResponse);
 
 	// 计算匹配的节点数量
@@ -35,7 +35,7 @@ service NodeService {
 	// 修改节点
 	rpc updateNode (UpdateNodeRequest) returns (RPCSuccess);
 
-	// 查看单个节点
+	// 获取单个节点信息
 	rpc findEnabledNode (FindEnabledNodeRequest) returns (FindEnabledNodeResponse);
 
 	// 获取当前节点配置
@@ -143,7 +143,7 @@ message RegisterClusterNodeResponse {
 	repeated string endpoints = 3;
 }
 
-// 节点数量
+// 所有可用的节点数量
 message CountAllEnabledNodesRequest {
 
 }
@@ -194,7 +194,7 @@ message UpdateNodeRequest {
 	SizeCapacity maxCacheMemoryCapacity = 12;
 }
 
-// 查找节点
+// 获取单个节点信息
 message FindEnabledNodeRequest {
 	int64 nodeId = 1;
 }

pkg/rpc/protos/service_node_ip_address.proto

@@ -32,9 +32,10 @@ service NodeIPAddressService {
 // 创建IP地址
 message CreateNodeIPAddressRequest {
 	int64 nodeId = 1;
-	string name = 2;
-	string ip = 3;
-	bool canAccess = 4;
+	string role = 2;
+	string name = 3;
+	string ip = 4;
+	bool canAccess = 5;
 }
 
 message CreateNodeIPAddressResponse {
@@ -67,6 +68,7 @@ message DisableNodeIPAddressResponse {
 // 禁用节点的所有IP地址
 message DisableAllIPAddressesWithNodeIdRequest {
 	int64 nodeId = 1;
+	string role = 2;
 }
 
 message DisableAllIPAddressesWithNodeIdResponse {
@@ -85,6 +87,7 @@ message FindEnabledNodeIPAddressResponse {
 // 查找节点的所有地址
 message FindAllEnabledIPAddressesWithNodeIdRequest {
 	int64 nodeId = 1;
+	string role = 2;
 }
 
 message FindAllEnabledIPAddressesWithNodeIdResponse {

pkg/rpc/protos/service_ns_node.proto

@@ -4,6 +4,7 @@ option go_package = "./pb";
 package pb;
 
 import "models/model_ns_node.proto";
+import "models/model_node_install_status.proto";
 import "models/rpc_messages.proto";
 
 // 域名服务器节点服务
@@ -11,7 +12,7 @@ service NSNodeService {
 	// 根据集群查找所有节点
 	rpc findAllEnabledNSNodesWithNSClusterId (FindAllEnabledNSNodesWithNSClusterIdRequest) returns (FindAllEnabledNSNodesWithNSClusterIdResponse);
 
-	// 节点数量
+	// 所有可用的节点数量
 	rpc countAllEnabledNSNodes (CountAllEnabledNSNodesRequest) returns (RPCCountResponse);
 
 	// 计算匹配的节点数量
@@ -19,6 +20,30 @@ service NSNodeService {
 
 	// 列出单页节点
 	rpc listEnabledNSNodesMatch (ListEnabledNSNodesMatchRequest) returns (ListEnabledNSNodesMatchResponse);
+
+	// 计算需要升级的节点数量
+	rpc countAllUpgradeNSNodesWithNSClusterId (CountAllUpgradeNSNodesWithNSClusterIdRequest) returns (RPCCountResponse);
+
+	// 创建节点
+	rpc createNSNode (CreateNSNodeRequest) returns (CreateNSNodeResponse);
+
+	// 删除节点
+	rpc deleteNSNode (DeleteNSNodeRequest) returns (RPCSuccess);
+
+	// 获取单个节点信息
+	rpc findEnabledNSNode (FindEnabledNSNodeRequest) returns (FindEnabledNSNodeResponse);
+
+	// 修改节点
+	rpc updateNSNode (UpdateNSNodeRequest) returns (RPCSuccess);
+
+	// 安装节点
+	rpc installNSNode (InstallNSNodeRequest) returns (InstallNSNodeResponse);
+
+	// 读取节点安装状态
+	rpc findNSNodeInstallStatus (FindNSNodeInstallStatusRequest) returns (FindNSNodeInstallStatusResponse);
+
+	// 修改节点安装状态
+	rpc updateNSNodeIsInstalled (UpdateNSNodeIsInstalledRequest) returns (RPCSuccess);
 }
 
 // 根据集群查找所有节点
@@ -30,7 +55,7 @@ message FindAllEnabledNSNodesWithNSClusterIdResponse {
 	repeated NSNode nsNodes = 1;
 }
 
-// 节点数量
+// 所有可用的节点数量
 message CountAllEnabledNSNodesRequest {
 
 }
@@ -38,8 +63,8 @@ message CountAllEnabledNSNodesRequest {
 // 计算匹配的节点数量
 message CountAllEnabledNSNodesMatchRequest {
 	int64 nsClusterId = 1;
-	//int32 installState = 2;
-	//int32 activeState = 3;
+	int32 installState = 2;
+	int32 activeState = 3;
 	string keyword = 4;
 	//int64 nodeGroupId = 5;
 	//int64 nodeRegionId = 6;
@@ -50,6 +75,8 @@ message ListEnabledNSNodesMatchRequest {
 	int64 offset = 1;
 	int64 size = 2;
 	int64 nsClusterId = 3;
+	int32 installState = 4;
+	int32 activeState = 5;
 	string keyword = 6;
 	//int64 nodeGroupId = 7;
 	//int64 nodeRegionId = 8;
@@ -57,4 +84,65 @@ message ListEnabledNSNodesMatchRequest {
 
 message ListEnabledNSNodesMatchResponse {
 	repeated NSNode nsNodes = 1;
+}
+
+// 计算需要升级的节点数量
+message CountAllUpgradeNSNodesWithNSClusterIdRequest {
+	int64 nsClusterId = 1;
+}
+
+// 创建节点
+message CreateNSNodeRequest {
+	string name = 1;
+	int64 nodeClusterId = 2;
+}
+
+message CreateNSNodeResponse {
+	int64 nsNodeId = 1;
+}
+
+// 删除节点
+message DeleteNSNodeRequest {
+	int64 nsNodeId = 1;
+}
+
+// 获取单个节点信息
+message FindEnabledNSNodeRequest {
+	int64 nsNodeId = 1;
+}
+
+message FindEnabledNSNodeResponse {
+	NSNode nsNode = 1;
+}
+
+// 修改节点
+message UpdateNSNodeRequest {
+	int64 nsNodeId = 1;
+	string name = 2;
+	int64 nsClusterId = 3;
+	bool isOn = 6;
+}
+
+// 安装节点
+message InstallNSNodeRequest {
+	int64 nsNodeId = 1;
+}
+
+message InstallNSNodeResponse {
+
+}
+
+// 读取节点安装状态
+message FindNSNodeInstallStatusRequest {
+	int64 nsNodeId = 1;
+}
+
+message FindNSNodeInstallStatusResponse {
+	NodeInstallStatus installStatus = 1;
+}
+
+// 修改节点安装状态
+message UpdateNSNodeIsInstalledRequest {
+	int64 nsNodeId = 1;
+	bool isInstalled = 2;
 }