diff --git a/internal/web/actions/default/clusters/cluster/node/detail.go b/internal/web/actions/default/clusters/cluster/node/detail.go
index 47cf053a..c0a7715c 100644
--- a/internal/web/actions/default/clusters/cluster/node/detail.go
+++ b/internal/web/actions/default/clusters/cluster/node/detail.go
@@ -69,7 +69,7 @@ func (this *DetailAction) RunGet(params struct {
}
// IP地址
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: params.NodeId,
Role: nodeconfigs.NodeRoleNode,
})
@@ -77,9 +77,9 @@ func (this *DetailAction) RunGet(params struct {
this.ErrorPage(err)
return
}
- var ipAddresses = ipAddressesResp.Addresses
+ var ipAddresses = ipAddressesResp.NodeIPAddresses
ipAddressMaps := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
if err != nil {
this.ErrorPage(err)
diff --git a/internal/web/actions/default/clusters/cluster/node/update.go b/internal/web/actions/default/clusters/cluster/node/update.go
index aa29bc94..5a85d63d 100644
--- a/internal/web/actions/default/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/clusters/cluster/node/update.go
@@ -47,7 +47,7 @@ func (this *UpdateAction) RunGet(params struct {
}
// IP地址
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: params.NodeId,
Role: nodeconfigs.NodeRoleNode,
})
@@ -56,7 +56,7 @@ func (this *UpdateAction) RunGet(params struct {
return
}
ipAddressMaps := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
thresholds, err := ipaddressutils.InitNodeIPAddressThresholds(this.Parent(), addr.Id)
if err != nil {
this.ErrorPage(err)
@@ -391,7 +391,7 @@ func (this *UpdateAction) RunPost(params struct {
}
// 禁用老的IP地址
- _, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+ _, err = this.RPC().NodeIPAddressRPC().DisableAllNodeIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllNodeIPAddressesWithNodeIdRequest{
NodeId: params.NodeId,
Role: nodeconfigs.NodeRoleNode,
})
diff --git a/internal/web/actions/default/clusters/cluster/nodes.go b/internal/web/actions/default/clusters/cluster/nodes.go
index 39e37b3f..d7a305c6 100644
--- a/internal/web/actions/default/clusters/cluster/nodes.go
+++ b/internal/web/actions/default/clusters/cluster/nodes.go
@@ -123,7 +123,7 @@ func (this *NodesAction) RunGet(params struct {
}
// IP
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: node.Id,
Role: nodeconfigs.NodeRoleNode,
})
@@ -132,7 +132,7 @@ func (this *NodesAction) RunGet(params struct {
return
}
ipAddresses := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
ipAddresses = append(ipAddresses, maps.Map{
"id": addr.Id,
"name": addr.Name,
diff --git a/internal/web/actions/default/clusters/index.go b/internal/web/actions/default/clusters/index.go
index 09842511..8d2dcfc8 100644
--- a/internal/web/actions/default/clusters/index.go
+++ b/internal/web/actions/default/clusters/index.go
@@ -193,7 +193,7 @@ func (this *IndexAction) searchNodes(keyword string) {
}
// IP
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: node.Id,
Role: nodeconfigs.NodeRoleNode,
})
@@ -202,7 +202,7 @@ func (this *IndexAction) searchNodes(keyword string) {
return
}
ipAddresses := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
ipAddresses = append(ipAddresses, maps.Map{
"id": addr.Id,
"name": addr.Name,
diff --git a/internal/web/actions/default/ns/clusters/cluster/index.go b/internal/web/actions/default/ns/clusters/cluster/index.go
index e4f90f7e..12f0de11 100644
--- a/internal/web/actions/default/ns/clusters/cluster/index.go
+++ b/internal/web/actions/default/ns/clusters/cluster/index.go
@@ -81,7 +81,7 @@ func (this *IndexAction) RunGet(params struct {
}
// IP
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: node.Id,
Role: nodeconfigs.NodeRoleDNS,
})
@@ -90,7 +90,7 @@ func (this *IndexAction) RunGet(params struct {
return
}
ipAddresses := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
ipAddresses = append(ipAddresses, maps.Map{
"id": addr.Id,
"name": addr.Name,
diff --git a/internal/web/actions/default/ns/clusters/cluster/node/index.go b/internal/web/actions/default/ns/clusters/cluster/node/index.go
index 93e72a0a..8637e049 100644
--- a/internal/web/actions/default/ns/clusters/cluster/node/index.go
+++ b/internal/web/actions/default/ns/clusters/cluster/node/index.go
@@ -56,7 +56,7 @@ func (this *IndexAction) RunGet(params struct {
}
// IP地址
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: params.NodeId,
Role: nodeconfigs.NodeRoleDNS,
})
@@ -65,7 +65,7 @@ func (this *IndexAction) RunGet(params struct {
return
}
ipAddressMaps := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
ipAddressMaps = append(ipAddressMaps, maps.Map{
"id": addr.Id,
"name": addr.Name,
diff --git a/internal/web/actions/default/ns/clusters/cluster/node/update.go b/internal/web/actions/default/ns/clusters/cluster/node/update.go
index e1b3addc..6589cc92 100644
--- a/internal/web/actions/default/ns/clusters/cluster/node/update.go
+++ b/internal/web/actions/default/ns/clusters/cluster/node/update.go
@@ -46,7 +46,7 @@ func (this *UpdateAction) RunGet(params struct {
}
// IP地址
- ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ ipAddressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: params.NodeId,
Role: nodeconfigs.NodeRoleDNS,
})
@@ -55,7 +55,7 @@ func (this *UpdateAction) RunGet(params struct {
return
}
ipAddressMaps := []maps.Map{}
- for _, addr := range ipAddressesResp.Addresses {
+ for _, addr := range ipAddressesResp.NodeIPAddresses {
ipAddressMaps = append(ipAddressMaps, maps.Map{
"id": addr.Id,
"name": addr.Name,
@@ -213,7 +213,7 @@ func (this *UpdateAction) RunPost(params struct {
}
// 禁用老的IP地址
- _, err = this.RPC().NodeIPAddressRPC().DisableAllIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllIPAddressesWithNodeIdRequest{
+ _, err = this.RPC().NodeIPAddressRPC().DisableAllNodeIPAddressesWithNodeId(this.AdminContext(), &pb.DisableAllNodeIPAddressesWithNodeIdRequest{
NodeId: params.NodeId,
Role: nodeconfigs.NodeRoleDNS,
})
diff --git a/internal/web/actions/default/ns/test/nodeOptions.go b/internal/web/actions/default/ns/test/nodeOptions.go
index 40665f9c..fe3550ad 100644
--- a/internal/web/actions/default/ns/test/nodeOptions.go
+++ b/internal/web/actions/default/ns/test/nodeOptions.go
@@ -28,7 +28,7 @@ func (this *NodeOptionsAction) RunPost(params struct {
continue
}
- addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledIPAddressesWithNodeIdRequest{
+ addressesResp, err := this.RPC().NodeIPAddressRPC().FindAllEnabledNodeIPAddressesWithNodeId(this.AdminContext(), &pb.FindAllEnabledNodeIPAddressesWithNodeIdRequest{
NodeId: node.Id,
Role: nodeconfigs.NodeRoleDNS,
})
@@ -36,7 +36,7 @@ func (this *NodeOptionsAction) RunPost(params struct {
this.ErrorPage(err)
return
}
- var addresses = addressesResp.Addresses
+ var addresses = addressesResp.NodeIPAddresses
if len(addresses) == 0 {
continue
}
diff --git a/web/views/@default/clusters/ip-addrs/addr/index.html b/web/views/@default/clusters/ip-addrs/addr/index.html
index f9180ca8..d108f929 100644
--- a/web/views/@default/clusters/ip-addrs/addr/index.html
+++ b/web/views/@default/clusters/ip-addrs/addr/index.html
@@ -14,10 +14,12 @@
不可访问
禁用
备用
+ [恢复]
{{addr.backupIP}}
- 在线
- 离线
+ 在线 [下线]
+ 离线 [上线]
+