Merge pull request #320 in YUNIONIO/onecloud from ~LIZEXI/onecloud:bugfix/lzx-vnc-find-port to release/2.0.0

* commit '83f09321cab7a3b12b67ef83e4bf8db27f8d9bf5':
  fix: kvm find vnc port index out of range
This commit is contained in:
李泽玺
2018-10-19 12:10:02 +08:00
+4 -5
View File
@@ -3,8 +3,8 @@ package guestdrivers
import (
"context"
"fmt"
"regexp"
"strconv"
"strings"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -43,10 +43,9 @@ func (self *SKVMGuestDriver) OnDeleteGuestFinalCleanup(ctx context.Context, gues
}
func findVNCPort(results string) int {
reg := regexp.MustCompile(`(\d+\.\d+\.\d+\.\d+):([\d]+)`)
finds := reg.FindStringSubmatch(results)
log.Debugf("finds=%s", finds)
port, _ := strconv.Atoi(finds[2])
vncInfo := strings.Split(results, "\n")
addrParts := strings.Split(vncInfo[1], ":")
port, _ := strconv.Atoi(addrParts[len(addrParts)-1])
return port
}