Automatic merge from release/2.6.0 -> master

* commit '9df488c256e9f40f6fb6a0478cbda2049f68b8bf':
  修正：esxi host名称不使用full domain name

pkg/util/esxi/host.go

@@ -77,6 +77,15 @@ func NewHost(manager *SESXiClient, host *mo.HostSystem, dc *SDatacenter) *SHost
 	return &SHost{SManagedObject: newManagedObject(manager, host, dc)}
 }
 
+func (self *SHost) GetName() string {
+	name := self.SManagedObject.GetName()
+	dotPos := strings.IndexByte(name, '.')
+	if dotPos > 0 {
+		name = name[:dotPos]
+	}
+	return name
+}
+
 func (self *SHost) GetMetadata() *jsonutils.JSONDict {
 	return nil
 }