rebase master

This commit is contained in:
ioito
2019-05-21 22:36:52 +08:00
parent 746a7d424e
commit ff2cca8611
82 changed files with 2247 additions and 717 deletions
+2 -1
View File
@@ -31,6 +31,7 @@ const (
SPICE = "spice"
WMKS = "wmks"
VMRC = "vmrc"
ZSTACK = "zstack"
)
type RemoteConsoleInfo struct {
@@ -108,7 +109,7 @@ func (info *RemoteConsoleInfo) GetConnectParams() (string, error) {
return info.getAliyunURL()
case QCLOUD:
return info.getQcloudURL()
case OPENSTACK, VMRC:
case OPENSTACK, VMRC, ZSTACK:
return info.Url, nil
default:
return "", fmt.Errorf("Can't convert protocol %s to connect params", info.Protocol)