fix: sms login not verify captchar (#15996 )

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
build(deps): bump golang.org/x/net from 0.1.0 to 0.7.0 (#15994 )
2026-09-20 08:03:53 +08:00 · 2023-02-18 18:27:35 +08:00 · 2023-02-18 17:54:33 +08:00 · 2023-02-18 13:04:49 +08:00 · 2023-02-18 13:03:30 +08:00 · 2023-02-18 13:03:01 +08:00
1627 changed files with 48867 additions and 28997 deletions
--- a/6
+++ b/6
@@ -282,12 +282,12 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod

-RELEASE_BRANCH:=master
+RELEASE_BRANCH:=release/3.10
 GOPROXY ?= direct

 mod:
-	GOPROXY=$(GOPROXY) go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
-	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' | grep -v '/cloudmux$$'))
+	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
+	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' | grep -v '/cloudmux$$'))
 	go mod tidy
 	go mod vendor -v

--- a/build/docker/Dockerfile.baremetal-agent
+++ b/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

 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"

--- a/build/docker/Dockerfile.baremetal-base
+++ b/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.7 as yunionos

 FROM centos:8 as grub-stage

--- a/build/docker/Dockerfile.lbagent
+++ b/build/docker/Dockerfile.lbagent
@@ -0,0 +1,8 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.3
+
+MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
+
+ENV TZ UTC
+
+RUN mkdir -p /opt/yunion/bin
+ADD ./_output/alpine-build/bin/lbagent /opt/yunion/bin/lbagent
--- a/build/docker/Dockerfile.lbagent-base
+++ b/build/docker/Dockerfile.lbagent-base
@@ -0,0 +1,35 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
+
+MAINTAINER "Jian QIU <qiujian@yunion.cn>"
+
+ENV TZ UTC
+
+ENV GOPATH=/root/go
+
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
+RUN set -x \
+    && apk update \
+    && apk upgrade \
+    && apk add --no-cache bash haproxy keepalived iptables \
+    && apk add --no-cache --virtual .build-deps \
+        build-base \
+        make \
+       	go \
+        git \
+        gcc \
+        libc-dev \
+        libgcc \
+        linux-headers
+
+RUN set -x \
+    && mkdir -p $GOPATH/src/github.com/yyyar $GOPATH/bin \
+    && cd $GOPATH/src/github.com/yyyar \
+    && git clone --depth 1 https://github.com/yyyar/gobetween.git \
+    && cd gobetween \
+    && make deps \
+    && make build \
+    && cp bin/gobetween /bin/gobetween \
+    && rm -fr $GOPATH \
+    && apk del .build-deps \
+    && rm -rf /var/cache/apk/*
--- a/build/docker/Makefile
+++ b/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

 baremetal-base:
 	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
@@ -60,3 +60,7 @@ host-image:
 	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-amd64 --arch amd64
 	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-arm64 --arch arm64
 	docker manifest push $(HOST_IMAGE_NAME)
+
+LBAGENT_BASE_VERSION = v0.0.3
+lbagent-base:
+	$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/MYSQL_OUT_OF_SYNC.tmpl
+++ b/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}}
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/NET_OUT_OF_SYNC.tmpl
+++ b/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 }}服务的网络拓扑信息同步不一致，请及时检查。	
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/PASSWORD_EXPIRE_SOON.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@cn/PASSWORD_EXPIRE_SOON.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/SERVER_PANICKED_FAILED.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@cn/SERVER_PANICKED_FAILED.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的虚拟机{{ $d.name }}崩溃了
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/SERVICE_ABNORMAL.tmpl
+++ b/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 }}
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/SYNC_ACCOUNT_STATUS.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@cn/SYNC_ACCOUNT_STATUS.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+云账号{{ $d.name }}状态异常，请及时检查。
--- a/build/notify/root/opt/yunion/share/local-templates/content@cn/WORK_BLOCK.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@cn/WORK_BLOCK.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ d.service_name}} worker阻塞半小时，请及时检查。
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/MYSQL_OUT_OF_SYNC.tmpl
+++ b/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}}
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/NET_OUT_OF_SYNC.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/PASSWORD_EXPIRE_SOON.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/SERVER_PANICKED_FAILED.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/content@en/SERVER_PANICKED_FAILED.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The server {{ $d.name }} in project {{ $d.project }} panicked.
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/SERVICE_ABNORMAL.tmpl
+++ b/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 }}
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/SYNC_ACCOUNT_STATUS.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/content@en/WORK_BLOCK.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/MYSQL_OUT_OF_SYNC.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@cn/MYSQL_OUT_OF_SYNC.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+数据库 {{$d.ip}} 的主从同步不一致，请及时检查。
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/NET_OUT_OF_SYNC.tmpl
+++ b/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 }}服务的网络拓扑信息同步不一致，请及时检查。	
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/PASSWORD_EXPIRE_SOON.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@cn/PASSWORD_EXPIRE_SOON.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/SERVER_PANICKED_FAILED.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@cn/SERVER_PANICKED_FAILED.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的虚拟机{{ $d.name }}崩溃了
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/SERVICE_ABNORMAL.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@cn/SERVICE_ABNORMAL.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ $d.service_name }}异常
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/SYNC_ACCOUNT_STATUS.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@cn/SYNC_ACCOUNT_STATUS.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+云账号{{ $d.name}}状态异常，请及时检查。
--- a/build/notify/root/opt/yunion/share/local-templates/title@cn/WORK_BLOCK.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@cn/WORK_BLOCK.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+服务{{ d.service_name}} worker阻塞半小时，请及时检查。
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/MYSQL_OUT_OF_SYNC.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/NET_OUT_OF_SYNC.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/PASSWORD_EXPIRE_SOON.tmpl
+++ b/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.
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/SERVER_PANICKED_FAILED.tmpl
+++ b/build/notify/root/opt/yunion/share/local-templates/title@en/SERVER_PANICKED_FAILED.tmpl
@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The server {{ $d.name }}  in project {{ $d.project }}panicked.
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/SERVICE_ABNORMAL.tmpl
+++ b/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
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/USER_LOCK
+++ b/build/notify/root/opt/yunion/share/local-templates/title@en/USER_LOCK
@@ -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.
--- a/build/notify/root/opt/yunion/share/local-templates/title@en/WORK_BLOCK.tmpl
+++ b/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.
--- a/cmd/climc/entry/climc.go
+++ b/cmd/climc/entry/climc.go
@@ -33,13 +33,13 @@ import (

 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/httputils"
 	"yunion.io/x/pkg/util/version"
 	"yunion.io/x/structarg"

 	"yunion.io/x/onecloud/cmd/climc/promputils"
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/util/httputils"
 )

 type BaseOptions struct {
--- a/cmd/climc/shell/ansible/common.go
+++ b/cmd/climc/shell/ansible/common.go
@@ -15,8 +15,9 @@
 package ansible

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/cloudevent/common.go
+++ b/cmd/climc/shell/cloudevent/common.go
@@ -15,8 +15,9 @@
 package cloudevent

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/cloudid/common.go
+++ b/cmd/climc/shell/cloudid/common.go
@@ -15,8 +15,9 @@
 package cloudid

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/cloudnet/common.go
+++ b/cmd/climc/shell/cloudnet/common.go
@@ -15,8 +15,9 @@
 package cloudnet

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/compute/baremetalnetworks.go
+++ b/cmd/climc/shell/compute/baremetalnetworks.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -42,7 +42,7 @@ func init() {
 		if len(args.Network) > 0 {
 			params.Add(jsonutils.NewString(args.Network), "network_id")
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Baremetalnetworks.ListDescendent(s, args.Host, params)
--- a/cmd/climc/shell/compute/baremetalstorages.go
+++ b/cmd/climc/shell/compute/baremetalstorages.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -38,7 +38,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Baremetalstorages.ListDescendent(s, args.Host, params)
--- a/cmd/climc/shell/compute/buckets.go
+++ b/cmd/climc/shell/compute/buckets.go
@@ -21,10 +21,10 @@ import (

 	"yunion.io/x/cloudmux/pkg/multicloud/objectstore"
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -142,7 +142,7 @@ func init() {
 			return err
 		}

-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		err = result.Unmarshal(&listResult)
 		if err != nil {
 			return err
--- a/cmd/climc/shell/compute/cloudaccounts.go
+++ b/cmd/climc/shell/compute/cloudaccounts.go
@@ -39,6 +39,7 @@ func init() {
 	cmd.CreateWithKeyword("create-huawei", &options.SHuaweiCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-hcso", &options.SHCSOAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-hcs", &options.SHCSAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-hcsop", &options.SHcsOpCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
@@ -64,7 +65,7 @@ func init() {
 	cmd.UpdateWithKeyword("update-openstack", &options.SOpenStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-huawei", &options.SHuaweiCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-hcso", &options.SHCSOAccountUpdateOptions{})
-	cmd.UpdateWithKeyword("update-hcs", &options.SHCSOAccountUpdateOptions{})
+	cmd.UpdateWithKeyword("update-hcs", &options.SHCSAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ucloud", &options.SUcloudCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-zstack", &options.SZStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-s3", &options.SS3CloudAccountUpdateOptions{})
--- a/cmd/climc/shell/compute/cloudproviderregions.go
+++ b/cmd/climc/shell/compute/cloudproviderregions.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -40,7 +40,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Manager) > 0 {
 			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager, params)
--- a/cmd/climc/shell/compute/cloudregions.go
+++ b/cmd/climc/shell/compute/cloudregions.go
@@ -18,10 +18,10 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -104,7 +104,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err
@@ -122,7 +122,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err
@@ -140,7 +140,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err
--- a/cmd/climc/shell/compute/common.go
+++ b/cmd/climc/shell/compute/common.go
@@ -15,8 +15,9 @@
 package compute

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/compute/dbinstances.go
+++ b/cmd/climc/shell/compute/dbinstances.go
@@ -15,9 +15,10 @@
 package compute

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
@@ -55,7 +56,7 @@ func init() {
 			return err
 		}

-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		if len(opts.DBInstance) > 0 {
 			result, err = modules.DBInstanceNetworks.ListDescendent(s, opts.DBInstance, params)
 		} else if len(opts.Network) > 0 {
--- a/cmd/climc/shell/compute/disks.go
+++ b/cmd/climc/shell/compute/disks.go
@@ -29,13 +29,13 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/httputils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	compute_options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
-	"yunion.io/x/onecloud/pkg/util/httputils"
 	"yunion.io/x/onecloud/pkg/util/sparsefile"
 )

--- a/cmd/climc/shell/compute/hostcachedimages.go
+++ b/cmd/climc/shell/compute/hostcachedimages.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -39,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Hostcachedimages.ListDescendent(s, args.Host, params)
--- a/cmd/climc/shell/compute/hosts.go
+++ b/cmd/climc/shell/compute/hosts.go
@@ -22,6 +22,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/httputils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -29,7 +30,6 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/httputils"
 	"yunion.io/x/onecloud/pkg/util/ssh"
 )

@@ -174,6 +174,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()
--- a/cmd/climc/shell/compute/hoststorages.go
+++ b/cmd/climc/shell/compute/hoststorages.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -39,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		// if len(args.Storage) > 0 {
 		// 	params.Add(jsonutils.NewString(args.Storage), "storage")
--- a/cmd/climc/shell/compute/hostwires.go
+++ b/cmd/climc/shell/compute/hostwires.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -39,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Hostwires.ListDescendent(s, args.Host, params)
--- a/cmd/climc/shell/compute/loadbalanceracls.go
+++ b/cmd/climc/shell/compute/loadbalanceracls.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	baseoptions "yunion.io/x/onecloud/pkg/mcclient/options"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
@@ -53,7 +53,7 @@ func init() {
 		}
 		printObject(jd)
 	}
-	printLbAclList := func(list *modulebase.ListResult, columns []string) {
+	printLbAclList := func(list *printutils.ListResult, columns []string) {
 		data := list.Data
 		for _, jsonObj := range data {
 			jd := jsonObj.(*jsonutils.JSONDict)
--- a/cmd/climc/shell/compute/loadbalanceragents.go
+++ b/cmd/climc/shell/compute/loadbalanceragents.go
@@ -132,7 +132,7 @@ func init() {
 		printLbagent(lbagent)
 		return nil
 	})
-	R(&options.LoadbalancerAgentActionDeployOptions{}, "lbagent-deploy", "Deploy lbagent", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentActionDeployOptions) error {
+	/*R(&options.LoadbalancerAgentActionDeployOptions{}, "lbagent-deploy", "Deploy lbagent", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentActionDeployOptions) error {
 		params, err := opts.Params()
 		if err != nil {
 			return err
@@ -151,5 +151,23 @@ func init() {
 		}
 		printLbagent(lbagent)
 		return nil
+	})*/
+	R(&options.LoadbalancerAgentJoinClusterOptions{}, "lbagent-join-cluster", "Agent join cluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentJoinClusterOptions) error {
+		params, _ := opts.Params()
+		lbagent, err := modules.LoadbalancerAgents.PerformAction(s, opts.ID, "join-cluster", params)
+		if err != nil {
+			return err
+		}
+		printLbagent(lbagent)
+		return nil
+	})
+	R(&options.LoadbalancerAgentLeaveClusterOptions{}, "lbagent-leave-cluster", "Agent leave cluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentLeaveClusterOptions) error {
+		params, _ := opts.Params()
+		lbagent, err := modules.LoadbalancerAgents.PerformAction(s, opts.ID, "leave-cluster", params)
+		if err != nil {
+			return err
+		}
+		printLbagent(lbagent)
+		return nil
 	})
 }
--- a/cmd/climc/shell/compute/loadbalancercachedacls.go
+++ b/cmd/climc/shell/compute/loadbalancercachedacls.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
@@ -52,7 +52,7 @@ func init() {
 		}
 		printObject(jd)
 	}
-	printLbAclList := func(list *modulebase.ListResult, columns []string) {
+	printLbAclList := func(list *printutils.ListResult, columns []string) {
 		data := list.Data
 		for _, jsonObj := range data {
 			jd := jsonObj.(*jsonutils.JSONDict)
--- a/cmd/climc/shell/compute/loadbalancerlisteners.go
+++ b/cmd/climc/shell/compute/loadbalancerlisteners.go
@@ -18,9 +18,9 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
@@ -34,7 +34,7 @@ func printLbBackendStatus(backendStatus jsonutils.JSONObject) error {
 	if err != nil {
 		return err
 	}
-	listResult := &modulebase.ListResult{
+	listResult := &printutils.ListResult{
 		Data: objList,
 	}
 	columns := []string{
--- a/cmd/climc/shell/compute/loadbalancernetworks.go
+++ b/cmd/climc/shell/compute/loadbalancernetworks.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -43,7 +43,7 @@ func init() {
 		if len(args.Ip) > 0 {
 			params.Add(jsonutils.NewString(args.Ip), "ip_addr")
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Loadbalancer) > 0 {
 			result, err = modules.Loadbalancernetworks.ListDescendent(s, args.Loadbalancer, params)
--- a/cmd/climc/shell/compute/metadata.go
+++ b/cmd/climc/shell/compute/metadata.go
@@ -15,6 +15,8 @@
 package compute

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
@@ -55,7 +57,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		err = result.Unmarshal(&listResult)
 		if err != nil {
 			return err
--- a/cmd/climc/shell/compute/network_ip_mac.go
+++ b/cmd/climc/shell/compute/network_ip_mac.go
@@ -0,0 +1,33 @@
+package compute
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+
+	cmd := shell.NewResourceCmd(&modules.NetworkIpMacs)
+	cmd.List(&options.NetworkIpMacListOptions{})
+	cmd.Update(&options.NetworkIpMacUpdateOptions{})
+	cmd.Show(&options.NetworkIpMacIdOptions{})
+	cmd.Delete(&options.NetworkIpMacIdOptions{})
+	cmd.Create(&options.NetworkIpMacCreateOptions{})
+	type NetworkIpMacBatchCreateOptions struct {
+		NETWORK string            `help:"network id" json:"network_id"`
+		IpMac   map[string]string `help:"ip mac map" json:"ip_mac"`
+	}
+	R(&NetworkIpMacBatchCreateOptions{},
+		"network-ip-mac-batch-create",
+		"Network ip mac bind batch create",
+		func(s *mcclient.ClientSession, args *NetworkIpMacBatchCreateOptions) error {
+			params := jsonutils.Marshal(args)
+			_, err := modules.NetworkIpMacs.PerformClassAction(s, "batch-create", params)
+			return err
+		},
+	)
+}
--- a/cmd/climc/shell/compute/networkinterfacenetworks.go
+++ b/cmd/climc/shell/compute/networkinterfacenetworks.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 )

@@ -30,7 +30,7 @@ func init() {
 	}
 	R(&NetworkinterfaceNetworkListOptions{}, "networkinterface-network-list", "List server network pairs", func(s *mcclient.ClientSession, args *NetworkinterfaceNetworkListOptions) error {
 		params := jsonutils.NewDict()
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Networkinterface) > 0 {
 			result, err = modules.Networkinterfacenetworks.ListDescendent(s, args.Networkinterface, params)
--- a/cmd/climc/shell/compute/networks.go
+++ b/cmd/climc/shell/compute/networks.go
@@ -18,11 +18,11 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -226,7 +226,7 @@ func init() {
 			fmt.Println("no result")
 			return nil
 		}
-		listResult := modulebase.ListResult{Data: addrList}
+		listResult := printutils.ListResult{Data: addrList}
 		printList(&listResult, nil)
 		return nil
 	})
--- a/cmd/climc/shell/compute/schedtagresources.go
+++ b/cmd/climc/shell/compute/schedtagresources.go
@@ -17,6 +17,8 @@ package compute
 import (
 	"fmt"

+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
@@ -54,7 +56,7 @@ func (h *schedtagModelHelper) list(slave modulebase.Manager, kw string) {
 			if err != nil {
 				return err
 			}
-			var result *modulebase.ListResult
+			var result *printutils.ListResult
 			if len(args.Schedtag) > 0 {
 				result, err = mod.ListDescendent(s, args.Schedtag, params)
 			} else {
--- a/cmd/climc/shell/compute/serverdisks.go
+++ b/cmd/climc/shell/compute/serverdisks.go
@@ -18,9 +18,9 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -45,7 +45,7 @@ func init() {
 		if args.Index >= 0 {
 			params.Add(jsonutils.NewInt(args.Index), "index")
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Server) > 0 {
 			result, err = modules.Serverdisks.ListDescendent(s, args.Server, params)
--- a/cmd/climc/shell/compute/servernetworks.go
+++ b/cmd/climc/shell/compute/servernetworks.go
@@ -19,12 +19,12 @@ import (
 	"strconv"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"
 	"yunion.io/x/pkg/util/regutils"

 	"yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudcommon/cmdline"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -53,7 +53,7 @@ func init() {
 		if len(args.Ip) > 0 {
 			params.Add(jsonutils.NewString(args.Ip), "ip_addr")
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Server) > 0 {
 			result, err = modules.Servernetworks.ListDescendent(s, args.Server, params)
--- a/cmd/climc/shell/compute/servers.go
+++ b/cmd/climc/shell/compute/servers.go
@@ -27,6 +27,7 @@ import (

 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/apis/compute"
@@ -55,7 +56,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))
@@ -161,7 +163,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		listResult.Data = tasks
 		printList(&listResult, nil)
 		return nil
@@ -620,7 +622,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := printutils.ListResult{}
 		listResult.Data, _ = result.GetArray()
 		printList(&listResult, nil)
 		return nil
--- a/cmd/climc/shell/compute/serversecgroups.go
+++ b/cmd/climc/shell/compute/serversecgroups.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -39,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Server) > 0 {
 			result, err = modules.Serversecgroups.ListDescendent(s, args.Server, params)
--- a/cmd/climc/shell/compute/specs.go
+++ b/cmd/climc/shell/compute/specs.go
@@ -18,9 +18,9 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -130,7 +130,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		data := &modulebase.ListResult{Data: hosts, Total: len(hosts)}
+		data := &printutils.ListResult{Data: hosts, Total: len(hosts)}
 		printList(data, []string{"ID", "Name", "Mem", "CPU", "Storage_Info"})
 		return nil
 	})
@@ -168,7 +168,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		data := &modulebase.ListResult{Data: devs, Total: len(devs)}
+		data := &printutils.ListResult{Data: devs, Total: len(devs)}
 		printList(data, []string{"ID", "Addr", "Dev_Type", "Model", "Vendor_Device_Id"})
 		return nil
 	})
--- a/cmd/climc/shell/compute/storagecachedimages.go
+++ b/cmd/climc/shell/compute/storagecachedimages.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -39,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		var err error
 		if len(args.Storagecache) > 0 {
 			result, err = modules.Storagecachedimages.ListDescendent(s, args.Storagecache, params)
--- a/cmd/climc/shell/compute/zones.go
+++ b/cmd/climc/shell/compute/zones.go
@@ -16,9 +16,9 @@ package compute

 import (
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -36,7 +36,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		if len(args.Region) > 0 {
 			result, err = modules.Zones.ListInContext(s, params, &modules.Cloudregions, args.Region)
 		} else {
--- a/cmd/climc/shell/devtool/common.go
+++ b/cmd/climc/shell/devtool/common.go
@@ -15,8 +15,9 @@
 package devtool

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/devtool/devtoolcronjob.go
+++ b/cmd/climc/shell/devtool/devtoolcronjob.go
@@ -19,9 +19,9 @@ import (

 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/ansible"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/devtool"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -55,7 +55,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		result, err = modules.DevToolCronjobs.List(s, params)
 		printList(result, modules.DevToolCronjobs.GetColumns(s))
 		return nil
--- a/cmd/climc/shell/devtool/devtooltemplate.go
+++ b/cmd/climc/shell/devtool/devtooltemplate.go
@@ -17,9 +17,9 @@ package devtool
 import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/devtool"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -48,7 +48,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		result, err = modules.DevToolTemplates.List(s, params)
 		printList(result, modules.DevToolTemplates.GetColumns(s))
 		return nil
--- a/cmd/climc/shell/etcd/service_registries.go
+++ b/cmd/climc/shell/etcd/service_registries.go
@@ -15,10 +15,11 @@
 package etcd

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/etcd"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 func init() {
--- a/cmd/climc/shell/events/common.go
+++ b/cmd/climc/shell/events/common.go
@@ -15,8 +15,9 @@
 package events

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/helper.go
+++ b/cmd/climc/shell/helper.go
@@ -20,11 +20,11 @@ import (
 	"strings"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"
 	"yunion.io/x/pkg/utils"

 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 type ResourceCmd struct {
@@ -142,7 +142,7 @@ func (cmd ResourceCmd) List(args IListOpt) {
 		if err != nil {
 			return err
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		contextId := args.GetContextId()
 		if cmd.contextManager != nil && len(contextId) > 0 {
 			result, err = man.(modulebase.Manager).ListInContext(s, params, cmd.contextManager.(modulebase.Manager), contextId)
@@ -242,7 +242,7 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 		}
 		if _, ok := ret.(*jsonutils.JSONArray); ok {
 			data, _ := ret.GetArray()
-			PrintList(&modulebase.ListResult{
+			PrintList(&printutils.ListResult{
 				Data: data,
 			}, nil)
 		} else {
@@ -634,7 +634,7 @@ func (cmd JointCmd) List(args IJointListOpt) {
 		if err != nil {
 			return err
 		}
-		var result *modulebase.ListResult
+		var result *printutils.ListResult
 		if len(args.GetMasterOpt()) > 0 {
 			result, err = man.ListDescendent(s, args.GetMasterOpt(), params)
 		} else if len(args.GetSlaveOpt()) > 0 {
--- a/cmd/climc/shell/identity/common.go
+++ b/cmd/climc/shell/identity/common.go
@@ -15,8 +15,9 @@
 package identity

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/identity/credential_aes_key.go
+++ b/cmd/climc/shell/identity/credential_aes_key.go
@@ -18,9 +18,9 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 )

@@ -65,7 +65,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		result := modulebase.ListResult{}
+		result := printutils.ListResult{}
 		result.Data = make([]jsonutils.JSONObject, len(secrets))
 		for i := range secrets {
 			result.Data[i] = secrets[i].Marshal()
--- a/cmd/climc/shell/identity/credentials.go
+++ b/cmd/climc/shell/identity/credentials.go
@@ -19,9 +19,9 @@ import (
 	"time"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 )

@@ -207,7 +207,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		result := modulebase.ListResult{}
+		result := printutils.ListResult{}
 		result.Data = make([]jsonutils.JSONObject, len(secrets))
 		for i := range secrets {
 			result.Data[i] = jsonutils.Marshal(secrets[i])
@@ -294,7 +294,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		result := modulebase.ListResult{}
+		result := printutils.ListResult{}
 		result.Data = make([]jsonutils.JSONObject, len(secrets))
 		for i := range secrets {
 			result.Data[i] = jsonutils.Marshal(secrets[i])
--- a/cmd/climc/shell/identity/identityproviders.go
+++ b/cmd/climc/shell/identity/identityproviders.go
@@ -19,6 +19,7 @@ import (

 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/shellutils"

 	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/httperrors"
@@ -26,7 +27,6 @@ import (
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 )

 func init() {
--- a/cmd/climc/shell/identity/policies.go
+++ b/cmd/climc/shell/identity/policies.go
@@ -23,6 +23,8 @@ import (

 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/util/rbacscope"
+	"yunion.io/x/pkg/util/shellutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	api "yunion.io/x/onecloud/pkg/apis/identity"
@@ -35,7 +37,6 @@ import (
 	options "yunion.io/x/onecloud/pkg/mcclient/options/identity"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
 	"yunion.io/x/onecloud/pkg/util/rbacutils"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 	"yunion.io/x/onecloud/pkg/util/tagutils"
 )

@@ -402,7 +403,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 {
@@ -420,12 +421,12 @@ func init() {

 		fmt.Println("Token", token)

-		for _, scope := range []rbacutils.TRbacScope{
-			rbacutils.ScopeSystem,
-			rbacutils.ScopeDomain,
-			rbacutils.ScopeProject,
-			rbacutils.ScopeUser,
-			rbacutils.ScopeNone,
+		for _, scope := range []rbacscope.TRbacScope{
+			rbacscope.ScopeSystem,
+			rbacscope.ScopeDomain,
+			rbacscope.ScopeProject,
+			rbacscope.ScopeUser,
+			rbacscope.ScopeNone,
 		} {
 			fmt.Printf("%s: ", scope)
 			capable := policy.PolicyManager.IsScopeCapable(token, scope)
@@ -456,7 +457,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()
 		}
--- a/cmd/climc/shell/identity/services.go
+++ b/cmd/climc/shell/identity/services.go
@@ -19,11 +19,11 @@ import (
 	"strings"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/shellutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 )

 func init() {
--- a/cmd/climc/shell/image/common.go
+++ b/cmd/climc/shell/image/common.go
@@ -15,8 +15,9 @@
 package image

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/image/images.go
+++ b/cmd/climc/shell/image/images.go
@@ -23,10 +23,10 @@ import (
 	"github.com/cheggaaa/pb/v3"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/image"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -412,7 +412,7 @@ func init() {
 				continue
 			}
 			arrays, _ := result.(*jsonutils.JSONArray).GetArray()
-			listResult := modulebase.ListResult{Data: arrays}
+			listResult := printutils.ListResult{Data: arrays}
 			printList(&listResult, []string{})
 		}
 		return nil
--- a/cmd/climc/shell/k8s/clusters.go
+++ b/cmd/climc/shell/k8s/clusters.go
@@ -23,12 +23,12 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/shellutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 )

 func initKubeCluster() {
--- a/cmd/climc/shell/k8s/k8s.go
+++ b/cmd/climc/shell/k8s/k8s.go
@@ -18,12 +18,12 @@ import (
 	"fmt"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 func init() {
--- a/cmd/climc/shell/k8s/list.go
+++ b/cmd/climc/shell/k8s/list.go
@@ -23,9 +23,9 @@ import (

 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )

@@ -56,7 +56,7 @@ func getPrinterRowValues(printer k8s.ListPrinter, obj jsonutils.JSONObject, cols
 	return ret
 }

-func ListerTable(res *modulebase.ListResult, printer k8s.ListPrinter, s *mcclient.ClientSession) *uitable.Table {
+func ListerTable(res *printutils.ListResult, printer k8s.ListPrinter, s *mcclient.ClientSession) *uitable.Table {
 	min := func(x, y int) int {
 		if x < y {
 			return x
@@ -78,7 +78,7 @@ func ListerTable(res *modulebase.ListResult, printer k8s.ListPrinter, s *mcclien
 	return table
 }

-func PrintListResultTable(res *modulebase.ListResult, printer k8s.ListPrinter, s *mcclient.ClientSession) {
+func PrintListResultTable(res *printutils.ListResult, printer k8s.ListPrinter, s *mcclient.ClientSession) {
 	fmt.Println(ListerTable(res, printer, s))

 	table := uitable.New()
--- a/cmd/climc/shell/logger/common.go
+++ b/cmd/climc/shell/logger/common.go
@@ -15,8 +15,9 @@
 package logger

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/misc/common.go
+++ b/cmd/climc/shell/misc/common.go
@@ -15,8 +15,9 @@
 package misc

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/misc/feature.go
+++ b/cmd/climc/shell/misc/feature.go
@@ -47,6 +47,7 @@ func init() {
 		"apsara",
 		"cloudpods",
 		"hcso",
+		"hcsop",
 		"hcs",
 		"nutanix",
 		"s3",
--- a/cmd/climc/shell/misc/version.go
+++ b/cmd/climc/shell/misc/version.go
@@ -20,6 +20,7 @@ import (
 	"yunion.io/x/cloudmux/pkg/cloudprovider"
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
+	"yunion.io/x/pkg/util/printutils"
 	"yunion.io/x/pkg/utils"

 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -67,7 +68,7 @@ func init() {
 			return err
 		}
 		data, _ := body.GetArray("workers")
-		printList(&modulebase.ListResult{Data: data}, nil)
+		printList(&printutils.ListResult{Data: data}, nil)
 		return nil
 	})

--- a/cmd/climc/shell/misc/vpcagent.go
+++ b/cmd/climc/shell/misc/vpcagent.go
@@ -0,0 +1,32 @@
+// 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 misc
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/vpcagent"
+)
+
+func init() {
+	type VpcAgentSyncOptions struct {
+	}
+	R(&VpcAgentSyncOptions{}, "vpcagent-sync", "Invoke sync of vpcagent", func(s *mcclient.ClientSession, args *VpcAgentSyncOptions) error {
+		err := vpcagent.VpcAgent.DoSync(s)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+}
--- a/cmd/climc/shell/monitor/alertnotification.go
+++ b/cmd/climc/shell/monitor/alertnotification.go
@@ -15,9 +15,10 @@
 package monitor

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	monitorapi "yunion.io/x/onecloud/pkg/apis/monitor"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
 )
@@ -34,7 +35,7 @@ func initAlertNotification() {
 			if err != nil {
 				return err
 			}
-			var result *modulebase.ListResult
+			var result *printutils.ListResult
 			if len(args.Alert) > 0 {
 				result, err = monitor.Alertnotification.ListDescendent(s, args.Alert, params)
 			} else if len(args.Notification) > 0 {
--- a/cmd/climc/shell/monitor/common.go
+++ b/cmd/climc/shell/monitor/common.go
@@ -15,9 +15,10 @@
 package monitor

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/monitor/unifiedmonitor.go
+++ b/cmd/climc/shell/monitor/unifiedmonitor.go
@@ -21,6 +21,8 @@ import (
 )

 func init() {
-	cmd := shell.NewResourceCmd(monitor.UnifiedMonitorManager).WithKeyword("monitor")
+	cmd := shell.NewResourceCmd(monitor.UnifiedMonitorManager).SetPrefix("monitor")
 	cmd.Show(&options.SimpleQueryOptions{})
+	cmd.GetProperty(&options.MeasurementsQueryOptions{})
+	cmd.GetProperty(&options.DatabasesQueryOptions{})
 }
--- a/cmd/climc/shell/notifyv2/common.go
+++ b/cmd/climc/shell/notifyv2/common.go
@@ -15,8 +15,9 @@
 package notifyv2

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/quota/common.go
+++ b/cmd/climc/shell/quota/common.go
@@ -15,8 +15,9 @@
 package quota

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/scheduledtask/scheduledtask.go
+++ b/cmd/climc/shell/scheduledtask/scheduledtask.go
@@ -19,13 +19,13 @@ import (
 	"time"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

 	"yunion.io/x/onecloud/cmd/climc/shell"
 	apis "yunion.io/x/onecloud/pkg/apis/scheduledtask"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/scheduledtask"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/scheduler/common.go
+++ b/cmd/climc/shell/scheduler/common.go
@@ -15,8 +15,9 @@
 package scheduler

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/cmd/climc/shell/utils.go
+++ b/cmd/climc/shell/utils.go
@@ -21,10 +21,9 @@ import (
 	"strings"

 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/printutils"

-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/util/excelutils"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 const (
@@ -41,7 +40,7 @@ func OutputFormat(s string) {
 	outputFormat = s
 }

-func PrintList(list *modulebase.ListResult, columns []string) {
+func PrintList(list *printutils.ListResult, columns []string) {
 	switch outputFormat {
 	case OUTPUT_FORMAT_TABLE:
 		printutils.PrintJSONList(list, columns)
@@ -103,11 +102,11 @@ func printObjectRecursiveEx(obj jsonutils.JSONObject, cb printutils.PrintJSONObj
 	printutils.PrintJSONObjectRecursiveEx(obj, cb)
 }

-func printBatchResults(results []modulebase.SubmitResult, columns []string) {
+func printBatchResults(results []printutils.SubmitResult, columns []string) {
 	printutils.PrintJSONBatchResults(results, columns)
 }

-func ExportList(list *modulebase.ListResult, file string, exportKeys string, exportTexts string, columns []string) {
+func ExportList(list *printutils.ListResult, file string, exportKeys string, exportTexts string, columns []string) {
 	var keys []string
 	var texts []string
 	if len(exportKeys) > 0 {
--- a/cmd/climc/shell/yunionconf/common.go
+++ b/cmd/climc/shell/yunionconf/common.go
@@ -15,8 +15,9 @@
 package yunionconf

 import (
+	"yunion.io/x/pkg/util/printutils"
+
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/util/printutils"
 )

 var (
--- a/Show More
+++ b/Show More