Merge pull request #7548 from wanyaoqi/automated-cherry-pick-of-#7547-upstream-release-3.3

Automated cherry pick of #7547: support diable usb kbd

.circleci/Dockerfile

@@ -1,39 +0,0 @@
-FROM centos:7
-MAINTAINER Yousong Zhou <zhouyousong@yunion.cn>
-
-RUN true \
-	&& yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
-	&& yum install -y git wget \
-	&& yum groupinstall -y "Development Tools" \
-	&& : ceph for cmd/host \
-	&& rpm --import 'https://download.ceph.com/keys/release.asc' \
-	&& yum install -y https://download.ceph.com/rpm-luminous/el7/noarch/ceph-release-1-1.el7.noarch.rpm \
-	&& yum install -y libcephfs-devel librbd-devel librados-devel \
-	&& yum clean all
-
-WORKDIR /opt
-RUN true \
-	&& wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz \
-	&& tar xzf go1.13.3.linux-amd64.tar.gz \
-	&& rm -vf  go1.13.3.linux-amd64.tar.gz \
-	&& true
-ENV GOROOT="/opt/go"
-ENV PATH="/opt/go/bin:${PATH}"
-
-RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /bin/bash build
-USER build
-ENV HOME /home/build
-WORKDIR /home/build
-USER build
-
-ENV GOPATH="/home/build/go"
-ENV PATH="${GOPATH}/bin:${PATH}"
-
-RUN true \
-	&& mkdir -p "$GOPATH" \
-	&& d="$GOPATH/src/golang.org/x/tools" \
-	&& mkdir -p "$d" \
-	&& git clone --branch yun --depth 8 https://github.com/yousong/tools "$d" \
-	&& cd "$d" \
-	&& go install ./cmd/goimports \
-	&& true

.circleci/config.yml

@@ -5,20 +5,20 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/onecloud-ci:v1.0.3
+      - image: yunionio/centos-build:1.0-1
         environment:
           ONECLOUD_CI_BUILD: "1"
-    working_directory: /home/build/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
     steps:
       - checkout
       - run:
           command: |
-            make check
+            make -j3 check
   build:
     requires:
       - check
     docker:
-      - image: yunionio/onecloud-ci:v1.0.2
+      - image: yunionio/centos-build:1.0-1
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -26,24 +26,24 @@ jobs:
     #### expecting it in the form of
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
-    working_directory: /home/build/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
     parallelism: 4
     steps:
       - checkout
       - restore_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
           paths:
-            - /home/build/.cache/go-build
+            - /root/.cache/go-build
       - run:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make $targets
+            make -j3 $targets
             ls -lh _output/bin/
       - save_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
           paths:
-            - /home/build/.cache/go-build
+            - /root/.cache/go-build
       - store_artifacts:
           path: _output/
 
@@ -51,16 +51,17 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/onecloud-ci:v1.0.2
+      - image: yunionio/centos-build:1.0-1
         environment:
           GO111MODULE: "on"
-    working_directory: /home/build/go/src/yunion.io/x/onecloud
+    working_directory: /root/go/onecloud
+    parallelism: 4
     steps:
       - checkout
       - restore_cache:
           key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
           paths:
-            - /home/build/.cache/go-build
+            - /root/.cache/go-build
       - run:
           name: unit_test
           command: |
@@ -68,7 +69,7 @@ jobs:
       - save_cache:
           key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
           paths:
-            - /home/build/.cache/go-build
+            - /root/.cache/go-build
 
 workflows:
   version: 2

.dockerignore

@@ -0,0 +1,4 @@
+/.git
+/vendor
+/cmd
+/pkg

.drone.yml

@@ -2,49 +2,131 @@
 kind: pipeline
 name: build
 
+clone:
+  depth: 1
+
 workspace:
-  base: /go
+  base: /home/build/go
   path: src/yunion.io/x/onecloud
 
 steps:
 - name: build
-  image: d3lx/golang:yunion
+  image: yunion/onecloud-ci:latest
   commands:
-  - make
-  when:
-    event:
-    - pull_request
-    - tag
+  - CGO_ENABLED=0 make -j 4 cmd/apigateway cmd/baremetal-agent cmd/climc cmd/keystone
+  - CGO_ENABLED=0 make -j 4 cmd/logger cmd/region cmd/scheduler cmd/webconsole
+  - CGO_ENABLED=0 make -j 4 cmd/yunionconf cmd/glance cmd/torrent
 
-trigger:
-  event:
-  - pull_request
-  - tag
-
----
-kind: pipeline
-name: release
-
-steps:
-- name: release-img
+- name: image-baremetal-agent
   image: plugins/docker
   settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/onecloud
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
     registry: registry.cn-beijing.aliyuncs.com
-    tags: "{DRONE_TAG}"
+    dockerfile: build/docker/Dockerfile.baremetal-agent
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-climc
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/climc
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.climc
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-keystone
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/keystone
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.keystone
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-logger
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/logger
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.logger
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-region
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/region
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.region
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-scheduler
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.scheduler
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-yunionconf
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/yunionconf
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.yunionconf
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-apigateway
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.apigateway
+    tags: "${DRONE_TAG}"
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+- name: image-glance
+  image: plugins/docker
+  settings:
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/glance
+    registry: registry.cn-beijing.aliyuncs.com
+    dockerfile: build/docker/Dockerfile.glance
+    tags: "${DRONE_TAG}"
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
-  when:
-    event:
-    - tag
 
 trigger:
   event:
   - tag
   status:
   - success
-
-depends_on:
-- build

.github/pull_request_template.md

@@ -1,9 +1,15 @@
 **这个 PR 实现什么功能/修复什么问题**:
 
+<!--
+- [ ] 功能、bugfix描述
+- [ ] 冒烟测试
+- [ ] 单元测试编写
+-->
+
 **是否需要 backport 到之前的 release 分支**:
+
 <!--
 如果不需要，填写 "NONE".
 如果需要，就以下面 item 的格式写 release 分支名，并提交对应的 cherry-pick PR:
-- release/2.8.0
-- release/2.6.0
+- release/3.1
 -->

.github/workflows/docker.yml

@@ -0,0 +1,242 @@
+name: Docker image
+
+on:
+  push:
+    branches:
+    - master
+    - releases/*
+    #paths:
+    #- 'cmd/*'
+    #- 'pkg/*'
+    #- 'vendor/*'
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go 1.12
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Build
+      run: |
+        sudo apt-get update
+        sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
+        make cmd/apigateway cmd/climc cmd/keystone
+        make cmd/logger cmd/region cmd/scheduler cmd/webconsole
+        make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway
+        make cmd/ansibleserver cmd/cloudnet cmd/notify
+        make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
+        make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
+        make cmd/cloudevent cmd/devtool cmd/cloudid
+        make cmd/*cli
+        make cmd/esxi-agent
+        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
+
+    - name: Image region
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/region
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.region
+
+    - name: Image host
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/host
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.host
+
+    - name: Image host-deployer
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.host-deployer
+
+    - name: Image baremetal-agent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.baremetal-agent
+
+    - name: Image esxi-agent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.esxi-agent
+
+    - name: Image vpcagent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/vpcagent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.vpcagent
+
+    - name: Image climc
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/climc
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.climc
+
+    - name: Image keystone
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.keystone
+
+    - name: Image logger
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/logger
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.logger
+
+    - name: Image scheduler
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.scheduler
+
+    - name: Image apigateway
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.apigateway
+
+    - name: Image s3gateway
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.s3gateway
+
+    - name: Image ansibleserver
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.ansibleserver
+
+    - name: Image cloudnet
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.cloudnet
+
+    - name: Image glance
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/glance
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.glance
+
+    - name: Image notify
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/notify
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.notify
+
+    - name: Image cloudevent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.cloudevent
+
+    - name: Image cloudid
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudid
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.cloudid
+
+    - name: Image devtool
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.devtool
+
+    - name: Image region DNS
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.region-dns

.gitignore

@@ -30,7 +30,10 @@ _output
 /relay
 /structargtest
 .idea
+.vscode
 GPATH
 GRTAGS
 GTAGS
 pkg/generated
+
+*.orig

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# 开发贡献参考
+
+详情见文档 [开发贡献](https://docs.yunion.io/docs/contribute/)

Dockerfile

@@ -1,20 +0,0 @@
-FROM alpine:3.8
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-# Fix binary file not found, see:
-# https://stackoverflow.com/questions/34729748/installed-go-binary-not-found-in-path-on-alpine-linux-docker
-RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/climc /opt/yunion/bin/climc
-ADD ./_output/bin/cloudir /opt/yunion/bin/cloudir
-ADD ./_output/bin/glance /opt/yunion/bin/glance
-ADD ./_output/bin/region /opt/yunion/bin/region
-ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
-ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler
-ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole
-ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf

Makefile

@@ -10,7 +10,7 @@ BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
 	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
-	GIT_VERSION := $(shell git describe --tags --abbrev=14 $(GIT_COMMIT)^{commit})
+	GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
 	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
 	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 else
@@ -32,8 +32,11 @@ LDFLAGS := "-w \
 
 
 #####################################################
-
-GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
+ifneq ($(DLV),)
+	GO_BUILD_FLAGS += -gcflags "all=-N -l"
+	LDFLAGS = ""
+endif
+GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
 GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test
@@ -44,10 +47,11 @@ CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
 ifdef LIBQEMUIO_PATH
-	X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
-	X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
+		X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
+export GOOS ?= linux
 export GO111MODULE:=on
 export CGO_CFLAGS = ${X_CGO_CFLAGS}
 export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
@@ -72,7 +76,7 @@ install: prepare_dir
 
 
 gencopyright:
-	@sh scripts/gencopyright.sh pkg cmd
+	@bash scripts/gencopyright.sh pkg cmd
 
 test:
 	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
@@ -80,6 +84,9 @@ test:
 vet:
 	go vet ./...
 
+cmd/esxi-agent: prepare_dir
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
 cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
@@ -156,9 +163,15 @@ goimports-check:
 	fi
 .PHONY: goimports-check
 
+vet-check:
+	./scripts/vet.sh gen
+	./scripts/vet.sh chk
+.PHONY: vet-check
+
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
+check: vet-check
 .PHONY: check
 
 
@@ -181,48 +194,82 @@ dep:
 	@$(MAKE) mod
 
 mod:
-	go get $(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'))
 	go mod tidy
 	go mod vendor -v
 
 
-DOCKER_BUILD_IMAGE_VERSION?=latest
+DOCKER_BUILD_IMAGE_VERSION?=1.0-1
 
-define dockerBuildCmd
+define dockerCentOSBuildCmd
+set -o xtrace
 set -o errexit
 set -o pipefail
-cd /home/build/onecloud
+cd /root/onecloud
 export GOFLAGS=-mod=vendor
 make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
 endef
 
-docker-build: export dockerBuildCmd:=$(call dockerBuildCmd,$(F))
-docker-build:
-	echo "$$dockerBuildCmd"
+docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
+docker-centos-build:
 	docker rm --force onecloud-ci-build &>/dev/null || true
 	docker run \
 		--name onecloud-ci-build \
 		--rm \
-		--volume $(CURDIR):/home/build/onecloud \
-		yunionio/onecloud-ci:$(DOCKER_BUILD_IMAGE_VERSION) \
-		/bin/bash -c "$$dockerBuildCmd"
+		--volume $(CURDIR):/root/onecloud \
+		--volume $(CURDIR)/_output/_cache:/root/.cache \
+		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:$(DOCKER_BUILD_IMAGE_VERSION) \
+		/bin/bash -c "$$dockerCentOSBuildCmd"
 	chown -R $$(id -u):$$(id -g) _output
 	ls -lh _output/bin
 
 # NOTE we need a way to stop and remove the container started by docker-build.
 # No --tty, --stop-signal won't work
-docker-build-stop:
-	docker stop --time 0 onecloud-ci-build || true
+docker-centos-build-stop:
+	docker-centos stop --time 0 onecloud-ci-build || true
 
-.PHONY: docker-build
-.PHONY: docker-build-stop
+.PHONY: docker-centos-build
+.PHONY: docker-centos-build-stop
+
+define dockerAlpineBuildCmd
+set -o xtrace
+set -o errexit
+set -o pipefail
+cd /root/go/src/yunion.io/x/onecloud
+export GOFLAGS=-mod=vendor
+make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
+endef
+
+docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
+docker-alpine-build:
+	docker rm --force onecloud-docker-alpine-build &>/dev/null || true
+	docker run --rm \
+		--name onecloud-docker-alpine-build \
+		-v $(CURDIR):/root/go/src/yunion.io/x/onecloud \
+		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
+		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
+		registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \
+		/bin/sh -c "$$dockerAlpineBuildCmd"
+	ls -lh _output/alpine-build/bin
+
+docker-alpine-build-stop:
+	docker stop --time 0 onecloud-docker-alpine-build || true
+
+.PHONY: docker-alpine-build
+.PHONY: docker-alpine-build-stop
 
 define helpText
 Build with docker
 
-	make docker-build F='-j4'
-	make docker-build F='-j4 cmd/region cmd/climc'
-	make docker-build-stop
+	make docker-centos-build F='-j4'
+	make docker-centos-build F='-j4 cmd/region cmd/climc'
+	make docker-centos-build-stop
+
+	make docker-alpine-build F='-j4'
+	make docker-alpine-build F='-j4 cmd/host cmd/host-deployer'
+	make docker-alpine-build-stop
 
 Tidy up go modules and vendor directory
 
@@ -233,11 +280,13 @@ help: export helpText:=$(helpText)
 help:
 	@echo "$$helpText"
 
+.PHONY: help
+
 gen-model-api-check:
 	which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen)
 
 gen-model-api: gen-model-api-check
-	./scripts/codegen.py model-api
+	$(ROOT_DIR)/scripts/codegen.py model-api
 
 gen-swagger-check:
 	which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
@@ -245,8 +294,27 @@ gen-swagger-check:
 	which swagger-serve || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-serve)
 
 gen-swagger: gen-swagger-check
-	./scripts/codegen.py swagger-code
-	./scripts/codegen.py swagger-yaml
+	$(ROOT_DIR)/scripts/codegen.py swagger-code
+	$(ROOT_DIR)/scripts/codegen.py swagger-yaml
 
-swagger-serve: gen-swagger
-	./scripts/codegen.py swagger-serve
+swagger-serve-only:
+	$(ROOT_DIR)/scripts/codegen.py swagger-serve
+
+swagger-serve: gen-model-api gen-swagger swagger-serve-only
+
+swagger-site: gen-model-api gen-swagger
+	$(ROOT_DIR)/scripts/codegen.py swagger-site
+
+.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve swagger-site
+
+REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
+VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
+                git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
+
+image:
+	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: image
+
+%:
+	@:

OWNERS

@@ -1,11 +1,13 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 reviewers:
-  - swordqiu
-  - yousong
-  - wanyaoqi
   - Zexi
   - ioito
+  - swordqiu
   - tb365
+  - wanyaoqi
+  - yousong
+  - zhaoxiangchun
+  - zhasm
 approvers:
   - swordqiu
   - yousong

README-CN.md

@@ -0,0 +1,54 @@
+# Yunion OneCloud (云联融合云）
+
+[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
+
+## 什么是云联融合云?
+
+云联融合云（Yunion OneCloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
+
+鉴于企业IT基础设施的两个趋势：1. 企业使用多云基础设施，并且公有云是最主要的基础设施提供者；2. 企业应用将逐步云原生化，企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施，另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
+
+云联融合云具备以下功能特性:
+
+- 多云资源统一管理
+
+  统一API、镜像、调度、账号体系、监控和计费等操作，能够全面管理 On premises、 私有云、公有云资源。
+
+- 内置私有云
+
+  OneCloud内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
+
+- 为多云Kubernetes提供运行环境
+
+  OneCloud自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
+
+欢迎安装部署云联融合云，期待大家的反馈！
+
+
+## 部署
+
+请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 OneCloud 集群。
+
+
+## 文档
+
+- [文档中心](https://docs.yunion.io/)
+
+- [Swagger API文档](https://docs.yunion.cn/api/)
+
+
+## 架构
+
+![architecture](./docs/architecture.png)
+
+
+## 贡献
+
+我们非常欢迎和感谢开发者向项目做贡献，流程细节请查看 [CONTRIBUTING.md](./CONTRIBUTING.md) 。
+
+
+## License
+
+OneCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。

README.md

@@ -1,10 +1,55 @@
 # Yunion OneCloud
 
 [![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.com/yunionio/onecloud/branches) 
 [![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
 
-# 文档
+### [README in Chinese](./README-CN.md)
 
-- 文档中心，https://docs.yunion.cn/
-- API文档，https://docs.yunion.cn/api/
+## What is Yunion OneCloud?
+
+Yunion OneCloud is an open source unified-IaaS cloud platform.
+
+As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion OneCloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
+
+As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion OneCloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
+
+Many may consider Yunion OneCloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
+
+Yunion OneCloud is working on abstracting APIs for the following resources:
+
+* Compute, including virtual machines, images, etc.
+* Storage, including disks, snapshots, object storages, etc.
+* Networking, including load balancers, VPC, virtual networks, NAT gateways, security groups, etc.
+* Accouting and billing, etc.
+* ...
+
+over the following many cloud providers:
+
+* On-premise IT resources, including kvm VM, baremetal, VMware vsphere/ESXi, etc.
+* Private clouds, including OpenStack, etc.
+* Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
+
+You are welcome to install and try Yunion OneCloud. Looking forward to your feedback.
+
+## Installation
+
+Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (currently in Chinese Only).
+
+## Documentations
+
+- [Yunion OneCloud Documents](https://docs.yunion.io/)
+
+- [Swagger API](https://docs.yunion.cn/apiv2/)
+
+## Architecture
+
+![architecture](./docs/architecture.png)
+
+## Contribution
+
+You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines.
+
+## License
+
+Apache License 2.0. See [LICENSE](./LICENSE) 。

build/climc/root/opt/yunion/scripts/tools/clean_account.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+
+pushd $(dirname $BASH_SOURCE) > /dev/null
+CUR_DIR=$(pwd -P)
+popd > /dev/null
+
+
+ACCOUNT=$1
+
+if [ -z "$ACCOUNT" ]; then
+    echo "Usage: $0 <cloud-acount-id-or-name>"
+    exit 1
+fi
+
+ACCOUNT_ID=$(climc cloud-account-show $ACCOUNT | grep -w " id " | awk '{print $4}')
+ACCOUNT_NAME=$(climc cloud-account-show $ACCOUNT | grep -w " name " | awk '{print $4}')
+
+if [ -z "$ACCOUNT_ID" ]; then
+    echo "Cloud account $ACCOUNT not found"
+    exit 1
+fi
+
+
+echo "Ready to clean cloud account $ACCOUNT_NAME($ACCOUNT_ID)..."
+
+echo "1. Disable cloud account $ACCOUNT_NAME($ACCOUNT_ID) ..."
+
+climc cloud-account-disable $ACCOUNT_ID
+
+echo "2. Clean all providers ..."
+
+for provider_id in $(climc cloud-provider-list --account $ACCOUNT_ID --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    echo "### to clean cloud provider $provider_id ..."
+    $CUR_DIR/clean_provider.sh $provider_id
+done
+
+echo "3. Delete cloud account ..."
+
+climc cloud-account-delete $ACCOUNT_ID

build/climc/root/opt/yunion/scripts/tools/clean_eip.sh

@@ -0,0 +1,27 @@
+#/bin/bash
+
+set -e
+
+EIP=$1
+
+if [ -z "$EIP" ]; then
+    echo "Usage: $0 <eip_id_or_name>"
+    exit 1
+fi
+
+EIP_NAME=$(climc eip-show $EIP | grep -w " name " | awk '{print $4}')
+EIP_ID=$(climc eip-show $EIP | grep -w " id " | awk '{print $4}')
+
+if [ -z "$EIP_ID" ]; then
+    echo "Cannot find eip $EIP_ID"
+    exit 1
+fi
+
+echo "To clean eip $EIP_NAME($EIP_ID)..."
+
+clean_eip() {
+    local EID=$1
+    climc eip-purge $EID
+}
+
+clean_eip $EIP_ID

build/climc/root/opt/yunion/scripts/tools/clean_host.sh

@@ -0,0 +1,80 @@
+#!/bin/bash
+
+set -e
+
+HOST=$1
+
+if [ -z "$HOST" ]; then
+    echo "Usage: $0 <host_id_or_name>"
+    exit 1
+fi
+
+error_exit() {
+    echo "Error: $1"
+    exit 1
+}
+
+HOSTID=$(climc host-show $HOST | grep -w " id " | awk '{print $4}')
+
+HOSTNAME=$(climc host-show $HOST | grep -w " name " | awk '{print $4}')
+
+if [ -z "$HOSTNAME" ]; then
+    error_exit "Cannot find host $HOST"
+fi
+
+if [ -z "$HOSTID" ]; then
+    error_exit "Cannot find host $HOST"
+fi
+
+echo "Ready to purge host $HOSTNAME($HOSTID)..."
+
+echo "1. Disable $HOSTNAME($HOSTID)"
+
+if ! climc host-disable $HOSTID > /dev/null; then
+    error_exit "Fail to disable $HOST"
+fi
+
+echo "2. Clean servers on $HOSTNAME($HOSTID)"
+
+for i in $(climc server-list --host $HOSTID --admin --limit 2048 --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc server-update --delete enable $i > /dev/null
+    climc server-purge $i > /dev/null
+done
+
+for i in $(climc server-list --host $HOSTID --admin --limit 2048 --pending-delete --system | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc server-purge $i > /dev/null
+done
+
+echo "3. Clean disks on $HOSTNAME($HOSTID)"
+
+for storageid in $(climc host-storage-list --host $HOSTID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
+do
+    STORAGENAME=$(climc storage-show $storageid | grep -w " name " | awk '{print $4}')
+    STORAGE_TYPE=$(climc storage-show $storageid | grep -w " storage_type " | awk '{print $4}')
+    if [ "$STORAGE_TYPE" == "local" ]; then
+        for diskid in $(climc disk-list --admin --system --details --search $storageid --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+        do
+            climc disk-purge $diskid > /dev/null
+        done
+        for diskid in $(climc disk-list --admin --system --details --search $storageid --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+        do
+            climc disk-purge $diskid > /dev/null
+        done
+    fi
+done
+
+echo "4. Remove host $HOSTNAME($HOSTID)"
+
+BAREMETAL=$(climc host-show $HOSTID | grep -w " is_baremetal " | awk '{print $4}')
+
+HOSTTYPE=$(climc host-show $HOSTID | grep -w " host_type " | awk '{print $4}')
+
+if [ "$BAREMETAL" == "true" ] && [ "$HOSTTYPE" != "baremetal" ]; then
+    climc host-update --host-type baremetal $HOSTID > /dev/null
+fi
+
+climc host-delete $HOSTID > /dev/null
+
+echo "DONE."

build/climc/root/opt/yunion/scripts/tools/clean_loadbalancer.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+LB=$1
+
+if [ -z "$LB" ]; then
+    echo "Usage: $0 <loadbalancer_id_or_name>"
+    exit 1
+fi
+
+LB_ID=$(climc lb-show $LB | grep -w " id " | awk '{print $4}')
+LB_NAME=$(climc lb-show $LB | grep -w " name " | awk '{print $4}')
+
+if [ -z "$LB_ID" ]; then
+    echo "Loadbalancer $LB not found"
+    exit 1
+fi
+
+echo "Ready to remove loadbalancer $LB_NAME($LB_ID) ..."
+
+clean_loadbalancer() {
+    local LID=$1
+    climc lb-purge $LID
+}
+
+clean_loadbalancer $LB_ID

build/climc/root/opt/yunion/scripts/tools/clean_loadbalancer_acl.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+LB_ACL=$1
+
+if [ -z "$LB_ACL" ]; then
+    echo "Usage: $0 <loadbalancer_id_or_name>"
+    exit 1
+fi
+
+LB_ACL_ID=$(climc lbacl-show $LB_ACL | grep -w " id " | awk '{print $4}')
+LB_ACL_NAME=$(climc lbacl-show $LB_ACL | grep -w " name " | awk '{print $4}')
+
+if [ -z "$LB_ACL_ID" ]; then
+    echo "Loadbalancer ACL $LB_ACL_ID not found"
+    exit 1
+fi
+
+echo "Ready to remove loadbalancer acl $LB_ACL_NAME($LB_ACL_ID) ..."
+
+clean_loadbalancer_acl() {
+    local LID=$1
+    climc lbacl-purge $LID
+}
+
+clean_loadbalancer_acl $LB_ACL_ID

build/climc/root/opt/yunion/scripts/tools/clean_loadbalancer_certificate.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+LB_CERT=$1
+
+if [ -z "$LB_CERT" ]; then
+    echo "Usage: $0 <loadbalancer_id_or_name>"
+    exit 1
+fi
+
+LB_CERT_ID=$(climc lbcert-show $LB_CERT | grep -w " id " | awk '{print $4}')
+LB_CERT_NAME=$(climc lbcert-show $LB_CERT | grep -w " name " | awk '{print $4}')
+
+if [ -z "$LB_CERT_ID" ]; then
+    echo "Loadbalancer certificate $LB_CERT_ID not found"
+    exit 1
+fi
+
+echo "Ready to remove loadbalancer certificate $LB_CERT_NAME($LB_CERT_ID) ..."
+
+clean_loadbalancer_cert() {
+    local LID=$1
+    climc lbcert-purge $LID
+}
+
+clean_loadbalancer_cert $LB_CERT_ID

build/climc/root/opt/yunion/scripts/tools/clean_provider.sh

@@ -0,0 +1,96 @@
+#!/bin/bash
+
+set -e
+
+pushd $(dirname $BASH_SOURCE) > /dev/null
+CUR_DIR=$(pwd -P)
+popd > /dev/null
+
+
+PROVIDER=$1
+
+if [ -z "$PROVIDER" ]; then
+    echo "Usage: $0 <cloud-provider-id-or-name>"
+    exit 1
+fi
+
+PROVIDER_ID=$(climc cloud-provider-show $PROVIDER | grep -w " id " | awk '{print $4}')
+PROVIDER_NAME=$(climc cloud-provider-show $PROVIDER | grep -w " name " | awk '{print $4}')
+
+if [ -z "$PROVIDER_ID" ]; then
+    echo "Cloud provider $PROVIDER not found"
+    exit 1
+fi
+
+
+echo "Ready to clean cloud provider $PROVIDER_NAME($PROVIDER_ID)..."
+
+echo "1. Disable cloud provider $PROVIDER_NAME($PROVIDER_ID) ..."
+
+climc cloud-provider-disable $PROVIDER_ID
+
+echo "2. Clean all hosts ..."
+
+for hostid in $(climc host-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_host.sh $hostid
+done
+
+echo "3. Clean all loadbalancer ..."
+
+for lbid in $(climc lb-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_loadbalancer.sh $lbid
+done
+
+echo "4. Clean all loadbalancer acl ..."
+
+for lbaclid in $(climc lbacl-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_loadbalancer_acl.sh $lbaclid
+done
+
+echo "5. Clean all loadbalancer certificate ..."
+
+for lbcertid in $(climc lbcert-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_loadbalancer_certificate.sh $lbcertid
+done
+
+echo "6. Clean all vpc ..."
+
+for vpcid in $(climc vpc-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_vpc.sh $vpcid
+done
+
+echo "7. Clean all eips ..."
+for eipid in $(climc eip-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_eip.sh $eipid
+done
+
+echo "8. Clean all snapshots ..."
+for snapid in $(climc snapshot-list --admin --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    echo "to clean snapshot $snapid ..."
+    $CUR_DIR/clean_snapshot.sh $snapid
+done
+
+echo "9. Clean all storagecache ..."
+
+for cacheid in $(climc storage-cache-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_storagecache.sh $cacheid
+done
+
+echo "10. Clean all storages ..."
+
+for storeid in $(climc storage-list --manager $PROVIDER_ID --admin --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    $CUR_DIR/clean_storage.sh $storeid
+done
+
+echo "Delete cloud provider ..."
+
+climc cloud-provider-delete $PROVIDER_ID

build/climc/root/opt/yunion/scripts/tools/clean_snapshot.sh

@@ -0,0 +1,27 @@
+#/bin/bash
+
+set -e
+
+SNAPSHOT=$1
+
+if [ -z "$SNAPSHOT" ]; then
+    echo "Usage: $0 <snapshot_id_or_name>"
+    exit 1
+fi
+
+SNAPSHOT_NAME=$(climc snapshot-show $SNAPSHOT | grep -w " name " | awk '{print $4}')
+SNAPSHOT_ID=$(climc snapshot-show $SNAPSHOT | grep -w " id " | awk '{print $4}')
+
+if [ -z "$SNAPSHOT_ID" ]; then
+    echo "Cannot find snapshot $SNAPSHOT_ID"
+    exit 1
+fi
+
+echo "To clean snapshot $SNAPSHOT_NAME($SNAPSHOT_ID)..."
+
+clean_snapshot() {
+    local SNAP_ID=$1
+    climc snapshot-purge $SNAP_ID > /dev/null
+}
+
+clean_snapshot $SNAPSHOT_ID

build/climc/root/opt/yunion/scripts/tools/clean_storage.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+STORAGE=$1
+
+if [ -z "$STORAGE" ]; then
+    echo "Usage: $0 <storage_id_or_name>"
+    exit 1
+fi
+
+STORAGE_ID=$(climc storage-show $STORAGE | grep -w " id " | awk '{print $4}')
+STORAGE_NAME=$(climc storage-show $STORAGE | grep -w " name " | awk '{print $4}')
+
+if [ -z "$STORAGE_ID" ]; then
+    echo "Storage $STORAGE not found"
+    exit 1
+fi
+
+echo "Clean disks on storage $STORAGE_NAME($STORAGE_ID) ..."
+
+for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc disk-purge $disk_id > /dev/null
+done
+
+for disk_id in $(climc disk-list --admin --storage $STORAGE_ID --show-emulated --pending-delete --limit 2048 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc disk-purge $disk_id > /dev/null
+done
+
+# CACHE_ID=$(climc storage-show $STORAGE_ID | grep -w " storagecache_id " | awk '{print $4}')
+
+climc storage-delete $STORAGE_ID > /dev/null

build/climc/root/opt/yunion/scripts/tools/clean_storagecache.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+CACHE=$1
+
+if [ -z "$CACHE" ]; then
+    echo "Usage: $0 <storage_cache_id_or_name>"
+    exit 1
+fi
+
+CACHE_ID=$(climc storage-cache-show $CACHE | grep -w " id " | awk '{print $4}')
+CACHE_NAME=$(climc storage-cache-show $CACHE | grep -w " name " | awk '{print $4}')
+
+if [ -z "$CACHE_ID" ]; then
+    echo "Storage cache $CACHE not found"
+    exit 1
+fi
+
+echo "Ready to remove storagecache $CACHE_NAME($CACHE_ID) ..."
+
+for imgid in $(climc storage-cached-image-list --storagecache $CACHE_ID --show-emulated --limit 0 | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $4}')
+do
+    climc storagecache-uncache-image $CACHE_ID $imgid --force # > /dev/null
+done
+
+climc storage-cache-delete $CACHE_ID > /dev/null
+

build/climc/root/opt/yunion/scripts/tools/clean_vpc.sh

@@ -0,0 +1,55 @@
+#/bin/bash
+
+set -e
+
+VPC=$1
+
+if [ -z "$VPC" ]; then
+    echo "Usage: $0 <vpc_id_or_name>"
+    exit 1
+fi
+
+VPC_NAME=$(climc vpc-show $VPC | grep -w " name " | awk '{print $4}')
+VPC_ID=$(climc vpc-show $VPC | grep -w " id " | awk '{print $4}')
+
+if [ -z "$VPC_ID" ]; then
+    echo "Cannot find vpc $VPC"
+    exit 1
+fi
+
+echo "To clean vpc $VPC_NAME($VPC_ID)..."
+
+clean_network() {
+    climc network-purge $1 > /dev/null
+}
+
+
+clean_wire() {
+    local WIRE_ID=$1
+    for net_id in $(climc network-list --admin --wire $WIRE_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+    do
+        clean_network $net_id
+    done
+    climc wire-delete $wire_id > /dev/null
+}
+
+clean_vpc() {
+    local VPC_ID=$1
+    climc vpc-purge $VPC_ID > /dev/null
+}
+
+echo "1. Clean wires ..."
+
+for wire_id in $(climc wire-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    clean_wire $wire_id
+done
+
+echo "2. Clean route tables ..."
+for routetable_id in $(climc routetable-list --vpc $VPC_ID --show-emulated | egrep '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}' | awk '{print $2}')
+do
+    climc routetable-purge $routetable_id >/dev/null
+done
+
+echo "3. clean vpc ..."
+clean_vpc $VPC_ID

build/cloudid/vars

@@ -0,0 +1 @@
+DESCRIPTION="Yunion CloudId"

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

@@ -0,0 +1,12 @@
+FROM alpine:3.11.6
+
+MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
+
+# openssh-client, for ansible ssh connection
+# git, ca-certificates, for fetching ansible roles
+RUN set -x \
+	&& apk update \
+	&& apk add openssh-client \
+	&& apk add ansible \
+	&& apk add tzdata git ca-certificates \
+	&& rm -rf /var/cache/apk/*

build/docker/Dockerfile.apigateway

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

build/docker/Dockerfile.baremetal-agent

@@ -0,0 +1,9 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1
+
+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

build/docker/Dockerfile.baremetal-base

@@ -0,0 +1,39 @@
+FROM frolvlad/alpine-glibc:glibc-2.28
+
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
+
+RUN mkdir -p /opt/yunion/bin
+
+RUN apk update && \
+    apk add --no-cache ipmitool ethtool tzdata ca-certificates && \
+    rm -rf /var/cache/apk/*
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /opt/cloud/yunion/baremetal
+
+# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
+COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+
+# add mkisofs with bundles libraries
+ADD ./mkisofs /bin/mkisofs
+ADD ./.mkisofs.bin /bin/.mkisofs.bin
+ADD ./bundles/mkisofs /bin/bundles/mkisofs
+# use GNU timeout command replace busybox timeout command
+RUN rm /usr/bin/timeout
+ADD ./timeout /bin/timeout
+ADD ./.timeout.bin /bin/.timeout.bin
+ADD ./bundles/timeout /bin/bundles/timeout

build/docker/Dockerfile.climc

@@ -0,0 +1,5 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308
+
+ADD ./build/climc/root/opt /opt
+
+ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -0,0 +1,16 @@
+FROM frolvlad/alpine-glibc:glibc-2.28
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+RUN mkdir -p /opt/yunion/bin
+
+RUN apk add --no-cache bash bash-completion tzdata ca-certificates vim && \
+    rm -rf /var/cache/apk/*
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+ENV PATH="/opt/yunion/bin:${PATH}"
+
+RUN mkdir -p /opt/yunion/bin

build/docker/Dockerfile.cloudevent

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

build/docker/Dockerfile.cloudid

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

build/docker/Dockerfile.cloudnet

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

build/docker/Dockerfile.devtool

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

build/docker/Dockerfile.esxi-agent

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

build/docker/Dockerfile.glance

@@ -0,0 +1,6 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+RUN mkdir -p /opt/yunion/bin
+ADD ./_output/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -0,0 +1,18 @@
+FROM frolvlad/alpine-glibc:glibc-2.28
+
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
+
+RUN apk update && \
+    apk add --no-cache tzdata ca-certificates qemu-img && \
+    rm -rf /var/cache/apk/*
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+ENV TZ Asia/Shanghai
+
+# add executable file torrent
+# make cmd/torrent && ./scripts/bundle-libraries.sh _output/bin/bundles/torrent _output/bin/torrent
+RUN mkdir -p /opt/yunion/bin
+ADD ./_output/bin/torrent /opt/yunion/bin/torrent
+ADD ./_output/bin/.torrent.bin /opt/yunion/bin/.torrent.bin
+ADD ./_output/bin/bundles/torrent /opt/yunion/bin/bundles/torrent

build/docker/Dockerfile.host

@@ -0,0 +1,9 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.2.0
+
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+
+ENV TZ Asia/Shanghai
+
+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

@@ -0,0 +1,11 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.0.3
+
+MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
+
+ENV TZ Asia/Shanghai
+
+RUN mkdir -p /opt/yunion/bin
+
+ADD ./_output/bin/host-deployer /opt/yunion/bin/host-deployer
+ADD ./_output/bin/.host-deployer.bin /opt/yunion/bin/.host-deployer.bin
+ADD ./_output/bin/bundles/host-deployer /opt/yunion/bin/bundles/host-deployer

build/docker/Dockerfile.keystone

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

build/docker/Dockerfile.logger

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

build/docker/Dockerfile.monitor

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

build/docker/Dockerfile.notify

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

build/docker/Dockerfile.onecloud-base

@@ -0,0 +1,13 @@
+FROM frolvlad/alpine-glibc:glibc-2.28
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+RUN mkdir -p /opt/yunion/bin
+
+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

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

build/docker/Dockerfile.region-dns

@@ -0,0 +1,4 @@
+FROM alpine:3.11.3
+
+RUN mkdir -p /opt/yunion/bin
+ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

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

build/docker/Dockerfile.scheduler

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

build/docker/Dockerfile.vpcagent

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

build/docker/Dockerfile.webconsole

@@ -0,0 +1,3 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:latest
+
+ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -0,0 +1,12 @@
+FROM yunion/kubectl:1.14.3
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+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

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

build/esxi-agent/root/opt/yunion/share/vmware/ovf.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1"
+          xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
+          xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common"
+          xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
+          xmlns:vmw="http://www.vmware.com/schema/ovf"
+          xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <References>
+    <File ovf:href="{{ .Name }}" ovf:id="file1" ovf:size="{{ .Size }}"/>
+  </References>
+  <DiskSection>
+    <Info>Virtual disk information</Info>
+    <Disk ovf:capacity="{{ .Capacity }}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="0"/>
+  </DiskSection>
+  <VirtualSystem ovf:id="{{ .ImportName }}">
+    <Info>A virtual machine</Info>
+    <Name>{{ .ImportName }}</Name>
+    <OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
+      <Info>The kind of installed guest operating system</Info>
+    </OperatingSystemSection>
+    <VirtualHardwareSection>
+      <Info>Virtual hardware requirements</Info>
+      <System>
+        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
+        <vssd:InstanceID>0</vssd:InstanceID>
+        <vssd:VirtualSystemIdentifier>{{ .ImportName }}</vssd:VirtualSystemIdentifier>
+        <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
+      </System>
+      <Item>
+        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
+        <rasd:Description>Number of Virtual CPUs</rasd:Description>
+        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
+        <rasd:InstanceID>1</rasd:InstanceID>
+        <rasd:ResourceType>3</rasd:ResourceType>
+        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
+      </Item>
+      <Item>
+        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
+        <rasd:Description>Memory Size</rasd:Description>
+        <rasd:ElementName>1024MB of memory</rasd:ElementName>
+        <rasd:InstanceID>2</rasd:InstanceID>
+        <rasd:ResourceType>4</rasd:ResourceType>
+        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
+      </Item>
+      <Item>
+        <rasd:Address>0</rasd:Address>
+        <rasd:Description>SCSI Controller</rasd:Description>
+        <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
+        <rasd:InstanceID>3</rasd:InstanceID>
+        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
+        <rasd:ResourceType>6</rasd:ResourceType>
+      </Item>
+      <Item>
+        <rasd:AddressOnParent>0</rasd:AddressOnParent>
+        <rasd:ElementName>Hard Disk 1</rasd:ElementName>
+        <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
+        <rasd:InstanceID>9</rasd:InstanceID>
+        <rasd:Parent>3</rasd:Parent>
+        <rasd:ResourceType>17</rasd:ResourceType>
+        <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>
+      </Item>
+    </VirtualHardwareSection>
+  </VirtualSystem>
+</Envelope>

build/esxi-agent/vars

@@ -0,0 +1,2 @@
+DESCRIPTION="Esxi Agent"
+# SERVICE="yes"

build/executor-server/root/usr/lib/systemd/system/yunion-executor.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=Yunion Command Executor
+Documentation=https://docs.yunion.cn
+
+[Service]
+Type=simple
+User=root
+Group=root
+ExecStart=/opt/yunion/bin/executor-server
+WorkingDirectory=/opt/yunion/bin
+KillMode=process
+Restart=always
+RestartSec=30
+LimitNOFILE=500000
+LimitNPROC=500000
+
+[Install]
+WantedBy=multi-user.target

build/executor-server/vars

@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Executor Server Command Line Utility"
+SERVICE="yes"

build/host-image/root/usr/lib/systemd/system/yunion-host-image.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Yunion Host Image Server
+Documentation=https://docs.yunion.cn
+After=network.target
+
+[Service]
+Type=simple
+User=root
+Group=root
+ExecStart=/opt/yunion/bin/host-image --conf /etc/yunion/host.conf
+WorkingDirectory=/opt/yunion/bin
+KillMode=process
+Restart=always
+RestartSec=30
+LimitNOFILE=500000
+LimitNPROC=500000
+
+[Install]
+WantedBy=multi-user.target

build/host-image/vars

@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Host Image Server"
+SERVICE="yes"

build/notify/root/opt/yunion/share/template/content/IMAGE_ACTIVED

@@ -0,0 +1 @@
+{{.os_type}} 镜像 {{.name}} 上传完成

build/notify/root/opt/yunion/share/template/content/VERIFY.email

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Document</title>
+</head>
+<body>
+  <table style="width: 650px; margin-bottom: 20px;" border="0" cellpadding="0" cellspacing="0" align="center">
+  	<tr style="height: 50px; background: #333; overflow: hidden;">
+  		<td>
+  			<table style="margin-left: 20px;">
+  				<tr>
+  					<td>
+  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
+  					</td>
+  				</tr>
+  			</table>
+  		</td>
+  		<td>
+  			<table style="float: right;">
+  				<tr>
+  					<td style="padding-left: 20px; padding-right: 20px;">
+  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">产品</a>
+  					</td>
+  					<td style="padding-left: 20px; padding-right: 20px;">
+  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">解决方案</a>
+  					</td>
+  					<td style="padding-left: 20px; padding-right: 20px;">
+  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">服务</a>
+  					</td>
+  					<td style="padding-left: 20px; padding-right: 20px;">
+  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">帮助与文档</a>
+  					</td>
+  					<td style="padding-left: 20px; padding-right: 20px;">
+  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">关于我们</a>
+  					</td>
+  				</tr>
+  			</table>
+  		</td>
+  	</tr>
+  	<tr>
+  		<td style="width: 100%;" colspan="2">
+  			<table style="padding: 20px 10px; width: 100%;">
+	  			<tr>
+	  				<td style="padding-bottom: 20px;">
+                        尊敬的{{.name}}，您好：
+	  				</td>
+	  			</tr>
+	  			<tr>
+	  				<td style="padding-bottom: 10px;">请点击下面的链接，完成用户邮箱的激活：</td>
+	  			</tr>
+	  			<tr>
+                    <td style="padding-bottom: 30px;"><a href="{{.link}}">{{.link}}</a></td>
+	  			</tr>
+	  		</table>
+  		</td>
+  	</tr>
+  	<tr style="width: 96%;">
+		<td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">*为了确保您的帐号安全，该链接仅48小时内访问有效，请勿直接回复此邮件。</td>
+	</tr>
+	<tr>
+		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
+	</tr>
+  </table>
+</body>
+</html>

build/notify/root/opt/yunion/share/template/title/IMAGE_ACTIVED

@@ -0,0 +1 @@
+镜像 {{.name}} 上传完成

build/notify/root/opt/yunion/share/template/title/VERIFY.email

@@ -0,0 +1 @@
+Yunion Verify

cmd/aliyuncli/main.go

@@ -84,7 +84,11 @@ func newClient(options *BaseOptions) (*aliyun.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
-	cli, err := aliyun.NewAliyunClient("", "", options.AccessKey, options.Secret, options.Debug)
+	cli, err := aliyun.NewAliyunClient(
+		aliyun.NewAliyunClientConfig(
+			options.AccessKey, options.Secret,
+		).Debug(options.Debug),
+	)
 	if err != nil {
 		return nil, err
 	}

cmd/awscli/main.go

@@ -85,7 +85,13 @@ func newClient(options *BaseOptions) (*aws.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
-	cli, err := aws.NewAwsClient("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
+	cli, err := aws.NewAwsClient(
+		aws.NewAwsClientConfig(
+			options.AccessUrl,
+			options.AccessKey,
+			options.Secret,
+		).Debug(options.Debug),
+	)
 	if err != nil {
 		return nil, err
 	}

cmd/azurecli/main.go

@@ -100,11 +100,17 @@ func newClient(options *BaseOptions) (*azure.SRegion, error) {
 		return nil, fmt.Errorf("Missing Cloud Environment")
 	}
 
-	cli, err := azure.NewAzureClient("", "", options.CloudEnv,
-		options.DirectoryID,
-		options.ApplicationID, options.ApplicationKey,
-		options.SubscriptionID,
-		options.Debug)
+	cli, err := azure.NewAzureClient(
+		azure.NewAzureClientConfig(
+			options.CloudEnv,
+			options.DirectoryID,
+			options.ApplicationID,
+			options.ApplicationKey,
+		).
+			SubscriptionId(options.SubscriptionID).
+			Debug(options.Debug),
+	)
+
 	if err != nil {
 		return nil, err
 	}

cmd/climc/entry/climc.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package entry
 
 import (
 	"context"
@@ -32,9 +32,6 @@ import (
 
 	"yunion.io/x/onecloud/cmd/climc/promputils"
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
 	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
@@ -48,7 +45,7 @@ type BaseOptions struct {
 	CertFile string `default:"$YUNION_CERT_FILE" help:"certificate file"`
 	KeyFile  string `default:"$YUNION_KEY_FILE" help:"private key file"`
 
-	Completion     string `default:"" help:"Generate climc auto complete script" choices:"bash"`
+	Completion     string `default:"" help:"Generate climc auto complete script" choices:"bash|zsh"`
 	UseCachedToken bool   `default:"$YUNION_USE_CACHED_TOKEN|false" help:"Use cached token"`
 
 	OsUsername string `default:"$OS_USERNAME" help:"Username, defaults to env[OS_USERNAME]"`
@@ -61,6 +58,8 @@ type BaseOptions struct {
 	OsAccessKey string `default:"$OS_ACCESS_KEY" help:"ak/sk access key, defaults to env[OS_ACCESS_KEY]"`
 	OsSecretKey string `default:"$OS_SECRET_KEY" help:"ak/s secret, defaults to env[OS_SECRET_KEY]"`
 
+	OsAuthToken string `default:"$OS_AUTH_TOKEN" help:"token authenticate, defaults to env[OS_AUTH_TOKEN]"`
+
 	OsAuthURL string `default:"$OS_AUTH_URL" help:"Defaults to env[OS_AUTH_URL]"`
 
 	OsRegionName   string `default:"$OS_REGION_NAME" help:"Defaults to env[OS_REGION_NAME]"`
@@ -72,9 +71,13 @@ type BaseOptions struct {
 }
 
 func getSubcommandsParser() (*structarg.ArgumentParser, error) {
+	var (
+		prog = "climc"
+		desc = `Command-line interface to the API server.`
+	)
 	parse, e := structarg.NewArgumentParser(&BaseOptions{},
-		"climc",
-		`Command-line interface to the API server.`,
+		prog,
+		desc,
 		`See "climc help COMMAND" for help on a specific command.`)
 	if e != nil {
 		return nil, e
@@ -95,26 +98,28 @@ func getSubcommandsParser() (*structarg.ArgumentParser, error) {
 			return nil
 		}
 	})
+
+	promptRootCmd := promputils.InitRootCmd(prog, desc, parse.GetOptArgs(), parse.GetPosArgs())
 	for _, v := range shell.CommandTable {
 		_par, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
 
 		if e != nil {
 			return nil, e
 		}
-		promputils.AppendCommand(v.Command, v.Desc)
+		promputils.AppendCommand(promptRootCmd, v.Command, v.Desc)
 		cmd := v.Command
 
 		for _, v := range _par.GetOptArgs() {
 			text := v.String()
 			text = strings.TrimLeft(text, "[<")
 			text = strings.TrimRight(text, "]>")
-			promputils.AppendOpt(cmd, text, v.HelpString(""))
+			promputils.AppendOpt(cmd, text, v.HelpString(""), v)
 		}
 		for _, v := range _par.GetPosArgs() {
 			text := v.String()
 			text = strings.TrimLeft(text, "[<")
 			text = strings.TrimRight(text, "]>")
-			promputils.AppendPos(cmd, text, v.HelpString(""))
+			promputils.AppendPos(cmd, text, v.HelpString(""), v)
 		}
 	}
 	return parse, nil
@@ -130,8 +135,8 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	if len(options.OsAuthURL) == 0 {
 		return nil, fmt.Errorf("Missing OS_AUTH_URL")
 	}
-	if len(options.OsUsername) == 0 && len(options.OsAccessKey) == 0 {
-		return nil, fmt.Errorf("Missing OS_USERNAME or OS_ACCESS_KEY")
+	if len(options.OsUsername) == 0 && len(options.OsAccessKey) == 0 && len(options.OsAuthToken) == 0 {
+		return nil, fmt.Errorf("Missing OS_USERNAME or OS_ACCESS_KEY or OS_AUTH_TOKEN")
 	}
 	if len(options.OsUsername) > 0 && len(options.OsPassword) == 0 {
 		return nil, fmt.Errorf("Missing OS_PASSWORD")
@@ -139,9 +144,6 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	if len(options.OsAccessKey) > 0 && len(options.OsSecretKey) == 0 {
 		return nil, fmt.Errorf("Missing OS_SECRET_KEY")
 	}
-	if len(options.OsRegionName) == 0 {
-		return nil, fmt.Errorf("Missing OS_REGION_NAME")
-	}
 
 	logLevel := "info"
 	if options.Debug {
@@ -184,7 +186,11 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	if cacheToken == nil {
 		var token mcclient.TokenCredential
 		var err error
-		if len(options.OsAccessKey) > 0 {
+		if len(options.OsAuthToken) > 0 {
+			token, err = client.AuthenticateToken(options.OsAuthToken, options.OsProjectName,
+				options.OsProjectDomain,
+				mcclient.AuthSourceCli)
+		} else if len(options.OsAccessKey) > 0 {
 			token, err = client.AuthenticateByAccessKey(options.OsAccessKey,
 				options.OsSecretKey, mcclient.AuthSourceCli)
 		} else {
@@ -260,7 +266,7 @@ func executeSubcommand(
 	}
 }
 
-func main() {
+func ClimcMain() {
 	parser, e := getSubcommandsParser()
 	if e != nil {
 		showErrorAndExit(e)
@@ -269,7 +275,7 @@ func main() {
 	options := parser.Options().(*BaseOptions)
 
 	if len(options.Completion) > 0 {
-		completeScript := promputils.GenerateAutoCompleteCmds(options.Completion)
+		completeScript := promputils.GenerateAutoCompleteCmds(promputils.GetRootCmd(), options.Completion)
 		if len(completeScript) > 0 {
 			fmt.Printf("%s", completeScript)
 		}

cmd/climc/entry/doc.go

@@ -1,4 +1,4 @@
-// Copyright 2017, OpenCensus Authors
+// 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.
@@ -12,8 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package ocgrpc contains OpenCensus stats and trace
-// integrations for gRPC.
-//
-// Use ServerHandler for servers and ClientHandler for clients.
-package ocgrpc // import "go.opencensus.io/plugin/ocgrpc"
+package entry // import "yunion.io/x/onecloud/cmd/climc/entry"

cmd/climc/main.go

@@ -0,0 +1,42 @@
+// 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 main
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/entry"
+	_ "yunion.io/x/onecloud/cmd/climc/shell"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudid"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/compute"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/events"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/identity"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/image"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/itsm"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/logger"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/meter"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/misc"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/notify"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/servicetree"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/yunionconf"
+)
+
+func main() {
+	entry.ClimcMain()
+}

cmd/climc/promputils/complete_zsh.go

@@ -0,0 +1,178 @@
+// 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 promputils
+
+import (
+	"fmt"
+	"io"
+	"strings"
+	"text/template"
+
+	"yunion.io/x/structarg"
+)
+
+// ref: https://github.com/spf13/cobra/blob/master/zsh_completions.go
+
+var (
+	zshCompFuncMap = template.FuncMap{
+		"genZshFuncName":              zshCompGenFuncName,
+		"extractFlags":                zshCompExtractFlag,
+		"genFlagEntryForZshArguments": zshCompGenFlagEntryForArguments,
+		"extractArgsCompletions":      zshCompExtractArgumentCompletionHintsForRendering,
+	}
+	zshCompletionText = `
+{{/* should accept Command (that contains subcommands) as parameter */}}
+{{define "argumentsC" -}}
+{{ $cmdPath := genZshFuncName .}}
+function {{$cmdPath}} {
+	local -a commands
+	_arguments -C \{{- range extractFlags .}}
+	  {{genFlagEntryForZshArguments .}} \{{- end}}
+	  "1: :->cmnds" \
+	  "*::arg:->args"
+
+	case $state in
+	cmnds)
+	  commands=({{range .SubCmds}}
+		"{{.Name}}:{{.Desc}}"{{end}}
+	  )
+	  _describe "command" commands
+	  ;;
+	esac
+
+	case "$words[1]" in {{- range .SubCmds}}
+	{{.Name}})
+	  {{$cmdPath}}_{{.Name}}
+	  ;;{{end}}
+	esac
+}
+{{range .SubCmds}}
+{{template "selectCmdTemplate" .}}
+{{- end}}
+{{- end}}
+
+{{/* should accept Command without subcommands as parameter */}}
+{{define "arguments" -}}
+function {{genZshFuncName .}} {
+{{"  _arguments"}}{{range extractFlags .}} \
+     {{genFlagEntryForZshArguments . -}}
+{{end}}{{range extractArgsCompletions .}} \
+     {{.}}{{end}}
+}
+{{end}}
+
+{{/* dispatcher for commands with or without subcommands */}}
+{{define "selectCmdTemplate" -}}
+{{if .SubCmds}}{{template "argumentsC" .}}{{else}}{{template "arguments" .}}{{end}}
+{{- end}}
+
+{{/* template entry point */}}
+{{define "Main" -}}
+#compdef _{{.Name}} {{.Name}}
+
+{{template "selectCmdTemplate" .}}
+compdef _{{.Name}} {{.Name}}
+{{end}}
+`
+)
+
+func zshCompGenFuncName(c *Cmd) string {
+	if c.ParentCmd != nil {
+		return zshCompGenFuncName(c.ParentCmd) + "_" + c.Name
+	}
+	return "_" + c.Name
+}
+
+func zshCompExtractFlag(c *Cmd) []structarg.Argument {
+	return c.GetArguments()
+}
+
+func zshCompGenFlagEntryForArguments(f structarg.Argument) string {
+	// not process positional argument and single command
+	if f.IsPositional() {
+		return ""
+	}
+	if f.ShortToken() == "" {
+		return zshCompGenFlagEntryForSingleOptionFlag(f)
+	}
+	return zshCompGenFlagEntryForMultiOptionFlag(f)
+}
+
+func zshCompGenFlagEntryForSingleOptionFlag(f structarg.Argument) string {
+	var option, multiMark, extras string
+	if f.IsMulti() {
+		multiMark = "*"
+	}
+
+	option = "--" + f.Token()
+	extras = zshCompGenFlagEntryExtras(f)
+	return fmt.Sprintf(`'%s%s[%s]%s'`, multiMark, option, zshCompQuoteFlagDescription(f.HelpString("")), extras)
+}
+
+func zshCompGenFlagEntryForMultiOptionFlag(f structarg.Argument) string {
+	var options, parenMultiMark, curlyMultiMark, extras string
+	if f.IsMulti() {
+		parenMultiMark = "*"
+		curlyMultiMark = "\\*"
+	}
+
+	options = fmt.Sprintf(`'(%s-%s %s--%s)'{%s-%s,%s--%s}`,
+		parenMultiMark, f.ShortToken(), parenMultiMark, f.Token(), curlyMultiMark, f.ShortToken(), curlyMultiMark, f.Token())
+	extras = zshCompGenFlagEntryExtras(f)
+
+	return fmt.Sprintf(`%s'[%s]%s'`, options, zshCompQuoteFlagDescription(f.HelpString("")), extras)
+}
+
+func zshCompGenFlagEntryExtras(f structarg.Argument) string {
+	if !f.NeedData() {
+		return ""
+	}
+	// allow options for flag
+	extras := ":"
+
+	type iChoices interface {
+		Choices() []string
+	}
+	if hasChoices, ok := f.(iChoices); ok {
+		// process choices
+		var words []string
+		for _, w := range hasChoices.Choices() {
+			words = append(words, fmt.Sprintf("%q", w))
+		}
+		if len(words) != 0 {
+			extras = fmt.Sprintf("%s :(%s)", extras, strings.Join(words, " "))
+		}
+	}
+	return extras
+}
+
+func zshCompQuoteFlagDescription(s string) string {
+	s = strings.Replace(s, "'", `'\''`, -1)
+	s = strings.Replace(s, "[", `\[`, -1)
+	s = strings.Replace(s, "]", `\]`, -1)
+	return s
+}
+
+func zshCompExtractArgumentCompletionHintsForRendering(c *Cmd) []string {
+	return nil
+}
+
+func (c *Cmd) GenZshCompletion(w io.Writer) error {
+	tmpl, err := template.New("Main").Funcs(zshCompFuncMap).Parse(zshCompletionText)
+	if err != nil {
+		return fmt.Errorf("error creating zsh completion template: %v", err)
+	}
+	return tmpl.Execute(w, c.Root())
+}

cmd/climc/promputils/completescript.go

@@ -75,33 +75,3 @@ _climc(){
     do
         line="${arr[$i]}"
         allopts[count]=${line%s`
-
-const ZSH_COMPLETE_SCRIPT_2 = `%"#"*}
-        subopts[count]=${line#*"#"}
-        ((count++))
-    done
-    _arguments \
-            '1: :->commands'\
-            '*: :->options'
-
-    case $state in 
-        commands)
-        _arguments '1:Comm:(${allopts[*]})'
-        ;;
-        *)
-            item=1
-            for key in ${allopts[*]}
-            do
-                case $words[2] in
-                    $key)
-                    compadd "$@"` + "`echo $subopts[item]`" + `
-                    ;;
-                    *)
-                    ;;
-                esac
-                ((item++))
-            done
-    esac    
-}
-_climc "$@"
-`

cmd/climc/promputils/completor.go

@@ -15,26 +15,118 @@
 package promputils
 
 import (
+	"bytes"
 	"fmt"
 	"regexp"
 	"strings"
 
 	prompt "github.com/c-bata/go-prompt"
+
+	"yunion.io/x/structarg"
 )
 
-type Cmd struct {
-	desc    string
-	optArgs []prompt.Suggest
-	posArgs []prompt.Suggest
-}
-
-var cmds = make(map[string]*Cmd)
+var (
+	subcmds = make(map[string]*Cmd)
+	rootCmd *Cmd
+)
 
 var optionHelp = []prompt.Suggest{
 	{Text: "-h"},
 	{Text: "--help"},
 }
 
+type Cmd struct {
+	Name      string
+	Desc      string
+	optArgs   []CmdArgument
+	posArgs   []CmdArgument
+	ParentCmd *Cmd
+	SubCmds   []*Cmd
+}
+
+func InitRootCmd(name, desc string, optArgs, posArgs []structarg.Argument) *Cmd {
+	rootCmd = NewCmd(name, desc)
+	for _, optA := range optArgs {
+		rootCmd.AddOptArgument(optA, optA.Token(), optA.HelpString(""))
+	}
+	for _, posA := range posArgs {
+		rootCmd.AddPosArgument(posA, posA.Token(), posA.HelpString(""))
+	}
+	return rootCmd
+}
+
+func GetRootCmd() *Cmd {
+	return rootCmd
+}
+
+func NewCmd(name, desc string) *Cmd {
+	return &Cmd{
+		Name:    name,
+		Desc:    desc,
+		optArgs: make([]CmdArgument, 0),
+		posArgs: make([]CmdArgument, 0),
+		SubCmds: make([]*Cmd, 0),
+	}
+}
+
+func (c Cmd) getPromptSuggests(args []CmdArgument) []prompt.Suggest {
+	ret := make([]prompt.Suggest, 0)
+	for _, arg := range args {
+		ret = append(ret, arg.Suggest)
+	}
+	return ret
+}
+
+func (c *Cmd) Root() *Cmd {
+	if c.ParentCmd == nil {
+		return c
+	}
+	return c.ParentCmd.Root()
+}
+
+func (c Cmd) GetName() string {
+	return c.Name
+}
+
+func (c *Cmd) AddCmd(cmd *Cmd) {
+	c.SubCmds = append(c.SubCmds, cmd)
+}
+
+func (c Cmd) GetPromptOptSuggests() []prompt.Suggest {
+	return c.getPromptSuggests(c.optArgs)
+}
+
+func (c Cmd) GetPromptPosSuggests() []prompt.Suggest {
+	return c.getPromptSuggests(c.posArgs)
+}
+
+func (c Cmd) GetOptArguments() []structarg.Argument {
+	return c.getArguments(c.optArgs)
+}
+
+func (c Cmd) GetArguments() []structarg.Argument {
+	ret := c.GetOptArguments()
+	ret = append(ret, c.GetPosArguments()...)
+	return ret
+}
+
+func (c Cmd) GetPosArguments() []structarg.Argument {
+	return c.getArguments(c.posArgs)
+}
+
+func (c Cmd) getArguments(args []CmdArgument) []structarg.Argument {
+	ret := make([]structarg.Argument, 0)
+	for _, a := range args {
+		ret = append(ret, a.Argument)
+	}
+	return ret
+}
+
+type CmdArgument struct {
+	Suggest  prompt.Suggest
+	Argument structarg.Argument
+}
+
 func optionCompleter(args []string, long bool) []prompt.Suggest {
 	l := len(args)
 	if l == 0 {
@@ -47,11 +139,11 @@ func optionCompleter(args []string, long bool) []prompt.Suggest {
 		return optionHelp
 	}
 
-	if cmds[args[0]] == nil {
+	if subcmds[args[0]] == nil {
 		return []prompt.Suggest{}
 	}
 
-	_cmd := cmds[args[0]].optArgs
+	_cmd := subcmds[args[0]].GetPromptOptSuggests()
 	return prompt.FilterContains(_cmd, strings.TrimLeft(args[l-1], "-"), true)
 }
 
@@ -100,7 +192,7 @@ func argumentsCompleter(args []string) []prompt.Suggest {
 	if len(args) == 1 {
 		return prompt.FilterHasPrefix(commands, args[0], true)
 	}
-	_cmd, ok := cmds[args[0]]
+	_cmd, ok := subcmds[args[0]]
 	if !ok {
 		return []prompt.Suggest{}
 	}
@@ -111,48 +203,75 @@ func argumentsCompleter(args []string) []prompt.Suggest {
 
 	prm := _cmd.posArgs[len(args)-2]
 	subcommands := []prompt.Suggest{
-		prm,
+		prm.Suggest,
 	}
 
 	return prompt.FilterHasPrefix(subcommands, args[len(args)-1], true)
 }
 
-func AppendCommand(text, desc string) {
+func AppendCommand(parentCmd *Cmd, text, desc string) {
 	commands = append(commands, prompt.Suggest{Text: text, Description: desc})
-	cmds[text] = &Cmd{}
-	cmds[text].desc = desc
-	cmds[text].posArgs = []prompt.Suggest{}
-	cmds[text].optArgs = []prompt.Suggest{}
+	cmd := &Cmd{
+		Name:      text,
+		Desc:      desc,
+		posArgs:   make([]CmdArgument, 0),
+		optArgs:   make([]CmdArgument, 0),
+		ParentCmd: parentCmd,
+	}
+	subcmds[text] = cmd
+	parentCmd.AddCmd(cmd)
 }
 
-func AppendPos(text, cmd, desc string) {
-	var v = []prompt.Suggest{{Text: cmd, Description: desc}}
-	cmds[text].posArgs = append(cmds[text].posArgs, v...)
+func (c *Cmd) addArgument(target *[]CmdArgument, arg structarg.Argument, argStr string, desc string) {
+	*target = append(*target, CmdArgument{
+		Suggest: prompt.Suggest{
+			Text:        argStr,
+			Description: desc,
+		},
+		Argument: arg,
+	})
 }
 
-func AppendOpt(text, cmd, desc string) {
-	var v = []prompt.Suggest{{Text: cmd, Description: desc}}
-	cmds[text].optArgs = append(cmds[text].optArgs, v...)
+func (c *Cmd) AddPosArgument(arg structarg.Argument, argStr string, desc string) {
+	c.addArgument(&c.posArgs, arg, argStr, desc)
 }
 
-func GenerateAutoCompleteCmds(shell string) string {
+func (c *Cmd) AddOptArgument(arg structarg.Argument, argStr string, desc string) {
+	c.addArgument(&c.optArgs, arg, argStr, desc)
+}
+
+func AppendPos(text, cmd, desc string, arg structarg.Argument) {
+	cmdObj := subcmds[text]
+	cmdObj.AddPosArgument(arg, cmd, desc)
+}
+
+func AppendOpt(text, cmd, desc string, arg structarg.Argument) {
+	cmdObj := subcmds[text]
+	cmdObj.AddOptArgument(arg, cmd, desc)
+}
+
+func GenerateAutoCompleteCmds(rootCmd *Cmd, shell string) string {
 	var ret = []string{}
 	var i = 0
 	if strings.ToLower(shell) == "zsh" {
-		i = 1
+		out := bytes.NewBufferString("")
+		if err := rootCmd.GenZshCompletion(out); err != nil {
+			panic(err)
+		}
+		return out.String()
 	}
-	for cmd, options := range cmds {
+	for _, cmd := range subcmds {
 		var (
 			strPosArgs = []string{}
 			strOptArgs = []string{}
 		)
-		for _, posArg := range options.posArgs {
+		for _, posArg := range cmd.GetPromptPosSuggests() {
 			strPosArgs = append(strPosArgs, posArg.Text)
 		}
-		for _, optArg := range options.optArgs {
+		for _, optArg := range cmd.GetPromptOptSuggests() {
 			strOptArgs = append(strOptArgs, strings.Split(optArg.Text, " ")[0])
 		}
-		ret = append(ret, fmt.Sprintf(`arr[%d]="%s# %s %s"`, i, cmd,
+		ret = append(ret, fmt.Sprintf(`arr[%d]="%s# %s %s"`, i, cmd.Name,
 			strings.Join(strPosArgs, " "), strings.Join(strOptArgs, " ")))
 		i += 1
 	}

cmd/climc/shell/ansible/ansible.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/ansible/ansibleplaybooks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/ansible/ansibleplaybooks_v2.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -49,4 +49,34 @@ func init() {
 		printList(apbs, modules.AnsiblePlaybooksV2.GetColumns(s))
 		return nil
 	})
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-run", "Run ansible playbook",
+		func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+			apb, err := modules.AnsiblePlaybooksV2.PerformAction(s, opts.ID, "run", nil)
+			if err != nil {
+				return err
+			}
+			printObject(apb)
+			return nil
+		},
+	)
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-stop", "Stop ansible playbook",
+		func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+			apb, err := modules.AnsiblePlaybooksV2.PerformAction(s, opts.ID, "stop", nil)
+			if err != nil {
+				return err
+			}
+			printObject(apb)
+			return nil
+		},
+	)
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-delete", "Delete ansible playbook",
+		func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+			apb, err := modules.AnsiblePlaybooksV2.Delete(s, opts.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(apb)
+			return nil
+		},
+	)
 }

cmd/climc/shell/ansible/common.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 ansible
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+
+	InvalidUpdateError   = shell.InvalidUpdateError
+	printObjectRecursive = printutils.PrintJSONObjectRecursive
+
+	exportList = shell.ExportList
+)

cmd/climc/shell/ansible/devtoolcronjob.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/ansible/devtooltemplate.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/jsonutils"
@@ -107,7 +107,7 @@ func init() {
 	R(
 		&options.DevtoolTemplateBindingOptions{},
 		"devtooltemplate-unbind",
-		"Binding devtool template to a host/vm",
+		"UnBinding devtool template to a host/vm",
 		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateBindingOptions) error {
 			params := jsonutils.NewDict()
 			params.Set("server_id", jsonutils.NewString(opts.ServerID))

cmd/climc/shell/cloudevent/cloudevents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package cloudevent
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/cloudevent/common.go

@@ -0,0 +1,25 @@
+// 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 cloudevent
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R         = shell.R
+	printList = printutils.PrintJSONList
+)

cmd/climc/shell/cloudid/cloudgroup.go

@@ -0,0 +1,168 @@
+// 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 cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudgroupListOptions struct {
+		options.BaseListOptions
+
+		ClouduserId   string `json:"clouduser_id"`
+		CloudpolicyId string `json:"cloudpolicy_id"`
+		Usable        bool   `json:"usable"`
+	}
+	R(&CloudgroupListOptions{}, "cloud-group-list", "List cloud groups", func(s *mcclient.ClientSession, opts *CloudgroupListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudgroups.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgroups.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupCreateOptions struct {
+		NAME           string   `json:"name"`
+		PROVIDER       string   `json:"provider" choices:"Google|Aliyun|Aws|Huawei|Qcloud"`
+		CloudpolicyIds []string `json:"cloudpolicy_ids"`
+		Desc           string   `json:"description"`
+	}
+
+	R(&CloudgroupCreateOptions{}, "cloud-group-create", "Create cloud group", func(s *mcclient.ClientSession, opts *CloudgroupCreateOptions) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Cloudgroups.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupIdOptions struct {
+		ID string `help:"Cloudgroup Id"`
+	}
+
+	R(&CloudgroupIdOptions{}, "cloud-group-delete", "Delete cloud group", func(s *mcclient.ClientSession, opts *CloudgroupIdOptions) error {
+		result, err := modules.Cloudgroups.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupIdOptions{}, "cloud-group-show", "Show cloud group", func(s *mcclient.ClientSession, opts *CloudgroupIdOptions) error {
+		result, err := modules.Cloudgroups.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupIdOptions{}, "cloud-group-syncstatus", "Sync cloud group status", func(s *mcclient.ClientSession, opts *CloudgroupIdOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupPolicyOptions struct {
+		ID             string `help:"Cloudgroup Id"`
+		CLOUDPOLICY_ID string `help:"Cloudpolicy Id"`
+	}
+
+	R(&CloudgroupPolicyOptions{}, "cloud-group-attach-policy", "Attach policy for cloud group", func(s *mcclient.ClientSession, opts *CloudgroupPolicyOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "attach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupPolicyOptions{}, "cloud-group-detach-policy", "Detach policy from cloud group", func(s *mcclient.ClientSession, opts *CloudgroupPolicyOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "detach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupUserOptions struct {
+		ID           string `help:"Cloudgroup Id"`
+		CLOUDUSER_ID string `help:"Clouduser Id"`
+	}
+
+	R(&CloudgroupUserOptions{}, "cloud-group-add-user", "Add user to cloud group", func(s *mcclient.ClientSession, opts *CloudgroupUserOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "add-user", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupUserOptions{}, "cloud-group-remove-user", "Remove user from cloud group", func(s *mcclient.ClientSession, opts *CloudgroupUserOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "remove-user", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupPoliciesOptions struct {
+		ID             string   `help:"Cloudgroup Id"`
+		CloudpolicyIds []string `json:"cloudpolicy_ids"`
+	}
+
+	R(&CloudgroupPoliciesOptions{}, "cloud-group-set-policies", "Set cloudpolicies for cloud group", func(s *mcclient.ClientSession, opts *CloudgroupPoliciesOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "set-policies", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudgroupUsersOptions struct {
+		ID           string   `help:"Cloudgroup Id"`
+		ClouduserIds []string `json:"clouduser_ids"`
+	}
+
+	R(&CloudgroupUsersOptions{}, "cloud-group-set-users", "Set users for cloud group", func(s *mcclient.ClientSession, opts *CloudgroupUsersOptions) error {
+		result, err := modules.Cloudgroups.PerformAction(s, opts.ID, "set-users", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudgroupcache.go

@@ -0,0 +1,73 @@
+// 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 cloudid
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudgroupcacheListOptions struct {
+		options.BaseListOptions
+
+		CloudgroupId string `json:"cloudgroup_id"`
+	}
+	R(&CloudgroupcacheListOptions{}, "cloud-group-cache-list", "List cloud group caches", func(s *mcclient.ClientSession, opts *CloudgroupcacheListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudgroupcaches.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgroupcaches.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupcacheIdOption struct {
+		ID string `help:"Cloudgroup Id"`
+	}
+
+	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-show", "Show cloud groupcache details", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
+		result, err := modules.Cloudgroupcaches.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-syncstatus", "Sync cloudgroupcache", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
+		result, err := modules.Cloudgroupcaches.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudgroupcacheIdOption{}, "cloud-group-cache-delete", "Delete cloudgroupcache", func(s *mcclient.ClientSession, opts *CloudgroupcacheIdOption) error {
+		result, err := modules.Cloudgroupcaches.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudgrouppolicies.go

@@ -0,0 +1,72 @@
+// 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 cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"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"
+)
+
+func init() {
+	type CloudgroupPolicyListOptions struct {
+		options.BaseListOptions
+		Cloudgroup  string `help:"ID or Name of Cloudgroup"`
+		Cloudpolicy string `help:"Policy ID or name"`
+	}
+	R(&CloudgroupPolicyListOptions{}, "cloud-group-policy-list", "List cloudgroup cloudpolicy pairs", func(s *mcclient.ClientSession, args *CloudgroupPolicyListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+		var result *modulebase.ListResult
+		var err error
+		if len(args.Cloudgroup) > 0 {
+			result, err = modules.Cloudgrouppolicies.ListDescendent(s, args.Cloudgroup, params)
+		} else if len(args.Cloudpolicy) > 0 {
+			result, err = modules.Cloudgrouppolicies.ListDescendent2(s, args.Cloudpolicy, params)
+		} else {
+			result, err = modules.Cloudgrouppolicies.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgrouppolicies.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupPolicyDetailOptions struct {
+		CLOUDUSER   string `help:"ID or Name of Cloudgroup"`
+		CLOUDPOLICY string `help:"ID or Name of Cloudpolicy"`
+	}
+	R(&CloudgroupPolicyDetailOptions{}, "cloud-group-policy-show", "Show cloudgrouppolicy details", func(s *mcclient.ClientSession, args *CloudgroupPolicyDetailOptions) error {
+		query := jsonutils.NewDict()
+		result, err := modules.Cloudgrouppolicies.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudgroupusers.go

@@ -0,0 +1,72 @@
+// 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 cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"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"
+)
+
+func init() {
+	type CloudgroupUserListOptions struct {
+		options.BaseListOptions
+		Cloudgroup string `help:"ID or Name of Cloudgroup"`
+		Clouduser  string `help:"User ID or name"`
+	}
+	R(&CloudgroupUserListOptions{}, "cloud-group-user-list", "List cloudgroup clouduser pairs", func(s *mcclient.ClientSession, args *CloudgroupUserListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+		var result *modulebase.ListResult
+		var err error
+		if len(args.Cloudgroup) > 0 {
+			result, err = modules.Cloudgroupusers.ListDescendent(s, args.Cloudgroup, params)
+		} else if len(args.Clouduser) > 0 {
+			result, err = modules.Cloudgroupusers.ListDescendent2(s, args.Clouduser, params)
+		} else {
+			result, err = modules.Cloudgroupusers.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudgroupusers.GetColumns(s))
+		return nil
+	})
+
+	type CloudgroupUserDetailOptions struct {
+		CLOUDUSER   string `help:"ID or Name of Cloudgroup"`
+		CLOUDPOLICY string `help:"ID or Name of Clouduser"`
+	}
+	R(&CloudgroupUserDetailOptions{}, "cloud-group-user-show", "Show cloudgroupuser details", func(s *mcclient.ClientSession, args *CloudgroupUserDetailOptions) error {
+		query := jsonutils.NewDict()
+		result, err := modules.Cloudgroupusers.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudpolicy.go

@@ -0,0 +1,81 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type CloudpolicyListOptions struct {
+		options.BaseListOptions
+
+		ClouduserId  string `json:"clouduser_id"`
+		CloudgroupId string `json:"cloudgroup_id"`
+	}
+	R(&CloudpolicyListOptions{}, "cloud-policy-list", "List cloud policies", func(s *mcclient.ClientSession, opts *CloudpolicyListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudpolicies.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudpolicies.GetColumns(s))
+		return nil
+	})
+
+	type CloudpolicyIdOptions struct {
+		ID string `help:"Cloudpolicy Id"`
+	}
+
+	R(&CloudpolicyIdOptions{}, "cloud-policy-show", "Sow cloud policiy details", func(s *mcclient.ClientSession, opts *CloudpolicyIdOptions) error {
+		result, err := modules.Cloudpolicies.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudpolicyGroupOptions struct {
+		ID            string `help:"Cloudpolicy Id"`
+		CLOUDGROUP_ID string `help:"Cloudgroup Id" json:"cloudgroup_id"`
+	}
+
+	R(&CloudpolicyGroupOptions{}, "cloud-policy-assign-group", "Assign cloud policiy to group", func(s *mcclient.ClientSession, opts *CloudpolicyGroupOptions) error {
+		result, err := modules.Cloudpolicies.PerformAction(s, opts.ID, "assign-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&CloudpolicyGroupOptions{}, "cloud-policy-revoke-group", "Revoke cloud policiy from group", func(s *mcclient.ClientSession, opts *CloudpolicyGroupOptions) error {
+		result, err := modules.Cloudpolicies.PerformAction(s, opts.ID, "revoke-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/clouduserpolicies.go

@@ -0,0 +1,72 @@
+// 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 cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"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"
+)
+
+func init() {
+	type ClouduserPolicyListOptions struct {
+		options.BaseListOptions
+		Clouduser   string `help:"ID or Name of Clouduser"`
+		Cloudpolicy string `help:"Policy ID or name"`
+	}
+	R(&ClouduserPolicyListOptions{}, "cloud-user-policy-list", "List clouduser cloudpolicy pairs", func(s *mcclient.ClientSession, args *ClouduserPolicyListOptions) error {
+		var params *jsonutils.JSONDict
+		{
+			var err error
+			params, err = args.BaseListOptions.Params()
+			if err != nil {
+				return err
+
+			}
+		}
+		var result *modulebase.ListResult
+		var err error
+		if len(args.Clouduser) > 0 {
+			result, err = modules.Clouduserpolicies.ListDescendent(s, args.Clouduser, params)
+		} else if len(args.Cloudpolicy) > 0 {
+			result, err = modules.Clouduserpolicies.ListDescendent2(s, args.Cloudpolicy, params)
+		} else {
+			result, err = modules.Clouduserpolicies.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Clouduserpolicies.GetColumns(s))
+		return nil
+	})
+
+	type ClouduserPolicyDetailOptions struct {
+		CLOUDUSER   string `help:"ID or Name of Clouduser"`
+		CLOUDPOLICY string `help:"ID or Name of Cloudpolicy"`
+	}
+	R(&ClouduserPolicyDetailOptions{}, "cloud-user-policy-show", "Show clouduserpolicy details", func(s *mcclient.ClientSession, args *ClouduserPolicyDetailOptions) error {
+		query := jsonutils.NewDict()
+		result, err := modules.Clouduserpolicies.Get(s, args.CLOUDUSER, args.CLOUDPOLICY, query)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/cloudusers.go

@@ -0,0 +1,197 @@
+// 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 cloudid
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type ClouduserListOptions struct {
+		options.BaseListOptions
+		CloudaccountId  string `help:"Cloudaccount Id"`
+		CloudproviderId string `help:"Cloudprovider Id"`
+		CloudpolicyId   string `help:"filter cloudusers by cloudpolicy"`
+		CloudgroupId    string `help:"filter cloudusers by cloudgroup"`
+	}
+	R(&ClouduserListOptions{}, "cloud-user-list", "List cloud users", func(s *mcclient.ClientSession, opts *ClouduserListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudusers.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Cloudusers.GetColumns(s))
+		return nil
+	})
+
+	type ClouduserCreateOptions struct {
+		Name            string
+		CloudaccountId  string   `help:"Cloudaccount Id"`
+		CloudproviderId string   `help:"Cloudprovider Id"`
+		OwnerId         string   `help:"Owner Id"`
+		CloudpolicyIds  []string `help:"cloudpolicy ids"`
+		CloudgroupIds   []string `help:"cloudgroup ids"`
+		Email           string   `help:"email address"`
+		MobilePhone     string   `help:"phone number"`
+		IsConsoleLogin  *bool    `help:"is console login"`
+		Password        string   `help:"clouduser password"`
+	}
+
+	R(&ClouduserCreateOptions{}, "cloud-user-create", "Create cloud user", func(s *mcclient.ClientSession, opts *ClouduserCreateOptions) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Cloudusers.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserIdOptions struct {
+		ID string `help:"Clouduser Id"`
+	}
+
+	R(&ClouduserIdOptions{}, "cloud-user-delete", "Delete cloud user", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserIdOptions{}, "cloud-user-logininfo", "Show cloud user login info", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.GetLoginInfo(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserIdOptions{}, "cloud-user-show", "Show cloud user", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserSyncOptions struct {
+		ID         string `help:"Clouduser Id"`
+		PolicyOnly bool   `help:"Ony sync clouduser policies for cloud"`
+	}
+
+	R(&ClouduserSyncOptions{}, "cloud-user-sync", "Sync cloud user policies", func(s *mcclient.ClientSession, opts *ClouduserSyncOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "sync", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserIdOptions{}, "cloud-user-syncstatus", "Sync cloud user status", func(s *mcclient.ClientSession, opts *ClouduserIdOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserPolicyOptions struct {
+		ID             string `help:"Clouduser Id"`
+		CLOUDPOLICY_ID string `help:"cloudpolicy Id"`
+	}
+
+	R(&ClouduserPolicyOptions{}, "cloud-user-attach-policy", "Attach policy for cloud user", func(s *mcclient.ClientSession, opts *ClouduserPolicyOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "attach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserPolicyOptions{}, "cloud-user-detach-policy", "Detach policy from cloud user", func(s *mcclient.ClientSession, opts *ClouduserPolicyOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "detach-policy", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserPasswordOptions struct {
+		ID       string `help:"Clouduser Id"`
+		Password string `help:"clouduser password"`
+	}
+
+	R(&ClouduserPasswordOptions{}, "cloud-user-reset-password", "Reset clouduser password", func(s *mcclient.ClientSession, opts *ClouduserPasswordOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "reset-password", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserChangeOwnerOptions struct {
+		ID      string `help:"clouduser id"`
+		USER_ID string `help:"local user id"`
+	}
+
+	R(&ClouduserChangeOwnerOptions{}, "cloud-user-change-owner", "Change clouduser owner", func(s *mcclient.ClientSession, opts *ClouduserChangeOwnerOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "change-owner", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ClouduserGroupOptions struct {
+		ID            string `help:"clouduser id"`
+		CLOUDGROUP_ID string `help:"cloudgroup id" json:"cloudgroup_id"`
+	}
+
+	R(&ClouduserGroupOptions{}, "cloud-user-join-group", "Join user to cloudgroup", func(s *mcclient.ClientSession, opts *ClouduserGroupOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "join-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ClouduserGroupOptions{}, "cloud-user-leave-group", "Leave from cloudgroup", func(s *mcclient.ClientSession, opts *ClouduserGroupOptions) error {
+		result, err := modules.Cloudusers.PerformAction(s, opts.ID, "leave-group", jsonutils.Marshal(opts))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/cloudid/common.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 cloudid
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R           = shell.R
+	printList   = printutils.PrintJSONList
+	printObject = printutils.PrintJSONObject
+)

cmd/climc/shell/cloudnet/routes.go

@@ -22,7 +22,7 @@ import (
 )
 
 func init() {
-	R(&options.RouteCreateOptions{}, "router-route-create", "Create router", func(s *mcclient.ClientSession, opts *options.RouteCreateOptions) error {
+	R(&options.RouteCreateOptions{}, "router-route-create", "Create router route", func(s *mcclient.ClientSession, opts *options.RouteCreateOptions) error {
 		params, err := base_options.StructToParams(opts)
 		if err != nil {
 			return err
@@ -34,7 +34,7 @@ func init() {
 		printObject(router)
 		return nil
 	})
-	R(&options.RouteGetOptions{}, "router-route-show", "Show router", func(s *mcclient.ClientSession, opts *options.RouteGetOptions) error {
+	R(&options.RouteGetOptions{}, "router-route-show", "Show router route", func(s *mcclient.ClientSession, opts *options.RouteGetOptions) error {
 		router, err := modules.Routes.Get(s, opts.ID, nil)
 		if err != nil {
 			return err
@@ -42,7 +42,7 @@ func init() {
 		printObject(router)
 		return nil
 	})
-	R(&options.RouteListOptions{}, "router-route-list", "List routers", func(s *mcclient.ClientSession, opts *options.RouteListOptions) error {
+	R(&options.RouteListOptions{}, "router-route-list", "List router routes", func(s *mcclient.ClientSession, opts *options.RouteListOptions) error {
 		params, err := base_options.ListStructToParams(opts)
 		if err != nil {
 			return err
@@ -54,7 +54,7 @@ func init() {
 		printList(result, modules.Routes.GetColumns(s))
 		return nil
 	})
-	R(&options.RouteUpdateOptions{}, "router-route-update", "Update router", func(s *mcclient.ClientSession, opts *options.RouteUpdateOptions) error {
+	R(&options.RouteUpdateOptions{}, "router-route-update", "Update router route", func(s *mcclient.ClientSession, opts *options.RouteUpdateOptions) error {
 		params, err := base_options.StructToParams(opts)
 		router, err := modules.Routes.Update(s, opts.ID, params)
 		if err != nil {
@@ -63,7 +63,7 @@ func init() {
 		printObject(router)
 		return nil
 	})
-	R(&options.RouteDeleteOptions{}, "router-route-delete", "Delete router", func(s *mcclient.ClientSession, opts *options.RouteDeleteOptions) error {
+	R(&options.RouteDeleteOptions{}, "router-route-delete", "Delete router route", func(s *mcclient.ClientSession, opts *options.RouteDeleteOptions) error {
 		router, err := modules.Routes.Delete(s, opts.ID, nil)
 		if err != nil {
 			return err

cmd/climc/shell/compute/baremetalagents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/baremetalnetworks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/baremetalstorages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/compute/buckets.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -26,18 +26,28 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	objectshell "yunion.io/x/onecloud/pkg/multicloud/objectstore"
+	"yunion.io/x/onecloud/pkg/multicloud/objectstore"
 )
 
 func init() {
 	type BucketListOptions struct {
 		options.BaseListOptions
+		DistinctField string `help:"query specified distinct field"`
 	}
 	R(&BucketListOptions{}, "bucket-list", "List all buckets", func(s *mcclient.ClientSession, args *BucketListOptions) error {
 		params, err := options.ListStructToParams(args)
 		if err != nil {
 			return err
 		}
+		if len(args.DistinctField) > 0 {
+			params.Add(jsonutils.NewString(args.DistinctField), "extra_field")
+			result, err := modules.Buckets.Get(s, "distinct-field", params)
+			if err != nil {
+				return err
+			}
+			fmt.Println(result)
+			return nil
+		}
 		result, err := modules.Buckets.List(s, params)
 		if err != nil {
 			return err
@@ -46,10 +56,10 @@ func init() {
 		return nil
 	})
 
-	type BucketShowOptions struct {
+	type BucketIdOptions struct {
 		ID string `help:"ID or name of bucket"`
 	}
-	R(&BucketShowOptions{}, "bucket-show", "Show details of bucket", func(s *mcclient.ClientSession, args *BucketShowOptions) error {
+	R(&BucketIdOptions{}, "bucket-show", "Id details of bucket", func(s *mcclient.ClientSession, args *BucketIdOptions) error {
 		result, err := modules.Buckets.Get(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -58,6 +68,15 @@ func init() {
 		return nil
 	})
 
+	R(&BucketIdOptions{}, "bucket-syncstatus", "Sync bucket statust", func(s *mcclient.ClientSession, args *BucketIdOptions) error {
+		result, err := modules.Buckets.PerformAction(s, args.ID, "syncstatus", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type BucketUpdateOptions struct {
 		ID   string `help:"ID or name of bucket" json:"-"`
 		Name string `help:"new name of bucket" json:"name"`
@@ -169,7 +188,7 @@ func init() {
 		StorageClass  string `help:"storage CLass"`
 		Acl           string `help:"object acl." choices:"private|public-read|public-read-write"`
 
-		objectshell.ObjectHeaderOptions
+		objectstore.ObjectHeaderOptions
 	}
 	R(&BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *BucketUploadObjectsOptions) error {
 		var body io.Reader
@@ -306,7 +325,7 @@ func init() {
 
 		Key []string `help:"Optional object key" json:"key"`
 
-		objectshell.ObjectHeaderOptions
+		objectstore.ObjectHeaderOptions
 	}
 	R(&BucketSetMetadataOptions{}, "bucket-set-metadata", "Set metadata of object", func(s *mcclient.ClientSession, args *BucketSetMetadataOptions) error {
 		input := api.BucketMetadataInput{}