Merge pull request #14730 from ioito/automated-cherry-pick-of-#14728-upstream-release-3.8

Automated cherry pick of #14728: fix(region): sync aliyun local disk

Makefile

@@ -268,7 +268,8 @@ dep:
 	@$(MAKE) mod
 
 mod:
-	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 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 sqlchemy))
+	go get -d yunion.io/x/sqlchemy@v1.0.2
 	go mod tidy
 	go mod vendor -v
 
@@ -330,7 +331,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=release-1.6.1 ARCH=all make image telegraf-raid-plugin
+	VERSION=release-1.6.4 ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

build/docker/Dockerfile.ansibleserver

@@ -1,7 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5-2
 
 # install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.3 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.3 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/playbook /opt/yunion/playbook
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -2,6 +2,8 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
+ENV TZ UTC
+
 # openssh-client, for ansible ssh connection
 # git, ca-certificates, for fetching ansible roles
 RUN set -x \

build/docker/Dockerfile.apigateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/apigateway /opt/yunion/bin/apigateway

build/docker/Dockerfile.baremetal-agent

@@ -1,11 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.3.3-2
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
-#ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
-#ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
-#ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent
-RUN apk add librados librbd
+ENV TZ UTC
 ADD ./_output/alpine-build/bin/baremetal-agent /opt/yunion/bin/baremetal-agent

build/docker/Dockerfile.baremetal-base

@@ -1,19 +1,17 @@
 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-21080303.x86_64.rpm
-#RUN yum install -y http://192.168.122.112:8083/baremetal-pxerom-1.1.0-21080303.x86_64.rpm
+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/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3-3.13.5
 
 MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
 RUN apk update && \
-    apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils && \
+    apk add --no-cache ipmitool ethtool tzdata ca-certificates cdrkit coreutils librados librbd && \
     rm -rf /var/cache/apk/*
 
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
 RUN mkdir -p /opt/cloud/yunion/baremetal
 
 # udpate latest pci.ids

build/docker/Dockerfile.climc

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210817
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20210901
 
 ADD ./build/climc/root/opt /opt
 

build/docker/Dockerfile.climc-base

@@ -8,7 +8,7 @@ RUN mkdir -p /opt/yunion/bin
 
 RUN echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories
 
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool kubectl && \
+RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim ipmitool kubectl ceph-common && \
     rm -rf /var/cache/apk/*
 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.cloudevent

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/cloudevent /opt/yunion/bin/cloudevent

build/docker/Dockerfile.cloudid

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/cloudid/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/cloudid /opt/yunion/bin/cloudid

build/docker/Dockerfile.cloudmon

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

build/docker/Dockerfile.cloudnet

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/cloudnet /opt/yunion/bin/cloudnet

build/docker/Dockerfile.cloudproxy

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/cloudproxy /opt/yunion/bin/cloudproxy

build/docker/Dockerfile.devtool

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/devtool /opt/yunion/bin/devtool

build/docker/Dockerfile.esxi-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/esxi-agent/root/opt/ /opt/
 

build/docker/Dockerfile.glance

@@ -1,7 +1,5 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:v0.0.1
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
+ENV TZ UTC
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -0,0 +1,5 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/torrent:20210815.0
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+RUN apk add --no-cache s3fs-fuse --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing

build/docker/Dockerfile.host

@@ -2,8 +2,7 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.4.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ Asia/Shanghai
+ENV TZ UTC
 
-RUN apk add librados librbd
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host

build/docker/Dockerfile.host-deployer

@@ -1,8 +1,8 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.1
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
-ENV TZ Asia/Shanghai
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 

build/docker/Dockerfile.host-image

@@ -0,0 +1,9 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
+
+RUN mkdir -p /opt/yunion/bin
+
+ENV TZ UTC
+
+ADD ./_output/bin/host-image /opt/yunion/bin/host-image
+ADD ./_output/bin/.host-image.bin /opt/yunion/bin/.host-image.bin
+ADD ./_output/bin/bundles/host-image /opt/yunion/bin/bundles/host-image

build/docker/Dockerfile.keystone

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/keystone /opt/yunion/bin/keystone

build/docker/Dockerfile.logger

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/logger /opt/yunion/bin/logger

build/docker/Dockerfile.monitor

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/monitor/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/monitor /opt/yunion/bin/monitor

build/docker/Dockerfile.notify

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/notify/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/notify /opt/yunion/bin/notify

build/docker/Dockerfile.onecloud-base

@@ -3,12 +3,12 @@ FROM alpine:3.13.5
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ Asia/Shanghai
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 
+RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
+
 RUN apk update && \
     apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
     rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.region

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 COPY ./build/region/root/opt/ /opt/
 ADD ./_output/alpine-build/bin/region /opt/yunion/bin/region

build/docker/Dockerfile.region-dns

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/s3gateway /opt/yunion/bin/s3gateway

build/docker/Dockerfile.scheduler

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/scheduler /opt/yunion/bin/scheduler

build/docker/Dockerfile.telegraf-raid-plugin

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.0
+FROM registry.cn-beijing.aliyuncs.com/yunionio/yunion-rootfs:v1.1
 
 ADD ./_output/centos-build/bin/telegraf-raid-plugin /opt/yunion/bin/telegraf-raid-plugin

build/docker/Dockerfile.torrent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 MAINTAINER "Zexi Li <zexi.li@icloud.com>"
 

build/docker/Dockerfile.vpcagent

@@ -2,5 +2,6 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.10.5-1
 
 MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
 
+ENV TZ UTC
 RUN mkdir -p /opt/yunion/bin
 ADD ./_output/alpine-build/bin/vpcagent /opt/yunion/bin/vpcagent

build/docker/Dockerfile.webconsole

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:v0.2-1
 
-ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole
+ADD ./_output/alpine-build/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -2,11 +2,9 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/kubectl:1.18.6
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 
-ENV TZ Asia/Shanghai
+ENV TZ UTC
 
 RUN mkdir -p /opt/yunion/bin
 
 RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
     rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.yunionconf

@@ -1,3 +1,3 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5
+FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
 ADD ./_output/alpine-build/bin/yunionconf /opt/yunion/bin/yunionconf

build/docker/Makefile

@@ -7,28 +7,40 @@ debian10-base:
 	docker buildx build --platform linux/arm64,linux/amd64 --push \
 		-t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base .
 
-ONECLOUD_BASE_VERSION = v0.3.5
+ONECLOUD_BASE_VERSION = v0.3-3.13.5
 
 onecloud-base:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
 
-ANSIBLESERVER_BASE = v1.0.5
+ANSIBLESERVER_BASE = v1.0.5-2
 
 ansibleserver-base:
 	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
 
-CLIMC_BASE_VERSION = 20210817
+CLIMC_BASE_VERSION = 20210901
 
 climc-base:
 	docker buildx build --platform linux/arm64,linux/amd64 --push \
 		-t registry.cn-beijing.aliyuncs.com/yunionio/climc-base:$(CLIMC_BASE_VERSION) -f ./Dockerfile.climc-base .
 
-BAREMETAL_BASE_VERSION = v0.3.2
+WEBCONSOLE_BASE_VERSION = v0.2-1
+webconsole-base:
+	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
+
+BAREMETAL_BASE_VERSION = v0.3.3-2
 
 baremetal-base:
 	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
 	#docker push $(REGISTRY)/baremetal-base:$(BAREMETAL_BASE_VERSION)
 
+TORRENT_VERSION = 20210815.0
+torrent:
+	$(DOCKER_BUILDX)/torrent:$(TORRENT_VERSION) -f ./Dockerfile.torrent .
+
+GLANCE_BASE_VERSION = v0.0.1
+glance-base:
+	$(DOCKER_BUILDX)/glance-base:$(GLANCE_BASE_VERSION) -f ./Dockerfile.glance-base .
+
 FILE_REPO_VERSION = v0.3.3
 
 file-repo:

build/docker/multi-arch/Dockerfile.host

@@ -13,6 +13,5 @@ MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
 ENV TZ Asia/Shanghai
 
-RUN apk add librados librbd
 RUN mkdir -p /opt/yunion/bin
 COPY --from=build /root/go/src/yunion.io/x/onecloud/_output/bin/host /opt/yunion/bin/host

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

@@ -3,7 +3,7 @@
 {{- if $d.brand -}}
 {{ $d.brand }}平台
 {{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经{{ .action_display }}{{.result_display}}
+{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}{{.result_display}}
 {{- if eq .result "failed" -}}
 ，请尽快前往控制台进行处理
 {{- end -}}

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

@@ -4,7 +4,7 @@
 {{- if $d.brand -}}
 {{ $d.brand }}平台
 {{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经创建成功
+{{ .resource_type_display }}{{ $d.name }}创建成功
 {{- if $d.private_dns -}}
 ，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
 {{- end -}}
@@ -13,8 +13,8 @@
 ，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}
 {{- end -}}
 
-{{- if and $d.address_type $d.address -}}
-，服务地址为{{ $d.address_type }}{{ $d.address }}
+{{- if $d.address -}}
+，服务地址为{{ $d.address }}
 {{- end -}}
 
 {{- if $d.ips -}}
@@ -29,8 +29,8 @@
 ，IP地址为{{ $d.ip_addr }}
 {{- end -}}
 
-{{- if $d.account -}}
-，初始帐号为{{ $d.account }}
+{{- if $d.login_account -}}
+，初始帐号为{{ $d.login_account }}
 {{- end -}}
 
 {{- if $d.password -}}
@@ -56,7 +56,7 @@
 {{- else -}}
 SSH
 {{- end -}}
-或控制面板控制台访问虚拟机。
+或前往控制台访问虚拟机。
 {{- end -}}
 
 {{- if has .resource_type $consoleServiceType -}}

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

@@ -19,4 +19,4 @@
 {{- if $d.ip_addr -}}
 ，IP地址为{{ $d.ip_addr }}
 {{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经删除成功。
+{{ .resource_type_display }}{{ $d.name }}删除成功

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 发生异常: {{ $d.message }}

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

@@ -3,4 +3,12 @@
 {{- if $d.brand -}}
 {{ $d.brand }}平台
 {{- end -}}
-{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，如需续期使用，请尽快前往控制台处理
+
+{{- if $d.private_dns -}}
+，内网地址为{{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+，外网地址为{{ $d.public_dns }}:{{ $d.public_connect_port }}的
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}还有{{ .advance_days }}天就要到期释放，{{ if $d.auto_renew }}到期已开启自动续费，{{ end }}如有其它变更，请尽快前往控制台处理

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 离线 {{- if $d.reason -}} 原因: {{ $d.reason }} {{- end -}}

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

@@ -0,0 +1,4 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC {{- if $d.error -}} 错误: {{ $d.error }} {{- end -}}
+堆栈信息: 
+{{ $d.stack }}

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

@@ -0,0 +1,14 @@
+{{- $d := .resource_details -}}
+您在{{ $d.project }}项目的
+
+{{- if $d.ips -}}
+IP地址为{{ $d.ips }}的
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+IP地址为{{ $d.ip_addr }}的
+{{- end -}}
+{{- if $d.brand -}}
+{{ $d.brand }}平台
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}成功加入回收站

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

@@ -3,7 +3,7 @@
 {{- if $d.brand -}}
 {{ $d.brand }}平台
 {{- end -}}
-{{ .resource_type_display }}{{ $d.name }}已经{{ .action_display }}成功
+{{ .resource_type_display }}{{ $d.name }}{{ .action_display }}成功
 {{- if $d.account -}}
 ，帐号为{{ $d.account }}
 {{- end -}}

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

@@ -9,8 +9,8 @@ Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {
 , the internet address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
 {{- end -}}
 
-{{- if and $d.address_type $d.address -}}
-, the service address is {{ $d.address_type }}{{ $d.address }}
+{{- if $d.address -}}
+, the service address is {{ $d.address }}
 {{- end -}}
 
 {{- if $d.ips -}}
@@ -46,7 +46,7 @@ Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {
 {{- end -}}
 
 {{- if eq .resource_type "server" -}}
-, and please use {{ if $d.windows -}} Remote Desktop Connector (RDC) {{ else -}} SSH {{ end -}} or the control panel console to access the VM.
+, and please use {{ if $d.windows -}} Remote Desktop Connector (RDC) {{ else -}} SSH {{ end -}} or go to the console to access the VM.
 {{- end -}}
 
 {{- if has .resource_type $consoleServiceType -}}

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

@@ -6,7 +6,7 @@ Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {
 {{- end -}}
 
 {{- if $d.public_dns -}}
-, the internet address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
+, the external address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
 {{- end -}}
 
 {{- if and $d.address_type $d.address -}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} exception occurs: {{ $d.message }}

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

@@ -1,2 +1,2 @@
 {{- $d := .resource_details -}}
-Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. If you need to renew, please go to the console as soon as possible
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type }} {{ $d.name }} {{ if $d.public_dns -}} with external address {{ $d.public_dns }}:{{ $d.public_connect_port }} {{ end -}} {{ if $d.project -}} in project {{ $d.project }} {{ end -}} will expire and be released in {{ .advance_days }} days. {{ if $d.auto_renew }}It has turned on automatic renewal. {{ end }}If there are other changes, please go to the console as soon as possible.

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type }} {{ $d.name }} Offline {{- if $d.reason -}} Reason: {{ $d.reason }}的 {{- end -}}

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

@@ -0,0 +1,4 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC {{- if $d.error -}} Error: {{ $d.error }} {{- end -}}
+Stack Info: 
+{{ $d.stack }}

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

@@ -0,0 +1,22 @@
+{{- $d := .resource_details -}}
+Your {{ if $d.brand -}} {{ $d.brand }} {{ end -}} {{ .resource_type_display }} {{ $d.name }} 
+{{ if $d.project -}} in project {{ $d.project }} {{ end -}} has been added to recycle bin successfully
+{{- if $d.private_dns -}}
+, the intranet address is {{ $d.private_dns }}:{{ $d.private_connect_port }}
+{{- end -}}
+
+{{- if $d.public_dns -}}
+, the external address is {{ $d.public_dns }}:{{ $d.public_connect_port }}
+{{- end -}}
+
+{{- if and $d.address_type $d.address -}}
+, the service address is {{ $d.address_type }}{{ $d.address }}
+{{- end -}}
+
+{{- if $d.ips -}}
+, the IP address is {{ $d.ips }}
+{{- end -}}
+
+{{- if $d.ip_addr -}}
+, the IP address is {{ $d.ip_addr }}
+{{- end -}}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 发生异常: {{ $d.message }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} 离线

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC

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

@@ -0,0 +1,5 @@
+{{- $d := .resource_details -}}
+{{- if $d.project -}}
+{{ $d.project }}项目的
+{{- end -}}
+{{ .resource_type_display }}{{ $d.name }}成功加入回收站

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.name }} exception occurs: {{ $d.message }}

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type }} {{ $d.name }} Offline 

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+{{ .resource_type }} {{ $d.task_name }} PANIC

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

@@ -0,0 +1,2 @@
+{{- $d := .resource_details -}}
+The {{ .resource_type_display }} {{ .Name }} {{ if $d.project }} in poject {{ $d.project }} {{ end -}} has been added to recycle bin successfully

cmd/aliyuncli/main.go

@@ -16,10 +16,15 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/structarg"
 
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud/aliyun"
 	_ "yunion.io/x/onecloud/pkg/multicloud/aliyun/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
@@ -85,12 +90,27 @@ func newClient(options *BaseOptions) (*aliyun.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
 	cli, err := aliyun.NewAliyunClient(
 		aliyun.NewAliyunClientConfig(
 			options.CloudEnv,
 			options.AccessKey,
 			options.Secret,
-		).Debug(options.Debug),
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
 	)
 	if err != nil {
 		return nil, err

cmd/apsaracli/main.go

@@ -16,8 +16,12 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/structarg"
 
 	"yunion.io/x/onecloud/pkg/cloudprovider"
@@ -87,13 +91,28 @@ func newClient(options *BaseOptions) (*apsara.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
 	cli, err := apsara.NewApsaraClient(
 		apsara.NewApsaraClientConfig(
 			options.AccessKey,
 			options.Secret,
 			options.Endpoint,
 			options.SApsaraEndpoints,
-		).Debug(options.Debug),
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
 	)
 	if err != nil {
 		return nil, err

cmd/awscli/main.go

@@ -16,11 +16,16 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/structarg"
 
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud/aws"
 	_ "yunion.io/x/onecloud/pkg/multicloud/aws/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
@@ -87,13 +92,28 @@ func newClient(options *BaseOptions) (*aws.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
 	cli, err := aws.NewAwsClient(
 		aws.NewAwsClientConfig(
 			options.AccessUrl,
 			options.AccessKey,
 			options.Secret,
 			options.AccountId,
-		).Debug(options.Debug),
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
 	)
 	if err != nil {
 		return nil, err

cmd/azurecli/main.go

@@ -16,10 +16,15 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/structarg"
 
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud/azure"
 	_ "yunion.io/x/onecloud/pkg/multicloud/azure/shell"
 	"yunion.io/x/onecloud/pkg/util/printutils"
@@ -100,6 +105,16 @@ func newClient(options *BaseOptions) (*azure.SRegion, error) {
 		return nil, fmt.Errorf("Missing Cloud Environment")
 	}
 
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
 	cli, err := azure.NewAzureClient(
 		azure.NewAzureClientConfig(
 			options.CloudEnv,
@@ -108,7 +123,12 @@ func newClient(options *BaseOptions) (*azure.SRegion, error) {
 			options.ApplicationKey,
 		).
 			SubscriptionId(options.SubscriptionID).
-			Debug(options.Debug),
+			Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
 	)
 
 	if err != nil {

cmd/climc/shell/cloudevent/cloudevents.go

@@ -15,6 +15,10 @@
 package cloudevent
 
 import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -41,17 +45,26 @@ func init() {
 		return nil
 	})
 
+	type CloudeventSplitTableOptions struct {
+	}
+
+	R(&CloudeventSplitTableOptions{}, "cloud-event-splitable", "Show obsolete cloud event logs", func(s *mcclient.ClientSession, opts *CloudeventSplitTableOptions) error {
+		resp, err := modules.Cloudevents.Get(s, "splitable", nil)
+		if err != nil {
+			return err
+		}
+		fmt.Println(resp)
+		return nil
+	})
+
 	type CloudeventLogsPurgeOptions struct {
 	}
-	R(&CloudeventLogsPurgeOptions{}, "cloud-event-purge", "Purge obsolete cloud event logs", func(s *mcclient.ClientSession, opts *CloudeventLogsPurgeOptions) error {
-		_, err := modules.Cloudevents.PerformClassAction(s, "purge-splitable", nil)
-		if err != nil {
-			return err
-		}
-		_, err = modules.CloudeventLogs.PerformClassAction(s, "purge-splitable", nil)
+	R(&CloudeventLogsPurgeOptions{}, "cloud-event-purge-splitable", "Purge obsolete cloud event logs", func(s *mcclient.ClientSession, opts *CloudeventLogsPurgeOptions) error {
+		resp, err := modules.Cloudevents.PerformClassAction(s, "purge-splitable", jsonutils.Marshal(opts))
 		if err != nil {
 			return err
 		}
+		fmt.Println(resp)
 		return nil
 	})
 }

cmd/climc/shell/cloudproxy/proxy_agents.go

@@ -28,4 +28,5 @@ func init() {
 	cmd.List(&options.ProxyAgentListOptions{})
 	cmd.Show(&options.ProxyAgentShowOptions{})
 	cmd.Delete(&options.ProxyAgentDeleteOptions{})
+	cmd.Perform("purge-forwards", &options.ProxyAgentPurgeForwardsOptions{})
 }

cmd/climc/shell/compute/backup.go

@@ -0,0 +1,46 @@
+// 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"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	bsCmd := shell.NewResourceCmd(&modules.BackupStorages)
+	bsCmd.List(&compute.BackupStorageListOptions{})
+	bsCmd.Show(&compute.BackupStorageIdOptions{})
+	bsCmd.Create(&compute.BackupStorageCreateOptions{})
+	bsCmd.Delete(&compute.BackupStorageIdOptions{})
+	bsCmd.Perform("public", &options.BasePublicOptions{})
+	bsCmd.Perform("private", &options.BaseIdOptions{})
+
+	dbCmd := shell.NewResourceCmd(&modules.DiskBackups)
+	dbCmd.List(&compute.DiskBackupListOptions{})
+	dbCmd.Show(&compute.DiskBackupIdOptions{})
+	dbCmd.Delete(&compute.DiskBackupIdOptions{})
+	dbCmd.Create(&compute.DiskBackupCreateOptions{})
+	dbCmd.Perform("recovery", &compute.DiskBackupRecoveryOptions{})
+	dbCmd.Perform("syncstatus", &compute.DiskBackupSyncstatusOptions{})
+
+	ibCmd := shell.NewResourceCmd(&modules.InstanceBackups)
+	ibCmd.List(&compute.InstanceBackupListOptions{})
+	ibCmd.Show(&compute.InstanceBackupIdOptions{})
+	ibCmd.Delete(&compute.InstanceBackupIdOptions{})
+	ibCmd.Perform("recovery", &compute.InstanceBackupRecoveryOptions{})
+}

cmd/climc/shell/compute/cdn_domains.go

@@ -17,10 +17,15 @@ package compute
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
 	cmd := shell.NewResourceCmd(&modules.CDNDomains)
 	cmd.List(&compute.CDNDomainListOptions{})
+	cmd.Show(&options.BaseIdOptions{})
+	cmd.Update(&compute.CDNDomainUpdateOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
+	cmd.Create(&compute.CDNDomainCreateOptions{})
 }

cmd/climc/shell/compute/cloudaccounts.go

@@ -37,7 +37,7 @@ func init() {
 	cmd.CreateWithKeyword("create-aws", &options.SAWSCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-openstack", &options.SOpenStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-huawei", &options.SHuaweiCloudAccountCreateOptions{})
-	cmd.CreateWithKeyword("create-huaweicloudstack", &options.SHuaweiCloudStackAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-hcso", &options.SHCSOAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-ucloud", &options.SUcloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-zstack", &options.SZStackCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-s3", &options.SS3CloudAccountCreateOptions{})
@@ -48,6 +48,7 @@ func init() {
 	cmd.CreateWithKeyword("create-ecloud", &options.SEcloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-jdcloud", &options.SJDcloudCloudAccountCreateOptions{})
 	cmd.CreateWithKeyword("create-cloudpods", &options.SCloudpodsCloudAccountCreateOptions{})
+	cmd.CreateWithKeyword("create-nutanix", &options.SNutanixCloudAccountCreateOptions{})
 
 	cmd.UpdateWithKeyword("update-vmware", &options.SVMwareCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-aliyun", &options.SAliyunCloudAccountUpdateOptions{})
@@ -57,13 +58,14 @@ func init() {
 	cmd.UpdateWithKeyword("update-aws", &options.SAWSCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-openstack", &options.SOpenStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-huawei", &options.SHuaweiCloudAccountUpdateOptions{})
-	cmd.UpdateWithKeyword("update-huaweicloudstack", &options.SHuaweiCloudStackAccountUpdateOptions{})
+	cmd.UpdateWithKeyword("update-hcso", &options.SHCSOAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ucloud", &options.SUcloudCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-zstack", &options.SZStackCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-s3", &options.SS3CloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-ctyun", &options.SCtyunCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-jdcloud", &options.SJDcloudCloudAccountUpdateOptions{})
 	cmd.UpdateWithKeyword("update-cloudpods", &options.SCloudpodsCloudAccountUpdateOptions{})
+	cmd.UpdateWithKeyword("update-nutanix", &options.SNutanixCloudAccountUpdateOptions{})
 
 	cmd.Perform("update-credential", &options.CloudaccountUpdateCredentialOptions{})
 
@@ -75,13 +77,14 @@ func init() {
 	cmd.PerformWithKeyword("update-credential-aws", "update-credential", &options.SAWSCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-openstack", "update-credential", &options.SOpenStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-huawei", "update-credential", &options.SHuaweiCloudAccountUpdateCredentialOptions{})
-	cmd.PerformWithKeyword("update-credential-huaweicloudstack", "update-credential", &options.SHuaweiCloudStackAccountUpdateCredentialOptions{})
+	cmd.PerformWithKeyword("update-credential-hcso", "update-credential", &options.SHCSOAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-ucloud", "update-credential", &options.SUcloudCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-zstack", "update-credential", &options.SZStackCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-s3", "update-credential", &options.SS3CloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-ctyun", "update-credential", &options.SCtyunCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-jdcloud", "update-credential", &options.SJDcloudCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("update-credential-cloudpods", "update-credential", &options.SCloudpodsCloudAccountUpdateCredentialOptions{})
+	cmd.PerformWithKeyword("update-credential-nutanix", "update-credential", &options.SNutanixCloudAccountUpdateCredentialOptions{})
 
 	cmd.PerformWithKeyword("test-connectivity-google", "test-connectivity", &options.SGoogleCloudAccountUpdateCredentialOptions{})
 	cmd.PerformWithKeyword("test-connectivity-vmware", "test-connectivity", &options.SVMwareCloudAccountUpdateCredentialOptions{})

cmd/climc/shell/compute/common.go

@@ -21,8 +21,8 @@ import (
 
 var (
 	R                 = shell.R
-	printList         = printutils.PrintJSONList
-	printObject       = printutils.PrintJSONObject
+	printList         = shell.PrintList
+	printObject       = shell.PrintObject
 	printBatchResults = printutils.PrintJSONBatchResults
 
 	InvalidUpdateError   = shell.InvalidUpdateError

cmd/climc/shell/compute/disks.go

@@ -15,11 +15,26 @@
 package compute
 
 import (
+	"compress/zlib"
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"strconv"
+	"time"
+
+	"github.com/cheggaaa/pb/v3"
+
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
+	"yunion.io/x/pkg/errors"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/util/httputils"
+	"yunion.io/x/onecloud/pkg/util/sparsefile"
 )
 
 func init() {
@@ -309,4 +324,110 @@ func init() {
 		return nil
 	})
 
+	type DiskDownloadOptions struct {
+		ID       string `help:"ID or name of disk" json:"-"`
+		Compress bool
+		Sparse   bool
+
+		Timeout int `help:"Timeout hours for download" default:"5"`
+		Debug   bool
+
+		FILE string
+	}
+	R(&DiskDownloadOptions{}, "disk-download", "Download disk from host", func(s *mcclient.ClientSession, args *DiskDownloadOptions) error {
+		disk, err := modules.Disks.GetById(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		storageId, _ := disk.GetString("storage_id")
+		storage, err := modules.Storages.GetById(s, storageId, nil)
+		if err != nil {
+			return err
+		}
+
+		hostsInfo := []struct {
+			Id string
+		}{}
+		storage.Unmarshal(&hostsInfo, "hosts")
+		header := http.Header{}
+		header.Set("X-Auth-Token", s.GetToken().GetTokenString())
+		if args.Compress {
+			header.Set("X-Compress-Content", "zlib")
+		}
+		if args.Sparse {
+			header.Set("X-Sparse-Content", "true")
+		}
+
+		client := httputils.GetTimeoutClient(time.Hour * time.Duration(args.Timeout))
+
+		for _, host := range hostsInfo {
+			host, err := modules.Hosts.GetById(s, host.Id, nil)
+			if err != nil {
+				return err
+			}
+			managerUri, _ := host.GetString("manager_uri")
+			if len(managerUri) == 0 {
+				continue
+			}
+			url := fmt.Sprintf("%s/download/disks/%s/%s", managerUri, storageId, args.ID)
+			resp, err := httputils.Request(client, context.Background(), httputils.GET, url, header, nil, args.Debug)
+			if err != nil {
+				log.Errorf("request %s error: %v", url, err)
+				continue
+			}
+			defer resp.Body.Close()
+
+			totalSize, _ := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+			sparseHeader, _ := strconv.ParseInt(resp.Header.Get("X-Sparse-Header"), 10, 64)
+
+			fi, err := os.Create(args.FILE)
+			if err != nil {
+				return errors.Wrapf(err, "os.Create(%s)", args.FILE)
+			}
+			defer fi.Close()
+
+			var reader = resp.Body
+
+			if args.Compress {
+				zlibRC, err := zlib.NewReader(resp.Body)
+				if err != nil {
+					return errors.Wrapf(err, "zlib.NewReader")
+				}
+				defer zlibRC.Close()
+				reader = zlibRC
+			}
+
+			var writer io.Writer = fi
+
+			if sparseHeader > 0 {
+				writer = sparsefile.NewSparseFileWriter(fi, sparseHeader, totalSize)
+			}
+
+			bar := pb.Full.Start64(totalSize)
+			barReader := bar.NewProxyReader(reader)
+
+			_, err = io.Copy(writer, barReader)
+			return err
+		}
+		return fmt.Errorf("no available download url")
+	})
+
+	type SparseHoleOptions struct {
+		FILE string
+	}
+	R(&SparseHoleOptions{}, "sparse-file-hole", "Show sparse file holes", func(s *mcclient.ClientSession, args *SparseHoleOptions) error {
+		fi, err := os.Open(args.FILE)
+		if err != nil {
+			return err
+		}
+		defer fi.Close()
+		sp, err := sparsefile.NewSparseFileReader(fi)
+		if err != nil {
+			return err
+		}
+		holes := sp.GetHoles()
+		printObject(jsonutils.Marshal(holes))
+		return nil
+	})
+
 }

cmd/climc/shell/compute/elastic_search.go

@@ -27,4 +27,5 @@ func init() {
 	cmd.Show(&compute.ElasticSearchIdOption{})
 	cmd.Delete(&compute.ElasticSearchIdOption{})
 	cmd.Perform("syncstatus", &compute.ElasticSearchIdOption{})
+	cmd.Get("access-info", &compute.ElasticSearchIdOption{})
 }

cmd/climc/shell/compute/elasticips.go

@@ -33,6 +33,6 @@ func init() {
 	cmd.Perform("dissociate", &compute.EipDissociateOptions{})
 	cmd.Perform("sync", &options.BaseIdOptions{})
 	cmd.Perform("syncstatus", &options.BaseIdOptions{})
-	cmd.Perform("change-bandwidth", &options.BaseIdOptions{})
+	cmd.Perform("change-bandwidth", &compute.EipChangeBandwidthOptions{})
 	cmd.Perform("change-owner", &compute.EipChangeOwnerOptions{})
 }

cmd/climc/shell/compute/globalvpcs.go

@@ -15,95 +15,16 @@
 package compute
 
 import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type GlobalVpcListOptions struct {
-		options.BaseListOptions
-	}
-	R(&GlobalVpcListOptions{}, "global-vpc-list", "List global vpcs", func(s *mcclient.ClientSession, args *GlobalVpcListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.GlobalVpcs.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.GlobalVpcs.GetColumns(s))
-		return nil
-	})
-
-	type GlobalVpcShowOptions struct {
-		ID string `help:"ID or Name of globalvpc"`
-	}
-	R(&GlobalVpcShowOptions{}, "global-vpc-show", "Show details of a global vpc", func(s *mcclient.ClientSession, args *GlobalVpcShowOptions) error {
-		result, err := modules.GlobalVpcs.GetById(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type GlobalVpcPublicOptions struct {
-		ID            string   `help:"ID or name of global vpc" json:"-"`
-		Scope         string   `help:"sharing scope" choices:"system|domain"`
-		SharedDomains []string `help:"share to domains"`
-	}
-	R(&GlobalVpcPublicOptions{}, "global-vpc-public", "Make global vpc public", func(s *mcclient.ClientSession, args *GlobalVpcPublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.GlobalVpcs.PerformAction(s, args.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type GlobalVpcPrivateOptions struct {
-		ID string `help:"ID or name of global vpc" json:"-"`
-	}
-	R(&GlobalVpcPrivateOptions{}, "global-vpc-private", "Make global vpc private", func(s *mcclient.ClientSession, args *GlobalVpcPrivateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.GlobalVpcs.PerformAction(s, args.ID, "private", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&GlobalVpcShowOptions{}, "global-vpc-change-owner-candidate-domains", "Show candiate domains of a global vpc for changing owner", func(s *mcclient.ClientSession, args *GlobalVpcShowOptions) error {
-		result, err := modules.GlobalVpcs.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type GlobalVpcChangeOwnerOptions struct {
-		ID            string `help:"ID or name of vpc" json:"-"`
-		ProjectDomain string `json:"project_domain" help:"target domain"`
-	}
-	R(&GlobalVpcChangeOwnerOptions{}, "global-vpc-change-owner", "Change owner domain of a global vpc", func(s *mcclient.ClientSession, args *GlobalVpcChangeOwnerOptions) error {
-		if len(args.ProjectDomain) == 0 {
-			return fmt.Errorf("empty project_domain")
-		}
-		params := jsonutils.Marshal(args)
-		ret, err := modules.GlobalVpcs.PerformAction(s, args.ID, "change-owner", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.GlobalVpcs).WithKeyword("global-vpc")
+	cmd.List(&options.GlobalVpcListOptions{})
+	cmd.Show(&options.GlobalVpcIdOption{})
+	cmd.Create(&options.GlobalVpcCreateOptions{})
+	cmd.Perform("syncstatus", &options.GlobalVpcIdOption{})
+	cmd.Get("change-owner-candidate-domains", &options.GlobalVpcIdOption{})
 }

cmd/climc/shell/compute/hosts.go

@@ -15,10 +15,12 @@
 package compute
 
 import (
+	"context"
 	"fmt"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/errors"
 
 	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -26,6 +28,7 @@ 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"
 )
 
@@ -43,8 +46,9 @@ func init() {
 	cmd.Perform("start", &options.BaseIdOptions{})
 	cmd.Perform("stop", &options.BaseIdOptions{})
 	cmd.Perform("reset", &options.BaseIdOptions{})
-	cmd.Perform("delete", &options.BaseIdOptions{})
+	cmd.BatchDelete(&options.BaseIdsOptions{})
 	cmd.Perform("remove-all-netifs", &options.BaseIdOptions{})
+	cmd.Perform("probe-isolated-devices", &options.BaseIdOptions{})
 
 	cmd.BatchPerform("enable", &options.BaseIdsOptions{})
 	cmd.BatchPerform("disable", &options.BaseIdsOptions{})
@@ -52,9 +56,11 @@ func init() {
 	cmd.BatchPerform("sync-config", &options.BaseIdsOptions{})
 	cmd.BatchPerform("prepare", &options.BaseIdsOptions{})
 	cmd.BatchPerform("ipmi-probe", &options.BaseIdsOptions{})
+	cmd.BatchPerform("auto-migrate-on-host-down", &compute.HostAutoMigrateOnHostDownOptions{})
 
 	cmd.Get("ipmi", &options.BaseIdOptions{})
 	cmd.Get("vnc", &options.BaseIdOptions{})
+	cmd.Get("app-options", &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)
@@ -523,9 +529,36 @@ func init() {
 			return e
 		}
 		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		privateKey := ""
 		if e != nil {
-			return e
+			if httputils.ErrorCode(e) == 404 || e.Error() == "ciphertext too short" {
+				var err error
+				privateKey, err = modules.Sshkeypairs.FetchPrivateKeyBySession(context.Background(), s)
+				if err != nil {
+					return errors.Wrap(err, "fetch private key")
+				}
+				params := jsonutils.NewDict()
+				params.Add(jsonutils.NewString(string(args.ID)), "ID")
+				ret, err := modules.Hosts.Get(s, args.ID, params)
+				if err != nil {
+					return errors.Wrap(err, "get host by ID")
+				}
+				ip, err := ret.GetString("access_ip")
+				if err != nil {
+					return errors.Wrap(err, "get the ip of the host")
+				}
+
+				jsonItem := jsonutils.NewDict()
+				jsonItem.Add(jsonutils.NewString(ip), "ip")
+				jsonItem.Add(jsonutils.NewString("root"), "username")
+				jsonItem.Add(jsonutils.NewString(""), "password")
+				jsonItem.Add(jsonutils.NewInt(22), "port")
+				i = jsonItem
+			} else {
+				return e
+			}
 		}
+
 		host, err := i.GetString("ip")
 		if err != nil {
 			return err
@@ -542,7 +575,7 @@ func init() {
 		if args.Port != 22 {
 			port = args.Port
 		}
-		sshCli, err := ssh.NewClient(host, port, user, passwd, "")
+		sshCli, err := ssh.NewClient(host, port, user, passwd, privateKey)
 		if err != nil {
 			return err
 		}
@@ -610,28 +643,6 @@ func init() {
 		return nil
 	})
 
-	type HostAutoMigrateOnHostDownOptions struct {
-		ID      string `help:"ID or name of host"`
-		Enable  bool   `help:"enable auto migrate"`
-		Disable bool   `help:"disable auto migrate"`
-	}
-	R(&HostAutoMigrateOnHostDownOptions{}, "host-auto-migrate-on-host-down", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *HostAutoMigrateOnHostDownOptions) error {
-		params := jsonutils.NewDict()
-		if args.Disable {
-			params.Set("auto_migrate_on_host_down", jsonutils.NewString("disable"))
-		} else if args.Enable {
-			params.Set("auto_migrate_on_host_down", jsonutils.NewString("enable"))
-		} else {
-			return fmt.Errorf("missing input enable or disable")
-		}
-		result, err := modules.Hosts.PerformAction(s, args.ID, "auto-migrate-on-host-down", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type HostSetReservedResourceForIsolatedDevice struct {
 		ID              []string `help:"ID or name of host" json:"-"`
 		ReservedCpu     *int     `help:"reserved cpu count"`

cmd/climc/shell/compute/instance_group.go

@@ -15,113 +15,28 @@
 package compute
 
 import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 
 func init() {
-	type InstanceGroupListOptions struct {
-		options.BaseListOptions
+	cmd := shell.NewResourceCmd(&modules.InstanceGroups)
+	cmd.List(&compute.InstanceGroupListOptions{})
+	cmd.Show(&options.BaseShowOptions{})
+	cmd.GetMetadata(&options.BaseIdOptions{})
+	cmd.Create(&compute.InstanceGroupCreateOptions{})
+	cmd.Update(&compute.InstanceGroupUpdateOptions{})
+	cmd.Delete(&options.BaseIdOptions{})
 
-		ServiceType string `help:"Service Type"`
-		ParentId    string `help:"Parent ID"`
-		ZoneId      string `help:"Zone ID"`
-		Server      string `help:"Guest ID or Name"`
-	}
+	cmd.Perform("bind-guests", &compute.InstanceGroupBindGuestsOptions{})
+	cmd.Perform("unbind-guests", &compute.InstanceGroupBindGuestsOptions{})
 
-	R(&InstanceGroupListOptions{}, "instance-group-list", "List instance group", func(s *mcclient.ClientSession,
-		args *InstanceGroupListOptions) error {
-
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.InstanceGroup.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.InstanceGroup.GetColumns(s))
-		return nil
-	})
-
-	type InstanceGroupShowOptions struct {
-		ID string `help:"ID or Name of instance group"`
-	}
-	R(&InstanceGroupShowOptions{}, "instance-group-show", "Show details of a instance group",
-		func(s *mcclient.ClientSession, args *InstanceGroupShowOptions) error {
-
-			result, err := modules.InstanceGroup.GetById(s, args.ID, nil)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		})
-
-	type InstanceGroupCreateOptions struct {
-		NAME string `help:"name of instance group"`
-
-		ZoneId          string `help:"zone id" json:"zone_id"`
-		ServiceType     string `help:"service type"`
-		ParentId        string `help:"parent id"`
-		SchedStrategy   string `help:"scheduler strategy"`
-		Granularity     string `help:"the upper limit number of guests with this group in a host"`
-		ForceDispersion bool   `help:"force to make guest dispersion"`
-	}
-
-	R(&InstanceGroupCreateOptions{}, "instance-group-create", "Create a instance group",
-		func(s *mcclient.ClientSession, args *InstanceGroupCreateOptions) error {
-			params, err := options.StructToParams(args)
-			if err != nil {
-				return err
-			}
-			result, err := modules.InstanceGroup.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		},
-	)
-
-	R(&InstanceGroupShowOptions{}, "instance-group-delete", "delete a instance group",
-		func(s *mcclient.ClientSession, args *InstanceGroupShowOptions) error {
-			result, err := modules.InstanceGroup.Delete(s, args.ID, nil)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		},
-	)
-
-	type InstanceGroupUpdateOptions struct {
-		ID              string `help:"ID or Name of servers to update" json:"-"`
-		Name            string `help:"New name to change"`
-		Granularity     string `help:"the upper limit number of guests with this group in a host"`
-		ForceDispersion string `help:"force to make guest dispersion" choices:"yes|no" json:"-"`
-	}
-
-	R(&InstanceGroupUpdateOptions{}, "instance-group-update", "update a instance group",
-		func(s *mcclient.ClientSession, args *InstanceGroupUpdateOptions) error {
-			params, err := options.StructToParams(args)
-			if err != nil {
-				return err
-			}
-			if args.ForceDispersion == "yes" {
-				params.Set("force_dispersion", jsonutils.JSONTrue)
-			} else {
-				params.Set("force_dispersion", jsonutils.JSONFalse)
-			}
-			ret, err := modules.InstanceGroup.Update(s, args.ID, params)
-			if err != nil {
-				return err
-			}
-			printObject(ret)
-			return nil
-		})
+	cmd.Perform("attachnetwork", &compute.InstanceGroupAttachnetworkOptions{})
+	cmd.Perform("detachnetwork", &compute.InstanceGroupDetachnetworkOptions{})
 
+	cmd.Perform("create-eip", &compute.InstanceGroupCreateEipOptions{})
+	cmd.Perform("associate-eip", &compute.InstanceGroupAssociateEipOptions{})
+	cmd.Perform("dissociate-eip", &compute.InstanceGroupDissociateEipOptions{})
 }

cmd/climc/shell/compute/instance_group_guest.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"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewJointCmd(&modules.InstanceGroupGuests)
+	cmd.List(&compute.InstanceGroupGuestListOptions{})
+}

cmd/climc/shell/compute/instance_group_network.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"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
+)
+
+func init() {
+	cmd := shell.NewJointCmd(&modules.InstancegroupNetworks)
+	cmd.List(&compute.InstanceGroupNetworkListOptions{})
+}

cmd/climc/shell/compute/isolatedevices.go

@@ -30,6 +30,7 @@ func init() {
 		Host   string `help:"Host ID or Name"`
 		Region string `help:"Cloudregion ID or Name"`
 		Zone   string `help:"Zone ID or Name"`
+		Server string `help:"Server ID or Name"`
 	}
 	R(&DeviceListOptions{}, "isolated-device-list", "List isolated devices like GPU", func(s *mcclient.ClientSession, args *DeviceListOptions) error {
 		var params *jsonutils.JSONDict
@@ -56,6 +57,9 @@ func init() {
 		if args.Zone != "" {
 			params.Add(jsonutils.NewString(args.Zone), "zone")
 		}
+		if args.Server != "" {
+			params.Add(jsonutils.NewString(args.Server), "guest_id")
+		}
 		result, err := modules.IsolatedDevices.List(s, params)
 		if err != nil {
 			return err
@@ -76,12 +80,12 @@ func init() {
 		return nil
 	})
 
-	R(&DeviceShowOptions{}, "isolated-device-delete", "Delete a isolated device", func(s *mcclient.ClientSession, args *DeviceShowOptions) error {
-		result, err := modules.IsolatedDevices.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
+	type DeviceDeleteOptions struct {
+		IDS []string `help:"IDs of the isolated device"`
+	}
+	R(&DeviceDeleteOptions{}, "isolated-device-delete", "Delete a isolated device", func(s *mcclient.ClientSession, args *DeviceDeleteOptions) error {
+		result := modules.IsolatedDevices.BatchDelete(s, args.IDS, nil)
+		printBatchResults(result, modules.IsolatedDevices.GetColumns(s))
 		return nil
 	})
 
@@ -90,6 +94,7 @@ func init() {
 		ReservedCpu     *int     `help:"reserved cpu for isolated device"`
 		ReservedMem     *int     `help:"reserved mem for isolated device"`
 		ReservedStorage *int     `help:"reserved storage for isolated device"`
+		DevType         string   `help:"Device type" choices:"GPU-HPC|GPU-VGA"`
 	}
 	R(&DeviceUpdateOptions{}, "isolated-device-update", "Update a isolated device", func(s *mcclient.ClientSession, args *DeviceUpdateOptions) error {
 		res := modules.IsolatedDevices.BatchUpdate(s, args.ID, jsonutils.Marshal(args))

cmd/climc/shell/compute/scheduled_task.go

@@ -33,6 +33,7 @@ func init() {
 		ScheduledType string `help:"scheduled type" choices:"timing|cycle"`
 		ResourceType  string `help:"resource type"`
 		Operation     string `help:"operation"`
+		UtcOffset     int    `help:"utc offset"`
 	}
 	R(&ScheduledTaskListOptions{}, "scheduledtask-list", "list Scheduled Task", func(s *mcclient.ClientSession, args *ScheduledTaskListOptions) error {
 		params, err := options.ListStructToParams(args)

cmd/climc/shell/compute/server_forward.go

@@ -47,7 +47,7 @@ func dump(input jsonutils.JSONObject) (*forwardInfo, error) {
 	}
 
 	if ret.ProxyPort <= 0 {
-		return nil, errors.Errorf("invalid proxy_port %d", ret.ProxyAddr)
+		return nil, errors.Errorf("invalid proxy_port %d", ret.ProxyPort)
 	}
 
 	return ret, nil

cmd/climc/shell/compute/serverisolatedevices.go

@@ -48,7 +48,7 @@ func init() {
 	R(&ServerDetachDeviceOptions{}, "server-detach-isolated-device", "Detach a isolated device from a virtual server", func(s *mcclient.ClientSession, args *ServerDetachDeviceOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.DEVICE), "device")
-		srv, err := modules.Servers.PerformAction(s, args.SERVER, "detach-isolated_device", params)
+		srv, err := modules.Servers.PerformAction(s, args.SERVER, "detach-isolated-device", params)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/compute/servers.go

@@ -15,6 +15,7 @@
 package compute
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -88,6 +89,10 @@ func init() {
 	cmd.Perform("create-eip", &options.ServerCreateEipOptions{})
 	cmd.Perform("make-sshable", &options.ServerMakeSshableOptions{})
 	cmd.Perform("migrate-network", &options.ServerMigrateNetworkOptions{})
+	cmd.Perform("set-sshport", &options.ServerSetSshportOptions{})
+	cmd.Perform("have-agent", &options.ServerHaveAgentOptions{})
+	cmd.Perform("change-disk-storage", &options.ServerChangeDiskStorageOptions{})
+	cmd.Perform("probe-isolated-devices", &options.ServerIdOptions{})
 
 	cmd.Get("vnc", new(options.ServerIdOptions))
 	cmd.Get("desc", new(options.ServerIdOptions))
@@ -98,7 +103,11 @@ func init() {
 	cmd.Get("make-sshable-cmd", new(options.ServerIdOptions))
 	cmd.Get("change-owner-candidate-domains", new(options.ServerChangeOwnerCandidateDomainsOptions))
 	cmd.Get("change-owner-candidate-domains", new(options.ServerChangeOwnerCandidateDomainsOptions))
+	cmd.Get("sshport", new(options.ServerIdOptions))
+
 	cmd.GetProperty(&options.ServerStatusStatisticsOptions{})
+	cmd.GetProperty(&options.ServerProjectStatisticsOptions{})
+	cmd.GetProperty(&options.ServerDomainStatisticsOptions{})
 
 	type ServerTaskShowOptions struct {
 		ID       string `help:"ID or name of server" json:"-"`
@@ -724,6 +733,20 @@ func init() {
 		printObject(result)
 		return nil
 	})
+	type ServerCreateBackup struct {
+		ID              string `help:"ID or name of VM" json:"-"`
+		BACKUP          string `help:"Instance backup name" json:"name"`
+		BACKUPSTORAGEID string `help:"backup storage id" json:"backup_storage_id"`
+	}
+	R(&ServerCreateBackup{}, "instance-backup-create", "create instance backup", func(s *mcclient.ClientSession, opts *ServerCreateBackup) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Servers.PerformAction(s, opts.ID, "instance-backup", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 
 	type ServerSnapshotAndClone struct {
 		ID          string `help:"ID or name of VM" json:"-"`
@@ -817,13 +840,15 @@ func init() {
 			return fmt.Errorf("Not found ip address from server %s", opts.ID)
 		}
 
+		privateKey := ""
 		params := jsonutils.NewDict()
 		if len(opts.Key) > 0 {
-			privateKey, e := ioutil.ReadFile(opts.Key)
+			key, e := ioutil.ReadFile(opts.Key)
 			if e != nil {
 				return e
 			}
-			params.Add(jsonutils.NewString(string(privateKey)), "private_key")
+			params.Add(jsonutils.NewString(string(key)), "private_key")
+			privateKey = string(key)
 		}
 
 		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
@@ -831,14 +856,14 @@ func init() {
 			return e
 		}
 		passwd, err := i.GetString("password")
-		if err != nil {
+		if err != nil && !opts.UseCloudroot {
 			return err
 		}
 		if opts.Password != "" {
 			passwd = opts.Password
 		}
 		user, err := i.GetString("username")
-		if err != nil {
+		if err != nil && !opts.UseCloudroot {
 			return err
 		}
 		if opts.User != "" {
@@ -868,8 +893,22 @@ func init() {
 			}
 		}
 
+		if opts.UseCloudroot {
+			var err error
+			privateKey, err = modules.Sshkeypairs.FetchPrivateKeyBySession(context.Background(), s)
+			if err != nil {
+				return err
+			}
+			passwd = ""
+			user = "cloudroot"
+		}
+
 		var sshCli *ssh.Client
-		for sshCli, err = ssh.NewClient(host, port, user, passwd, ""); err != nil; {
+		err = nil
+		for ; sshCli == nil; sshCli, err = ssh.NewClient(host, port, user, passwd, privateKey) {
+			if err == nil {
+				continue
+			}
 			if opts.Host != "" {
 				return err
 			}
@@ -877,12 +916,14 @@ func init() {
 				closeForward(s, srvid, forwardItem)
 				return err
 			} else {
-				forwardItem, err = openForward(s, srvid)
-				if err != nil {
-					return err
+				if vpcid != "default" {
+					forwardItem, e = openForward(s, srvid)
+					if e != nil {
+						return e
+					}
+					host = forwardItem.ProxyAddr
+					port = forwardItem.ProxyPort
 				}
-				host = forwardItem.ProxyAddr
-				port = forwardItem.ProxyPort
 			}
 		}
 

cmd/climc/shell/compute/vpcs.go

@@ -36,6 +36,7 @@ func init() {
 	cmd.Perform("public", &options.BasePublicOptions{})
 	cmd.Perform("change-owner", &options.VpcChangeOwnerOptions{})
 	cmd.Get("vpc-change-owner-candidate-domains", &options.VpcIdOptions{})
+	cmd.Get("topology", &options.VpcIdOptions{})
 
 	R(&options.ResourceMetadataOptions{}, "vpc-set-user-metadata", "Set metadata of a vpc", func(s *mcclient.ClientSession, opts *options.ResourceMetadataOptions) error {
 		params, err := opts.Params()

cmd/climc/shell/compute/wires.go

@@ -32,4 +32,5 @@ func init() {
 	cmd.Perform("change-owner-candidate-domains", new(options.WireOptions))
 	cmd.PerformWithKeyword("merge", "merge-from", new(options.WireMergeOptions))
 	cmd.Perform("merge-network", new(options.WireOptions))
+	cmd.Get("topology", &options.WireOptions{})
 }

cmd/climc/shell/devtool/serviceurl.go

@@ -0,0 +1,29 @@
+// 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 devtool
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/devtool"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DevToolServiceUrls).WithKeyword("devtool-serviceurl")
+	cmd.List(new(options.ServiceUrlListOptions))
+	cmd.Create(new(options.ServiceUrlCreateOptions))
+	cmd.Show(new(options.ServiceUrlOptions))
+	cmd.Delete(new(options.ServiceUrlOptions))
+}

cmd/climc/shell/devtool/sshinfo.go

@@ -0,0 +1,29 @@
+// 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 devtool
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/devtool"
+)
+
+func init() {
+	cmd := shell.NewResourceCmd(&modules.DevToolSshInfos).WithKeyword("devtool-sshinfo")
+	cmd.List(new(options.SshInfoListOptions))
+	cmd.Create(new(options.SshInfoCreateOptions))
+	cmd.Show(new(options.SshInfoOptions))
+	cmd.Delete(new(options.SshInfoOptions))
+}

cmd/climc/shell/events/events.go

@@ -40,17 +40,21 @@ type BaseEventListOptions struct {
 	OwnerDomainIds  []string `help:"filter by owner domain ids"`
 
 	PagingMarker string `help:"marker for pagination"`
+	PagingOrder  string `help:"pagination order" choices:"DESC|ASC"`
+
+	Filter []string `help:"Filters"`
 }
 
 type EventListOptions struct {
 	BaseEventListOptions
-	Id   string   `help:"" metavar:"OBJ_ID"`
+	Id   []string `help:"object IDs" metavar:"OBJ_ID"`
+	Name []string `help:"object names" metavar:"OBJ_NAME"`
 	Type []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
 }
 
 type TypeEventListOptions struct {
 	BaseEventListOptions
-	ID string `help:"" metavar:"OBJ_ID"`
+	ID []string `help:"object IDs" metavar:"OBJ_ID"`
 }
 
 func doComputeEventList(s *mcclient.ClientSession, args *EventListOptions) error {
@@ -71,7 +75,10 @@ func DoEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args
 		params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
 	}
 	if len(args.Id) > 0 {
-		params.Add(jsonutils.NewString(args.Id), "obj_id")
+		params.Add(jsonutils.NewStringArray(args.Id), "obj_id")
+	}
+	if len(args.Name) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Name), "obj_name")
 	}
 	if len(args.Since) > 0 {
 		params.Add(jsonutils.NewString(args.Since), "since")
@@ -114,6 +121,12 @@ func DoEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args
 	if len(args.PagingMarker) > 0 {
 		params.Add(jsonutils.NewString(args.PagingMarker), "paging_marker")
 	}
+	if len(args.PagingOrder) > 0 {
+		params.Add(jsonutils.NewString(args.PagingOrder), "paging_order")
+	}
+	if len(args.Filter) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Filter), "filter")
+	}
 	logs, err := man.List(s, params)
 	if err != nil {
 		return err

cmd/climc/shell/helper.go

@@ -160,7 +160,7 @@ func (cmd ResourceCmd) List(args IListOpt) {
 			ExportList(result, exportFile, args.GetExportKeys(), args.GetExportTexts(), man.GetColumns(s))
 			return nil
 		}
-		printList(result, man.GetColumns(s))
+		PrintList(result, man.GetColumns(s))
 		return nil
 	}
 	cmd.Run("list", args, callback)
@@ -184,7 +184,7 @@ func (cmd ResourceCmd) create(s *mcclient.ClientSession, args ICreateOpt) error
 	if err != nil {
 		return err
 	}
-	printObject(ret)
+	PrintObject(ret)
 	return nil
 }
 
@@ -240,7 +240,7 @@ func (cmd ResourceCmd) GetProperty(args IPropertyOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc(args.Property(), fmt.Sprintf("Get property of a %s", man.GetKeyword()), args, callback)
@@ -257,7 +257,7 @@ func (cmd ResourceCmd) Show(args IShowOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc("show", fmt.Sprintf("Show details of a %s", man.GetKeyword()), args, callback)
@@ -274,7 +274,7 @@ func (cmd ResourceCmd) ClassShow(args IShowOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc(args.GetId(), fmt.Sprintf("Show %s of a %s", args.GetId(), man.GetKeyword()), args, callback)
@@ -320,7 +320,7 @@ func (cmd ResourceCmd) Custom(action TCustomAction, funcname string, args IGetAc
 		if reterr.IsNil() {
 			v, ok := retobj.Interface().(jsonutils.JSONObject)
 			if ok {
-				printObject(v)
+				PrintObject(v)
 				return nil
 			}
 		}
@@ -349,7 +349,7 @@ func (cmd ResourceCmd) Delete(args IDeleteOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc("delete", fmt.Sprintf("Delete %s", man.GetKeyword()), args, callback)
@@ -461,7 +461,7 @@ func (cmd ResourceCmd) GetWithCustomShow(specific string, show func(data jsonuti
 }
 
 func (cmd ResourceCmd) Get(specific string, args IGetOpt) {
-	cmd.GetWithCustomShow(specific, printObject, args)
+	cmd.GetWithCustomShow(specific, PrintObject, args)
 }
 
 type IUpdateOpt interface {
@@ -485,7 +485,7 @@ func (cmd ResourceCmd) UpdateWithKeyword(keyword string, args IUpdateOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.Run(keyword, args, callback)
@@ -511,7 +511,7 @@ func (cmd ResourceCmd) GetMetadata(args IMetadataOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(ret)
+		PrintObject(ret)
 		return nil
 	}
 	cmd.RunWithDesc("metadata", fmt.Sprintf("Show metadata of a %s", man.GetKeyword()), args, callback)
@@ -612,7 +612,7 @@ func (cmd JointCmd) List(args IJointListOpt) {
 		if err != nil {
 			return err
 		}
-		printList(result, man.GetColumns(s))
+		PrintList(result, man.GetColumns(s))
 		return nil
 	}
 	cmd.RunWithDesc("list", fmt.Sprintf("list %s %s pairs", man.MasterManager().KeyString(), man.SlaveManager().KeyString()), args, callback)
@@ -635,7 +635,7 @@ func (cmd JointCmd) Show(args IJointShowOpt) {
 		if err != nil {
 			return err
 		}
-		printObject(result)
+		PrintObject(result)
 		return nil
 	}
 	cmd.Run("show", args, callback)

cmd/climc/shell/identity/credentials.go

@@ -181,7 +181,9 @@ func init() {
 		if err != nil {
 			return err
 		}
-		printObject(jsonutils.Marshal(&secret))
+		result := jsonutils.Marshal(secret)
+		result.(*jsonutils.JSONDict).Add(jsonutils.NewString(secret.KeyId), "access_key")
+		printObject(result)
 		return nil
 	})
 

cmd/climc/shell/identity/groups.go

@@ -193,39 +193,6 @@ func init() {
 		return nil
 	})
 
-	type GroupBindGuestsOptions struct {
-		ID    string   `help:"ID"`
-		Guest []string `help:"ID or Name of Guest"`
-	}
-
-	R(&GroupBindGuestsOptions{}, "instance-group-bind-guests", "bind instancegroup to guests",
-		func(s *mcclient.ClientSession, opts *GroupBindGuestsOptions) error {
-			params, err := options.StructToParams(opts)
-			if err != nil {
-				return err
-			}
-			sp, err := modules.InstanceGroup.PerformAction(s, opts.ID, "bind-guests", params)
-			if err != nil {
-				return err
-			}
-			printObject(sp)
-			return nil
-		})
-
-	R(&GroupBindGuestsOptions{}, "instance-group-unbind-guests", "bind instancegroup to guests",
-		func(s *mcclient.ClientSession, opts *GroupBindGuestsOptions) error {
-			params, err := options.StructToParams(opts)
-			if err != nil {
-				return err
-			}
-			sp, err := modules.InstanceGroup.PerformAction(s, opts.ID, "unbind-guests", params)
-			if err != nil {
-				return err
-			}
-			printObject(sp)
-			return nil
-		})
-
 	type GroupAddUsersOptions struct {
 		GROUP string   `help:"group Id or Name" json:"-"`
 		USER  []string `help:"list of user id or name" json:"user"`

cmd/climc/shell/identity/policies.go

@@ -37,9 +37,17 @@ import (
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
-func createPolicy(s *mcclient.ClientSession, name string, policy string, domain string, enabled bool, disabled bool, desc string, scope string, isSystem *bool) error {
+func createPolicy(s *mcclient.ClientSession, name string, genName string, policy string, domain string, enabled bool, disabled bool, desc string, scope string, isSystem *bool) error {
 	params := jsonutils.NewDict()
-	params.Add(jsonutils.NewString(name), "type")
+	if len(genName) > 0 {
+		params.Add(jsonutils.NewString(genName), "generate_name")
+		params.Add(jsonutils.NewString(genName), "type")
+	} else if len(name) > 0 {
+		params.Add(jsonutils.NewString(name), "name")
+		params.Add(jsonutils.NewString(name), "type")
+	} else {
+		return fmt.Errorf("mising name")
+	}
 	params.Add(jsonutils.NewString(policy), "policy")
 	if len(domain) > 0 {
 		params.Add(jsonutils.NewString(domain), "project_domain_id")
@@ -71,7 +79,18 @@ func createPolicy(s *mcclient.ClientSession, name string, policy string, domain
 	printObject(result)
 
 	return nil
+}
 
+func createPolicyFromJson(s *mcclient.ClientSession, old jsonutils.JSONObject, argsName, genName, argsDomain, argsScope string) error {
+	policy, _ := old.GetString("policy")
+	enabled, _ := old.Bool("enabled")
+	desc, _ := old.GetString("description")
+	scope, _ := old.GetString("scope")
+	if len(argsScope) > 0 {
+		scope = argsScope
+	}
+	isSystem, _ := old.Bool("is_system")
+	return createPolicy(s, argsName, genName, policy, argsDomain, enabled, !enabled, desc, scope, &isSystem)
 }
 
 func init() {
@@ -94,10 +113,40 @@ func init() {
 			return err
 		}
 
-		return createPolicy(s, args.NAME, string(policyBytes), args.Domain, args.Enabled, args.Disabled, args.Desc, args.Scope, args.IsSystem)
+		return createPolicy(s, args.NAME, "", string(policyBytes), args.Domain, args.Enabled, args.Disabled, args.Desc, args.Scope, args.IsSystem)
+	})
+
+	type PolicyExportOptions struct {
+		ID string `json:"id"`
+	}
+	R(&PolicyExportOptions{}, "policy-export", "Export a policy", func(s *mcclient.ClientSession, args *PolicyExportOptions) error {
+		ret, err := modules.Policies.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		fmt.Println(ret.PrettyString())
+		return nil
+	})
+
+	type PolicyImportOptions struct {
+		FILE   string `json:"id"`
+		Domain string `help:"domain of the policy"`
+	}
+	R(&PolicyImportOptions{}, "policy-import", "Import a policy", func(s *mcclient.ClientSession, args *PolicyImportOptions) error {
+		cont, err := ioutil.ReadFile(args.FILE)
+		if err != nil {
+			return err
+		}
+		jsonCont, err := jsonutils.Parse(cont)
+		if err != nil {
+			return err
+		}
+		name, _ := jsonCont.GetString("name")
+		return createPolicyFromJson(s, jsonCont, "", name, args.Domain, "")
 	})
 
 	type PolicyCloneOptions struct {
+		Scope  string `help:"scope of policy"`
 		Domain string `help:"domain of the policy"`
 		OLD    string `help:"name or id of the old policy"`
 		NAME   string `help:"name of the policy"`
@@ -107,12 +156,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		policy, _ := old.GetString("policy")
-		enabled, _ := old.Bool("enabled")
-		desc, _ := old.GetString("description")
-		scope, _ := old.GetString("scope")
-		isSystem, _ := old.Bool("is_system")
-		return createPolicy(s, args.NAME, policy, args.Domain, enabled, !enabled, desc, scope, &isSystem)
+		return createPolicyFromJson(s, old, args.NAME, "", args.Domain, args.Scope)
 	})
 
 	type PolicyPatchOptions struct {

cmd/climc/shell/image/images.go

@@ -22,10 +22,12 @@ import (
 
 	"yunion.io/x/jsonutils"
 
+	"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"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/mcclient/options/glance"
 )
 
 type ImageOptionalOptions struct {
@@ -55,6 +57,7 @@ type ImageOptionalOptions struct {
 	DiskDriver         string   `help:"Perfer disk driver" choices:"virtio|scsi|pvscsi|ide|sata"`
 	NetDriver          string   `help:"Preferred network driver" choices:"virtio|e1000|vmxnet3"`
 	DisableUsbKbd      bool     `help:"Disable usb keyboard on this image(for hypervisor kvm)"`
+	BootMode           string   `help:"UEFI support" choices:"UEFI|BIOS"`
 }
 
 func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDict, args ImageOptionalOptions) error {
@@ -135,73 +138,19 @@ func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDi
 	if args.DisableUsbKbd {
 		params.Add(jsonutils.NewString("true"), "properties", "disable_usb_kbd")
 	}
+	if args.BootMode == "UEFI" {
+		params.Add(jsonutils.JSONTrue, "properties", "uefi_support")
+	} else if args.BootMode == "BIOS" {
+		params.Add(jsonutils.JSONFalse, "properties", "uefi_support")
+	}
 	return nil
 }
 
 func init() {
-	type ImageListOptions struct {
-		options.BaseListOptions
 
-		IsPublic     string   `help:"filter images public or not(True, False or None)" choices:"true|false"`
-		IsStandard   string   `help:"filter images standard or non-standard" choices:"true|false"`
-		Protected    string   `help:"filter images by protected" choices:"true|false"`
-		IsUefi       bool     `help:"list uefi image"`
-		Format       []string `help:"Disk formats"`
-		SubFormats   []string `help:"Sub formats"`
-		Name         string   `help:"Name filter"`
-		OsType       []string `help:"Type of OS filter e.g. 'Windows, Linux, Freebsd, Android, macOS, VMWare'"`
-		Distribution []string `help:"Distribution filter, e.g. 'CentOS, Ubuntu, Debian, Windows'"`
-	}
-	R(&ImageListOptions{}, "image-list", "List images", func(s *mcclient.ClientSession, args *ImageListOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		if len(args.IsPublic) > 0 {
-			params.Add(jsonutils.NewString(args.IsPublic), "is_public")
-		}
-		if len(args.IsStandard) > 0 {
-			params.Add(jsonutils.NewString(args.IsStandard), "is_standard")
-		}
-		if len(args.Protected) > 0 {
-			params.Add(jsonutils.NewString(args.Protected), "protected")
-		}
-		if args.IsUefi {
-			params.Add(jsonutils.JSONTrue, "uefi")
-		}
-		if len(args.Tenant) > 0 {
-			tid, e := modules.Projects.GetId(s, args.Tenant, nil)
-			if e != nil {
-				return e
-			}
-			params.Add(jsonutils.NewString(tid), "owner")
-		}
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Format) > 0 {
-			fs := jsonutils.NewArray()
-			for _, f := range args.Format {
-				fs.Add(jsonutils.NewString(f))
-			}
-			params.Add(fs, "disk_formats")
-		}
-		if len(args.SubFormats) > 0 {
-			params.Add(jsonutils.Marshal(args.SubFormats), "sub_formats")
-		}
-		if len(args.OsType) > 0 {
-			params.Add(jsonutils.NewStringArray(args.OsType), "os_types")
-		}
-		if len(args.Distribution) > 0 {
-			params.Add(jsonutils.NewStringArray(args.Distribution), "distributions")
-		}
-		result, err := modules.Images.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Images.GetColumns(s))
-		return nil
-	})
+	cmd := shell.NewResourceCmd(&modules.Images)
+	cmd.List(&glance.ImageListOptions{})
+	cmd.GetProperty(&glance.ImageStatusStatisticsOptions{})
 
 	type ImageOperationOptions struct {
 		ID []string `help:"Image id or name" metavar:"IMAGE"`
@@ -477,4 +426,16 @@ func init() {
 		printObject(srv)
 		return nil
 	})
+
+	type ImageProbeOptions struct {
+		ID string `help:"ID or name of image to probe"`
+	}
+	R(&ImageProbeOptions{}, "image-probe", "Start image probe task", func(s *mcclient.ClientSession, opts *ImageProbeOptions) error {
+		img, err := modules.Images.PerformAction(s, opts.ID, "probe", nil)
+		if err != nil {
+			return err
+		}
+		printObject(img)
+		return nil
+	})
 }

cmd/climc/shell/logger/actions.go

@@ -120,6 +120,31 @@ func doActionList(s *mcclient.ClientSession, args *ActionListOptions) error {
 func init() {
 	R(&ActionListOptions{}, "action-show", "Show operation action logs", doActionList)
 
+	type ActionSplitTableOptions struct {
+	}
+
+	R(&ActionSplitTableOptions{}, "action-splitable", "Show splitables", func(s *mcclient.ClientSession, args *ActionSplitTableOptions) error {
+		resp, err := modules.Actions.Get(s, "splitable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(resp)
+		return nil
+	})
+
+	type ActionPurgeOptions struct {
+		Tables []string
+	}
+
+	R(&ActionPurgeOptions{}, "action-purge-splitable", "Purge action splitables", func(s *mcclient.ClientSession, args *ActionPurgeOptions) error {
+		resp, err := modules.Actions.PerformClassAction(s, "purge-splitable", jsonutils.Marshal(args))
+		if err != nil {
+			return err
+		}
+		printObject(resp)
+		return nil
+	})
+
 	R(&TypeActionListOptions{}, "server-action", "Show operation action logs of server", func(s *mcclient.ClientSession, args *TypeActionListOptions) error {
 		nargs := ActionListOptions{BaseActionListOptions: args.BaseActionListOptions, Id: args.ID, Type: []string{"server"}}
 		return doActionList(s, &nargs)

cmd/climc/shell/misc/appoptions.go

@@ -0,0 +1,34 @@
+// 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"
+)
+
+func init() {
+	type AppOptionsOptions struct {
+		SERVICE string `help:"Service type"`
+	}
+	R(&AppOptionsOptions{}, "app-options-show", "query backend service for its options", func(s *mcclient.ClientSession, args *AppOptionsOptions) error {
+		opts, err := modules.GetAppOptions(s, args.SERVICE)
+		if err != nil {
+			return err
+		}
+		printObject(opts)
+		return nil
+	})
+}

cmd/climc/shell/utils.go

@@ -41,18 +41,26 @@ func OutputFormat(s string) {
 	outputFormat = s
 }
 
-func printList(list *modulebase.ListResult, columns []string) {
-	printutils.PrintJSONList(list, columns)
+func PrintList(list *modulebase.ListResult, columns []string) {
+	switch outputFormat {
+	case OUTPUT_FORMAT_TABLE:
+		printutils.PrintJSONList(list, columns)
+	case OUTPUT_FORMAT_JSON:
+		fmt.Print(jsonutils.Marshal(list).PrettyString())
+		fmt.Print("\n")
+	default:
+		fmt.Fprintf(os.Stderr, "unknown output format: %q\n", outputFormat)
+	}
 }
 
-func printObject(obj jsonutils.JSONObject) {
+func PrintObject(obj jsonutils.JSONObject) {
 	switch outputFormat {
 	case OUTPUT_FORMAT_TABLE:
 		printutils.PrintJSONObject(obj)
 	case OUTPUT_FORMAT_KV:
 		printObjectFmtKv(obj)
 	case OUTPUT_FORMAT_JSON:
-		fmt.Print(obj.String())
+		fmt.Print(obj.PrettyString())
 		fmt.Print("\n")
 	case OUTPUT_FORMAT_FLATTEN_TABLE:
 		printObjectRecursive(obj)
@@ -88,7 +96,7 @@ func printObjectFmtKv(obj jsonutils.JSONObject) {
 }
 
 func printObjectRecursive(obj jsonutils.JSONObject) {
-	printutils.PrintJSONObjectRecursive(obj)
+	PrintObject(obj)
 }
 
 func printObjectRecursiveEx(obj jsonutils.JSONObject, cb printutils.PrintJSONObjectRecursiveExFunc) {

cmd/cloudpodscli/main.go

@@ -16,10 +16,15 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/structarg"
 
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud/cloudpods"
 	_ "yunion.io/x/onecloud/pkg/multicloud/cloudpods/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
@@ -88,12 +93,27 @@ func newClient(options *BaseOptions) (*cloudpods.SRegion, error) {
 		return nil, fmt.Errorf("Missing access secret")
 	}
 
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
 	cli, err := cloudpods.NewCloudpodsClient(
 		cloudpods.NewCloudpodsClientConfig(
 			options.AuthURL,
 			options.AccessKey,
 			options.AccessSecret,
-		).Debug(options.Debug),
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
 	)
 	if err != nil {
 		return nil, err

cmd/cryptool/shell/fernet.go

@@ -16,7 +16,6 @@ package shell
 
 import (
 	"fmt"
-	"time"
 
 	"yunion.io/x/pkg/util/timeutils"
 
@@ -110,7 +109,7 @@ func init() {
 		}
 		fmt.Println("primary key hash:", fm.PrimaryKeyHash())
 
-		ret := fm.Decrypt([]byte(args.MSG), time.Hour*-1)
+		ret := fm.Decrypt([]byte(args.MSG))
 		if len(ret) == 0 {
 			return fmt.Errorf("invalid message")
 		}

cmd/ctyuncli/main.go

@@ -16,16 +16,23 @@ package main
 
 import (
 	"fmt"
+	"net/http"
+	"net/url"
 	"os"
 
+	"golang.org/x/net/http/httpproxy"
+
 	"yunion.io/x/structarg"
 
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud/ctyun"
 	_ "yunion.io/x/onecloud/pkg/multicloud/ctyun/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 type BaseOptions struct {
+	cloudprovider.SCtyunExtraOptions
+
 	Help       bool   `help:"Show help" default:"false"`
 	Debug      bool   `help:"Show debug" default:"false"`
 	AccessKey  string `help:"Access key" default:"$CTYUN_ACCESS_KEY"`
@@ -84,10 +91,25 @@ func newClient(options *BaseOptions) (*ctyun.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
 	cli, err := ctyun.NewSCtyunClient(
 		ctyun.NewSCtyunClientConfig(
-			options.AccessKey, options.Secret,
-		).Debug(options.Debug),
+			options.AccessKey, options.Secret, &options.SCtyunExtraOptions,
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
 	)
 	if err != nil {
 		return nil, err