fix(region): reset guest quorum child index on guest shutdown (#25137)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>

.editorconfig

@@ -0,0 +1,3 @@
+[*.sh]
+indent_style = space
+indent_size = 4

.github/workflows/ci-pr-build-test.yml

@@ -0,0 +1,38 @@
+name: Building and test for PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.18'
+
+    - name: Install check tools
+      shell: bash
+      run: |
+        set -o xtrace
+        git clone --branch yun --depth 4 https://github.com/yousong/tools && cd tools
+        go build ./cmd/goimports && sudo cp goimports /usr/bin/ && cd .. && rm -rf tools
+        git clone --depth 4 https://github.com/yousong/y18n && cd y18n
+        go build . && sudo cp y18n /usr/bin && cd .. && rm -rf y18n
+
+    
+    - name: Test and build
+      shell: bash
+      run: |
+        set -o xtrace
+        export GO111MODULE=on
+        make -j3 check
+        make test
+        targets="$(find cmd -mindepth 1 -maxdepth 1 -type d | grep -v cmd/host-image)"
+        echo $targets | tr ' ' '\n'
+        make $targets
+        ls -lh _output/bin

Makefile

@@ -285,9 +285,11 @@ dep:
 GOPROXY ?= direct
 
 mod:
-	GOPROXY=$(GOPROXY) go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
-	go mod tidy
-	go mod vendor -v
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/sqlchemy@v1.1.2
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/pkg@v1.10.0
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | egrep -v '/cloudmux$$|/sqlchemy$$|/pkg$$'))
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod tidy
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go mod vendor -v
 
 define helpText
 Build with docker

build/build.sh

@@ -44,7 +44,12 @@ echo "Build root ${BUILDROOT}"
 if [ -z "$VERSION" ]; then
 	TAG=$(git describe --abbrev=0 --tags || echo testing)
 	VERSION=${TAG/\//-}
-	VERSION=${VERSION/v/}
+	if [[ "$VERSION" =~ ^v0. ]]; then
+		VERSION=${VERSION/v0./}
+	elif [[ "$VERSION" =~ ^v ]]; then
+		VERSION=${VERSION/v/}
+	fi
+	VERSION=${VERSION//-/.}
 fi
 RELEASE=`date +"%y%m%d%H"`
 

build/docker/Dockerfile.baremetal-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.8
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.9-20230221.2
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.baremetal-base

@@ -1,7 +1,7 @@
 #FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
 #RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
 #RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v0.1.6 as yunionos
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v0.1.8-20230221.2 as yunionos
 
 FROM centos:8 as grub-stage
 

build/docker/Dockerfile.host-deployer

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.4.9
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Makefile

@@ -30,7 +30,7 @@ WEBCONSOLE_BASE_VERSION = v0.2-1
 webconsole-base:
 	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.8
+BAREMETAL_BASE_VERSION = v0.3.9-20230221.2
 
 baremetal-base:
 	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .

build/notify/root/opt/yunion/share/local-templates/content@cn/CHECKSUM_TEST_FAILED.tmpl

@@ -11,3 +11,6 @@
 {{- if eq .resource_type "image" }}
 镜像{{ $d.name }}完整性校验失败
 {{- end -}}
+{{- if eq .resource_type "vm_integrity" }}
+主机{{ $d.name }}完整性校验失败
+{{- end -}}

build/notify/root/opt/yunion/share/local-templates/content@cn/MYSQL_OUT_OF_SYNC.tmpl

@@ -0,0 +1,18 @@
+{{- $d := .resource_details -}}
+数据库 {{$d.ip}} 的主从同步不一致，请及时检查。
+
+{{ range $status := $d.status }}
+数据库 {{$status.ip}} 状态:
+{{- if not $status.operator_error }}
+  - Slave_IO_Running: {{$status.slave_io_running}}
+  - Slave_SQL_Running: {{$status.slave_sql_running}}
+  {{- if $status.last_error }}
+  - Last_Error: {{$status.last_error}}
+  {{- end -}}
+  {{- if $status.last_io_error }}
+  - Last_IO_Error: {{$status.last_io_error}}
+  {{- end }}
+{{else}}
+  - Operator_Error: {{$status.operator_error}}
+{{- end}}
+{{end}}

build/notify/root/opt/yunion/share/local-templates/content@cn/NET_OUT_OF_SYNC.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}服务的网络拓扑信息同步不一致，请及时检查。	

build/notify/root/opt/yunion/share/local-templates/content@cn/PASSWORD_EXPIRE_SOON.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。

build/notify/root/opt/yunion/share/local-templates/content@cn/SERVICE_ABNORMAL.tmpl

@@ -0,0 +1,8 @@
+{{- $d := .resource_details -}}
+服务：{{ $d.service_name }} 异常。
+方法：{{ $d.method }}
+路径：{{ $d.path }} 
+{{- if $d.body }}
+请求：{{ $d.body -}}
+{{ end }}
+错误：{{ $d.error }}

build/notify/root/opt/yunion/share/local-templates/content@cn/SYNC_ACCOUNT_STATUS.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+云账号{{ $d.name }}状态异常，请及时检查。

build/notify/root/opt/yunion/share/local-templates/content@cn/WORK_BLOCK.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ d.service_name}} worker阻塞半小时，请及时检查。

build/notify/root/opt/yunion/share/local-templates/content@en/MYSQL_OUT_OF_SYNC.tmpl

@@ -0,0 +1,18 @@
+{{- $d := .resource_details -}}
+The primary and secondary synchronization of the database ({{ $d.ip }}) is inconsistent, please check in time.
+
+{{ range $status := $d.status }}
+Database {{$status.ip}} status:
+{{- if not $status.operator_error }}
+  - Slave_IO_Running: {{$status.slave_io_running}}
+  - Slave_SQL_Running: {{$status.slave_sql_running}}
+  {{- if $status.last_error }}
+  - Last_Error: {{$status.last_error}}
+  {{- end -}}
+  {{- if $status.last_io_error }}
+  - Last_IO_Error: {{$status.last_io_error}}
+  {{- end }}
+{{else}}
+  - Operator_Error: {{$status.operator_error}}
+{{- end}}
+{{end}}

build/notify/root/opt/yunion/share/local-templates/content@en/NET_OUT_OF_SYNC.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}: The network topology information of the service is inconsistent, please check in time.

build/notify/root/opt/yunion/share/local-templates/content@en/PASSWORD_EXPIRE_SOON.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:Your password is valid and will expire soon. Please log in to the platform in time to update your password.

build/notify/root/opt/yunion/share/local-templates/content@en/SERVICE_ABNORMAL.tmpl

@@ -0,0 +1,8 @@
+{{- $d := .resource_details -}}
+Service: {{ $d.service_name }} abnormal
+Method: {{ $d.method }}
+Path: {{ $d.path }} 
+{{- if $d.body }}
+Body: {{ $d.body -}}
+{{ end }}
+Error: {{ $d.error }}

build/notify/root/opt/yunion/share/local-templates/content@en/SYNC_ACCOUNT_STATUS.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The account {{ $d.name }} status is abnormal. Please check in time.

build/notify/root/opt/yunion/share/local-templates/content@en/WORK_BLOCK.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The service: {{ d.service_name}} worker has been block 30 minutes.Please verify the service in time.

build/notify/root/opt/yunion/share/local-templates/title@cn/MYSQL_OUT_OF_SYNC.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+数据库 {{$d.ip}} 的主从同步不一致，请及时检查。

build/notify/root/opt/yunion/share/local-templates/title@cn/NET_OUT_OF_SYNC.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}服务的网络拓扑信息同步不一致，请及时检查。	

build/notify/root/opt/yunion/share/local-templates/title@cn/PASSWORD_EXPIRE_SOON.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。

build/notify/root/opt/yunion/share/local-templates/title@cn/SERVICE_ABNORMAL.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ $d.service_name }}异常

build/notify/root/opt/yunion/share/local-templates/title@cn/SYNC_ACCOUNT_STATUS.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+云账号{{ $d.name}}状态异常，请及时检查。

build/notify/root/opt/yunion/share/local-templates/title@cn/WORK_BLOCK.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ d.service_name}} worker阻塞半小时，请及时检查。

build/notify/root/opt/yunion/share/local-templates/title@en/MYSQL_OUT_OF_SYNC.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The primary and secondary synchronization of the database ({{ $d.ip }}) is inconsistent, please check in time.

build/notify/root/opt/yunion/share/local-templates/title@en/NET_OUT_OF_SYNC.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.service_name }}: The network topology information of the service is inconsistent, please check in time.

build/notify/root/opt/yunion/share/local-templates/title@en/PASSWORD_EXPIRE_SOON.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:Your password is valid and will expire soon. Please log in to the platform in time to update your password.

build/notify/root/opt/yunion/share/local-templates/title@en/SERVICE_ABNORMAL.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+Server {{ $d.service_name }} abnormal

build/notify/root/opt/yunion/share/local-templates/title@en/USER_LOCK copy.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The account {{ $d.name }} has been locked due to abnormal login. Please verify the situation. If you need to unlock the user, please go to the user list to enable the user.

build/notify/root/opt/yunion/share/local-templates/title@en/WORK_BLOCK.tmpl

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The service: {{ d.service_name}} worker has been block 30 minutes.Please verify the service in time.

cmd/climc/promputils/executor.go

@@ -75,7 +75,7 @@ func Executor(s string) {
 	} else {
 		session.GetClient().SetDebug(false)
 	}
-	if subparser.IsHelpSet() {
+	if subparser != nil && subparser.IsHelpSet() {
 		fmt.Print(subparser.HelpString())
 		return
 	}

cmd/climc/shell/cloudid/cloudusers.go

@@ -15,7 +15,10 @@
 package cloudid
 
 import (
+	"yunion.io/x/jsonutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
@@ -35,4 +38,10 @@ func init() {
 	cmd.Perform("reset-password", &cloudid.ClouduserResetPasswordOptions{})
 	cmd.Perform("cloud-user-join-group", &cloudid.ClouduserGroupOptions{})
 	cmd.Perform("cloud-user-leave-group", &cloudid.ClouduserGroupOptions{})
+	cmd.GetWithCustomShow("access-keys", func(result jsonutils.JSONObject) {
+		ret := modulebase.JSON2ListResult(result)
+		shell.PrintList(ret, nil)
+	}, &cloudid.ClouduserListAccessKeyInput{})
+	cmd.Perform("delete-access-key", &cloudid.ClouduserDeleteAccessKeyInput{})
+	cmd.Perform("create-access-key", &cloudid.ClouduserCreateAccessKeyInput{})
 }

cmd/climc/shell/compute/backup.go

@@ -49,4 +49,10 @@ func init() {
 	ibCmd.Create(&compute.InstanceBackupManagerCreateFromPackageOptions{})
 	ibCmd.Perform("syncstatus", &compute.DiskBackupSyncstatusOptions{})
 	ibCmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+
+	hbsCmd := shell.NewJointCmd(&modules.HostBackupstorages)
+	hbsCmd.List(&compute.HostBackupStorageListOptions{})
+	hbsCmd.Show(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Attach(&compute.HostBackupStorageJoinOptions{})
+	hbsCmd.Detach(&compute.HostBackupStorageJoinOptions{})
 }

cmd/climc/shell/compute/baremetalagents.go

@@ -17,69 +17,90 @@ package compute
 import (
 	"yunion.io/x/jsonutils"
 
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
-func init() {
-	type BaremetalAgentListOptions struct {
-		options.BaseListOptions
-	}
-	R(&BaremetalAgentListOptions{}, "agent-list", "List all agent", func(s *mcclient.ClientSession, args *BaremetalAgentListOptions) error {
-		var params *jsonutils.JSONDict
-		{
-			var err error
-			params, err = args.BaseListOptions.Params()
-			if err != nil {
-				return err
-
-			}
-		}
-		result, err := modules.Baremetalagents.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Baremetalagents.GetColumns(s))
-		return nil
-	})
-
-	type BaremetalAgentOpsOperations struct {
-		ID string `help:"ID or name of agent"`
-	}
-	R(&BaremetalAgentOpsOperations{}, "agent-show", "Show details of an agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
-		result, err := modules.Baremetalagents.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&BaremetalAgentOpsOperations{}, "agent-enable", "Enable agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
-		result, err := modules.Baremetalagents.PerformAction(s, args.ID, "enable", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&BaremetalAgentOpsOperations{}, "agent-disable", "Disable agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
-		result, err := modules.Baremetalagents.PerformAction(s, args.ID, "disable", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&BaremetalAgentOpsOperations{}, "agent-delete", "Delete agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
-		result, err := modules.Baremetalagents.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
+type AgentListOptions struct {
+	options.BaseListOptions
+}
+
+func (o AgentListOptions) Params() (jsonutils.JSONObject, error) {
+	return o.BaseListOptions.Params()
+}
+
+func (o AgentListOptions) Description() string {
+	return "List all agent"
+}
+
+type AgentOpsOperations struct {
+	ID string `help:"ID or name of agent"`
+}
+
+func (o AgentOpsOperations) GetId() string {
+	return o.ID
+}
+
+func (o AgentOpsOperations) Params() (jsonutils.JSONObject, error) {
+	return nil, nil
+}
+
+type AgentShowOpt struct {
+	AgentOpsOperations
+}
+
+func (o AgentShowOpt) Description() string {
+	return "Show details of an agent"
+}
+
+type AgentEnableOpt struct {
+	AgentOpsOperations
+}
+
+func (o AgentEnableOpt) Description() string {
+	return "Enable agent"
+}
+
+type AgentDisableOpt struct {
+	AgentOpsOperations
+}
+
+func (o AgentDisableOpt) Description() string {
+	return "Disable agent"
+}
+
+type AgentDeleteOpt struct {
+	AgentOpsOperations
+}
+
+func (o AgentDeleteOpt) Description() string {
+	return "Delete agent"
+}
+
+type AgentEnableImageCacheOpt struct {
+	AgentOpsOperations
+}
+
+func (o AgentEnableImageCacheOpt) Description() string {
+	return "Enable cache image of a agent"
+}
+
+type AgentDisableImageCacheOpt struct {
+	AgentOpsOperations
+}
+
+func (o AgentDisableImageCacheOpt) Description() string {
+	return "Disable cache image of a agent"
+}
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.Baremetalagents).WithKeyword("agent")
+	cmd.List(new(AgentListOptions))
+	cmd.Show(new(AgentShowOpt))
+	cmd.Perform("enable", new(AgentEnableOpt))
+	cmd.Perform("disable", new(AgentDisableOpt))
+	cmd.Perform("enable-image-cache", new(AgentEnableImageCacheOpt))
+	cmd.Perform("disable-image-cache", new(AgentDisableImageCacheOpt))
+	cmd.Delete(new(AgentDeleteOpt))
 }

cmd/climc/shell/compute/cloudproviders.go

@@ -47,7 +47,7 @@ func init() {
 			return
 		}
 		for k, v := range rc {
-			fmt.Printf(`export %s="%s"`+"\n", k, v)
+			fmt.Printf(`export %s='%s'`+"\n", k, v)
 		}
 	}, &options.BaseIdOptions{})
 	cmd.Get("storage-classes", &compute.CloudproviderStorageClassesOptions{})

cmd/climc/shell/compute/disks.go

@@ -174,6 +174,7 @@ func init() {
 		AutoSnapshot string `help:"enable/disable auto snapshot of disk" choices:"enable|disable"`
 		DiskType     string `help:"Disk type" choices:"data|volume"`
 		IsSsd        *bool  `help:"mark disk as ssd" negative:"no-is-ssd"`
+		AutoReset    *bool  `help:"Enable auto reset disk after geust shutdown"`
 	}
 	R(&DiskUpdateOptions{}, "disk-update", "Update property of a virtual disk", func(s *mcclient.ClientSession, args *DiskUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -207,6 +208,10 @@ func init() {
 				params.Add(jsonutils.JSONFalse, "is_ssd")
 			}
 		}
+		if args.AutoReset != nil {
+			params.Add(jsonutils.NewBool(*args.AutoReset), "auto_reset")
+		}
+
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}
@@ -226,11 +231,16 @@ func init() {
 		if args.TaskNotify {
 			s.PrepareTask()
 		}
-		disk, err := modules.Disks.Create(s, params.JSON(params))
-		if err != nil {
-			return err
+		if args.Count > 1 {
+			results := modules.Disks.BatchCreate(s, params.JSON(params), args.Count)
+			printBatchResults(results, modules.Disks.GetColumns(s))
+		} else {
+			disk, err := modules.Disks.Create(s, params.JSON(params))
+			if err != nil {
+				return err
+			}
+			printObject(disk)
 		}
-		printObject(disk)
 		if args.TaskNotify {
 			s.WaitTaskNotify()
 		}
@@ -410,6 +420,13 @@ func init() {
 
 			if sparseHeader > 0 {
 				writer = sparsefile.NewSparseFileWriter(fi, sparseHeader, totalSize)
+				fileSize, _ := strconv.ParseInt(resp.Header.Get("X-File-Size"), 10, 64)
+				if fileSize > 0 {
+					err = fi.Truncate(fileSize)
+					if err != nil {
+						return errors.Wrapf(err, "failed truncate file")
+					}
+				}
 			}
 
 			bar := pb.Full.Start64(totalSize)

cmd/climc/shell/compute/hosts.go

@@ -52,6 +52,7 @@ func init() {
 	cmd.Perform("probe-isolated-devices", &options.BaseIdOptions{})
 	cmd.Perform("class-metadata", &options.ResourceMetadataOptions{})
 	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-commit-bound", &compute.HostSetCommitBoundOptions{})
 
 	cmd.BatchPerform("enable", &options.BaseIdsOptions{})
 	cmd.BatchPerform("disable", &options.BaseIdsOptions{})
@@ -69,11 +70,7 @@ func init() {
 	cmd.Get("tap-config", &options.BaseIdOptions{})
 
 	R(&options.BaseIdOptions{}, "host-logininfo", "Get SSH login information of a host", func(s *mcclient.ClientSession, args *options.BaseIdOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		i, e := modules.Hosts.PerformAction(s, args.ID, "login_info", nil)
 		if e != nil {
 			return e
 		}
@@ -151,14 +148,12 @@ func init() {
 	})
 
 	type HostUpdateOptions struct {
-		ID                string  `help:"ID or Name of Host"`
-		Name              string  `help:"New name of the host"`
-		Desc              string  `help:"New Description of the host"`
-		CpuCommitBound    float64 `help:"CPU overcommit upper bound at this host"`
-		MemoryCommitBound float64 `help:"Memory overcommit upper bound at this host"`
-		MemoryReserved    string  `help:"Memory reserved"`
-		CpuReserved       int64   `help:"CPU reserved"`
-		HostType          string  `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
+		ID             string `help:"ID or Name of Host"`
+		Name           string `help:"New name of the host"`
+		Desc           string `help:"New Description of the host"`
+		MemoryReserved string `help:"Memory reserved"`
+		CpuReserved    int64  `help:"CPU reserved"`
+		HostType       string `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
 		// AccessIp          string  `help:"Change access ip, CAUTION!!!!"`
 		AccessMac string `help:"Change baremetal access MAC, CAUTION!!!!"`
 		Uuid      string `help:"Change baremetal UUID,  CAUTION!!!!"`
@@ -168,6 +163,8 @@ func init() {
 		IpmiIpAddr   string `help:"IPMI ip_addr"`
 
 		Sn string `help:"serial number"`
+
+		Hostname string `help:"update host name"`
 	}
 	R(&HostUpdateOptions{}, "host-update", "Update information of a host", func(s *mcclient.ClientSession, args *HostUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -177,12 +174,6 @@ func init() {
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}
-		if args.CpuCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat64(args.CpuCommitBound), "cpu_cmtbound")
-		}
-		if args.MemoryCommitBound > 0.0 {
-			params.Add(jsonutils.NewFloat64(args.MemoryCommitBound), "mem_cmtbound")
-		}
 		if len(args.MemoryReserved) > 0 {
 			params.Add(jsonutils.NewString(args.MemoryReserved), "mem_reserved")
 		}
@@ -413,6 +404,7 @@ func init() {
 		AccessWire string `help:"Access wire"`
 
 		NoProbe   bool `help:"just save the record, do not probe"`
+		NoBMC     bool `help:"No BMC hardware"`
 		NoPrepare bool `help:"just probe, do not reboot baremetal to prepare"`
 
 		DisablePxeBoot bool `help:"set enable_pxe_boot to false, which is true by default"`
@@ -454,6 +446,9 @@ func init() {
 		if args.NoPrepare {
 			params.Add(jsonutils.JSONTrue, "no_prepare")
 		}
+		if args.NoBMC {
+			params.Add(jsonutils.JSONTrue, "no_bmc")
+		}
 		if args.DisablePxeBoot {
 			params.Add(jsonutils.JSONFalse, "enable_pxe_boot")
 		}
@@ -562,11 +557,7 @@ func init() {
 		Port int    `help:"SSH service port" default:"22"`
 	}
 	R(&HostSSHLoginOptions{}, "host-ssh", "SSH login of a host", func(s *mcclient.ClientSession, args *HostSSHLoginOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		i, e := modules.Hosts.PerformAction(s, args.ID, "login_info", nil)
 		privateKey := ""
 		if e != nil {
 			if httputils.ErrorCode(e) == 404 || e.Error() == "ciphertext too short" {

cmd/climc/shell/compute/instance_snapshots.go

@@ -57,6 +57,17 @@ func init() {
 		printBatchResults(ret, modules.InstanceSnapshots.GetColumns(s))
 		return nil
 	})
+	type InstanceSnapshotPurgeOptions struct {
+		ID string `help:"Delete snapshot id"`
+	}
+	R(&InstanceSnapshotPurgeOptions{}, "instance-snapshot-purge", "Purge snapshots", func(s *mcclient.ClientSession, args *InstanceSnapshotPurgeOptions) error {
+		result, err := modules.InstanceSnapshots.PerformAction(s, args.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 
 	type InstanceSnapshotShowOptions struct {
 		ID string `help:"ID or Name of snapshot"`

cmd/climc/shell/compute/modelarts_pool.go

@@ -0,0 +1,31 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.ModelartsPools).WithKeyword("modelarts-pool")
+	cmd.List(&compute.ModelartsPoolListOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Create(&compute.ModelartsPoolCreateOption{})
+	cmd.Perform("syncstatus", &compute.ModelartsPoolSyncstatusOption{})
+	cmd.Perform("change-config", &compute.ModelartsPoolChangeConfigOption{})
+}

cmd/climc/shell/compute/modelarts_pool_sku.go

@@ -0,0 +1,26 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.ModelartsPoolSku).WithKeyword("modelarts-pool-sku")
+	cmd.List(&compute.ModelartsPoolSkuListOptions{})
+}

cmd/climc/shell/compute/servers.go

@@ -55,7 +55,8 @@ func init() {
 	cmd.BatchPerform("sync", new(options.ServerIdsOptions))
 	cmd.Perform("switch-to-backup", new(options.ServerSwitchToBackupOptions))
 	cmd.BatchPerform("reconcile-backup", new(options.ServerIdsOptions))
-	cmd.BatchPerform("create-backup", new(options.ServerIdsOptions))
+	cmd.Perform("create-backup", new(options.ServerCreateBackupOptions))
+	cmd.BatchPerform("start-backup", new(options.ServerIdsOptions))
 	cmd.Perform("delete-backup", new(options.ServerDeleteBackupOptions))
 	cmd.BatchPerform("stop", new(options.ServerStopOptions))
 	cmd.BatchPerform("suspend", new(options.ServerIdsOptions))
@@ -66,6 +67,8 @@ func init() {
 	cmd.PrintObjectYAML().Perform("migrate-forecast", new(options.ServerMigrateForecastOptions))
 	cmd.Perform("migrate", new(options.ServerMigrateOptions))
 	cmd.Perform("live-migrate", new(options.ServerLiveMigrateOptions))
+	cmd.BatchPerform("cancel-live-migrate", new(options.ServerIdsOptions))
+	cmd.Perform("set-live-migrate-params", new(options.ServerSetLiveMigrateParamsOptions))
 	cmd.Perform("modify-src-check", new(options.ServerModifySrcCheckOptions))
 	cmd.Perform("set-secgroup", new(options.ServerSecGroupsOptions))
 	cmd.Perform("add-secgroup", new(options.ServerSecGroupsOptions))
@@ -95,6 +98,7 @@ func init() {
 	cmd.Perform("set-sshport", &options.ServerSetSshportOptions{})
 	cmd.Perform("have-agent", &options.ServerHaveAgentOptions{})
 	cmd.Perform("change-disk-storage", &options.ServerChangeDiskStorageOptions{})
+	cmd.Perform("change-storage", &options.ServerChangeStorageOptions{})
 	cmd.PerformClass("batch-user-metadata", &options.ServerBatchMetadataOptions{})
 	cmd.PerformClass("batch-set-user-metadata", &options.ServerBatchMetadataOptions{})
 	cmd.Perform("user-metadata", &baseoptions.ResourceMetadataOptions{})
@@ -107,7 +111,12 @@ func init() {
 	cmd.BatchPerform("enable-memclean", new(options.ServerIdsOptions))
 	cmd.Perform("qga-set-password", &options.ServerQgaSetPassword{})
 	cmd.Perform("qga-command", &options.ServerQgaCommand{})
+	cmd.Perform("qga-ping", &options.ServerQgaPing{})
+	cmd.Perform("qga-guest-info-task", &options.ServerQgaGuestInfoTask{})
+	cmd.Perform("qga-get-network", &options.ServerQgaGetNetwork{})
 	cmd.Perform("set-password", &options.ServerSetPasswordOptions{})
+	cmd.Perform("monitor", &options.ServerMonitorOptions{})
+	cmd.Perform("disable-auto-merge-snapshot", &options.ServerDisableAutoMergeSnapshot{})
 
 	cmd.Get("vnc", new(options.ServerIdOptions))
 	cmd.Get("desc", new(options.ServerIdOptions))
@@ -287,11 +296,6 @@ func init() {
 	})
 
 	R(&options.ServerLoginInfoOptions{}, "server-logininfo", "Get login info of a server", func(s *mcclient.ClientSession, opts *options.ServerLoginInfoOptions) error {
-		srvid, e := modules.Servers.GetId(s, opts.ID, nil)
-		if e != nil {
-			return e
-		}
-
 		params := jsonutils.NewDict()
 		if len(opts.Key) > 0 {
 			privateKey, e := ioutil.ReadFile(opts.Key)
@@ -301,7 +305,7 @@ func init() {
 			params.Add(jsonutils.NewString(string(privateKey)), "private_key")
 		}
 
-		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		i, e := modules.Servers.PerformAction(s, opts.ID, "login_info", params)
 		if e != nil {
 			return e
 		}
@@ -309,23 +313,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.ServerMonitorOptions{}, "server-monitor", "Send commands to qemu monitor", func(s *mcclient.ClientSession, opts *options.ServerMonitorOptions) error {
-		params, err := baseoptions.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		ret, err := modules.Servers.PerformAction(s, opts.ID, "monitor", params)
-		if err != nil {
-			return err
-		}
-		result, err := ret.GetString("results")
-		if err != nil {
-			return err
-		}
-		fmt.Println(result)
-		return nil
-	})
-
 	type ServerDiskSnapshotOptions struct {
 		SERVER       string `help:"server ID or Name"`
 		DISK         string `help:"create snapshot disk id"`
@@ -404,10 +391,15 @@ func init() {
 	type ServerRemoveExtraOption struct {
 		ID  string `help:"ID or name of server"`
 		KEY string `help:"Option key"`
+
+		Value string `help:"Option value"`
 	}
 	R(&ServerRemoveExtraOption{}, "server-remove-extra-options", "Remove server extra options", func(s *mcclient.ClientSession, args *ServerRemoveExtraOption) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.KEY), "key")
+		if len(args.Value) > 0 {
+			params.Add(jsonutils.NewString(args.Value), "value")
+		}
 		result, err := modules.Servers.PerformAction(s, args.ID, "del-extra-option", params)
 		if err != nil {
 			return err
@@ -865,7 +857,7 @@ func init() {
 			privateKey = string(key)
 		}
 
-		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		i, e := modules.Servers.PerformAction(s, srvid, "login_info", params)
 		if e != nil {
 			return e
 		}

cmd/climc/shell/compute/storages.go

@@ -45,6 +45,7 @@ func init() {
 	cmd.Perform("force-detach-host", &compute.StorageForceDetachHost{})
 	cmd.Perform("public", &options.BasePublicOptions{})
 	cmd.Perform("private", &options.BaseIdOptions{})
+	cmd.Perform("set-commit-bound", &compute.StorageSetCommitBoundOptions{})
 
 	type StorageCephRunOptions struct {
 		ID     string `help:"ID or name of ceph storage"`

cmd/climc/shell/compute/webconsole.go

@@ -35,6 +35,11 @@ const (
 
 func init() {
 	handleResult := func(opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
+		if obj.Contains("access_url") {
+			accessUrl, _ := obj.GetString("access_url")
+			fmt.Println("AccessURL:", accessUrl)
+			return nil
+		}
 		if opt.WebconsoleUrl == "" {
 			opt.WebconsoleUrl = DefaultWebconsoleServer
 		}

cmd/climc/shell/helper.go

@@ -651,15 +651,15 @@ func (cmd JointCmd) List(args IJointListOpt) {
 	cmd.RunWithDesc("list", fmt.Sprintf("list %s %s pairs", man.MasterManager().KeyString(), man.SlaveManager().KeyString()), args, callback)
 }
 
-type IJointShowOpt interface {
+type IJointOpt interface {
 	IOpt
 	GetMasterId() string
 	GetSlaveId() string
 }
 
-func (cmd JointCmd) Show(args IJointShowOpt) {
+func (cmd JointCmd) Show(args IJointOpt) {
 	man := cmd.manager.(modulebase.JointManager)
-	callback := func(s *mcclient.ClientSession, args IJointShowOpt) error {
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
 		params, err := args.Params()
 		if err != nil {
 			return err
@@ -673,3 +673,54 @@ func (cmd JointCmd) Show(args IJointShowOpt) {
 	}
 	cmd.Run("show", args, callback)
 }
+
+func (cmd JointCmd) Attach(args IJointOpt) {
+	man := cmd.manager.(modulebase.JointManager)
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := man.Attach(s, args.GetMasterId(), args.GetSlaveId(), params)
+		if err != nil {
+			return err
+		}
+		PrintObject(result)
+		return nil
+	}
+	cmd.Run("attach", args, callback)
+}
+
+func (cmd JointCmd) Detach(args IJointOpt) {
+	man := cmd.manager.(modulebase.JointManager)
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := man.Detach(s, args.GetMasterId(), args.GetSlaveId(), params)
+		if err != nil {
+			return err
+		}
+		PrintObject(result)
+		return nil
+	}
+	cmd.Run("detach", args, callback)
+}
+
+func (cmd JointCmd) Update(args IJointOpt) {
+	man := cmd.manager.(modulebase.JointManager)
+	callback := func(s *mcclient.ClientSession, args IJointOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		result, err := man.Update(s, args.GetMasterId(), args.GetSlaveId(), nil, params)
+		if err != nil {
+			return err
+		}
+		PrintObject(result)
+		return nil
+	}
+	cmd.Run("update", args, callback)
+}

cmd/climc/shell/identity/policies.go

@@ -402,7 +402,7 @@ func init() {
 	}
 	R(&PolicyAdminCapableOptions{}, "policy-admin-capable", "Check admin capable", func(s *mcclient.ClientSession, args *PolicyAdminCapableOptions) error {
 		auth.InitFromClientSession(s)
-		policy.EnableGlobalRbac(15*time.Second, false)
+		policy.EnableGlobalRbac(15*time.Second, false, 1)
 
 		var token mcclient.TokenCredential
 		if len(args.User) > 0 {
@@ -456,7 +456,7 @@ func init() {
 			rbacutils.ShowMatchRuleDebug = true
 		}
 		auth.InitFromClientSession(s)
-		policy.EnableGlobalRbac(15*time.Second, false)
+		policy.EnableGlobalRbac(15*time.Second, false, 1)
 		if args.Debug {
 			consts.EnableRbacDebug()
 		}

cmd/climc/shell/image/imageguest.go

@@ -18,6 +18,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
 
+	api "yunion.io/x/onecloud/pkg/apis/image"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/image"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -26,9 +27,10 @@ import (
 func init() {
 
 	type GuestImageCreateOptions struct {
-		NAME        string `help:"Name of guest image"`
-		ImageNumber int    `help:"common image number of guest image"`
-		Protected   bool   `help:"if guest image is protected"`
+		NAME        string   `help:"Name of guest image"`
+		ImageNumber int      `help:"common image number of guest image"`
+		Protected   bool     `help:"if guest image is protected"`
+		Image       []string `help:"list of images"`
 	}
 
 	R(&GuestImageCreateOptions{}, "guest-image-create", "Create guest image's metadata", func(s *mcclient.ClientSession,
@@ -42,6 +44,15 @@ func init() {
 		if args.Protected {
 			params.Add(jsonutils.JSONTrue, "protected")
 		}
+		if len(args.Image) > 0 {
+			images := make([]api.GuestImageCreateInputSubimage, 0)
+			for _, img := range args.Image {
+				images = append(images, api.GuestImageCreateInputSubimage{
+					Id: img,
+				})
+			}
+			params.Add(jsonutils.Marshal(images), "images")
+		}
 		ret, err := modules.GuestImages.Create(s, params)
 		if err != nil {
 			return err

cmd/climc/shell/k8s/clusters.go

@@ -43,7 +43,7 @@ func initKubeCluster() {
 	cmd.Create(new(o.K8SClusterCreateOptions))
 	cmd.Perform("sync", new(o.ClusterSyncOptions))
 	cmd.Perform("syncstatus", new(o.IdentOptions))
-	cmd.Perform("deploy", new(o.IdentOptions))
+	cmd.Perform("deploy", new(o.ClusterDeployOptions))
 	cmd.Get("components-status", new(o.IdentOptions))
 	cmd.Get("api-resources", new(o.IdentOptions))
 	cmd.Get("cluster-users", new(o.IdentOptions))
@@ -52,6 +52,8 @@ func initKubeCluster() {
 	cmd.Perform("delete-machines", new(o.KubeClusterDeleteMachinesOptions))
 	cmd.Perform("add-machines", new(o.KubeClusterAddMachinesOptions))
 	cmd.PerformClass("gc", new(o.ClusterGCOpts))
+	cmd.Perform("set-extra-config", new(o.ClusterSetExtraConfigOpt))
+	cmd.Get("extra-config", new(o.IdentOptions))
 
 	R(&o.KubeClusterImportOptions{}, cmdN("import"), "Import k8s cluster", func(s *mcclient.ClientSession, args *o.KubeClusterImportOptions) error {
 		params, err := args.Params()

cmd/climc/shell/k8s/releases.go

@@ -53,7 +53,7 @@ func initRelease() {
 			return err
 		}
 
-		res, err := k8s.Releases.Put(s, args.NAME, params)
+		res, err := k8s.Releases.PerformAction(s, args.NAME, "upgrade", params)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/logger/actions.go

@@ -45,8 +45,9 @@ type BaseActionListOptions struct {
 
 type ActionListOptions struct {
 	BaseActionListOptions
-	Id   string   `help:"" metavar:"OBJ_ID"`
-	Type []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
+	Service []string `help:"service name`
+	Id      string   `help:"" metavar:"OBJ_ID"`
+	Type    []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
 }
 
 type TypeActionListOptions struct {
@@ -56,6 +57,9 @@ type TypeActionListOptions struct {
 
 func doActionList(s *mcclient.ClientSession, args *ActionListOptions) error {
 	params := jsonutils.NewDict()
+	if len(args.Service) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Service), "service")
+	}
 	if len(args.Type) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
 	}

cmd/climc/shell/misc/feature.go

@@ -47,6 +47,8 @@ func init() {
 		"apsara",
 		"cloudpods",
 		"hcso",
+		"hcsop",
+		"hcs",
 		"nutanix",
 		"s3",
 		"ceph",

cmd/climc/shell/misc/pprof.go

@@ -58,7 +58,7 @@ func init() {
 			svcUrl string
 		)
 		if len(opts.Service) > 0 {
-			svcUrl, err = s.GetServiceURL(opts.Service, "", "")
+			svcUrl, err = s.GetServiceURL(opts.Service, "")
 			if err != nil {
 				return errors.Wrapf(err, "get service %s url", opts.Service)
 			}

cmd/climc/shell/monitor/alert.go

@@ -29,7 +29,7 @@ import (
 func init() {
 	cmd := NewResourceCmd(monitor.Alerts)
 	cmd.List(new(options.AlertListOptions))
-	cmd.Create(new(options.AlertCreateOptions))
+	// cmd.Create(new(options.AlertCreateOptions))
 	cmd.Show(new(options.AlertShowOptions))
 	cmd.Update(new(options.AlertUpdateOptions))
 	cmd.BatchDelete(new(options.AlertDeleteOptions))

cmd/climc/shell/monitor/commonalert.go

@@ -20,7 +20,8 @@ import (
 )
 
 func init() {
-	cmd := NewResourceCmd(modules.CommonAlertManager)
+	cmd := NewResourceCmd(modules.CommonAlerts)
+	cmd.Create(new(options.CommonAlertCreateOptions))
 	cmd.List(new(options.CommonAlertListOptions))
 	cmd.Show(new(options.CommonAlertShowOptions))
 	cmd.Perform("enable", &options.CommonAlertShowOptions{})

cmd/climc/shell/monitor/monitor_resource.go

@@ -21,5 +21,6 @@ import (
 
 func init() {
 	cmd := NewResourceCmd(modules.MonitorResourceManager)
-	cmd.Get("", new(options.MonitorResourceJointAlertOptions))
+	cmd.GetProperty(new(options.MonitorResourceJointAlertOptions))
+	cmd.List(new(options.MonitorResourceListOptions))
 }

cmd/climc/shell/monitor/unifiedmonitor.go

@@ -0,0 +1,28 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package monitor
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(monitor.UnifiedMonitorManager).SetPrefix("monitor")
+	cmd.Show(&options.SimpleQueryOptions{})
+	cmd.GetProperty(&options.MeasurementsQueryOptions{})
+	cmd.GetProperty(&options.DatabasesQueryOptions{})
+}

cmd/esxicli/main.go

@@ -35,6 +35,8 @@ type BaseOptions struct {
 	Port       int    `help:"Service port" default:"$VMWARE_PORT" metavar:"VMWARE_PORT"`
 	Account    string `help:"VCenter or ESXi Account" default:"$VMWARE_ACCOUNT" metavar:"VMWARE_ACCOUNT"`
 	Password   string `help:"Password" default:"$VMWARE_PASSWORD" metavar:"VMWARE_PASSWORD"`
+	Debug      bool
+	Format     string `choices:"xml|json" default:"json"`
 	SUBCOMMAND string `help:"aliyuncli subcommand" subcommand:"true"`
 }
 
@@ -101,7 +103,7 @@ func newClient(options *BaseOptions) (*esxi.SESXiClient, error) {
 				cloudprovider.ProviderConfig{
 					ProxyFunc: proxyFunc,
 				},
-			),
+			).Debug(options.Debug).Format(options.Format),
 	)
 }
 

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/cheggaaa/pb/v3 v3.0.8
 	github.com/coredns/coredns v1.3.0
 	github.com/creack/pty v1.1.11
-	github.com/fatih/color v1.10.0
+	github.com/fatih/color v1.13.0
 	github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e
 	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
@@ -48,7 +48,7 @@ require (
 	github.com/lestrrat-go/jwx v1.0.2
 	github.com/lestrrat/go-jwx v0.0.0-20180221005942-b7d4802280ae
 	github.com/libvirt/libvirt-go-xml v5.2.0+incompatible
-	github.com/ma314smith/signedxml v0.0.0-20200410192636-c342a2d0ae60
+	github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c
 	github.com/mattn/go-sqlite3 v1.14.12
 	github.com/mdlayher/arp v0.0.0-20190313224443-98a83c8a2717
 	github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
@@ -56,7 +56,7 @@ require (
 	github.com/mholt/caddy v0.10.11
 	github.com/miekg/dns v1.1.25
 	github.com/minio/minio-go v6.0.14+incompatible
-	github.com/mozillazg/go-pinyin v0.15.0
+	github.com/mozillazg/go-pinyin v0.19.0
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
 	github.com/opentracing/opentracing-go v1.0.2 // indirect
 	github.com/openzipkin/zipkin-go-opentracing v0.3.4 // indirect
@@ -67,10 +67,11 @@ require (
 	github.com/serialx/hashring v0.0.0-20180504054112-49a4782e9908
 	github.com/sevlyar/go-daemon v0.1.5
 	github.com/shirou/gopsutil v3.21.11+incompatible
+	github.com/shirou/gopsutil/v3 v3.22.10
 	github.com/sirupsen/logrus v1.9.0
 	github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9
-	github.com/smartystreets/goconvey v1.6.4
-	github.com/stretchr/testify v1.7.2
+	github.com/smartystreets/goconvey v1.7.2
+	github.com/stretchr/testify v1.8.1
 	github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e
 	github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.413
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.24
@@ -82,15 +83,15 @@ require (
 	github.com/vmware/govmomi v0.20.1
 	go.etcd.io/etcd/api/v3 v3.5.0
 	go.etcd.io/etcd/client/v3 v3.5.0
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
-	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+	golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2
 	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
 	golang.org/x/text v0.3.7
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20191008142428-8d021180e987
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220916014741-473347a5e6e3
 	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/fatih/set.v0 v0.2.1
@@ -101,14 +102,18 @@ require (
 	k8s.io/client-go v0.19.3
 	k8s.io/cluster-bootstrap v0.19.3
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
-	yunion.io/x/jsonutils v1.0.0
-	yunion.io/x/log v1.0.0
-	yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7
-	yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e
+	yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361
+	yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900
+	yunion.io/x/pkg v1.10.0
 	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
-	yunion.io/x/sqlchemy v1.1.2-0.20220704015412-b0c3988ceaa2
-	yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6
+	yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c
+)
+
+require (
+	github.com/google/uuid v1.3.0
+	yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
+	yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19
+	yunion.io/x/sqlchemy v1.1.2
 )
 
 require (
@@ -175,10 +180,8 @@ require (
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	github.com/google/btree v1.0.0 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
 	github.com/googleapis/gnostic v0.4.1 // indirect
 	github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb // indirect
@@ -195,7 +198,8 @@ require (
 	github.com/lestrrat-go/iter v0.0.0-20200422075355-fc1769541911 // indirect
 	github.com/lestrrat-go/pdebug v0.0.0-20200204225717-4d6bd78da58d // indirect
 	github.com/lestrrat/go-pdebug v0.0.0-20180220043741-569c97477ae8 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/mattn/go-colorable v0.1.9 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/mattn/go-tty v0.0.0-20181127064339-e4f871175a2f // indirect
@@ -215,6 +219,7 @@ require (
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pkg/term v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.32.1 // indirect
@@ -223,14 +228,15 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect
 	github.com/satori/go.uuid v1.2.0 // indirect
-	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
+	github.com/smartystreets/assertions v1.2.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.1.1 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e // indirect
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/tredoe/osutil/v2 v2.0.0-rc.16 // indirect
 	github.com/ugorji/go/codec v1.1.7 // indirect
 	github.com/willf/bitset v1.1.9 // indirect
 	github.com/willf/bloom v2.0.3+incompatible // indirect
@@ -242,7 +248,7 @@ require (
 	go.uber.org/zap v1.17.0 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
 	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/tools v0.1.2 // indirect
 	google.golang.org/api v0.30.0 // indirect
 	google.golang.org/appengine v1.6.6 // indirect
@@ -250,7 +256,7 @@ require (
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.44.0 // indirect
+	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.2.0 // indirect
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73 // indirect

go.sum

@@ -240,8 +240,9 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710 h1:QdyRyGZWLEvJG5Kw3VcVJvhXJ5tZ1MkRgqpJOEZSySM=
 github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710/go.mod h1:eNde4IQyEiA5br02AouhEHCu3p3UzrCdFR4LuQHklMI=
-github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e h1:P10tZmVD2XclAaT9l7OduMH1OLFzTa1wUuUqHZnEdI0=
 github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e/go.mod h1:2H9hjfbpSMHwY503FclkV/lZTBh2YlOmLLSda12uL8c=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
@@ -355,8 +356,10 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -431,7 +434,6 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
@@ -481,13 +483,16 @@ github.com/lestrrat/go-pdebug v0.0.0-20180220043741-569c97477ae8/go.mod h1:VXFH1
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/libvirt/libvirt-go-xml v5.2.0+incompatible h1:ALyVpa0/lFfFaUpb5l0fNBohufmQG6jsOGRCl/nKEi8=
 github.com/libvirt/libvirt-go-xml v5.2.0+incompatible/go.mod h1:oBlgD3xOA01ihiK5stbhFzvieyW+jVS6kbbsMVF623A=
-github.com/ma314smith/signedxml v0.0.0-20200410192636-c342a2d0ae60 h1:q5rqPuvxdOzg1NC6sls3XSpRokQ5KAmLIYdLW1/kyOo=
-github.com/ma314smith/signedxml v0.0.0-20200410192636-c342a2d0ae60/go.mod h1:KEgVcb43+f5KFUH/x6Vd3NROG0AIL2CuKMrIqYsmx6E=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c h1:UPJygtyk491bJJ/DnRJFuzcq9Dl9NSeFrJ7VdiRzMxc=
+github.com/ma314smith/signedxml v0.0.0-20210628192057-abc5b481ae1c/go.mod h1:KEgVcb43+f5KFUH/x6Vd3NROG0AIL2CuKMrIqYsmx6E=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
@@ -512,10 +517,6 @@ github.com/mdlayher/arp v0.0.0-20190313224443-98a83c8a2717/go.mod h1:eOj1DDj3NAZ
 github.com/mdlayher/ethernet v0.0.0-20190313224307-5b5fc417d966/go.mod h1:5s5p/sMJ6sNsFl6uCh85lkFGV8kLuIYJCRJLavVJwvg=
 github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
 github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
-github.com/mdlayher/genetlink v0.0.0-20191004171646-5cf585d3b847/go.mod h1:LNhNWFVJapYK8zEjVHUIle4gy+Oahfc3UtcaqZ8Dz98=
-github.com/mdlayher/netlink v0.0.0-20190409211403-11939a169225/go.mod h1:eQB3mZE4aiYnlUsyGGCOpPETfdQq4Jhsgf1fk3cwQaA=
-github.com/mdlayher/netlink v0.0.0-20191004170026-3c8695cb0643/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
-github.com/mdlayher/netlink v0.0.0-20191008140946-2a17fd90af51/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqcnu43w/+M=
 github.com/mdlayher/raw v0.0.0-20190313224157-43dbcdd7739d/go.mod h1:r1fbeITl2xL/zLbVnNHFyOzQJTgr/3fpf1lJX/cjzR8=
 github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
 github.com/mdlayher/raw v0.0.0-20190606144222-a54781e5f38f h1:Xjvm7UTnKTwrlhbs+8qA6I0v1iX77rY3QxftSgvOVRk=
@@ -526,7 +527,6 @@ github.com/mholt/caddy v0.10.11 h1:s8X+R8DuBbrrMuUTcWSxlDe567B0s5EDmiDBKSYsioY=
 github.com/mholt/caddy v0.10.11/go.mod h1:Wb1PlT4DAYSqOEd03MsqkdkXnTxA8v9pKjdpxbqM1kY=
 github.com/miekg/dns v1.1.25 h1:dFwPR6SfLtrSwgDcIq2bcU/gVutB4sNApq2HBdqcakg=
 github.com/miekg/dns v1.1.25/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
 github.com/minio/cli v1.20.0/go.mod h1:bYxnK0uS629N3Bq+AOZZ+6lwF77Sodk4+UL9vNuXhOY=
 github.com/minio/minio-go v6.0.14+incompatible h1:fnV+GD28LeqdN6vT2XdGKW8Qe/IfjJDswNVuni6km9o=
 github.com/minio/minio-go v6.0.14+incompatible/go.mod h1:7guKYtitv8dktvNUGrhzmNlA5wrAABTQXCoesZdFQO8=
@@ -551,8 +551,8 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/mozillazg/go-httpheader v0.2.1 h1:geV7TrjbL8KXSyvghnFm+NyTux/hxwueTSrwhe88TQQ=
 github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60=
-github.com/mozillazg/go-pinyin v0.15.0 h1:sSwlnsogK/WMzcf0HnjgxyAI4GU6LFqwXnhr77q1Z80=
-github.com/mozillazg/go-pinyin v0.15.0/go.mod h1:bO+dztNW6O2lSJdYLha7LO3bujXzjjU3UvKb2IGANfg=
+github.com/mozillazg/go-pinyin v0.19.0 h1:p+J8/kjJ558KPvVGYLvqBhxf8jbZA2exSLCs2uUVN8c=
+github.com/mozillazg/go-pinyin v0.19.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
@@ -589,6 +589,8 @@ github.com/pkg/term v1.0.0 h1:raTSNJjic7X4n89hhPyLOsgRYczmr3MyezRierWCTa8=
 github.com/pkg/term v1.0.0/go.mod h1:6rk0zrj6TXf8MR5fdVFsZMeGM2lxe3tUFLNBRlwX+dk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/pquerna/otp v1.2.0 h1:/A3+Jn+cagqayeR3iHs/L62m5ue7710D35zl1zJ1kok=
 github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -635,6 +637,8 @@ github.com/sevlyar/go-daemon v0.1.5 h1:Zy/6jLbM8CfqJ4x4RPr7MJlSKt90f00kNM1D401C+
 github.com/sevlyar/go-daemon v0.1.5/go.mod h1:6dJpPatBT9eUwM5VCw9Bt6CdX9Tk6UWvhW3MebLDRKE=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg=
+github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -643,12 +647,14 @@ github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9 h1:lpEzuenPuO1XNTeikEmvqYFcU37GVLl8SRNblzyvGBE=
 github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9/go.mod h1:PLPIyL7ikehBD1OAjmKKiOEhbvWyHGaNDjquXMcYABo=
 github.com/smartystreets/assertions v0.0.0-20180607162144-eb5b59917fa2/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
+github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
 github.com/smartystreets/gunit v0.0.0-20180314194857-6f0d6275bdcd/go.mod h1:XUKj4gbqj2QvJk/OdLWzyZ3FYli0f+MdpngyryX0gcw=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
@@ -660,16 +666,20 @@ github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syncthing/syncthing v0.14.48-rc.4/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402eqvEIasMQOE8nFOxy7M=
 github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8=
 github.com/tatsushid/go-fastping v0.0.0-20160109021039-d7bb493dee3e h1:nt2877sKfojlHCTOBXbpWjBkuWKritFaGIfgQwbQUls=
@@ -691,6 +701,8 @@ github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c h1:5q7IHeqvAA4hWR1CfpTOS7RFsTDC36TaSZ8Dvc00bPk=
 github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c/go.mod h1:M/I710pXKQToMdqt/D+mJ4QsnW6WDaajyB6DWFmDXBs=
+github.com/tredoe/osutil/v2 v2.0.0-rc.16 h1:5A2SKvyB2c3lhPYUIHyFtu6jbaXlaA3Hu5gWIam8Pik=
+github.com/tredoe/osutil/v2 v2.0.0-rc.16/go.mod h1:uLRVx/3pb7Y4RQhG8cQFbPE9ha5r81e6MXpBsxbTAYc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
@@ -742,15 +754,13 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -805,10 +815,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191007182048-72f939374954/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -827,8 +834,9 @@ golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2 h1:6mzvA99KwZxbOrxww4EvWVQUnN1+xEu9tafK5ZxkYeA=
+golang.org/x/net v0.0.0-20220418201149-a630d4f3e7a2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -858,7 +866,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190411185658-b44545bcd369/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -868,15 +875,11 @@ golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190830023255-19e00faab6ad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191003212358-c178f38b412c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -900,6 +903,7 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -910,13 +914,13 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
 golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -986,9 +990,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.zx2c4.com/wireguard v0.0.20190908/go.mod h1:LhfXh5z6bLC2lW2ve6BzYZFwnnsXK3OQjySR0Yh2dO8=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20191008142428-8d021180e987 h1:26OAgqBTufVr8WKonCEhhjO1oKsYhHv0iM5Dg92G1TM=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20191008142428-8d021180e987/go.mod h1:7hq1rEDsx7/FWl8IEEnfH2Xhs6M2MNnjUfN0PeI8Rm0=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220916014741-473347a5e6e3 h1:ARxNdT6I+00ZyY5yRT/ZECkQti4iGrMZX9dvG/ao/LY=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220916014741-473347a5e6e3/go.mod h1:yp4gl6zOlnDGOZeWeDfMwQcsdOIQnMdhuPx9mwwWBL4=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -1090,8 +1093,8 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.44.0 h1:YRJzTUp0kSYWUVFF5XAbDFfyiqwsl0Vb9R8TVP5eRi0=
-gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
+gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ldap.v3 v3.0.3 h1:YKRHW/2sIl05JsCtx/5ZuUueFuJyoj/6+DGXe3wp6ro=
 gopkg.in/ldap.v3 v3.0.3/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
@@ -1145,25 +1148,24 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
-yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
+yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
+yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
-yunion.io/x/jsonutils v1.0.0 h1:ySgXdIoRqUZRYA0t8QVqRkWgV8IWJlh2JtGovqqc+iI=
-yunion.io/x/jsonutils v1.0.0/go.mod h1:p0nyMqGA/apTxxyLIU/o1k4V7Vujl2O6ey30L594sYE=
+yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19 h1:mZh6vuo7oOiOtE5HF4667+XBNnn7uYpmGN5eIgCVMLk=
+yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19/go.mod h1:VK4Z93dgiKgAijcSqbMKmGaBMJuHulR16Hz4K015ZPo=
 yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXcevLsJLKixV+sR/E7WSYTSx1fE=
 yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
-yunion.io/x/log v1.0.0 h1:VPgssPi8Om+KAHjlEjf6RDU86du//yO+X0upu+h6fZM=
-yunion.io/x/log v1.0.0/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
-yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7 h1:gjqNa2uQzIEXyySsbvVz0UltTEbGsnFFlvnzOpCfHdo=
-yunion.io/x/ovsdb v0.0.0-20200526071744-27bf0940cbc7/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc=
+yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 h1:c5LyNdhbvBe/92pXs9jgXOU/S+RgYh/DHe538LpT/Mo=
+yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
+yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 h1:Hu/4ERvoWaN6aiFs4h4/yvVBMeVzb3eDaYTxkVx9Kdo=
+yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc=
 yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
 yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
-yunion.io/x/pkg v0.0.0-20200814072949-4f1b541857d6/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
-yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e h1:p/Cb7z6gyJbZKnGMeOPL3pTmnphB9GLCU+8qMsln7qA=
-yunion.io/x/pkg v1.0.1-0.20220630095420-9925accd7c5e/go.mod h1:nYOMflWG1wQC6301rGVglQva9bYbJxHThEJUxRAgMFc=
+yunion.io/x/pkg v1.10.0 h1:A0L/ebGyF3+z+kXGRifnpMaLX1GSOHwNx6ocLR6cKRw=
+yunion.io/x/pkg v1.10.0/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk=
 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo=
 yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
-yunion.io/x/sqlchemy v1.1.2-0.20220704015412-b0c3988ceaa2 h1:Kz+Np1WHxYIyn2SQJEolFrMifLoT1yNF6J34W0zbRc8=
-yunion.io/x/sqlchemy v1.1.2-0.20220704015412-b0c3988ceaa2/go.mod h1:xXVfJLIxxTRTnPEaVIIoRZXqWyO8+takIOYhc+zO5KE=
-yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6 h1:WuWXhY3DvhdRTzWCJ/kwt3Ss6KIq7+KqJwb+esvNGwU=
-yunion.io/x/structarg v0.0.0-20220312084958-9c6c79c7d1c6/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=
+yunion.io/x/sqlchemy v1.1.2 h1:h44E1ZO3bwiObXZsnCNSTRgXc9xSV86CWINUMs0qDVE=
+yunion.io/x/sqlchemy v1.1.2/go.mod h1:uuPVZEyEq3sWd5vf9VjGSy6lZzof22X87OEHw9sddJQ=
+yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ=
+yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=

pkg/ansibleserver/models/ansibleplaybooks_v2.go

@@ -149,6 +149,9 @@ func (apb *SAnsiblePlaybookV2) runPlaybook(ctx context.Context, userCred mcclien
 		return fmt.Errorf("playbook is already running")
 	}
 
+	// hack: force Sleep 50s to wait some host ssh service started
+	time.Sleep(50 * time.Second)
+
 	var (
 		privateKey string
 		err        error

pkg/apigateway/handler/auth.go

@@ -145,10 +145,8 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr
 		Domains:           []string{},
 		ReturnFullDomains: false,
 		Idps:              []agapi.SIdp{},
-		SCommonConfig: agapi.SCommonConfig{
-			ApiServer: options.Options.ApiServer,
-		},
-		EncryptPasswd: true,
+		EncryptPasswd:     true,
+		ApiServer:         options.Options.ApiServer,
 	}
 
 	s := auth.GetAdminSession(ctx, regions[0])
@@ -195,12 +193,10 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr
 	// fetch this option directly from Keystone
 	commonCfg, err := modules.ServicesV3.GetSpecific(s, "common", "config", nil)
 	if err == nil && commonCfg != nil {
-		config := agapi.SCommonConfig{}
-		commonCfg.Unmarshal(&config, "config", "default")
-		if len(config.ApiServer) > 0 {
-			ret.ApiServer = config.ApiServer
+		apiServer, _ := commonCfg.GetString("config", "default", "api_server")
+		if len(apiServer) > 0 {
+			ret.ApiServer = apiServer
 		}
-		ret.IsForgetLoginUser = config.IsForgetLoginUser
 	}
 	return ret, nil
 }
@@ -241,11 +237,13 @@ func getStatsInfo(ctx context.Context, req *http.Request) (jsonutils.JSONObject,
 	}{}
 
 	accounts, err := compute_modules.Cloudaccounts.List(s, params)
-	if err != nil {
+	if err != nil && httputils.ErrorCode(err) != 403 {
 		return nil, err
 	}
 
-	ret.Cloudaccounts = accounts.Total
+	if accounts != nil {
+		ret.Cloudaccounts = accounts.Total
+	}
 
 	return jsonutils.Marshal(ret), nil
 }
@@ -253,7 +251,7 @@ func getStatsInfo(ctx context.Context, req *http.Request) (jsonutils.JSONObject,
 func (h *AuthHandlers) getStats(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 	data, err := getStatsInfo(ctx, req)
 	if err != nil {
-		httperrors.NotFoundError(ctx, w, err.Error())
+		httperrors.GeneralServerError(ctx, w, err)
 		return
 	}
 	body := jsonutils.NewDict()
@@ -359,6 +357,11 @@ func (h *AuthHandlers) doCredentialLogin(ctx context.Context, req *http.Request,
 		//	return nil, errors.Wrap(err, "processSsoLoginData")
 		// }
 	} else if body.Contains("verify_code") { // verify by mobile
+		if h.preLoginHook != nil {
+			if err = h.preLoginHook(ctx, req, body); err != nil {
+				return nil, err
+			}
+		}
 		verifyCode, _ := body.GetString("verify_code")
 		uid, _ := body.GetString("uid")
 		contactType, _ := body.GetString("contact_type")
@@ -375,13 +378,15 @@ func (h *AuthHandlers) doCredentialLogin(ctx context.Context, req *http.Request,
 			if httperr.Code == 409 || httperr.Code == 429 {
 				return nil, err
 			}
-			switch httperr.Class {
-			case "UserNotFound", "WrongPassword":
+			switch errors.Error(httperr.Class) {
+			case httperrors.ErrUserNotFound, httperrors.ErrWrongPassword:
 				return nil, httperrors.NewJsonClientError(httperrors.ErrIncorrectUsernameOrPassword, "incorrect username or password")
-			case "UserLocked":
+			case httperrors.ErrUserLocked:
 				return nil, httperrors.NewJsonClientError(httperrors.ErrUserLocked, "The user has been locked, please contact the administrator")
-			case "UserDisabled":
+			case httperrors.ErrUserDisabled:
 				return nil, httperrors.NewJsonClientError(httperrors.ErrUserDisabled, "The user has been disabled, please contact the administrator")
+			case httperrors.ErrInvalidIdpStatus:
+				return nil, httperrors.NewJsonClientError(httperrors.ErrInvalidIdpStatus, "The IDP of user has been disabled or in invalid status")
 			}
 		}
 		return nil, httperrors.NewInvalidCredentialError("invalid credential")
@@ -872,7 +877,8 @@ func getUserInfo2(s *mcclient.ClientSession, uid string, pid string, loginIp str
 		"created_at", "enable_mfa", "is_system_account",
 		"last_active_at", "last_login_ip",
 		"last_login_source",
-		"password_expires_at", "failed_auth_count", "failed_auth_at", "need_reset_password",
+		"password_expires_at", "failed_auth_count", "failed_auth_at",
+		"need_reset_password", "password_reset_hint",
 		"idps",
 		"is_local",
 	} {

pkg/apigateway/handler/backendproxy.go

@@ -16,9 +16,11 @@ package handler
 
 import (
 	"context"
+	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
 
 	"yunion.io/x/log"
 
@@ -39,14 +41,40 @@ func NewBackendServiceProxyHandler(prefix string) *SBackendServiceProxyHandler {
 	}
 }
 
+func removeLeadingSlash(p string) string {
+	for len(p) > 0 && p[0] == '/' {
+		p = p[1:]
+	}
+	return p
+}
+
 func (h *SBackendServiceProxyHandler) requestManipulator(ctx context.Context, r *http.Request) (*http.Request, error) {
 	// remove leading prefixes /api/s/<service>
 	path := r.URL.Path[len("/api/s/"):]
+	path = removeLeadingSlash(path)
 	slashPos := strings.Index(path, "/")
 	if slashPos <= 0 {
 		return r, httperrors.NewBadRequestError("invalid request URL %s", r.URL.Path)
 	}
 	path = path[slashPos:]
+	if strings.HasPrefix(path, "/r/") {
+		path = path[len("/r/"):]
+		path = removeLeadingSlash(path)
+		slashPos := strings.Index(path, "/")
+		if slashPos <= 0 {
+			return r, httperrors.NewBadRequestError("invalid request URL %s", r.URL.Path)
+		}
+		path = path[slashPos:]
+		if strings.HasPrefix(path, "/z/") {
+			path = path[len("/z/"):]
+			path = removeLeadingSlash(path)
+			slashPos := strings.Index(path, "/")
+			if slashPos <= 0 {
+				return r, httperrors.NewBadRequestError("invalid request URL %s", r.URL.Path)
+			}
+			path = path[slashPos:]
+		}
+	}
 	log.Debugf("Path: %s => %s", r.URL.Path, path)
 	r.URL = &url.URL{
 		Path:     path,
@@ -57,7 +85,25 @@ func (h *SBackendServiceProxyHandler) requestManipulator(ctx context.Context, r
 }
 
 func (h *SBackendServiceProxyHandler) Bind(app *appsrv.Application) {
-	app.AddReverseProxyHandler(h.prefix, h.fetchReverseEndpoint(), h.requestManipulator)
+	app.AddReverseProxyHandlerWithCallbackConfig(
+		h.prefix, h.fetchReverseEndpoint(), h.requestManipulator,
+		func(method string, hi *appsrv.SHandlerInfo) *appsrv.SHandlerInfo {
+			if method == "OPTIONS" {
+				return nil
+			}
+			if method == "GET" || method == "PUT" || method == "POST" {
+				hi.SetProcessTimeout(6 * time.Hour)
+			}
+			var worker *appsrv.SWorkerManager
+			if method == "GET" || method == "HEAD" {
+				worker = appsrv.NewWorkerManager("apigateway-backend-api-read", 8, appsrv.DEFAULT_BACKLOG, false)
+			} else {
+				worker = appsrv.NewWorkerManager("apigateway-backend-api-write", 4, appsrv.DEFAULT_BACKLOG, false)
+			}
+			hi.SetWorkerManager(worker)
+			return hi
+		},
+	)
 }
 
 func (h *SBackendServiceProxyHandler) fetchReverseEndpoint() *proxy.SEndpointFactory {
@@ -67,9 +113,41 @@ func (h *SBackendServiceProxyHandler) fetchReverseEndpoint() *proxy.SEndpointFac
 		if len(serviceName) == 0 {
 			return "", httperrors.NewBadRequestError("no service")
 		}
+		path := r.URL.Path
+		serviceSeg := fmt.Sprintf("/api/s/%s/", serviceName)
+		pos := strings.Index(path, serviceSeg)
+		if pos < 0 {
+			return "", httperrors.NewBadRequestError("malformed URL, expect service")
+		}
+		path = path[pos+len(serviceSeg):]
+		path = removeLeadingSlash(path)
+		region := FetchRegion(r)
+		zone := ""
+		if strings.HasPrefix(path, "r/") {
+			path = path[len("r/"):]
+			path = removeLeadingSlash(path)
+			slashPos := strings.Index(path, "/")
+			if slashPos <= 0 {
+				return "", httperrors.NewBadRequestError("malformed URL, expect region")
+			}
+			region = path[:slashPos]
+			path = path[slashPos+1:]
+			if strings.HasPrefix(path, "z/") {
+				path = path[len("z/"):]
+				path = removeLeadingSlash(path)
+				slashPos := strings.Index(path, "/")
+				if slashPos <= 0 {
+					return "", httperrors.NewBadRequestError("malformed URL, expect zone")
+				}
+				zone = path[:slashPos]
+			}
+		}
 		endpointType := "internalURL"
-		session := auth.GetAdminSession(ctx, FetchRegion(r))
-		ep, err := session.GetServiceURL(serviceName, endpointType, "")
+		session := auth.GetAdminSession(ctx, region)
+		if len(zone) > 0 {
+			session.SetZone(zone)
+		}
+		ep, err := session.GetServiceURL(serviceName, endpointType)
 		if err != nil {
 			return "", httperrors.NewBadRequestError("invalid service %s: %s", serviceName, err)
 		}

pkg/apigateway/handler/imageutils.go

@@ -22,6 +22,7 @@ import (
 	"mime/multipart"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"yunion.io/x/jsonutils"
@@ -121,13 +122,23 @@ func imageUploadHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ
 		return
 	}
 
+	properties := map[string]string{}
+	prefix := "properties."
+
 	// add all other params
 	for k, v := range p {
 		if k == "name" || k == "image_size" {
 			continue
 		}
+		if strings.HasPrefix(k, prefix) {
+			properties[strings.TrimPrefix(k, prefix)] = v
+			continue
+		}
 		params.Add(jsonutils.NewString(v), k)
 	}
+	if len(properties) > 0 {
+		params.Set("properties", jsonutils.Marshal(properties))
+	}
 
 	token := AppContextToken(ctx)
 	s := auth.GetSession(ctx, token, FetchRegion(r))

pkg/apigateway/handler/misc.go

@@ -108,6 +108,8 @@ func (h *MiscHandler) Bind(app *appsrv.Application) {
 	// syslog webservice handlers
 	app.AddHandler(POST, prefix+"syslog/token", handleSyslogWebServiceToken)
 	app.AddHandler(POST, prefix+"syslog/message", handleSyslogWebServiceMessage)
+	// service settings
+	app.AddHandler(GET, prefix+"service_settings", h.getServiceSettings)
 }
 
 func UploadHandlerInfo(method, prefix string, handler func(context.Context, http.ResponseWriter, *http.Request)) *appsrv.SHandlerInfo {

pkg/apigateway/handler/proxy.go

@@ -69,7 +69,7 @@ func fetchReverseEndpoint(serviceName string) *proxy.SEndpointFactory {
 	f := func(ctx context.Context, r *http.Request) (string, error) {
 		endpointType := "internalURL"
 		session := auth.GetAdminSession(ctx, FetchRegion(r))
-		ep, err := session.GetServiceURL(serviceName, endpointType, "")
+		ep, err := session.GetServiceURL(serviceName, endpointType)
 		if err != nil {
 			return "", err
 		}

pkg/apigateway/handler/service_setting.go

@@ -0,0 +1,81 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package handler
+
+import (
+	"context"
+	"net/http"
+
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/appsrv"
+	"yunion.io/x/onecloud/pkg/httperrors"
+	"yunion.io/x/onecloud/pkg/mcclient/auth"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/identity"
+)
+
+var settingNames = map[string][]string{
+	"identity":   []string{"no_action_logout_seconds"},
+	"yunionapi":  []string{"enable_organization"},
+	"image":      []string{"enable_pending_delete"},
+	"compute_v2": []string{"enable_pending_delete"},
+	"meter":      []string{"cost_conversion_available", "enable_prediction", "share_resource_type"},
+	"common":     []string{"api_server", "enable_quota_check", "enable_watermark", "enable_cloud_shell"},
+}
+
+func (mh *MiscHandler) getServiceSettings(ctx context.Context, w http.ResponseWriter, req *http.Request) {
+	s := auth.GetAdminSession(ctx, FetchRegion(req))
+	types := []string{}
+	for typ := range settingNames {
+		types = append(types, typ)
+	}
+	params := map[string]interface{}{
+		"limit": 20,
+		"scope": "system",
+		"type":  types,
+	}
+	resp, err := identity.ServicesV3.List(s, jsonutils.Marshal(params))
+	if err != nil {
+		e := httperrors.NewInternalServerError(err.Error())
+		httperrors.JsonClientError(ctx, w, e)
+		return
+	}
+	services := []struct {
+		Id   string
+		Type string
+	}{}
+	err = jsonutils.Update(&services, resp.Data)
+	if err != nil {
+		e := httperrors.NewInternalServerError(err.Error())
+		httperrors.JsonClientError(ctx, w, e)
+		return
+	}
+	result := map[string]map[string]interface{}{}
+	for _, service := range services {
+		result[service.Type] = map[string]interface{}{}
+		data, err := identity.ServicesV3.GetSpecific(s, service.Id, "config", nil)
+		if err != nil {
+			e := httperrors.NewInternalServerError(err.Error())
+			httperrors.JsonClientError(ctx, w, e)
+			return
+		}
+		names, _ := settingNames[service.Type]
+		for _, name := range names {
+			v, _ := data.Get("config", "default", name)
+			result[service.Type][name] = v
+		}
+	}
+	appsrv.SendJSON(w, jsonutils.Marshal(result))
+}

pkg/apigateway/handler/syslog_webservices.go

@@ -132,11 +132,11 @@ func handleSyslogWebServiceMessage(ctx context.Context, w http.ResponseWriter, r
 		httperrors.ForbiddenError(ctx, w, "syslog webservice not enabled")
 		return
 	}
-	resp := fetchSyslogMessage(r)
+	resp := fetchSyslogMessage(ctx, r)
 	appsrv.SendJSON(w, resp)
 }
 
-func fetchSyslogMessage(r *http.Request) jsonutils.JSONObject {
+func fetchSyslogMessage(ctx context.Context, r *http.Request) jsonutils.JSONObject {
 	token := r.FormValue("token")
 	date := r.FormValue("date")
 	eventId := r.FormValue("eventId")
@@ -170,7 +170,7 @@ func fetchSyslogMessage(r *http.Request) jsonutils.JSONObject {
 		params.Add(jsonutils.NewString(moduleType), "service")
 	}
 
-	sess := auth.GetAdminSession(nil, "")
+	sess := auth.GetAdminSession(ctx, "")
 	logs, err := modules.Actions.List(sess, params)
 	if err != nil {
 		ret.Code = 2

pkg/apigateway/report/report.go

@@ -16,6 +16,8 @@ package report
 
 import (
 	"context"
+	"net"
+	"os"
 	"strings"
 	"time"
 
@@ -36,33 +38,90 @@ import (
 )
 
 type sReport struct {
-	GenerateName       string
-	UUID               string
-	Version            string
-	OsDist             string
-	OsVersion          string
-	QemuVersion        string
-	CpuArchitecture    string
-	Brands             string
-	HostCnt            int64
-	KvmHostCnt         int64
-	HostCpuCnt         int64
-	HostMemSizeMb      int64
-	BaremetalCnt       int64
-	BaremetalCpuCnt    int64
-	BaremetalMemSizeMb int64
-	ServerCnt          int64
-	ServerCpuCnt       int64
-	ServerMemSizeMb    int64
-	DiskCnt            int64
-	DiskSizeMb         int64
-	BucketCnt          int64
-	RdsCnt             int64
-	MongoDBCnt         int64
-	KafkaCnt           int64
-	UserCnt            int64
-	ProjectCnt         int64
-	DomainCnt          int64
+	GenerateName           string
+	UUID                   string
+	Version                string
+	OsDist                 string
+	OsVersion              string
+	QemuVersion            string
+	CpuArchitecture        string
+	Brands                 string
+	HostCnt                int64
+	KvmHostCnt             int64
+	VmwareHostCnt          int64
+	HostCpuCnt             int64
+	HostMemSizeMb          int64
+	BaremetalCnt           int64
+	BaremetalCpuCnt        int64
+	BaremetalMemSizeMb     int64
+	BaremetalStorageSizeGb int64
+	ServerCnt              int64
+	ServerCpuCnt           int64
+	ServerMemSizeMb        int64
+	DiskCnt                int64
+	DiskSizeMb             int64
+	BucketCnt              int64
+	RdsCnt                 int64
+	MongoDBCnt             int64
+	KafkaCnt               int64
+	UserCnt                int64
+	ProjectCnt             int64
+	DomainCnt              int64
+	RunningEnv             string
+}
+
+const (
+	RUNNING_ENV_KUBERNETES     = "kubernetes"
+	RUNNING_ENV_DOCKER_COMPOSE = "docker-compose"
+	RUNNING_ENV_UNKNOWN        = "unknown"
+)
+
+func isInsideDockerCompose() bool {
+	// hostname likes: c1577eee2aed
+	DOCKER_HOSTNAME_LEN := 12
+	hostname := os.Getenv("HOSTNAME")
+	if len(hostname) != DOCKER_HOSTNAME_LEN {
+		return false
+	}
+	// resolv mysql and keystone host
+	resolvTimeout := 500 * time.Millisecond
+	ctx, cancel := context.WithTimeout(context.Background(), resolvTimeout)
+	defer cancel()
+	var r net.Resolver
+	hosts := []string{"mysql", "keystone", "region"}
+
+	for _, host := range hosts {
+		_, err := r.LookupIPAddr(ctx, host)
+		if err != nil {
+			return false
+		}
+	}
+	return true
+}
+
+func isInsideKubernetes() bool {
+	k8sHost := os.Getenv("KUBERNETES_SERVICE_HOST")
+	if len(k8sHost) == 0 {
+		return false
+	}
+	// check /var/run/secrets/kubernetes.io/serviceaccount/ directory
+	k8sSecDir := "/var/run/secrets/kubernetes.io/serviceaccount/"
+	if _, err := os.Stat(k8sSecDir); err != nil {
+		return false
+	}
+
+	return true
+}
+
+func getRunningEnv() string {
+	if isInsideKubernetes() {
+		return RUNNING_ENV_KUBERNETES
+	}
+
+	if isInsideDockerCompose() {
+		return RUNNING_ENV_DOCKER_COMPOSE
+	}
+	return RUNNING_ENV_UNKNOWN
 }
 
 func Report(ctx context.Context, userCred mcclient.TokenCredential, isStart bool) {
@@ -83,12 +142,23 @@ func Report(ctx context.Context, userCred mcclient.TokenCredential, isStart bool
 		resp, err := compute.Hosts.List(s, jsonutils.Marshal(map[string]interface{}{
 			"scope":      "system",
 			"hypervisor": api.HYPERVISOR_KVM,
-			"limit":      20,
+			"limit":      1,
 		}))
 		if err != nil {
 			return nil, errors.Wrapf(err, "Hosts.List")
 		}
 		ret.KvmHostCnt = int64(resp.Total)
+
+		resp, err = compute.Hosts.List(s, jsonutils.Marshal(map[string]interface{}{
+			"scope":      "system",
+			"hypervisor": api.HYPERVISOR_ESXI,
+			"limit":      1,
+		}))
+		if err != nil {
+			return nil, errors.Wrapf(err, "Hosts.List")
+		}
+		ret.VmwareHostCnt = int64(resp.Total)
+
 		osDists, osVersions, qemuVersions, archs := []string{}, []string{}, []string{}, []string{}
 		hosts := []api.HostDetails{}
 		jsonutils.Update(&hosts, resp.Data)
@@ -147,6 +217,10 @@ func Report(ctx context.Context, userCred mcclient.TokenCredential, isStart bool
 		ret.RdsCnt, _ = usage.Int("all.rds")
 		ret.MongoDBCnt, _ = usage.Int("all.mongodb")
 		ret.KafkaCnt, _ = usage.Int("all.kafka")
+		ret.BaremetalCnt, _ = usage.Int("baremetals")
+		ret.BaremetalCpuCnt, _ = usage.Int("baremetals.cpu")
+		ret.BaremetalMemSizeMb, _ = usage.Int("baremetals.memory")
+		ret.BaremetalStorageSizeGb, _ = usage.Int("baremetals.storage_gb")
 		usage, err = identity.IdentityUsages.GetUsage(s, system)
 		if err != nil {
 			return nil, errors.Wrapf(err, "IdentityUsages.GetUsage")
@@ -154,6 +228,7 @@ func Report(ctx context.Context, userCred mcclient.TokenCredential, isStart bool
 		ret.UserCnt, _ = usage.Int("users")
 		ret.DomainCnt, _ = usage.Int("domains")
 		ret.ProjectCnt, _ = usage.Int("projects")
+		ret.RunningEnv = getRunningEnv()
 		return ret, nil
 	}
 	rp, err := func() (*sReport, error) {

pkg/apihelper/apihelper.go

@@ -19,11 +19,15 @@ import (
 	"sync"
 	"time"
 
+	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 
+	api "yunion.io/x/onecloud/pkg/apis/notify"
+	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
+	npk "yunion.io/x/onecloud/pkg/mcclient/modules/notify"
 )
 
 const (
@@ -83,7 +87,7 @@ func (h *APIHelper) RunManually(ctx context.Context) {
 func (h *APIHelper) run(ctx context.Context) {
 	changed, err := h.doSync(ctx)
 	if err != nil {
-		log.Errorln(err)
+		log.Errorf("doSync error: %v", err)
 	}
 	if changed {
 		mssCopy := h.modelSets.CopyJoined()
@@ -107,10 +111,15 @@ func (h *APIHelper) doSync(ctx context.Context) (changed bool, err error) {
 	mss := h.modelSets.Copy()
 	r, err := SyncModelSets(mss, s, h.opts)
 	if err != nil {
-		return false, err
+		return false, errors.Wrap(err, "SyncModelSets")
 	}
 	h.modelSets = mss
 	if !r.Correct {
+		// 发送消息通知
+		err := sendSyncErrNotify(s)
+		if err != nil {
+			log.Errorf("unable to EventNotify: %s", err)
+		}
 		return false, errors.Wrap(ErrSync, "incorrect")
 	}
 	changed = r.Changed
@@ -131,3 +140,14 @@ func (h *APIHelper) adminClientSession(ctx context.Context) *mcclient.ClientSess
 	h.mcclientSession = auth.GetAdminSession(ctx, region)
 	return h.mcclientSession
 }
+
+func sendSyncErrNotify(s *mcclient.ClientSession) error {
+	params := api.NotificationManagerEventNotifyInput{}
+	params.Event = api.Event.WithAction(api.ActionNetOutOfSync).WithResourceType(api.TOPIC_RESOURCE_NET).String()
+	params.AdvanceDays = 0
+	message := &jsonutils.JSONDict{}
+	message.Add(jsonutils.NewString(consts.GetServiceType()), "service_name")
+	params.ResourceDetails = message
+	_, err := npk.Notification.PerformClassAction(s, "event-notify", jsonutils.Marshal(params))
+	return err
+}

pkg/apihelper/interface.go

@@ -54,6 +54,10 @@ type IModelListParam interface {
 	ModelParamFilter() jsonutils.JSONObject
 }
 
+type IModelListSetParams interface {
+	SetModelListParams(params *jsonutils.JSONDict) *jsonutils.JSONDict
+}
+
 func SyncModelSets(mssOld IModelSets, s *mcclient.ClientSession, opt *Options) (r ModelSetsUpdateResult, err error) {
 	mss := mssOld.ModelSetList()
 	mssNews := mssOld.NewEmpty()

pkg/apihelper/reflect.go

@@ -21,6 +21,7 @@ import (
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/timeutils"
 
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
@@ -139,6 +140,9 @@ func GetModels(opts *GetModelsOptions) error {
 		filter := inter.ModelParamFilter()
 		params.Update(filter)
 	}
+	if inter, ok := opts.ModelSet.(IModelListSetParams); ok {
+		params = inter.SetModelListParams(params)
+	}
 	//XXX
 	//params.Set(api.LBAGENT_QUERY_ORIG_KEY, jsonutils.NewString(api.LBAGENT_QUERY_ORIG_VAL))
 
@@ -147,8 +151,8 @@ func GetModels(opts *GetModelsOptions) error {
 		var err error
 		listResult, err := opts.ModelManager.List(opts.ClientSession, params)
 		if err != nil {
-			return fmt.Errorf("%s: list failed with updated_at.gt('%s'): %s",
-				manKeyPlural, minUpdatedAt, err)
+			log.Errorf("%s: list failed with updated_at.gt('%s'): %s", manKeyPlural, minUpdatedAt, err)
+			return errors.Wrapf(err, "%s list failed with params: %s", manKeyPlural, params.QueryString())
 		}
 		entriesJson = append(entriesJson, listResult.Data...)
 		if listResult.Offset+len(listResult.Data) >= listResult.Total {
@@ -226,8 +230,8 @@ type ModelSetUpdateResult struct {
 
 // ModelSetApplyUpdates applies bSet to aSet.
 //
-//  - PendingDeleted in bSet are removed from aSet
-//  - Newer models in bSet are updated in aSet
+//   - PendingDeleted in bSet are removed from aSet
+//   - Newer models in bSet are updated in aSet
 func ModelSetApplyUpdates(aSet, bSet IModelSet) *ModelSetUpdateResult {
 	r := &ModelSetUpdateResult{
 		Changed: false,

pkg/apis/apigateway/regions.go

@@ -23,11 +23,6 @@ type SIdp struct {
 	IsDefault bool   `json:"is_default"`
 }
 
-type SCommonConfig struct {
-	ApiServer         string `json:"api_server,allowempty"`
-	IsForgetLoginUser bool   `json:"is_forget_login_user"`
-}
-
 type SRegionsReponse struct {
 	Regions []string `json:"regions,allowempty"`
 	Domains []string `json:"domains,allowempty"`
@@ -37,5 +32,5 @@ type SRegionsReponse struct {
 
 	EncryptPasswd bool `json:"encrypt_passwd"`
 
-	SCommonConfig
+	ApiServer string `json:"api_server,allowempty"`
 }

pkg/apis/cloudid/clouduser.go

@@ -268,3 +268,14 @@ type ClouduserChangeOwnerInput struct {
 	// 本地用户Id
 	UserId string `json:"user_id"`
 }
+
+type ClouduserCreateAccessKeyInput struct {
+	Name string `json:"name"`
+}
+
+type ClouduserDeleteAccessKeyInput struct {
+	AccessKey string `json:"access_key"`
+}
+
+type ClouduserListAccessKeyInput struct {
+}

pkg/apis/cloudprovider/zz_generated.model.go

@@ -14,8 +14,6 @@
 
 package cloudprovider
 
-import "yunion.io/x/onecloud/pkg/cloudprovider"
-
 // DefaultAction is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudprovider.DefaultAction.
 type DefaultAction struct {
 	// Allow, Block, Log, Count, Alert, Detection, Prevention
@@ -30,6 +28,17 @@ type DefaultAction struct {
 	ResponseHeaders map[string]string `json:"response_headers"`
 }
 
+// ElasticSearchAccessInfo is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudprovider.ElasticSearchAccessInfo.
+type ElasticSearchAccessInfo struct {
+	Domain           string `json:"domain"`
+	PrivateDomain    string `json:"private_domain"`
+	Vip              string `json:"vip"`
+	Port             int    `json:"port"`
+	PrivatePort      int    `json:"private_port"`
+	KibanaUrl        string `json:"kibana_url"`
+	KibanaPrivateUrl string `json:"kibana_private_url"`
+}
+
 // SCdnDomain is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudprovider.SCdnDomain.
 type SCdnDomain struct {
 	// cdn加速域名
@@ -48,14 +57,22 @@ type SCdnDomain struct {
 
 // SCdnOrigin is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudprovider.SCdnOrigin.
 type SCdnOrigin struct {
-	Type       string `json:"type"`
-	Origin     string `json:"origin"`
+	// 源站类型
+	// domain: 域名类型, cos：对象存储源站, ip：IP 列表作为源站
+	// enmu: domain, cos, ip
+	// required: true
+	Type string `json:"type"`
+	// 源站地址
+	Origin string `json:"origin"`
+	// 回主源站时 Host 头部
 	ServerName string `json:"server_name"`
-	Protocol   string `json:"protocol"`
-	Path       string `json:"path"`
-	Port       int    `json:"port"`
-	Enabled    string `json:"enabled"`
-	Priority   int    `json:"priority"`
+	// 回源协议
+	// enmu: http, follow, https
+	Protocol string `json:"protocol"`
+	Path     string `json:"path"`
+	Port     int    `json:"port"`
+	Enabled  string `json:"enabled"`
+	Priority int    `json:"priority"`
 }
 
 // SCdnOrigins is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudprovider.SCdnOrigins.
@@ -89,6 +106,8 @@ type SGeographicInfo struct {
 type SSubAccount struct {
 	// 若Account不为空，可不传
 	Name string `json:"name"`
+	// 描述信息
+	Desc string `json:"desc"`
 	// 输入必填，若为空，需要指定子账号名称
 	Account      string `json:"account"`
 	HealthStatus string `json:"health_status"`
@@ -163,7 +182,7 @@ type ServerVncOutput struct {
 // SubAccounts is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudprovider.SubAccounts.
 type SubAccounts struct {
 	// 若输出则是全量子账号列表，若输入，代表允许同步的子账号
-	Accounts []cloudprovider.SSubAccount `json:"accounts"`
+	Accounts []SSubAccount `json:"accounts"`
 	// 若输出是云账号查询到的区域列表，若输入，代表允许同步的区域
 	Cloudregions []struct {
 		Id     string

pkg/apis/compute/api.go

@@ -129,6 +129,10 @@ type DiskConfig struct {
 	// requried: false
 	Fs string `json:"fs"`
 
+	// 关机后自动重置磁盘
+	// required: false
+	AutoReset bool `json:"auto_reset"`
+
 	// 磁盘存储格式
 	// enum: qcow2, raw, docker, iso, vmdk, vmdkflatver1, vmdkflatver2, vmdkflat, vmdksparse, vmdksparsever1, vmdksparsever2, vmdksepsparse vhd
 	// requried: false
@@ -377,6 +381,10 @@ type ServerCreateInput struct {
 	// required: false
 	UserData string `json:"user_data"`
 
+	// swagger: ignore
+	// 创建测试数据，不实际创建资源
+	FakeCreate bool `json:"fake_create"`
+
 	// swagger:ignore
 	// Deprecated
 	Keypair string `json:"keypair" yunion-deprecated-by:"keypair_id"`
@@ -580,6 +588,8 @@ type GuestBatchMigrateRequest struct {
 	SkipCpuCheck    bool   `json:"skip_cpu_check"`
 	SkipKernelCheck bool   `json:"skip_kernel_check"`
 	EnableTLS       *bool  `json:"enable_tls"`
+	MaxBandwidthMb  *int64 `json:"max_bandwidth_mb"`
+	QuciklyFinish   *bool  `json:"quickly_finish"`
 }
 
 type GuestBatchMigrateParams struct {
@@ -590,6 +600,8 @@ type GuestBatchMigrateParams struct {
 	EnableTLS       *bool
 	RescueMode      bool
 	OldStatus       string
+	MaxBandwidthMb  *int64
+	QuciklyFinish   *bool
 }
 
 type HostLoginInfo struct {

pkg/apis/compute/backup.go

@@ -80,6 +80,11 @@ type BackupStorageDetails struct {
 
 type BackupStorageListInput struct {
 	apis.EnabledStatusInfrasResourceBaseListInput
+
+	// filter by server_id
+	ServerId string `json:"server_id"`
+	// filter by disk_id
+	DiskId string `json:"disk_id"`
 }
 
 type DiskBackupListInput struct {
@@ -107,6 +112,8 @@ type DiskBackupDetails struct {
 	BackupStorageName string `json:"backup_storage_name"`
 	// description: 是否是子备份
 	IsSubBackup bool `json:"is_sub_backup"`
+
+	SDiskBackup
 }
 
 type DiskBackupCreateInput struct {

pkg/apis/compute/backup_storages.go

@@ -0,0 +1,47 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+type BackupstorageResourceInput struct {
+	// 备份存储（ID或Name）
+	BackupstorageId string `json:"backupstorage_id"`
+	// swagger:ignore
+	// Deprecated
+	// filter by backupstorage_id
+	Backupstorage string `json:"backupstorage" yunion-deprecated-by:"backupstorage_id"`
+}
+
+type BackupstorageFilterListInputBase struct {
+	BackupstorageResourceInput
+
+	// 以备份存储名称排序
+	// pattern:asc|desc
+	OrderByBackupstorage string `json:"order_by_backupstorage"`
+}
+
+type BackupstorageResourceInfo struct {
+	// 备份存储名称
+	Backupstorage string `json:"backupstorage"`
+
+	// 备份存储类型
+	BackupstorageType string `json:"backupstorage_type"`
+
+	// 备份存储状态
+	BackupstorageStatus string `json:"backupstorage_status"`
+}
+
+type BackupstorageFilterListInput struct {
+	BackupstorageFilterListInputBase
+}

pkg/apis/compute/bucket.go

@@ -16,7 +16,6 @@ package compute
 
 import (
 	"net/http"
-	"strings"
 
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/regutils"
@@ -66,6 +65,7 @@ type BucketDetails struct {
 
 func (self BucketDetails) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":             self.Id,
 		"brand":          self.Brand,
 		"cloudregion":    self.Cloudregion,
 		"cloudregion_id": self.CloudregionId,
@@ -77,11 +77,7 @@ func (self BucketDetails) GetMetricTags() map[string]string {
 		"status":         self.Status,
 		"tenant":         self.Project,
 		"tenant_id":      self.ProjectId,
-	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
+		"external_id":    self.ExternalId,
 	}
 	return ret
 }

pkg/apis/compute/cachedimage.go

@@ -30,6 +30,12 @@ type CachedImageManagerCacheImageInput struct {
 	ImageId string `json:"image_id"`
 }
 
+type CachedimageUsage struct {
+	// 此镜像被使用次数
+	// example: 0
+	CachedCount int `json:"cached_count"`
+}
+
 type CachedimageDetails struct {
 	apis.SharableVirtualResourceDetails
 
@@ -56,7 +62,7 @@ type CachedimageDetails struct {
 
 	// 此镜像被使用次数
 	// example: 0
-	CachedCount int `json:"cached_count"`
+	CachedimageUsage
 }
 
 type CachedImageSetClassMetadataInput struct {

pkg/apis/compute/cloudaccount.go

@@ -17,7 +17,6 @@ package compute
 import (
 	"fmt"
 	"reflect"
-	"strings"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/gotypes"
@@ -133,6 +132,11 @@ type CloudaccountResourceInfo struct {
 	// 云账号名称
 	// example: google-account
 	Account string `json:"account,omitempty"`
+
+	// 云账号状态
+	AccountStatus string `json:"account_status,omitempty"`
+	// 云账号监控状态
+	AccountHealthStatus string `json:"account_health_status,omitempty"`
 }
 
 type CloudaccountCreateInput struct {
@@ -146,6 +150,9 @@ type CloudaccountCreateInput struct {
 	// swagger:ignore
 	AccountId string
 
+	// 跳过重复账号注册检查
+	SkipDuplicateAccountCheck bool
+
 	// 指定云平台品牌, 此参数默认和provider相同
 	// requried: false
 	//
@@ -317,21 +324,20 @@ type CloudaccountDetail struct {
 	ProxySetting proxyapi.SProxySetting `json:"proxy_setting"`
 
 	ProjectMappingResourceInfo
+
+	// 上次同步耗时
+	LastSyncCost string
 }
 
 func (self CloudaccountDetail) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":                self.Id,
 		"cloudaccount_id":   self.Id,
 		"cloudaccount_name": self.Name,
 		"brand":             self.Brand,
 		"domain_id":         self.DomainId,
 		"project_domain":    self.ProjectDomain,
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 
@@ -378,9 +384,9 @@ type CloudaccountPerformPrepareNetsInput struct {
 type CloudaccountPerformPrepareNetsOutput struct {
 	CAWireNets []CAWireNet  `json:"wire_networks"`
 	Hosts      []CAGuestNet `json:"hosts"`
-	Guests     []CAGuestNet `json:"guests"`
-	Wires      []CAPWire    `json:"wires"`
-	VSwitchs   []VSwitch    `json:"vswitchs"`
+	// Guests     []CAGuestNet `json:"guests"`
+	Wires    []CAPWire `json:"wires"`
+	VSwitchs []VSwitch `json:"vswitchs"`
 }
 
 type CloudaccountSyncVMwareNetworkInput struct {
@@ -415,10 +421,10 @@ type CAWireNet struct {
 	SuitableWire  string      `json:"suitable_wire,allowempty"`
 	Hosts         []CAHostNet `json:"hosts"`
 	// description: 没有合适的已有网络，推荐的网络配置
-	HostSuggestedNetworks []CANetConf  `json:"host_suggested_networks"`
-	Guests                []CAGuestNet `json:"guests"`
+	HostSuggestedNetworks []CANetConf `json:"host_suggested_networks"`
+	// Guests                []CAGuestNet `json:"guests"`
 	// description: 没有合适的已有网络，推荐的网络配置
-	GuestSuggestedNetworks []CANetConf `json:"guest_suggested_networks"`
+	// GuestSuggestedNetworks []CANetConf `json:"guest_suggested_networks"`
 }
 
 type CAWireConf struct {
@@ -513,14 +519,16 @@ type SyncRangeInput struct {
 	Force    bool `json:"force"`
 	FullSync bool `json:"full_sync"`
 	DeepSync bool `json:"deep_sync"`
+	// 极速模式(差量更新)
+	Xor bool `json:"xor"`
 
 	Region []string `json:"region"`
 	Zone   []string `json:"zone"`
 	Host   []string `json:"host"`
 
 	// 按资源类型同步，可输入多个
-	// enmu: compute, network, loadbalancer, objectstore, rds, cache, nat, nas, waf, mongodb, es, kafka, app, container
-	Resources []string `json:"resources" choices:"compute|network|loadbalancer|objectstore|rds|cache|nat|nas|waf|mongodb|es|kafka|app|container|eip|tablestore"`
+	// enmu: project, compute, network, eip, loadbalancer, objectstore, rds, cache, event, cloudid, dnszone, public_ip, intervpcnetwork, saml_auth, quota, nat, nas, waf, mongodb, es, kafka, app, cdn, container, ipv6_gateway, tablestore, modelarts, vpcpeer, misc
+	Resources []string `json:"resources" choices:"project|compute|network|eip|loadbalancer|objectstore|rds|cache|event|cloudid|dnszone|public_ip|intervpcnetwork|saml_auth|quota|nat|nas|waf|mongodb|es|kafka|app|cdn|container|ipv6_gateway|tablestore|modelarts|vpcpeer|misc"`
 }
 
 type SAccountPermission struct {

pkg/apis/compute/cloudprovider.go

@@ -141,6 +141,9 @@ type CloudproviderDetails struct {
 	ReadOnly bool `json:"read_only"`
 
 	ProjectMappingResourceInfo
+
+	// 上次同步耗时
+	LastSyncCost string
 }
 
 // 云订阅输入参数

pkg/apis/compute/cloudproviderregion.go

@@ -38,6 +38,9 @@ type CloudproviderregionDetails struct {
 
 	// 支持服务列表
 	Capabilities []string `json:"capabilities"`
+
+	// 上次同步耗时
+	LastSyncCost string `json:"last_sync_cost"`
 }
 
 type CloudproviderregionListInput struct {

pkg/apis/compute/cloudregions_const.go

@@ -103,11 +103,12 @@ const (
 
 	// 印度
 	CITY_DELHI       = "Delhi"       // 德里
-	CITY_MUMBAI      = "Mumbai"      //孟买
-	CITY_KANCHIPURAM = "Kanchipuram" //甘吉布勒姆
-	CITY_MAHARASHTRA = "Maharashtra" //马哈拉施特拉邦
-	CITY_JAMNAGAR    = "Jamnagar"    //贾姆讷格尔
-	CITY_NAGPUR      = "Nagpur"      //那格浦尔
+	CITY_MUMBAI      = "Mumbai"      // 孟买
+	CITY_KANCHIPURAM = "Kanchipuram" // 甘吉布勒姆
+	CITY_MAHARASHTRA = "Maharashtra" // 马哈拉施特拉邦
+	CITY_JAMNAGAR    = "Jamnagar"    // 贾姆讷格尔
+	CITY_NAGPUR      = "Nagpur"      // 那格浦尔
+	CITY_HYDERABAD   = "Hyderabad"   // 海得拉巴
 
 	// 美国
 	CITY_VIRGINIA       = "Virginia"       //弗吉尼亚
@@ -128,6 +129,8 @@ const (
 	CITY_SALT_LAKE_CITY = "Salt Lake City" //盐湖城
 	CITY_LAS_VEGAS      = "Las Vegas"      //拉斯维加斯
 	CITY_PHOENIX        = "Phoenix"        //菲尼克斯
+	CITY_DALLAS         = "Dallas"         //达拉斯
+	CITY_COLUMBUS       = "Columbus"       //哥伦布
 
 	// 英国
 	CITY_LONDON      = "London"      //伦敦
@@ -135,7 +138,8 @@ const (
 	CITY_WEST_SUSSEX = "West Sussex" //西苏塞克斯
 
 	// 阿拉伯联合酋长国
-	CITY_DUBAI = "Dubai" //迪拜
+	CITY_DUBAI     = "Dubai"     //迪拜
+	CITY_ABU_DHABI = "Abu Dhabi" // 阿布扎比
 
 	// 德国
 	CITY_FRANKFURT   = "Frankfurt"   // 法兰克福
@@ -199,6 +203,15 @@ const (
 	// 越南
 	CITY_HO_CHI_MINH = "Ho Chi Minh" //???
 
+	// 以色列
+	CITY_TEL_AVIV = "Tel Aviv" // 拉斯维夫
+
+	// 意大利
+	CITY_MILAN = "Milan" // 米兰
+
+	// 西班牙
+	CITY_MADRID = "Madrid" // 马德里
+
 	COUNTRY_CODE_CN = "CN" //中国
 	COUNTRY_CODE_JP = "JP" //日本
 	COUNTRY_CODE_SG = "SG" //新加坡
@@ -230,4 +243,7 @@ const (
 	COUNTRY_CODE_PL = "PL" //波兰
 	COUNTRY_CODE_FI = "FI" //芬兰
 	COUNTRY_CODE_BE = "BE" //比利时
+	COUNTRY_CODE_IL = "IL" //以色列
+	COUNTRY_CODE_IT = "IT" //意大利
+	COUNTRY_CODE_ES = "ES" //西班牙
 )

pkg/apis/compute/dbinstance.go

@@ -324,6 +324,7 @@ type DBInstanceDetails struct {
 
 func (self DBInstanceDetails) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":             self.Id,
 		"rds_id":         self.Id,
 		"rds_name":       self.Name,
 		"zone":           self.Zone1Name,
@@ -339,15 +340,11 @@ func (self DBInstanceDetails) GetMetricTags() map[string]string {
 		"brand":          self.Brand,
 		"domain_id":      self.DomainId,
 		"project_domain": self.ProjectDomain,
+		"external_id":    self.ExternalId,
 	}
 	if len(self.IpAddrs) > 0 {
 		ret["rds_ip"] = strings.ReplaceAll(self.IpAddrs, ",", "|")
 	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
-	}
 	return ret
 }
 

pkg/apis/compute/disk.go

@@ -230,11 +230,6 @@ type DiskDetails struct {
 
 	// 自动快照策略
 	Snapshotpolicies []SimpleSnapshotPolicy `json:"snapshotpolicies"`
-
-	// 手动快照数量
-	ManualSnapshotCount int `json:"manual_snapshot_count"`
-	// 最多可创建手动快照数量
-	MaxManualSnapshotCount int `json:"max_manual_snapshot_count"`
 }
 
 type DiskResourceInfoBase struct {
@@ -259,6 +254,8 @@ type DiskUpdateInput struct {
 
 	// 磁盘类型
 	DiskType string `json:"disk_type"`
+	// 关机自动重置
+	AutoReset *bool `json:"auto_reset"`
 }
 
 type DiskSaveInput struct {
@@ -317,5 +314,6 @@ type DiskAllocateFromBackupInput struct {
 }
 
 type DiskDeleteInput struct {
-	SkipRecycle *bool
+	SkipRecycle      *bool
+	EsxiFlatFilePath string
 }

pkg/apis/compute/disk_const.go

@@ -64,7 +64,10 @@ const (
 	DISK_EXIST     = "exist"
 )
 
-const DISK_META_EXISTING_PATH = "disk_existing_path"
+const (
+	DISK_META_EXISTING_PATH      = "disk_existing_path"
+	DISK_META_LAST_ATTACHED_HOST = "__disk_last_attached_host"
+)
 
 const (
 	DISK_DRIVER_VIRTIO = "virtio"

pkg/apis/compute/dnsrecordsets.go

@@ -65,6 +65,8 @@ type DnsRecordSetDetails struct {
 	SDnsRecordSet
 
 	TrafficPolicies []DnsRecordPolicy
+
+	DnsZone string `json:"dns_zone"`
 }
 
 type DnsRecordSetListInput struct {

pkg/apis/compute/elasticcache.go

@@ -15,7 +15,6 @@
 package compute
 
 import (
-	"strings"
 	"time"
 
 	"yunion.io/x/onecloud/pkg/apis"
@@ -40,6 +39,7 @@ type ElasticcacheDetails struct {
 
 func (self ElasticcacheDetails) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":             self.Id,
 		"redis_id":       self.Id,
 		"redis_ip":       self.PrivateIpAddr,
 		"redis_name":     self.Name,
@@ -55,11 +55,7 @@ func (self ElasticcacheDetails) GetMetricTags() map[string]string {
 		"brand":          self.Brand,
 		"domain_id":      self.DomainId,
 		"project_domain": self.ProjectDomain,
-	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
+		"external_id":    self.ExternalId,
 	}
 	return ret
 }

pkg/apis/compute/guest_const.go

@@ -43,7 +43,9 @@ const (
 	VM_DETACH_DISK     = "detach_disk"
 
 	VM_BACKUP_STARTING         = "backup_starting"
+	VM_BACKUP_STOPING          = "backup_stopping"
 	VM_BACKUP_CREATING         = "backup_creating"
+	VM_BACKUP_START_FAILED     = "backup_start_failed"
 	VM_BACKUP_CREATE_FAILED    = "backup_create_fail"
 	VM_DEPLOYING_BACKUP        = "deploying_backup"
 	VM_DEPLOYING_BACKUP_FAILED = "deploging_backup_fail"
@@ -71,6 +73,7 @@ const (
 
 	VM_START_MIGRATE  = "start_migrate"
 	VM_MIGRATING      = "migrating"
+	VM_LIVE_MIGRATING = "live_migrating"
 	VM_MIGRATE_FAILED = "migrate_failed"
 
 	VM_CHANGE_FLAVOR      = "change_flavor"
@@ -157,6 +160,9 @@ const (
 	VM_QGA_SET_PASSWORD      = "qga_set_password"
 	VM_QGA_COMMAND_EXECUTING = "qga_command_executing"
 
+	VM_QGA_SET_NETWORK        = "qga_set_network"
+	VM_QGA_SET_NETWORK_FAILED = "qga_set_network_failed"
+
 	SHUTDOWN_STOP      = "stop"
 	SHUTDOWN_TERMINATE = "terminate"
 
@@ -330,18 +336,19 @@ const (
 	VM_AZURE_DEFAULT_LOGIN_USER           = "azureuser"
 	VM_ZSTACK_DEFAULT_LOGIN_USER          = "root"
 
-	VM_METADATA_APP_TAGS            = "app_tags"
-	VM_METADATA_CREATE_PARAMS       = "create_params"
-	VM_METADATA_LOGIN_ACCOUNT       = "login_account"
-	VM_METADATA_LOGIN_KEY           = "login_key"
-	VM_METADATA_LAST_LOGIN_KEY      = "last_login_key"
-	VM_METADATA_LOGIN_KEY_TIMESTAMP = "login_key_timestamp"
-	VM_METADATA_OS_ARCH             = "os_arch"
-	VM_METADATA_OS_DISTRO           = "os_distribution"
-	VM_METADATA_OS_NAME             = "os_name"
-	VM_METADATA_OS_VERSION          = "os_version"
-	VM_METADATA_CGROUP_CPUSET       = "cgroup_cpuset"
-	VM_METADATA_ENABLE_MEMCLEAN     = "enable_memclean"
+	VM_METADATA_APP_TAGS                    = "app_tags"
+	VM_METADATA_CREATE_PARAMS               = "create_params"
+	VM_METADATA_LOGIN_ACCOUNT               = "login_account"
+	VM_METADATA_LOGIN_KEY                   = "login_key"
+	VM_METADATA_LAST_LOGIN_KEY              = "last_login_key"
+	VM_METADATA_LOGIN_KEY_TIMESTAMP         = "login_key_timestamp"
+	VM_METADATA_OS_ARCH                     = "os_arch"
+	VM_METADATA_OS_DISTRO                   = "os_distribution"
+	VM_METADATA_OS_NAME                     = "os_name"
+	VM_METADATA_OS_VERSION                  = "os_version"
+	VM_METADATA_CGROUP_CPUSET               = "cgroup_cpuset"
+	VM_METADATA_ENABLE_MEMCLEAN             = "enable_memclean"
+	VM_METADATA_DISABLE_AUTO_MERGE_SNAPSHOT = "disable_auto_merge_snapshot"
 )
 
 func Hypervisors2HostTypes(hypervisors []string) []string {

pkg/apis/compute/guest_disk.go

@@ -34,6 +34,8 @@ type GuestDiskDetails struct {
 	// 磁盘类型
 	// example: data
 	DiskType string `json:"disk_type"`
+	// 关机自动重置
+	AutoReset bool `json:"auto_reset"`
 	// 介质类型
 	// example: ssd
 	MediumType string `json:"medium_type"`
@@ -90,6 +92,7 @@ type GuestdiskJsonDesc struct {
 	Dev              string `json:"dev"`
 	IsSSD            bool   `json:"is_ssd"`
 	NumQueues        uint8  `json:"num_queues"`
+	AutoReset        bool   `json:"auto_reset"`
 
 	// esxi
 	ImageInfo struct {

pkg/apis/compute/guest_image.go

@@ -14,14 +14,16 @@
 
 package compute
 
-type sPair struct {
-	ID         string
+type SSubImage struct {
+	Id         string
 	Name       string
 	MinDiskMB  int32
 	DiskFormat string
 }
 
 type SImagesInGuest struct {
-	RootImage  sPair
-	DataImages []sPair
+	Id         string
+	Name       string
+	RootImage  SSubImage
+	DataImages []SSubImage
 }

pkg/apis/compute/guest_metadata.go

@@ -15,9 +15,11 @@
 package compute
 
 const (
-	MIRROR_JOB        = "__mirror_job_status"
-	MIRROR_JOB_READY  = "ready"
-	MIRROR_JOB_FAILED = "failed"
+	MIRROR_JOB            = "__mirror_job_status"
+	MIRROR_JOB_READY      = "ready"
+	MIRROR_JOB_FAILED     = "failed"
+	MIRROR_JOB_INPROGRESS = "inprogress"
+	QUORUM_CHILD_INDEX    = "__quorum_child_index"
 
 	DISK_CLONE_TASK_ID = "__disk_clone_task_id"
 

pkg/apis/compute/guests.go

@@ -24,6 +24,7 @@ import (
 
 	"yunion.io/x/onecloud/pkg/apis"
 	"yunion.io/x/onecloud/pkg/apis/billing"
+	"yunion.io/x/onecloud/pkg/apis/cloudcommon/db"
 	imageapi "yunion.io/x/onecloud/pkg/apis/image"
 	"yunion.io/x/onecloud/pkg/httperrors"
 )
@@ -59,7 +60,7 @@ type ServerListInput struct {
 	// 列出管理安全组为指定安全组的主机
 	AdminSecgroup string `json:"admin_security"`
 	// 列出Hypervisor为指定值的主机
-	// enum: kvm,esxi,baremetal,aliyun,azure,aws,huawei,ucloud,zstack,openstack,google,ctyun"`
+	// enum: kvm,esxi,baremetal,aliyun,azure,aws,huawei,ucloud,zstack,openstack,google,ctyun,cloudpods,ecloud,jdcloud,remotefile`
 	Hypervisor []string `json:"hypervisor"`
 	// 列出绑定了弹性IP（EIP）的主机
 	WithEip *bool `json:"with_eip"`
@@ -77,7 +78,9 @@ type ServerListInput struct {
 
 	OrderByIp string `json:"order_by_ip"`
 	// 根据ip查找机器
-	IpAddr string `json:"ip_addr"`
+	IpAddr string `json:"ip_addr" yunion-deprecated-by:"ip_addrs"`
+	// 根据多个ip查找机器
+	IpAddrs []string `json:"ip_addrs"`
 
 	// 列出可以挂载指定EIP的主机
 	UsableServerForEip string `json:"usable_server_for_eip"`
@@ -143,6 +146,7 @@ type ServerRebuildRootInput struct {
 	Password      string `json:"password"`
 	AutoStart     *bool  `json:"auto_start"`
 	AllDisks      *bool  `json:"all_disks"`
+	LoginAccount  string `json:"login_account"`
 }
 
 type ServerResumeInput struct {
@@ -185,6 +189,8 @@ type ServerDetails struct {
 	BackupHostName string `json:"backup_host_name"`
 	// 备份主机所在宿主机状态
 	BackupHostStatus string `json:"backup_host_status"`
+	// 主备机同步状态
+	BackupGuestSyncStatus string `json:"backup_guest_sync_status"`
 
 	// 是否可以回收
 	CanRecycle bool `json:"can_recycle"`
@@ -244,10 +250,14 @@ type ServerDetails struct {
 
 	// 伸缩组id
 	ScalingGroupId string `json:"scaling_group_id"`
+
+	// 监控上报URL
+	MonitorUrl string `json:"monitor_url"`
 }
 
 func (self ServerDetails) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":                  self.Id,
 		"res_type":            "guest",
 		"is_vm":               "true",
 		"paltform":            self.Hypervisor,
@@ -271,9 +281,13 @@ func (self ServerDetails) GetMetricTags() map[string]string {
 		"project_domain":      self.ProjectDomain,
 		"account":             self.Account,
 		"account_id":          self.AccountId,
+		"external_id":         self.ExternalId,
 	}
 	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
+		if strings.HasPrefix(k, db.USER_TAG_PREFIX) {
+			if strings.Contains(k, "login_key") || strings.Contains(v, "=") {
+				continue
+			}
 			ret[k] = v
 		}
 	}
@@ -301,6 +315,7 @@ type GuestDiskInfo struct {
 	Driver      string `json:"driver"`
 	CacheMode   string `json:"cache_mode"`
 	AioMode     string `json:"aio_mode"`
+	AutoReset   bool   `json:"auto_reset"`
 	MediumType  string `json:"medium_type"`
 	StorageType string `json:"storage_type"`
 	Iops        int    `json:"iops"`
@@ -425,20 +440,30 @@ type GuestSyncFixNicsInput struct {
 }
 
 type GuestMigrateInput struct {
-	PreferHost   string `json:"prefer_host"`
+	// swagger: ignore
+	PreferHost   string `json:"prefer_host" yunion-deprecated-by:"prefer_host_id"`
+	PreferHostId string `json:"prefer_host_id"`
 	AutoStart    bool   `json:"auto_start"`
 	IsRescueMode bool   `json:"rescue_mode"`
 }
 
 type GuestLiveMigrateInput struct {
+	// swagger: ignore
+	PreferHost string `json:"prefer_host" yunion-deprecated-by:"prefer_host_id"`
 	// 指定期望的迁移目标宿主机
-	PreferHost string `json:"prefer_host"`
+	PreferHostId string `json:"prefer_host_id"`
 	// 是否跳过CPU检查，默认要做CPU检查
 	SkipCpuCheck *bool `json:"skip_cpu_check"`
 	// 是否跳过kernel检查
 	SkipKernelCheck *bool `json:"skip_kernel_check"`
 	// 是否启用 tls
 	EnableTLS *bool `json:"enable_tls"`
+
+	// 迁移带宽限制
+	MaxBandwidthMb *int64 `json:"max_bandwidth_mb"`
+	// 快速完成，内存同步一定周期后调整 downtime
+	QuicklyFinish         *bool `json:"quickly_finish"`
+	KeepDestGuestOnFailed *bool `json:"keep_dest_guest_on_failed"`
 }
 
 type GuestSetSecgroupInput struct {
@@ -618,6 +643,7 @@ type ServerMigrateForecastInput struct {
 	LiveMigrate     bool   `json:"live_migrate"`
 	SkipCpuCheck    bool   `json:"skip_cpu_check"`
 	SkipKernelCheck bool   `json:"skip_kernel_check"`
+	IsRescueMode    bool   `json:"is_rescue_mode"`
 }
 
 type ServerResizeDiskInput struct {
@@ -657,6 +683,9 @@ type ServerDeployInput struct {
 	// 若虚拟机重置密码后需要重启生效，并且当前虚拟机状态为running, 此参数默认为true
 	// 若虚拟机状态为ready, 指定此参数后，部署完成后，虚拟机会自动启动
 	AutoStart bool `json:"auto_start"`
+	// swagger: ignore
+	LoginAccount string `json:"login_account"`
+
 	// swagger: ignore
 	Restart bool `json:"restart"`
 
@@ -704,6 +733,8 @@ type ServerChangeConfigInput struct {
 type ServerUpdateInput struct {
 	apis.VirtualResourceBaseUpdateInput
 
+	HostnameInput
+
 	// 删除保护开关
 	DisableDelete *bool `json:"disable_delete"`
 	// 启动顺序
@@ -725,22 +756,23 @@ type ServerUpdateInput struct {
 }
 
 type GuestJsonDesc struct {
-	Name        string `json:"name"`
-	Hostname    string `json:"hostname"`
-	Description string `json:"description"`
-	UUID        string `json:"uuid"`
-	Mem         int    `json:"mem"`
-	Cpu         int    `json:"cpu"`
-	Vga         string `json:"vga"`
-	Vdi         string `json:"vdi"`
-	Machine     string `json:"machine"`
-	Bios        string `json:"bios"`
-	BootOrder   string `json:"boot_order"`
-	SrcIpCheck  bool   `json:"src_ip_check"`
-	SrcMacCheck bool   `json:"src_mac_check"`
-	IsMaster    *bool  `json:"is_master"`
-	IsSlave     *bool  `json:"is_slave"`
-	HostId      string `json:"host_id"`
+	Name           string `json:"name"`
+	Hostname       string `json:"hostname"`
+	Description    string `json:"description"`
+	UUID           string `json:"uuid"`
+	Mem            int    `json:"mem"`
+	Cpu            int    `json:"cpu"`
+	Vga            string `json:"vga"`
+	Vdi            string `json:"vdi"`
+	Machine        string `json:"machine"`
+	Bios           string `json:"bios"`
+	BootOrder      string `json:"boot_order"`
+	SrcIpCheck     bool   `json:"src_ip_check"`
+	SrcMacCheck    bool   `json:"src_mac_check"`
+	IsMaster       *bool  `json:"is_master"`
+	IsSlave        *bool  `json:"is_slave"`
+	IsVolatileHost bool   `json:"is_volatile_host"`
+	HostId         string `json:"host_id"`
 
 	IsolatedDevices []*IsolatedDeviceJsonDesc `json:"isolated_devices"`
 
@@ -778,7 +810,7 @@ type GuestJsonDesc struct {
 	UserData       string            `json:"user_data"`
 	PendingDeleted bool              `json:"pending_deleted"`
 
-	ScallingGroupId string `json:"scalling_group_id"`
+	ScalingGroupId string `json:"scaling_group_id"`
 
 	// baremetal
 	DiskConfig  jsonutils.JSONObject    `json:"disk_config"`
@@ -795,6 +827,17 @@ type GuestJsonDesc struct {
 	IsDaemon bool `json:"is_daemon"`
 }
 
+type ServerChangeStorageInput struct {
+	TargetStorageId string `json:"target_storage_id"`
+	KeepOriginDisk  bool   `json:"keep_origin_disk"`
+}
+
+type ServerChangeStorageInternalInput struct {
+	ServerChangeStorageInput
+	Disks        []string `json:"disks"`
+	GuestRunning bool     `json:"guest_running"`
+}
+
 type ServerChangeDiskStorageInput struct {
 	DiskId          string `json:"disk_id"`
 	TargetStorageId string `json:"target_storage_id"`
@@ -803,10 +846,16 @@ type ServerChangeDiskStorageInput struct {
 
 type ServerChangeDiskStorageInternalInput struct {
 	ServerChangeDiskStorageInput
-	StorageId    string `json:"storage_id"`
-	TargetDiskId string `json:"target_disk_id"`
-	DiskFormat   string `json:"disk_format"`
-	GuestRunning bool   `josn:"guest_running"`
+	StorageId      string             `json:"storage_id"`
+	TargetDiskId   string             `json:"target_disk_id"`
+	DiskFormat     string             `json:"disk_format"`
+	GuestRunning   bool               `json:"guest_running"`
+	TargetDiskDesc *GuestdiskJsonDesc `json:"target_disk_desc"`
+}
+
+type ServerCopyDiskToStorageInput struct {
+	KeepOriginDisk bool `json:"keep_origin_disk"`
+	GuestRunning   bool `json:"guest_running"`
 }
 
 type ServerSetExtraOptionInput struct {
@@ -887,17 +936,63 @@ type ServerGetCPUSetCoresResp struct {
 	HostUsedCores []int `json:"host_used_cores"`
 }
 
+type ServerMonitorInput struct {
+	COMMAND string
+	QMP     bool
+}
+
 type ServerQemuInfo struct {
 	Version string `json:"version"`
 	Cmdline string `json:"cmdline"`
 }
 
+type IPAddress struct {
+	IPAddress     string `json:"ip-address"`
+	IPAddressType string `json:"ip-address-type"`
+	Prefix        int    `json:"prefix"`
+}
+
+type IfnameDetail struct {
+	HardwareAddress string      `json:"hardware-address"`
+	IPAddresses     []IPAddress `json:"ip-addresses"`
+	Name            string      `json:"name"`
+	Statistics      struct {
+		RxBytes   int `json:"rx-bytes"`
+		RxDropped int `json:"rx-dropped"`
+		RxErrs    int `json:"rx-errs"`
+		RxPackets int `json:"rx-packets"`
+		TxBytes   int `json:"tx-bytes"`
+		TxDropped int `json:"tx-dropped"`
+		TxErrs    int `json:"tx-errs"`
+		TxPackets int `json:"tx-packets"`
+	} `json:"statistics"`
+}
+
 type ServerQgaSetPasswordInput struct {
 	Username string
 	Password string
 }
 
+type ServerQgaGuestInfoTaskInput struct {
+}
+
+type ServerQgaSetNetworkInput struct {
+	ServerQgaTimeoutInput
+	Device  string
+	Ipmask  string
+	Gateway string
+}
+
+type ServerQgaGetNetworkInput struct {
+}
+
+type ServerQgaTimeoutInput struct {
+	// qga execute timeout millisecond
+	Timeout int
+}
+
 type ServerQgaCommandInput struct {
+	ServerQgaTimeoutInput
 	Command string
 }
 
@@ -909,3 +1004,45 @@ type ServerSetPasswordInput struct {
 	ResetPassword bool
 	AutoStart     bool
 }
+
+type ServerSetLiveMigrateParamsInput struct {
+	MaxBandwidthMB  *int64
+	DowntimeLimitMS *int64
+}
+
+type ServerNicTrafficLimit struct {
+	Mac            string `json:"mac"`
+	RxTrafficLimit *int64 `json:"rx_traffic_limit"`
+	TxTrafficLimit *int64 `json:"tx_traffic_limit"`
+}
+
+type GuestAddSubIpsInput struct {
+	Mac    string   `json:"mac"`
+	IpAddr string   `json:"ip_addr"`
+	Count  int      `json:"count"`
+	SubIps []string `json:"sub_ips"`
+
+	Reserved bool `json:"reserved"`
+
+	AllocDir IPAllocationDirection `json:"alloc_dir"`
+}
+
+type NetworkAddrConf struct {
+	Id      string `json:"id"`
+	Type    string `json:"type"`
+	IpAddr  string `json:"ip_addr"`
+	Masklen int    `json:"masklen"`
+	Gateway string `json:"gateway"`
+}
+
+type ServerLoginInfoInput struct {
+	PrivateKey string `json:"private_key"`
+}
+
+type ServerLoginInfoOutput struct {
+	Username string `json:"username"`
+	Updated  string `json:"updated"`
+	LoginKey string `json:"login_key"`
+	Keypair  string `json:"keypair"`
+	Password string `json:"password"`
+}

pkg/apis/compute/host.go

@@ -15,7 +15,7 @@
 package compute
 
 import (
-	"strings"
+	"time"
 
 	"yunion.io/x/jsonutils"
 
@@ -69,13 +69,14 @@ type HostListInput struct {
 
 	StorageFilterListInput
 	UsableResourceListInput
+	BackupstorageFilterListInput
 
 	// filter by ResourceType
 	ResourceType string `json:"resource_type"`
 	// filter by mac of any network interface
 	AnyMac string `json:"any_mac"`
 	// filter by ip of any network interface
-	AnyIp string `json:"any_ip"`
+	AnyIp []string `json:"any_ip"`
 	// filter storages not attached to this host
 	StorageNotAttached *bool `json:"storage_not_attached"`
 	// filter by Hypervisor
@@ -232,6 +233,7 @@ type HostDetails struct {
 
 func (self HostDetails) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":             self.Id,
 		"host_id":        self.Id,
 		"host_ip":        self.AccessIp,
 		"host":           self.Name,
@@ -248,11 +250,7 @@ func (self HostDetails) GetMetricTags() map[string]string {
 		"account":        self.Account,
 		"res_type":       "host",
 		"account_id":     self.AccountId,
-	}
-	for k, v := range self.Metadata {
-		if strings.HasPrefix(k, apis.USER_TAG_PREFIX) {
-			ret[k] = v
-		}
+		"external_id":    self.ExternalId,
 	}
 	return ret
 }
@@ -279,6 +277,9 @@ type HostResourceInfo struct {
 	// 宿主机序列号
 	HostSN string `json:"host_sn"`
 
+	// 宿主是否启用
+	HostEnabled bool `json:"host_enabled"`
+
 	// 宿主机状态
 	HostStatus string `json:"host_status"`
 
@@ -416,6 +417,9 @@ type HostCreateInput struct {
 	// 新建带IPMI信息的物理机时不进行IPMI信息探测
 	NoProbe *bool `json:"no_probe"`
 
+	// 物理机不带 BMC 控制器
+	NoBMC bool `json:"no_bmc"`
+
 	// host uuid
 	Uuid string `json:"uuid"`
 
@@ -457,6 +461,7 @@ type HostUpdateInput struct {
 	HostAccessAttributes
 	HostSizeAttributes
 	HostIpmiAttributes
+	HostnameInput
 
 	// IPMI info
 	IpmiInfo jsonutils.JSONObject `json:"ipmi_info"`
@@ -523,3 +528,96 @@ type HostAutoMigrateInput struct {
 	AutoMigrateOnHostDown     string `json:"auto_migrate_on_host_down"`
 	AutoMigrateOnHostShutdown string `json:"auto_migrate_on_host_shutdown"`
 }
+
+type HostNetifInput struct {
+	Mac string `json:"mac"`
+
+	VlanId int `json:"vlan_id"`
+}
+
+type HostAddNetifInput struct {
+	HostNetifInput
+
+	// Deprecated
+	Wire string `json:"wire" yunion-deprecated-by:"wire_id"`
+
+	WireId string `json:"wire_id"`
+
+	IpAddr string `json:"ip_addr"`
+
+	Rate int `json:"rate"`
+
+	NicType string `json:"nic_type"`
+
+	Index int8 `json:"index"`
+
+	LinkUp string `json:"link_up"`
+
+	Mtu int16 `json:"mtu"`
+
+	Reset *bool `json:"reset"`
+
+	Interface *string `json:"interface"`
+
+	Bridge *string `json:"bridge"`
+
+	Reserve *bool `json:"reserve"`
+
+	RequireDesignatedIp *bool `json:"require_designated_ip"`
+}
+
+type HostEnableNetifInput struct {
+	HostNetifInput
+
+	// Deprecated
+	Network   string `json:"network" yunion-deprecated-by:"network_id"`
+	NetworkId string `json:"network_id"`
+
+	IpAddr string `json:"ip_addr"`
+
+	AllocDir string `json:"alloc_dir"`
+
+	NetType string `json:"net_type"`
+
+	Reserve *bool `json:"reserve"`
+
+	RequireDesignatedIp *bool `json:"require_designated_ip"`
+}
+
+type HostDisableNetifInput struct {
+	HostNetifInput
+
+	Reserve *bool `json:"reserve"`
+}
+
+type HostRemoveNetifInput struct {
+	HostNetifInput
+
+	Reserve *bool `json:"reserve"`
+}
+
+type HostError struct {
+	Type    string
+	Id      string
+	Name    string
+	Content string
+	Time    time.Time
+}
+
+type HostSyncErrorsInput struct {
+	HostErrors []HostError
+}
+
+type HostLoginInfoInput struct {
+}
+
+type HostLoginInfoOutput struct {
+	Ip       string `json:"ip"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+type HostSetCommitBoundInput struct {
+	CpuCmtbound *float32
+	MemCmtbound *float32
+}

pkg/apis/compute/hostbackupstorage.go

@@ -0,0 +1,47 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/pkg/apis"
+)
+
+type HostBackupstorageDetails struct {
+	HostJointResourceDetails
+
+	SHostBackupstorage
+
+	// 存储名称
+	Backupstorage string `json:"backupstorage"`
+	// 存储大小
+	CapacityMb int64 `json:"capacity_mb"`
+	// 存储类型
+	// example: local
+	StorageType string `json:"storage_type"`
+	// 是否启用
+	Enabled bool `json:"enabled"`
+}
+
+type HostBackupstorageListInput struct {
+	HostJointsListInput
+
+	BackupstorageFilterListInput
+}
+
+type HostBackupstorageCreateInput struct {
+	apis.JoinResourceBaseCreateInput
+	BackupstorageId string `json:"backupstorage_id"`
+	HostId          string `json:"host_id"`
+}

pkg/apis/compute/hostjoin.go

@@ -27,7 +27,8 @@ type HostJointResourceDetailsBase struct {
 type HostJointResourceDetails struct {
 	apis.JointResourceBaseDetails
 
-	HostJointResourceDetailsBase
+	// HostJointResourceDetailsBase
+	HostResourceInfo
 }
 
 type HostJointsListInput struct {

pkg/apis/compute/kube_cluster.go

@@ -53,6 +53,7 @@ type KubeClusterDetails struct {
 
 func (self KubeClusterDetails) GetMetricTags() map[string]string {
 	ret := map[string]string{
+		"id":             self.ExternalClusterId,
 		"res_type":       "kube_cluster",
 		"cluster_id":     self.ExternalClusterId,
 		"cluster_name":   self.Name,
@@ -64,6 +65,7 @@ func (self KubeClusterDetails) GetMetricTags() map[string]string {
 		"project_domain": self.ProjectDomain,
 		"account":        self.Account,
 		"account_id":     self.AccountId,
+		"external_id":    self.ExternalId,
 	}
 	return ret
 }

pkg/apis/compute/loadbalancercluster.go

@@ -22,6 +22,8 @@ type LoadbalancerClusterDetails struct {
 	WireResourceInfoBase
 
 	SLoadbalancerCluster
+
+	RefCounts map[string]int
 }
 
 type LoadbalancerClusterResourceInfo struct {