change host to name in hosts moudle

tiansuo114 · caoxianfei1 · commit ed6a13d6104d · 2023-12-14T16:54:09.000+08:00
Signed-off-by: noobcoder &lt;zhaoyi_114@outlook.com&gt;
diff --git a/cli/cli/cli.go b/cli/cli/cli.go
@@ -280,23 +280,23 @@ func (curveadm *CurveAdm) ClusterPoolData() string           { return curveadm.c
 func (curveadm *CurveAdm) ClusterType() string               { return curveadm.clusterType }
 func (curveadm *CurveAdm) Monitor() storage.Monitor          { return curveadm.monitor }
 
-func (curveadm *CurveAdm) GetHost(host string) (*hosts.HostConfig, error) {
+func (curveadm *CurveAdm) GetHost(name string) (*hosts.HostConfig, error) {
 	if len(curveadm.Hosts()) == 0 {
 		return nil, errno.ERR_HOST_NOT_FOUND.
-			F("host: %s", host)
+			F("host: %s", name)
 	}
 	hcs, err := hosts.ParseHosts(curveadm.Hosts())
 	if err != nil {
 		return nil, err
 	}
 
 	for _, hc := range hcs {
-		if hc.GetHost() == host {
+		if hc.GetName() == name {
 			return hc, nil
 		}
 	}
 	return nil, errno.ERR_HOST_NOT_FOUND.
-		F("host: %s", host)
+		F("host: %s", name)
 }
 
 func (curveadm *CurveAdm) ParseTopologyData(data string) ([]*topology.DeployConfig, error) {
@@ -306,7 +306,7 @@ func (curveadm *CurveAdm) ParseTopologyData(data string) ([]*topology.DeployConf
 		return nil, err
 	}
 	for _, hc := range hcs {
-		ctx.Add(hc.GetHost(), hc.GetHostname())
+		ctx.Add(hc.GetName(), hc.GetHostname())
 	}
 
 	dcs, err := topology.ParseTopology(data, ctx)
@@ -466,7 +466,7 @@ func (curveadm *CurveAdm) DiffTopology(data1, data2 string) ([]topology.Topology
 		return nil, err
 	}
 	for _, hc := range hcs {
-		ctx.Add(hc.GetHost(), hc.GetHostname())
+		ctx.Add(hc.GetName(), hc.GetHostname())
 	}
 
 	if len(data1) == 0 {
diff --git a/cli/command/hosts/list_test.go b/cli/command/hosts/list_test.go
@@ -37,7 +37,7 @@ func run(t *testing.T, data string, labels []string, out []string) {
 	assert.Nil(err)
 	assert.Equal(len(hcs), len(out))
 	for i, hc := range hcs {
-		assert.Equal(hc.GetHost(), out[i])
+		assert.Equal(hc.GetName(), out[i])
 	}
 }
 
diff --git a/cli/command/hosts/playbook.go b/cli/command/hosts/playbook.go
@@ -91,7 +91,7 @@ func NewPlaybookCommand(curveadm *cli.CurveAdm) *cobra.Command {
 
 func execute(curveadm *cli.CurveAdm, options playbookOptions, idx int, hc *hosts.HostConfig) {
 	defer func() { wg.Done() }()
-	name := hc.GetHost()
+	name := hc.GetName()
 	target := path.Join("/tmp", utils.RandString(8))
 	err := tools.Scp(curveadm, name, options.filepath, target)
 	if err != nil {
diff --git a/internal/configure/hosts/hc_get.go b/internal/configure/hosts/hc_get.go
@@ -67,7 +67,17 @@ func (hc *HostConfig) getBool(i *comm.Item) bool {
 	return v.(bool)
 }
 
+func (hc *HostConfig) getName() string {
+	res := hc.GetHost()
+	if res != "" {
+		return res
+	}
+
+	return hc.getString(CONFIG_NAME)
+}
+
 func (hc *HostConfig) GetHost() string           { return hc.getString(CONFIG_HOST) }
+func (hc *HostConfig) GetName() string           { return hc.getName() }
 func (hc *HostConfig) GetHostname() string       { return hc.getString(CONFIG_HOSTNAME) }
 func (hc *HostConfig) GetSSHHostname() string    { return hc.getString(CONFIG_SSH_HOSTNAME) }
 func (hc *HostConfig) GetSSHPort() int           { return hc.getInt(CONFIG_SSH_PORT) }
diff --git a/internal/configure/hosts/hc_item.go b/internal/configure/hosts/hc_item.go
@@ -45,6 +45,12 @@ var (
 		nil,
 	)
 
+	CONFIG_NAME = itemset.Insert(
+		"name",
+		comm.REQUIRE_STRING,
+		false,
+		nil,
+	)
 	CONFIG_HOSTNAME = itemset.Insert(
 		"hostname",
 		comm.REQUIRE_STRING,
diff --git a/internal/configure/hosts/hosts.go b/internal/configure/hosts/hosts.go
@@ -141,9 +141,9 @@ func (hc *HostConfig) Build() error {
 	}
 
 	privateKeyFile := hc.GetPrivateKeyFile()
-	if len(hc.GetHost()) == 0 {
+	if len(hc.GetName()) == 0 {
 		return errno.ERR_HOST_FIELD_MISSING.
-			F("hosts[%d].host = nil", hc.sequence)
+			F("hosts[%d].host/name = nil", hc.sequence)
 	} else if len(hc.GetHostname()) == 0 {
 		return errno.ERR_HOSTNAME_FIELD_MISSING.
 			F("hosts[%d].hostname = nil", hc.sequence)
@@ -206,12 +206,12 @@ func ParseHosts(data string) ([]*HostConfig, error) {
 			return nil, err
 		}
 
-		if _, ok := exist[hc.GetHost()]; ok {
-			return nil, errno.ERR_DUPLICATE_HOST.
-				F("duplicate host: %s", hc.GetHost())
+		if _, ok := exist[hc.GetName()]; ok {
+			return nil, errno.ERR_DUPLICATE_NAME.
+				F("duplicate host: %s", hc.GetName())
 		}
 		hcs = append(hcs, hc)
-		exist[hc.GetHost()] = true
+		exist[hc.GetName()] = true
 	}
 	build.DEBUG(build.DEBUG_HOSTS, hosts)
 	return hcs, nil
diff --git a/internal/configure/monitor.go b/internal/configure/monitor.go
@@ -265,7 +265,7 @@ func ParseMonitorConfig(curveadm *cli.CurveAdm, filename string, data string, hs
 		return nil, err
 	}
 	for _, hc := range hcs {
-		ctx.Add(hc.GetHost(), hc.GetHostname())
+		ctx.Add(hc.GetName(), hc.GetHostname())
 	}
 
 	mkind := dcs[0].GetKind()
diff --git a/internal/errno/errno.go b/internal/errno/errno.go
@@ -310,7 +310,7 @@ var (
 	ERR_PRIVATE_KEY_FILE_REQUIRE_ABSOLUTE_PATH   = EC(321004, "SSH private key file needs to be an absolute path")
 	ERR_PRIVATE_KEY_FILE_NOT_EXIST               = EC(321005, "SSH private key file not exist")
 	ERR_PRIVATE_KEY_FILE_REQUIRE_600_PERMISSIONS = EC(321006, "SSH private key file require 600 permissions")
-	ERR_DUPLICATE_HOST                           = EC(321007, "host is duplicate")
+	ERR_DUPLICATE_NAME                           = EC(321007, "name is duplicate")
 	ERR_HOSTNAME_REQUIRES_VALID_IP_ADDRESS       = EC(321008, "hostname requires valid IP address")
 
 	// 322: configure (monitor.yaml: parse failed)
diff --git a/internal/task/task/common/client_status.go b/internal/task/task/common/client_status.go
@@ -163,7 +163,7 @@ func NewGetClientStatusTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task,
 
 	containerId := client.ContainerId
 	subname := fmt.Sprintf("host=%s kind=%s containerId=%s",
-		hc.GetHost(), client.Kind, tui.TrimContainerId(containerId))
+		hc.GetName(), client.Kind, tui.TrimContainerId(containerId))
 	t := task.NewTask("Get Client Status", subname, hc.GetSSHConfig())
 
 	// add step
diff --git a/internal/task/task/common/collect_client.go b/internal/task/task/common/collect_client.go
@@ -46,7 +46,7 @@ func NewCollectClientTask(curveadm *cli.CurveAdm, v interface{}) (*task.Task, er
 	// new task
 	containerId := client.ContainerId
 	subname := fmt.Sprintf("host=%s kind=%s containerId=%s",
-		hc.GetHost(), client.Kind, tui.TrimContainerId(containerId))
+		hc.GetName(), client.Kind, tui.TrimContainerId(containerId))
 	t := task.NewTask("Collect Client", subname, hc.GetSSHConfig())
 
 	// add step to task
diff --git a/internal/tui/hosts.go b/internal/tui/hosts.go
@@ -41,7 +41,7 @@ const (
 func FormatHosts(hcs []*configure.HostConfig, verbose bool) string {
 	lines := [][]interface{}{}
 	title := []string{
-		"Host",
+		"Name",
 		"Hostname",
 		"User",
 		"Port",
@@ -58,7 +58,7 @@ func FormatHosts(hcs []*configure.HostConfig, verbose bool) string {
 	for i := 0; i < len(hcs); i++ {
 		hc := hcs[i]
 
-		host := hc.GetHost()
+		name := hc.GetName()
 		hostname := hc.GetHostname()
 		user := hc.GetUser()
 		port := strconv.Itoa(hc.GetSSHPort())
@@ -74,7 +74,7 @@ func FormatHosts(hcs []*configure.HostConfig, verbose bool) string {
 		}
 
 		lines = append(lines, []interface{}{
-			host,
+			name,
 			hostname,
 			user,
 			port,

Original file line number	Diff line number	Diff line change
`@@ -280,23 +280,23 @@ func (curveadm *CurveAdm) ClusterPoolData() string { return curveadm.c`
`280`	`280`	`func (curveadm *CurveAdm) ClusterType() string { return curveadm.clusterType }`
`281`	`281`	`func (curveadm *CurveAdm) Monitor() storage.Monitor { return curveadm.monitor }`
`282`	`282`
`283`		`-func (curveadm CurveAdm) GetHost(host string) (hosts.HostConfig, error) {`
	`283`	`+func (curveadm CurveAdm) GetHost(name string) (hosts.HostConfig, error) {`
`284`	`284`	`if len(curveadm.Hosts()) == 0 {`
`285`	`285`	`return nil, errno.ERR_HOST_NOT_FOUND.`
`286`		`- F("host: %s", host)`
	`286`	`+ F("host: %s", name)`
`287`	`287`	`}`
`288`	`288`	`hcs, err := hosts.ParseHosts(curveadm.Hosts())`
`289`	`289`	`if err != nil {`
`290`	`290`	`return nil, err`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`for _, hc := range hcs {`
`294`		`- if hc.GetHost() == host {`
	`294`	`+ if hc.GetName() == name {`
`295`	`295`	`return hc, nil`
`296`	`296`	`}`
`297`	`297`	`}`
`298`	`298`	`return nil, errno.ERR_HOST_NOT_FOUND.`
`299`		`- F("host: %s", host)`
	`299`	`+ F("host: %s", name)`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`func (curveadm CurveAdm) ParseTopologyData(data string) ([]topology.DeployConfig, error) {`
`@@ -306,7 +306,7 @@ func (curveadm CurveAdm) ParseTopologyData(data string) ([]topology.DeployConf`
`306`	`306`	`return nil, err`
`307`	`307`	`}`
`308`	`308`	`for _, hc := range hcs {`
`309`		`- ctx.Add(hc.GetHost(), hc.GetHostname())`
	`309`	`+ ctx.Add(hc.GetName(), hc.GetHostname())`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`dcs, err := topology.ParseTopology(data, ctx)`
`@@ -466,7 +466,7 @@ func (curveadm *CurveAdm) DiffTopology(data1, data2 string) ([]topology.Topology`
`466`	`466`	`return nil, err`
`467`	`467`	`}`
`468`	`468`	`for _, hc := range hcs {`
`469`		`- ctx.Add(hc.GetHost(), hc.GetHostname())`
	`469`	`+ ctx.Add(hc.GetName(), hc.GetHostname())`
`470`	`470`	`}`
`471`	`471`
`472`	`472`	`if len(data1) == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func run(t *testing.T, data string, labels []string, out []string) {`
`37`	`37`	`assert.Nil(err)`
`38`	`38`	`assert.Equal(len(hcs), len(out))`
`39`	`39`	`for i, hc := range hcs {`
`40`		`- assert.Equal(hc.GetHost(), out[i])`
	`40`	`+ assert.Equal(hc.GetName(), out[i])`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ func ParseMonitorConfig(curveadm *cli.CurveAdm, filename string, data string, hs`
`265`	`265`	`return nil, err`
`266`	`266`	`}`
`267`	`267`	`for _, hc := range hcs {`
`268`		`- ctx.Add(hc.GetHost(), hc.GetHostname())`
	`268`	`+ ctx.Add(hc.GetName(), hc.GetHostname())`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`mkind := dcs[0].GetKind()`