Merge pull request #3956 from ioito/automated-cherry-pick-of-#3939-upstream-release-2.12

Automated cherry pick of #3939: fix: 避免解绑eip后可以立即syncstatus操作导致同步eip出现问题
Merge branch 'release/2.12' into automated-cherry-pick-of-#3939-upstream-release-2.12
2026-09-21 00:24:07 +08:00 · 2019-11-27 22:08:29 +08:00 · 2019-11-27 21:40:04 +08:00 · 2019-11-27 21:30:40 +08:00 · 2019-11-27 21:26:28 +08:00 · 2019-11-27 21:05:28 +08:00
4829 changed files with 579246 additions and 360228 deletions
--- a/.circleci/Dockerfile
+++ b/.circleci/Dockerfile
@@ -13,9 +13,9 @@ RUN true \

 WORKDIR /opt
 RUN true \
-	&& wget https://dl.google.com/go/go1.12.1.linux-amd64.tar.gz \
-	&& tar xzf go1.12.1.linux-amd64.tar.gz \
-	&& rm -vf  go1.12.1.linux-amd64.tar.gz \
+	&& 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}"
@@ -24,6 +24,16 @@ RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /
 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
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,9 +3,24 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
-  build:
+  check:
    docker:
-      - image: yunionio/onecloud-ci:20190328
+      - image: yunionio/onecloud-ci:v1.0.3
+        environment:
+          ONECLOUD_CI_BUILD: "1"
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
+    steps:
+      - checkout
+      - run:
+          command: |
+            make check
+  build:
+    requires:
+      - check
+    docker:
+      - image: yunionio/onecloud-ci:v1.0.2
+        environment:
+          ONECLOUD_CI_BUILD: "1"

    #### TEMPLATE_NOTE: go expects specific checkout path representing url
    #### expecting it in the form of
@@ -15,29 +30,54 @@ jobs:
    parallelism: 4
    steps:
      - checkout
+      - restore_cache:
+          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
      - run:
          command: |
            targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
            echo $targets | tr ' ' '\n'
            make $targets
            ls -lh _output/bin/
+      - save_cache:
+          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
+      - store_artifacts:
+          path: _output/

  test:
+    requires:
+      - check
    docker:
-      - image: yunionio/onecloud-ci:20190328
+      - image: yunionio/onecloud-ci:v1.0.2
+        environment:
+          GO111MODULE: "on"
    working_directory: /home/build/go/src/yunion.io/x/onecloud
    steps:
      - checkout
+      - restore_cache:
+          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
      - run:
          name: unit_test
-          command: make test
-      - run:
-          name: generate_code_coverage
-          command: ./scripts/coverage.sh --codecov
+          command: |
+            ./scripts/coverage.sh --codecov
+      - save_cache:
+          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build

 workflows:
  version: 2
  build_and_test:
    jobs:
-      - build
-      - test
+      - check
+      - build:
+          requires:
+            - check
+      - test:
+          requires:
+            - check
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,29 @@
-# This is how to tell Travis to use the fast container-based test
-# runner instead of the slow VM-based one.
 sudo: false

-dist: xenial
+dist: bionic

-services:
-  - docker
+addons:
+  apt:
+    sources:
+      - sourceline: "deb https://download.ceph.com/debian-luminous/ bionic main"
+        key_url: "https://download.ceph.com/keys/release.asc"
+    packages:
+      - build-essential
+      - libcephfs-dev
+      - librbd-dev
+      - librados-dev

 language: go
-
-go_import_path: yunion.io/x/onecloud
-
 go:
-  - "1.12.x"
+  - 1.12.x
+go_import_path: yunion.io/x/onecloud
+cache:
+  directories:
+    - $HOME/.cache/go-build

-# Only clone the most recent commit.
 git:
-  depth: 1
+  depth: 8

 script:
-  - make docker_build
+  - make -j$(nproc) ONECLOUD_CI_BUILD=1
+  - ls -lh _output/bin
--- a/Gopkg.lock
+++ b/Gopkg.lock
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -1,212 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#   name = "github.com/x/y"
-#   version = "2.4.0"
-#
-# [prune]
-#   non-go = false
-#   go-tests = true
-#   unused-packages = true
-
-[[constraint]]
-  name = "github.com/pierrec/lz4"
-  version = "2.0.7"
-
-[[constraint]]
-  name = "github.com/360EntSecGroup-Skylar/excelize"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/Azure/azure-sdk-for-go"
-  version = "=19.1.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/Microsoft/azure-vhd-utils"
-
-[[constraint]]
-  name = "github.com/aliyun/alibaba-cloud-sdk-go"
-  version = "0.7.4"
-
-[[constraint]]
-  name = "github.com/aliyun/aliyun-oss-go-sdk"
-  version = "1.9.1"
-
-[[constraint]]
-  name = "github.com/aokoli/goutils"
-  version = "1.0.1"
-
-[[constraint]]
-  name = "github.com/aws/aws-sdk-go"
-  version = "=1.15.73"
-
-[[constraint]]
-  name = "github.com/bitly/go-simplejson"
-  version = "0.5.0"
-
-[[constraint]]
-  name = "github.com/c-bata/go-prompt"
-  version = "=0.2.1"
-
-[[constraint]]
-  name = "github.com/coredns/coredns"
-  version = "v1.2.0"
-
-[[constraint]]
-  name = "github.com/fatih/color"
-  version = "1.7.0"
-
-[[constraint]]
-  name = "github.com/go-sql-driver/mysql"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/golang-plus/uuid"
-  version = "1.0.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/googollee/go-socket.io"
-
-[[constraint]]
-  name = "github.com/gorilla/mux"
-  version = "1.6.2"
-
-[[constraint]]
-  name = "github.com/gorilla/websocket"
-  version = "1.4.0"
-
-[[constraint]]
-  name = "github.com/koding/websocketproxy"
-  branch = "master"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/gosuri/uitable"
-
-[[constraint]]
-  name = "github.com/hako/durafmt"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/jinzhu/gorm"
-  version = "1.9.1"
-
-[[constraint]]
-  name = "github.com/kr/pty"
-  version = "1.1.3"
-
-[[constraint]]
-  name = "github.com/mholt/caddy"
-  version = "0.10.11"
-
-[[constraint]]
-  name = "github.com/miekg/dns"
-  version = "1.0.15"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/moul/http2curl"
-
-[[constraint]]
-  name = "github.com/nelsonken/cos-go-sdk-v5"
-  version = "1.21.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/serialx/hashring"
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.3.0"
-
-[[constraint]]
-  name = "github.com/tencentcloud/tencentcloud-sdk-go"
-  version = "=3.0.30"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/tredoe/osutil"
-
-[[constraint]]
-  name = "github.com/vmware/govmomi"
-  version = "0.19.0"
-
-[[constraint]]
-  branch = "master"
-  name = "golang.org/x/crypto"
-
-[[constraint]]
-  name = "gopkg.in/gin-gonic/gin.v1"
-  version = "1.2.0"
-
-[[constraint]]
-  name = "k8s.io/api"
-  version = "kubernetes-1.12.0"
-
-[[constraint]]
-  branch = "master"
-  name = "k8s.io/apimachinery"
-
-[[constraint]]
-  name = "k8s.io/client-go"
-  version = "9.0.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/anacrolix/torrent"
-
-[[constraint]]
-  branch = "master"
-  name = "yunion.io/x/jsonutils"
-
-[[constraint]]
-  branch = "master"
-  name = "yunion.io/x/log"
-
-[[constraint]]
-  branch = "master"
-  name = "yunion.io/x/pkg"
-
-[[constraint]]
-  branch = "master"
-  name = "yunion.io/x/sqlchemy"
-
-[[constraint]]
-  branch = "master"
-  name = "yunion.io/x/structarg"
-
-[[override]]
-  name = "github.com/apache/thrift"
-  revision = "e59b73d3c2bf1c328ccb78e683c0462fa1a473c7"
-
-[prune]
-  go-tests = true
-  unused-packages = true
-
-[[constraint]]
-  name = "github.com/shirou/gopsutil"
-  version = "2.18.10"
-
-[[constraint]]
-  name="github.com/ceph/go-ceph"
-  branch = "master"
-[[constraint]]
-  branch = "master"
-  name = "github.com/libvirt/libvirt-go-xml"
--- a/184
+++ b/184
@@ -1,18 +1,25 @@
 #####################################################

 REPO_PREFIX := yunion.io/x/onecloud
-VENDOR_PATH := $(REPO_PREFIX)/vendor
-VERSION_PKG := $(VENDOR_PATH)/yunion.io/x/pkg/util/version
+VERSION_PKG := yunion.io/x/pkg/util/version
 ROOT_DIR := $(CURDIR)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh

-GIT_COMMIT := $(shell git rev-parse --short HEAD)
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
-GIT_VERSION := $(shell git describe --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')
+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_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
+	GIT_COMMIT:=x
+	GIT_BRANCH:=x
+	GIT_VERSION:=x
+	BUILD_TREE_STATE:=clean
+	BUILD_DATE=2099-07-01T07:11:09Z
+endif

 LDFLAGS := "-w \
 	-X $(VERSION_PKG).gitVersion=$(GIT_VERSION) \
@@ -26,7 +33,8 @@ LDFLAGS := "-w \

 #####################################################

-GO_BUILD := go build -ldflags $(LDFLAGS)
+GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
+GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test

@@ -36,13 +44,23 @@ 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 GO111MODULE:=on
 export CGO_CFLAGS = ${X_CGO_CFLAGS}
 export CGO_LDFLAGS = ${X_CGO_LDFLAGS}

+UNAME := $(shell uname)
+
+ifeq ($(UNAME), Linux)
+XARGS_FLAGS = --no-run-if-empty
+endif
+
+cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
+rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
+
 all: build


@@ -53,33 +71,29 @@ install: prepare_dir
 	done


-build: gendoc
-	$(MAKE) $(filter-out cmd/host-image, $(wildcard cmd/*))
-
-gendoc:
-	@sh build/gendoc.sh
-
 gencopyright:
 	@sh scripts/gencopyright.sh pkg cmd

 test:
-	@go test $(shell go list ./... | egrep -v 'host-image|hostimage')
+	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')

 vet:
 	go vet ./...

-cmd/%: prepare_dir fmt
+cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@

+rpm/%: cmd/%
+	$(BUILD_SCRIPT) $*

-pkg/%: prepare_dir fmt
+pkg/%: prepare_dir
 	$(GO_INSTALL) $(REPO_PREFIX)/$@

+build:
+	$(MAKE) $(cmdTargets)

-# a hack
 rpm:
-	$(MAKE) $(patsubst %,cmd/%,$(filter-out $@,$(MAKECMDGOALS)))
-	$(foreach cmd,$(filter-out $@,$(MAKECMDGOALS)),$(BUILD_SCRIPT) $(cmd);)
+	$(MAKE) $(rpmTargets)

 rpmclean:
 	rm -fr $(BUILD_DIR)/rpms
@@ -94,14 +108,8 @@ bin_dir: output_dir
 output_dir:
 	@mkdir -p $(BUILD_DIR)

-dep_clean:
-	rm -fr $(GOPATH)/pkg/dep/sources/*

-dep_install:
-	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
-
-.PHONY: all build prepare_dir clean fmt rpm
+.PHONY: all build prepare_dir clean rpm


 clean:
@@ -109,14 +117,118 @@ clean:


 fmt:
-	@find . -type f -name "*.go" -not -path "./_output/*" \
-		-not -path "./vendor/*" | xargs gofmt -s -w
+	@git ls-files --exclude '*' '*.go' \
+		| grep -v '^vendor/' \
+		| xargs $(XARGS_FLAGS) gofmt -w

+fmt-check: fmt
+	@if git status --short | grep -E '^.M .*/[^.]+.go'; then \
+		git diff | cat; \
+		echo "$@: working tree modified (possibly by gofmt)" >&2 ; \
+		false ; \
+	fi
+.PHONY: fmt fmt-check
+
+gendocgo:
+	@sh build/gendoc.sh
+
+adddocgo:
+	@git ls-files --others '*/doc.go' | xargs $(XARGS_FLAGS) -- git add
+
+gendocgo-check: gendocgo
+	@n="$$(git ls-files --others '*/doc.go' | wc -l)"; \
+	if test "$$n" -gt 0; then \
+		git ls-files --others '*/doc.go' | sed -e 's/^/  /'; \
+		echo "$@: untracked doc.go file(s) exist in working directory" >&2 ; \
+		false ; \
+	fi
+.PHONY: gendocgo adddocgo gendocgo-check
+
+goimports-check:
+	@goimports -w -local "yunion.io/x/:yunion.io/x/onecloud" pkg cmd; \
+	if git status --short | grep -E '^.M .*/[^.]+.go'; then \
+		git diff | cat; \
+		echo "$@: working tree modified (possibly by goimports)" >&2 ; \
+		echo "$@: " >&2 ; \
+		echo "$@: import spec should be grouped in order: std, 3rd-party, yunion.io/x, yunion.io/x/onecloud" >&2 ; \
+		echo "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
+		false ; \
+	fi
+.PHONY: goimports-check
+
+check: fmt-check
+check: gendocgo-check
+check: goimports-check
+.PHONY: check
+
+
+define depDeprecated
+OneCloud now requires using go-mod for dependency management.  dep target,
+vendor files will be removed in future versions
+
+Follow the following link to find out more about go-mod
+
+ - https://blog.golang.org/using-go-modules
+ - https://github.com/golang/go/wiki/Modules
+
+Switching to "make mod"...
+
+endef
+
+dep: export depDeprecated:=$(depDeprecated)
 dep:
-	cd $(ROOT_DIR) && dep ensure -v -update $(shell for p in $$(ls vendor/yunion.io/x/); do echo "yunion.io/x/$$p"; done | xargs)
+	@echo "$$depDeprecated"
+	@$(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 mod tidy
+	go mod vendor -v

-docker_build:
-	$(ROOT_DIR)/build/docker_build.sh
+
+DOCKER_BUILD_IMAGE_VERSION?=latest
+
+define dockerBuildCmd
+set -o errexit
+set -o pipefail
+cd /home/build/onecloud
+export GOFLAGS=-mod=vendor
+make $(1)
+endef
+
+docker-build: export dockerBuildCmd:=$(call dockerBuildCmd,$(F))
+docker-build:
+	echo "$$dockerBuildCmd"
+	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"
+	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
+
+.PHONY: docker-build
+.PHONY: docker-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
+
+Tidy up go modules and vendor directory
+
+	make mod
+endef
+
+help: export helpText:=$(helpText)
+help:
+	@echo "$$helpText"
--- a/README.md
+++ b/README.md
@@ -1,3 +1,10 @@
 # Yunion OneCloud

-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) [![Build Status](https://travis-ci.org/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/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) 
+
+# 文档
+
+- 文档中心，https://docs.yunion.cn/
+- API文档，https://docs.yunion.cn/api/
--- a/build/ansibleserver/root/etc/yunion/ansibleserver.conf.sample
+++ b/build/ansibleserver/root/etc/yunion/ansibleserver.conf.sample
@@ -0,0 +1,10 @@
+region = 'Yunion'
+address = '10.168.222.136'
+port = 8890
+auth_uri = 'http://10.168.222.136:35357/v3'
+admin_user = 'yunionansible'
+admin_password = 'xxxxxxxxxxxxxxxx'
+admin_tenant_name = 'system'
+sql_connection = 'mysql+pymysql://yunionansible:9YuQL9KEZn1mppaK@localhost:3306/yunionansible?charset=utf8'
+
+auto_sync_table = True
--- a/build/ansibleserver/vars
+++ b/build/ansibleserver/vars
@@ -0,0 +1,5 @@
+DESCRIPTION="Yunion Ansible Controller"
+
+REQUIRES=(
+	"ansible"
+)
--- a/build/baremetal-agent/vars
+++ b/build/baremetal-agent/vars
@@ -0,0 +1,6 @@
+DESCRIPTION="Baremetal Agent Command Line Utility"
+
+REQUIRES=(
+    ipmitool
+    mkisofs
+)
--- a/build/build.sh
+++ b/build/build.sh
@@ -134,7 +134,11 @@ fi

 rpmbuild --define "_topdir $BUILDROOT" -bb $SPEC_FILE

-mkdir -p $OUTPUT_DIR
-cp -fr $RPM_DIR/* $OUTPUT_DIR/
+find $RPM_DIR -type f | while read f; do
+	d="$(dirname "$f")"
+	d="$OUTPUT_DIR/${d#$RPM_DIR}"
+	mkdir -p "$d"
+	cp $f $d
+done

 rm -fr $BUILDROOT
--- a/build/cloudnet/root/etc/yunion/cloudnet.conf.sample
+++ b/build/cloudnet/root/etc/yunion/cloudnet.conf.sample
@@ -0,0 +1,10 @@
+region = 'Yunion'
+address = '10.168.222.136'
+port = 8891
+auth_uri = 'http://10.168.222.136:35357/v3'
+admin_user = 'cloudnetadmin'
+admin_password = 'xxxxxxxxxxxxxxxx'
+admin_tenant_name = 'system'
+sql_connection = 'mysql+pymysql://yunionansible:9YuQL9KEZn1mppaK@localhost:3306/yunionansible?charset=utf8'
+
+auto_sync_table = True
--- a/build/cloudnet/vars
+++ b/build/cloudnet/vars
@@ -0,0 +1 @@
+DESCRIPTION="Yunion Cloudnet"
--- a/build/docker_build.sh
+++ b/build/docker_build.sh
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-SRC_ROOT=$(realpath $(dirname "${BASH_SOURCE[0]}")/..)
-BIN_DIR=$SRC_ROOT/_output/bin
-WORK_DIR="/go/src/yunion.io/x/onecloud"
-
-docker run --rm -it \
-    -w $WORK_DIR \
-    -v $SRC_ROOT:$WORK_DIR \
-    d3lx/golang:yunion \
-    make
-
-echo "Build finish"
-ls -alh $BIN_DIR
--- a/build/glance/root/opt/yunion/share/notify_templates/image/content/IMAGE_ACTIVED
+++ b/build/glance/root/opt/yunion/share/notify_templates/image/content/IMAGE_ACTIVED
@@ -0,0 +1 @@
+您的{{ .os_type }}镜像{{ .name }}上传成功
--- a/build/glance/root/opt/yunion/share/notify_templates/image/title/IMAGE_ACTIVED
+++ b/build/glance/root/opt/yunion/share/notify_templates/image/title/IMAGE_ACTIVED
@@ -0,0 +1 @@
+镜像{{ .name }}上传成功
--- a/build/host-deployer/root/usr/lib/systemd/system/yunion-host-deployer.service
+++ b/build/host-deployer/root/usr/lib/systemd/system/yunion-host-deployer.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Yunion Host Deploy Agent
+Documentation=https://docs.yunion.cn
+After=network.target httpd.service
+
+[Service]
+Type=simple
+User=root
+Group=root
+ExecStart=/opt/yunion/bin/host-deployer --conf /etc/yunion/host.conf
+WorkingDirectory=/opt/yunion/bin
+KillMode=process
+Restart=always
+RestartSec=30
+LimitNOFILE=500000
+LimitNPROC=500000
+
+[Install]
+WantedBy=multi-user.target
--- a/build/host-deployer/vars
+++ b/build/host-deployer/vars
@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Host Deploy Agent"
+SERVICE="yes"
--- a/build/host/root/usr/lib/systemd/system/yunion-host.service
+++ b/build/host/root/usr/lib/systemd/system/yunion-host.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Yunion Cloud Host Agent server
+Documentation=https://docs.yunion.cn
+After=network-online.target
+Wants=network-online.target
+After=network.target yunion-host-deployer.service
+
+[Service]
+Type=simple
+User=root
+Group=root
+ExecStart=/opt/yunion/bin/host --config /etc/yunion/host.conf
+WorkingDirectory=/opt/yunion/bin
+KillMode=process
+Restart=always
+RestartSec=30
+LimitNOFILE=500000
+LimitNPROC=500000
+
+[Install]
+WantedBy=multi-user.target
--- a/build/host/vars
+++ b/build/host/vars
@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Host Command Line Utility"
+SERVICE="yes"
--- a/build/keystone/vars
+++ b/build/keystone/vars
@@ -0,0 +1 @@
+DESCRIPTION="Yunion Cloud Keystone Identity server"
--- a/build/ldapcli/vars
+++ b/build/ldapcli/vars
@@ -0,0 +1 @@
+DESCRIPTION="LDAP Command Line Utility"
--- a/build/notify/vars
+++ b/build/notify/vars
@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Cloud noitfy Service"
+
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CHANGE_FLAVOR
@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
+您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED
@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
+您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN
@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经创建成功。
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED
@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}已经删除。
+您的{{ .brand }}主机{{ .name }}已经删除。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN
@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经删除。
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}
--- a/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_REBUILD_ROOT
@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}的系统盘已经重置成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
+您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CHANGE_FLAVOR
@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
+您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED
@@ -1 +1 @@
-{{ .hypervisor }}主机{{ .Name }}创建成功
+{{ .brand }}主机{{ .Name }}创建成功
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN
@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经创建成功
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED
@@ -1 +1 @@
-{{ .hypervisor }}主机{{ .name }}删除通知
+{{ .brand }}主机{{ .name }}删除通知
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN
@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经删除
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED
@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}系统崩溃了
--- a/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT
+++ b/build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT
@@ -1 +1 @@
-{{ .hypervisor }}主机{{ .name }}的系统盘重置成功
+{{ .brand }}主机{{ .name }}重装系统成功
--- a/build/s3cli/vars
+++ b/build/s3cli/vars
@@ -0,0 +1 @@
+DESCRIPTION="S3 Cli Command Line Utility"
--- a/build/s3gateway/vars
+++ b/build/s3gateway/vars
@@ -0,0 +1 @@
+DESCRIPTION="Yunion Cloud S3 Gateway Service"
--- a/build/zstackcli/vars
+++ b/build/zstackcli/vars
@@ -0,0 +1 @@
+DESCRIPTION="Zstack Command Line Utility"
--- a/cmd/aliyuncli/main.go
+++ b/cmd/aliyuncli/main.go
@@ -18,11 +18,10 @@ import (
 	"fmt"
 	"os"

-	"yunion.io/x/log"
 	"yunion.io/x/structarg"

-	"yunion.io/x/onecloud/pkg/util/aliyun"
-	_ "yunion.io/x/onecloud/pkg/util/aliyun/shell"
+	"yunion.io/x/onecloud/pkg/multicloud/aliyun"
+	_ "yunion.io/x/onecloud/pkg/multicloud/aliyun/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )

@@ -71,7 +70,8 @@ func getSubcommandParser() (*structarg.ArgumentParser, error) {
 }

 func showErrorAndExit(e error) {
-	log.Errorf("%s", e)
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
 	os.Exit(1)
 }

--- a/cmd/ansibleserver/main.go
+++ b/cmd/ansibleserver/main.go
@@ -0,0 +1,23 @@
+// 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/pkg/ansibleserver/service"
+)
+
+func main() {
+	service.StartService()
+}
--- a/cmd/apigateway/main.go
+++ b/cmd/apigateway/main.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 main
+
+import (
+	"yunion.io/x/onecloud/pkg/apigateway/service"
+	"yunion.io/x/onecloud/pkg/util/atexit"
+)
+
+func main() {
+	defer atexit.Handle()
+
+	service.StartService()
+}
--- a/cmd/awscli/main.go
+++ b/cmd/awscli/main.go
@@ -18,16 +18,16 @@ import (
 	"fmt"
 	"os"

-	"yunion.io/x/log"
 	"yunion.io/x/structarg"

-	"yunion.io/x/onecloud/pkg/util/aws"
-	_ "yunion.io/x/onecloud/pkg/util/aws/shell"
+	"yunion.io/x/onecloud/pkg/multicloud/aws"
+	_ "yunion.io/x/onecloud/pkg/multicloud/aws/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )

 type BaseOptions struct {
 	Help       bool   `help:"Show help"`
+	Debug      bool   `help:"debug mode"`
 	AccessUrl  string `help:"Access key" default:"$AWS_ACCESS_URL" choices:"ChinaCloud|InternationalCloud"`
 	AccessKey  string `help:"Access key" default:"$AWS_ACCESS_KEY"`
 	Secret     string `help:"Secret" default:"$AWS_SECRET"`
@@ -71,7 +71,8 @@ func getSubcommandParser() (*structarg.ArgumentParser, error) {
 }

 func showErrorAndExit(e error) {
-	log.Errorf("%s", e)
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
 	os.Exit(1)
 }

@@ -84,7 +85,7 @@ func newClient(options *BaseOptions) (*aws.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}

-	cli, err := aws.NewAwsClient("", "", options.AccessUrl, options.AccessKey, options.Secret)
+	cli, err := aws.NewAwsClient("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
 	if err != nil {
 		return nil, err
 	}
--- a/cmd/azurecli/main.go
+++ b/cmd/azurecli/main.go
@@ -18,11 +18,10 @@ import (
 	"fmt"
 	"os"

-	"yunion.io/x/log"
 	"yunion.io/x/structarg"

-	"yunion.io/x/onecloud/pkg/util/azure"
-	_ "yunion.io/x/onecloud/pkg/util/azure/shell"
+	"yunion.io/x/onecloud/pkg/multicloud/azure"
+	_ "yunion.io/x/onecloud/pkg/multicloud/azure/shell"
 	"yunion.io/x/onecloud/pkg/util/printutils"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
@@ -75,7 +74,8 @@ func getSubcommandParser() (*structarg.ArgumentParser, error) {
 }

 func showErrorAndExit(e error) {
-	log.Errorf("%s", e)
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
 	os.Exit(1)
 }

@@ -100,9 +100,11 @@ func newClient(options *BaseOptions) (*azure.SRegion, error) {
 		return nil, fmt.Errorf("Missing Cloud Environment")
 	}

-	account := fmt.Sprintf("%s/%s", options.DirectoryID, options.SubscriptionID)
-	secret := fmt.Sprintf("%s/%s", options.ApplicationID, options.ApplicationKey)
-	cli, err := azure.NewAzureClient("", "", account, secret, options.CloudEnv, options.Debug)
+	cli, err := azure.NewAzureClient("", "", options.CloudEnv,
+		options.DirectoryID,
+		options.ApplicationID, options.ApplicationKey,
+		options.SubscriptionID,
+		options.Debug)
 	if err != nil {
 		return nil, err
 	}
--- a/cmd/baremetal-agent/main.go
+++ b/cmd/baremetal-agent/main.go
@@ -16,8 +16,11 @@ package main

 import (
 	"yunion.io/x/onecloud/pkg/baremetal/service"
+	"yunion.io/x/onecloud/pkg/util/atexit"
 )

 func main() {
+	defer atexit.Handle()
+
 	service.New().StartService()
 }
--- a/cmd/climc/climc.go
+++ b/cmd/climc/climc.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"

-	prompt "github.com/c-bata/go-prompt"
+	"github.com/c-bata/go-prompt"

 	"yunion.io/x/log"
 	"yunion.io/x/pkg/util/version"
@@ -32,6 +32,7 @@ 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"
@@ -49,16 +50,24 @@ type BaseOptions struct {

 	Completion     string `default:"" help:"Generate climc auto complete script" choices:"bash"`
 	UseCachedToken bool   `default:"$YUNION_USE_CACHED_TOKEN|false" help:"Use cached token"`
-	OsUsername     string `default:"$OS_USERNAME" help:"Username, defaults to env[OS_USERNAME]"`
-	OsPassword     string `default:"$OS_PASSWORD" help:"Password, defaults to env[OS_PASSWORD]"`
+
+	OsUsername string `default:"$OS_USERNAME" help:"Username, defaults to env[OS_USERNAME]"`
+	OsPassword string `default:"$OS_PASSWORD" help:"Password, defaults to env[OS_PASSWORD]"`
 	// OsProjectId string `default:"$OS_PROJECT_ID" help:"Proejct ID, defaults to env[OS_PROJECT_ID]"`
-	OsProjectName  string `default:"$OS_PROJECT_NAME" help:"Project name, defaults to env[OS_PROJECT_NAME]"`
-	OsDomainName   string `default:"$OS_DOMAIN_NAME" help:"Domain name, defaults to env[OS_DOMAIN_NAME]"`
-	OsAuthURL      string `default:"$OS_AUTH_URL" help:"Defaults to env[OS_AUTH_URL]"`
+	OsProjectName   string `default:"$OS_PROJECT_NAME" help:"Project name, defaults to env[OS_PROJECT_NAME]"`
+	OsProjectDomain string `default:"$OS_PROJECT_DOMAIN" help:"Domain name of project, defaults to env[OS_PROJECT_DOMAIN]"`
+	OsDomainName    string `default:"$OS_DOMAIN_NAME" help:"Domain name, defaults to env[OS_DOMAIN_NAME]"`
+
+	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]"`
+
+	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]"`
 	OsZoneName     string `default:"$OS_ZONE_NAME" help:"Defaults to env[OS_ZONE_NAME]"`
 	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL"`
 	ApiVersion     string `default:"$API_VERSION" help:"override default modules service api version"`
+	OutputFormat   string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|flatten-table|flatten-kv" help:"output format"`
 	SUBCOMMAND     string `help:"climc subcommand" subcommand:"true"`
 }

@@ -112,7 +121,8 @@ func getSubcommandsParser() (*structarg.ArgumentParser, error) {
 }

 func showErrorAndExit(e error) {
-	fmt.Fprintf(os.Stderr, "Error: %s\n", e)
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
 	os.Exit(1)
 }

@@ -120,20 +130,18 @@ 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 {
-		return nil, fmt.Errorf("Missing OS_USERNAME")
+	if len(options.OsUsername) == 0 && len(options.OsAccessKey) == 0 {
+		return nil, fmt.Errorf("Missing OS_USERNAME or OS_ACCESS_KEY")
 	}
-	if len(options.OsPassword) == 0 {
+	if len(options.OsUsername) > 0 && len(options.OsPassword) == 0 {
 		return nil, fmt.Errorf("Missing OS_PASSWORD")
 	}
+	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")
 	}
-	// if len(options.OsProjectId) == 0 && len(options.OsProjectName) == 0 {
-	//    showErrorAndExit(fmt.Errorf("Missing OS_PROEJCT_ID or OS_PROJECT_NAME"))
-	if len(options.OsProjectName) == 0 {
-		return nil, fmt.Errorf("Missing OS_PROJECT_NAME")
-	}

 	logLevel := "info"
 	if options.Debug {
@@ -174,10 +182,19 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	}

 	if cacheToken == nil {
-		token, err := client.Authenticate(options.OsUsername,
-			options.OsPassword,
-			options.OsDomainName,
-			options.OsProjectName)
+		var token mcclient.TokenCredential
+		var err error
+		if len(options.OsAccessKey) > 0 {
+			token, err = client.AuthenticateByAccessKey(options.OsAccessKey,
+				options.OsSecretKey, mcclient.AuthSourceCli)
+		} else {
+			token, err = client.AuthenticateWithSource(options.OsUsername,
+				options.OsPassword,
+				options.OsDomainName,
+				options.OsProjectName,
+				options.OsProjectDomain,
+				mcclient.AuthSourceCli)
+		}
 		if err != nil {
 			return nil, err
 		}
@@ -269,6 +286,7 @@ func main() {
 		return
 	}

+	shell.OutputFormat(options.OutputFormat)
 	ensureSessionFactory := func() *mcclient.ClientSession {
 		session, err := newClientSession(options)
 		if err != nil {
--- a/cmd/climc/shell/actions.go
+++ b/cmd/climc/shell/actions.go
@@ -24,6 +24,7 @@ import (
 )

 type BaseActionListOptions struct {
+	Scope      string   `help:"scope" choices:"project|domain|system"`
 	Since      string   `help:"Show logs since specific date" metavar:"DATETIME"`
 	Until      string   `help:"Show logs until specific date" metavar:"DATETIME"`
 	Limit      int64    `help:"Limit number of logs" default:"20"`
@@ -35,6 +36,11 @@ type BaseActionListOptions struct {
 	Admin      bool     `help:"admin mode"`
 	Succ       bool     `help:"Show success action log only"`
 	Fail       bool     `help:"Show failed action log only"`
+
+	User    []string `help:"filter by operator user"`
+	Project []string `help:"filter by owner project"`
+
+	PagingMarker string `help:"marker for pagination"`
 }

 type ActionListOptions struct {
@@ -59,6 +65,18 @@ func doActionList(s *mcclient.ClientSession, args *ActionListOptions) error {
 	if len(args.Search) > 0 {
 		params.Add(jsonutils.NewString(args.Search), "search")
 	}
+	if len(args.User) > 0 {
+		params.Add(jsonutils.NewStringArray(args.User), "user")
+	}
+	if len(args.Project) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Project), "project")
+	}
+	if len(args.Scope) > 0 {
+		params.Add(jsonutils.NewString(args.Scope), "scope")
+	}
+	if len(args.PagingMarker) > 0 {
+		params.Add(jsonutils.NewString(args.PagingMarker), "paging_marker")
+	}
 	if len(args.Since) > 0 {
 		params.Add(jsonutils.NewString(args.Since), "since")
 	}
--- a/cmd/climc/shell/ansible.go
+++ b/cmd/climc/shell/ansible.go
@@ -94,7 +94,7 @@ func doList(s *mcclient.ClientSession, args *AnsibleHostsOptions) error {
 	output.Add(children, "all", "children")
 	output.Add(hosts, "ungrouped", "hosts")

-	fmt.Printf("%s", output.PrettyString())
+	fmt.Printf("%s\n", output.PrettyString())

 	return nil
 }
@@ -123,7 +123,7 @@ func doHost(s *mcclient.ClientSession, host string, args *AnsibleHostsOptions) e
 		hostVar.Add(jsonutils.NewString(args.UserBecome), "ansible_become_user")
 	}

-	fmt.Printf("%s", hostVar.PrettyString())
+	fmt.Printf("%s\n", hostVar.PrettyString())

 	return nil
 }
--- a/cmd/climc/shell/ansibleplaybooks.go
+++ b/cmd/climc/shell/ansibleplaybooks.go
@@ -0,0 +1,108 @@
+// 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 shell
+
+import (
+	//"fmt"
+	//"strings"
+
+	"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() {
+	printAnsiblePlaybookObject := func(obj jsonutils.JSONObject) {
+		dict := obj.(*jsonutils.JSONDict)
+		pbJson, err := dict.Get("playbook")
+		if err != nil {
+			printObject(obj)
+			return
+		}
+		pbStr := pbJson.YAMLString()
+		dict.Set("playbook", jsonutils.NewString(pbStr))
+		printObject(obj)
+	}
+	R(&options.AnsiblePlaybookCreateOptions{}, "ansibleplaybook-create", "Create ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookCreateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apb, err := modules.AnsiblePlaybooks.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-show", "Show ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookListOptions{}, "ansibleplaybook-list", "List ansible playbooks", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookListOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apbs, err := modules.AnsiblePlaybooks.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(apbs, modules.AnsiblePlaybooks.GetColumns(s))
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-delete", "Delete ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookUpdateOptions{}, "ansibleplaybook-update", "Update ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookUpdateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apb, err := modules.AnsiblePlaybooks.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-run", "Run ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.PerformAction(s, opts.ID, "run", nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-stop", "Stop ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.PerformAction(s, opts.ID, "stop", nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+}
--- a/cmd/climc/shell/ansibleplaybooks_v2.go
+++ b/cmd/climc/shell/ansibleplaybooks_v2.go
@@ -0,0 +1,52 @@
+// 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 shell
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type AnsiblePlaybookV2IdOptions struct {
+		ID string `help:"name/id of the playbook"`
+	}
+
+	type AnsiblePlaybookV2ListOptions struct {
+		options.BaseListOptions
+	}
+
+	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-show", "Show ansible playbook", func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
+		apb, err := modules.AnsiblePlaybooksV2.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(apb)
+		return nil
+	})
+	R(&AnsiblePlaybookV2ListOptions{}, "ansibleplaybookv2-list", "List ansible playbooks", func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2ListOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apbs, err := modules.AnsiblePlaybooksV2.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(apbs, modules.AnsiblePlaybooksV2.GetColumns(s))
+		return nil
+	})
+}
--- a/cmd/climc/shell/baremetalagents.go
+++ b/cmd/climc/shell/baremetalagents.go
@@ -26,7 +26,7 @@ func init() {
 	type BaremetalAgentListOptions struct {
 		options.BaseListOptions
 	}
-	R(&BaremetalAgentListOptions{}, "baremetal-agent-list", "List baremetal agent", func(s *mcclient.ClientSession, args *BaremetalAgentListOptions) error {
+	R(&BaremetalAgentListOptions{}, "agent-list", "List all agent", func(s *mcclient.ClientSession, args *BaremetalAgentListOptions) error {
 		var params *jsonutils.JSONDict
 		{
 			var err error
@@ -47,7 +47,16 @@ func init() {
 	type BaremetalAgentOpsOperations struct {
 		ID string `help:"ID or name of agent"`
 	}
-	R(&BaremetalAgentOpsOperations{}, "baremetal-agent-enable", "Enable baremetal agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
+	R(&BaremetalAgentOpsOperations{}, "agent-show", "Show details of an agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
+		result, err := modules.Baremetalagents.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&BaremetalAgentOpsOperations{}, "agent-enable", "Enable agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
 		result, err := modules.Baremetalagents.PerformAction(s, args.ID, "enable", nil)
 		if err != nil {
 			return err
@@ -56,7 +65,7 @@ func init() {
 		return nil
 	})

-	R(&BaremetalAgentOpsOperations{}, "baremetal-agent-disable", "Disable baremetal agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
+	R(&BaremetalAgentOpsOperations{}, "agent-disable", "Disable agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
 		result, err := modules.Baremetalagents.PerformAction(s, args.ID, "disable", nil)
 		if err != nil {
 			return err
@@ -64,4 +73,13 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	R(&BaremetalAgentOpsOperations{}, "agent-delete", "Delete agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
+		result, err := modules.Baremetalagents.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }
--- a/cmd/climc/shell/baremetalevents.go
+++ b/cmd/climc/shell/baremetalevents.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 shell
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+)
+
+func init() {
+	type BaremetalEventListOptions struct {
+		HostId       string `help:"filter by hostId"`
+		HostName     string `help:"filter by hostname"`
+		IpmiIp       string `help:"filter by ipmi_ip"`
+		Type         string `help:"filter by type" choices:"system|manager"`
+		PagingMarker string `help:"marker for pagination"`
+		Limit        int    `help:"page limit, default 20" default:"20"`
+		Severity     string `help:"filter by severity"`
+		Since        string `help:"Show logs since specific date" metavar:"DATETIME"`
+		Until        string `help:"Show logs until specific date" metavar:"DATETIME"`
+	}
+	R(&BaremetalEventListOptions{}, "baremetal-event-list", "List baremetal events", func(s *mcclient.ClientSession, args *BaremetalEventListOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.BaremetalEvents.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.BaremetalEvents.GetColumns(s))
+		return nil
+	})
+
+	type BaremetalEventCreateOptions struct {
+		HOST     string `json:"-" help:"Host Id"`
+		Type     string `json:"type" help:"event type" choices:"system|manager"`
+		EventId  string `json:"event_id" help:"original event Id"`
+		MESSAGE  string `json:"message" help:"content of event"`
+		Severity string `json:"severity" help:"Severity of event"`
+		CREATED  string `json:"created" help:"when event was created"`
+	}
+	R(&BaremetalEventCreateOptions{}, "baremetal-event-create", "Create baremetal event", func(s *mcclient.ClientSession, args *BaremetalEventCreateOptions) error {
+		host, err := modules.Hosts.Get(s, args.HOST, nil)
+		if err != nil {
+			return err
+		}
+		hostId, _ := host.Get("id")
+		hostName, _ := host.Get("name")
+		ipmiIp, _ := host.Get("ipmi_ip")
+		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
+		params.Add(hostId, "host_id")
+		params.Add(hostName, "host_name")
+		params.Add(ipmiIp, "ipmi_ip")
+		result, err := modules.BaremetalEvents.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/baremetalnetworks.go
+++ b/cmd/climc/shell/baremetalnetworks.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -41,7 +42,7 @@ func init() {
 		if len(args.Network) > 0 {
 			params.Add(jsonutils.NewString(args.Network), "network_id")
 		}
-		var result *modules.ListResult
+		var result *modulebase.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Baremetalnetworks.ListDescendent(s, args.Host, params)
--- a/cmd/climc/shell/baremetalstorages.go
+++ b/cmd/climc/shell/baremetalstorages.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -37,7 +38,7 @@ func init() {

 			}
 		}
-		var result *modules.ListResult
+		var result *modulebase.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Baremetalstorages.ListDescendent(s, args.Host, params)
--- a/cmd/climc/shell/buckets.go
+++ b/cmd/climc/shell/buckets.go
@@ -0,0 +1,293 @@
+// 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 shell
+
+import (
+	"fmt"
+	"io"
+	"os"
+
+	"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 BucketListOptions struct {
+		options.BaseListOptions
+	}
+	R(&BucketListOptions{}, "bucket-list", "List all buckets", func(s *mcclient.ClientSession, args *BucketListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Buckets.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Buckets.GetColumns(s))
+		return nil
+	})
+
+	type BucketShowOptions struct {
+		ID string `help:"ID or name of bucket"`
+	}
+	R(&BucketShowOptions{}, "bucket-show", "Show details of bucket", func(s *mcclient.ClientSession, args *BucketShowOptions) error {
+		result, err := modules.Buckets.Get(s, args.ID, 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"`
+		Desc string `help:"Description of bucket" json:"description" token:"desc"`
+	}
+	R(&BucketUpdateOptions{}, "bucket-update", "update bucket", func(s *mcclient.ClientSession, args *BucketUpdateOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Buckets.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketDeleteOptions struct {
+		ID string `help:"ID or name of bucket" json:"-"`
+	}
+	R(&BucketDeleteOptions{}, "bucket-delete", "delete bucket", func(s *mcclient.ClientSession, args *BucketDeleteOptions) error {
+		result, err := modules.Buckets.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketCreateOptions struct {
+		NAME        string `help:"name of bucket" json:"name"`
+		CLOUDREGION string `help:"location of bucket" json:"cloudregion"`
+		MANAGER     string `help:"cloud provider" json:"manager"`
+
+		StorageClass string `help:"bucket storage class"`
+		Acl          string `help:"bucket ACL"`
+	}
+	R(&BucketCreateOptions{}, "bucket-create", "Create a bucket", func(s *mcclient.ClientSession, args *BucketCreateOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Buckets.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketListObjectsOptions struct {
+		ID        string `help:"ID or name of bucket" json:"-"`
+		Prefix    string `help:"List objects with prefix"`
+		Recursive bool   `help:"List objects recursively"`
+	}
+	R(&BucketListObjectsOptions{}, "bucket-object-list", "List objects in a bucket", func(s *mcclient.ClientSession, args *BucketListObjectsOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Buckets.GetSpecific(s, args.ID, "objects", params)
+		if err != nil {
+			return err
+		}
+
+		arrays, _ := result.GetArray("objects")
+		listResult := modulebase.ListResult{Data: arrays}
+		printList(&listResult, []string{})
+		return nil
+	})
+
+	type BucketDeleteObjectsOptions struct {
+		ID   string   `help:"ID or name of bucket" json:"-"`
+		KEYS []string `help:"List of objects to delete"`
+	}
+	R(&BucketDeleteObjectsOptions{}, "bucket-object-delete", "Delete objects in a bucket", func(s *mcclient.ClientSession, args *BucketDeleteObjectsOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Buckets.PerformAction(s, args.ID, "delete", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketMakeDirOptions struct {
+		ID  string `help:"ID or name of bucket" json:"-"`
+		KEY string `help:"DIR key to create"`
+	}
+	R(&BucketMakeDirOptions{}, "bucket-mkdir", "Mkdir in a bucket", func(s *mcclient.ClientSession, args *BucketMakeDirOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Buckets.PerformAction(s, args.ID, "makedir", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketUploadObjectsOptions struct {
+		ID   string `help:"ID or name of bucket" json:"-"`
+		KEY  string `help:"Key of object to upload"`
+		Path string `help:"Path to file to upload" required:"true"`
+
+		ContentLength int64  `help:"Content lenght (bytes)" default:"-1"`
+		ContentType   string `help:"Content type"`
+		StorageClass  string `help:"storage CLass"`
+		Acl           string `help:"object acl." choices:"private|public-read|public-read-write"`
+	}
+	R(&BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *BucketUploadObjectsOptions) error {
+		var body io.Reader
+		if len(args.Path) > 0 {
+			file, err := os.Open(args.Path)
+			if err != nil {
+				return err
+			}
+			defer file.Close()
+			body = file
+
+			fileInfo, err := file.Stat()
+			if err != nil {
+				return err
+			}
+
+			args.ContentLength = fileInfo.Size()
+		} else {
+			body = os.Stdin
+		}
+
+		if args.ContentLength < 0 {
+			return fmt.Errorf("required content-length")
+		}
+
+		err := modules.Buckets.Upload(s, args.ID, args.KEY, body, args.ContentLength, args.ContentType, args.StorageClass, args.Acl)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
+	type BucketPresignObjectsOptions struct {
+		ID            string `help:"ID or name of bucket" json:"-"`
+		KEY           string `help:"Key of object to upload"`
+		Method        string `help:"Request method" choices:"GET|PUT|DELETE"`
+		ExpireSeconds int    `help:"expire in seconds" default:"60"`
+	}
+	R(&BucketPresignObjectsOptions{}, "bucket-object-tempurl", "Get temporal URL for an object in a bucket", func(s *mcclient.ClientSession, args *BucketPresignObjectsOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Buckets.PerformAction(s, args.ID, "temp-url", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketSetAclOptions struct {
+		ID  string   `help:"ID or name of bucket" json:"-"`
+		ACL string   `help:"ACL to set" choices:"default|private|public-read|public-read-write" json:"acl"`
+		Key []string `help:"Optional object key" json:"key"`
+	}
+	R(&BucketSetAclOptions{}, "bucket-set-acl", "Set ACL of bucket or object", func(s *mcclient.ClientSession, args *BucketSetAclOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Buckets.PerformAction(s, args.ID, "acl", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketAclOptions struct {
+		ID  string `help:"ID or name of bucket" json:"-"`
+		Key string `help:"Optional object key"`
+	}
+	R(&BucketAclOptions{}, "bucket-acl", "Get ACL of bucket or object", func(s *mcclient.ClientSession, args *BucketAclOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Buckets.GetSpecific(s, args.ID, "acl", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketSyncOptions struct {
+		ID        string `help:"ID or name of bucket" json:"-"`
+		StatsOnly bool   `help:"sync statistics only"`
+	}
+	R(&BucketSyncOptions{}, "bucket-sync", "Sync bucket", func(s *mcclient.ClientSession, args *BucketSyncOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Buckets.PerformAction(s, args.ID, "sync", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketLimitOptions struct {
+		ID          string `help:"ID or name of bucket" json:"-"`
+		SizeBytes   int64  `help:"size limit in bytes"`
+		ObjectCount int64  `help:"object count limit"`
+	}
+	R(&BucketLimitOptions{}, "bucket-limit", "Set limit of bucket", func(s *mcclient.ClientSession, args *BucketLimitOptions) error {
+		limit := jsonutils.Marshal(args)
+		params := jsonutils.NewDict()
+		params.Set("limit", limit)
+		result, err := modules.Buckets.PerformAction(s, args.ID, "limit", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type BucketAccessInfoOptions struct {
+		ID string `help:"ID or name of bucket" json:"-"`
+	}
+	R(&BucketAccessInfoOptions{}, "bucket-access-info", "Show backend access info of a bucket", func(s *mcclient.ClientSession, args *BucketAccessInfoOptions) error {
+		result, err := modules.Buckets.GetSpecific(s, args.ID, "access-info", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/capabilities.go
+++ b/cmd/climc/shell/capabilities.go
@@ -17,13 +17,20 @@ package shell
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )

 func init() {
 	type CapabilitiesOptions struct {
+		Domain string `help:"ID or name of domain"`
+		Scope  string `help:"query scope" choices:"system|domain|project"`
 	}
 	R(&CapabilitiesOptions{}, "capabilities", "Show backend capabilities", func(s *mcclient.ClientSession, args *CapabilitiesOptions) error {
-		result, err := modules.Capabilities.List(s, nil)
+		query, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Capabilities.List(s, query)
 		if err != nil {
 			return err
 		}
--- a/cmd/climc/shell/cloudaccounts.go
+++ b/cmd/climc/shell/cloudaccounts.go
@@ -19,6 +19,7 @@ import (

 	"yunion.io/x/jsonutils"

+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -156,6 +157,61 @@ func init() {
 		return nil
 	})

+	R(&options.SUcloudCloudAccountCreateOptions{}, "cloud-account-create-ucloud", "Create a Ucloud cloud account", func(s *mcclient.ClientSession, args *options.SUcloudCloudAccountCreateOptions) error {
+		params := jsonutils.Marshal(args)
+		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Ucloud"), "provider")
+		result, err := modules.Cloudaccounts.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SZStackCloudAccountCreateOptions{}, "cloud-account-create-zstack", "Create a ZStack cloud account", func(s *mcclient.ClientSession, args *options.SZStackCloudAccountCreateOptions) error {
+		params := jsonutils.Marshal(args)
+		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("ZStack"), "provider")
+		result, err := modules.Cloudaccounts.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SS3CloudAccountCreateOptions{}, "cloud-account-create-s3", "Create a generaic S3 object storage account", func(s *mcclient.ClientSession, args *options.SS3CloudAccountCreateOptions) error {
+		params := jsonutils.Marshal(args)
+		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("S3"), "provider")
+		result, err := modules.Cloudaccounts.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SS3CloudAccountCreateOptions{}, "cloud-account-create-ceph", "Create a ceph object storage account", func(s *mcclient.ClientSession, args *options.SS3CloudAccountCreateOptions) error {
+		params := jsonutils.Marshal(args)
+		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Ceph"), "provider")
+		result, err := modules.Cloudaccounts.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SS3CloudAccountCreateOptions{}, "cloud-account-create-xsky", "Create a xsky object storage account", func(s *mcclient.ClientSession, args *options.SS3CloudAccountCreateOptions) error {
+		params := jsonutils.Marshal(args)
+		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Xsky"), "provider")
+		result, err := modules.Cloudaccounts.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type CloudaccountUpdateOptions struct {
 		ID        string `help:"ID or Name of cloud account"`
 		Name      string `help:"New name to update"`
@@ -294,6 +350,45 @@ func init() {
 		return nil
 	})

+	R(&options.SUcloudCloudAccountUpdateOptions{}, "cloud-account-update-ucloud", "update a Ucloud cloud account", func(s *mcclient.ClientSession, args *options.SUcloudCloudAccountUpdateOptions) error {
+		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
+		if params.Size() == 0 {
+			return InvalidUpdateError()
+		}
+		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SZStackCloudAccountUpdateOptions{}, "cloud-account-update-zstack", "update a ZStack cloud account", func(s *mcclient.ClientSession, args *options.SZStackCloudAccountUpdateOptions) error {
+		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
+		if params.Size() == 0 {
+			return InvalidUpdateError()
+		}
+		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SS3CloudAccountUpdateOptions{}, "cloud-account-update-s3", "update a generic S3 cloud account", func(s *mcclient.ClientSession, args *options.SS3CloudAccountUpdateOptions) error {
+		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
+		if params.Size() == 0 {
+			return InvalidUpdateError()
+		}
+		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type CloudaccountShowOptions struct {
 		ID string `help:"ID or Name of cloud account"`
 	}
@@ -448,6 +543,36 @@ func init() {
 		return nil
 	})

+	R(&options.SUcloudCloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-ucloud", "Update credential of a Ucloud cloud account", func(s *mcclient.ClientSession, args *options.SUcloudCloudAccountUpdateCredentialOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SZStackCloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-zstack", "Update credential of a ZStack cloud account", func(s *mcclient.ClientSession, args *options.SZStackCloudAccountUpdateCredentialOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&options.SS3CloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-s3", "Update credential of a generic S3 cloud account", func(s *mcclient.ClientSession, args *options.SS3CloudAccountUpdateCredentialOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type CloudaccountSyncOptions struct {
 		ID       string   `help:"ID or Name of cloud account"`
 		Force    bool     `help:"Force sync no matter what"`
@@ -509,4 +634,39 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type CloudaccountPublicOptions struct {
+		ID string `help:"ID or name of cloud account"`
+	}
+	R(&CloudaccountPublicOptions{}, "cloud-account-public", "Mark this cloud account public ", func(s *mcclient.ClientSession, args *CloudaccountPublicOptions) error {
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "public", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+	R(&CloudaccountPublicOptions{}, "cloud-account-private", "Mark this cloud account private", func(s *mcclient.ClientSession, args *CloudaccountPublicOptions) error {
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "private", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CloudaccountShareModeOptions struct {
+		ID   string `help:"ID or name of cloud account"`
+		MODE string `help:"cloud account share mode" choices:"account_domain|system|provider_domain"`
+	}
+	R(&CloudaccountShareModeOptions{}, "cloud-account-share-mode", "Set share_mode of a cloud account", func(s *mcclient.ClientSession, args *CloudaccountShareModeOptions) error {
+		input := api.CloudaccountShareModeInput{}
+		input.ShareMode = args.MODE
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "share-mode", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }
--- a/cmd/climc/shell/cloudnet/common.go
+++ b/cmd/climc/shell/cloudnet/common.go
@@ -0,0 +1,27 @@
+// 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 cloudnet
+
+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
+)
--- a/cmd/climc/shell/cloudnet/meshnetworks.go
+++ b/cmd/climc/shell/cloudnet/meshnetworks.go
@@ -0,0 +1,82 @@
+// 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 cloudnet
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
+	base_options "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudnet"
+)
+
+func init() {
+	R(&options.MeshNetworkCreateOptions{}, "meshnetwork-create", "Create mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkCreateOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		mn, err := modules.MeshNetworks.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(mn)
+		return nil
+	})
+	R(&options.MeshNetworkGetOptions{}, "meshnetwork-show", "Show mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkGetOptions) error {
+		mn, err := modules.MeshNetworks.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(mn)
+		return nil
+	})
+	R(&options.MeshNetworkListOptions{}, "meshnetwork-list", "List mesh networks", func(s *mcclient.ClientSession, opts *options.MeshNetworkListOptions) error {
+		params, err := base_options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.MeshNetworks.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.MeshNetworks.GetColumns(s))
+		return nil
+	})
+	R(&options.MeshNetworkUpdateOptions{}, "meshnetwork-update", "Update mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkUpdateOptions) error {
+		params, err := base_options.StructToParams(opts)
+		mn, err := modules.MeshNetworks.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(mn)
+		return nil
+	})
+	R(&options.MeshNetworkDeleteOptions{}, "meshnetwork-delete", "Delete mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkDeleteOptions) error {
+		mn, err := modules.MeshNetworks.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(mn)
+		return nil
+	})
+	R(&options.MeshNetworkActionRealizeOptions{}, "meshnetwork-realize", "Realize mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkActionRealizeOptions) error {
+		mn, err := modules.MeshNetworks.PerformAction(s, opts.ID, "realize", nil)
+		if err != nil {
+			return err
+		}
+		printObject(mn)
+		return nil
+	})
+}
--- a/cmd/climc/shell/cloudnet/routers.go
+++ b/cmd/climc/shell/cloudnet/routers.go
@@ -0,0 +1,134 @@
+// 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 cloudnet
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
+	base_options "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudnet"
+)
+
+func init() {
+	R(&options.RouterCreateOptions{}, "router-create", "Create router", func(s *mcclient.ClientSession, opts *options.RouterCreateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routers.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterGetOptions{}, "router-show", "Show router", func(s *mcclient.ClientSession, opts *options.RouterGetOptions) error {
+		router, err := modules.Routers.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterListOptions{}, "router-list", "List routers", func(s *mcclient.ClientSession, opts *options.RouterListOptions) error {
+		params, err := base_options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Routers.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Routers.GetColumns(s))
+		return nil
+	})
+	R(&options.RouterUpdateOptions{}, "router-update", "Update router", func(s *mcclient.ClientSession, opts *options.RouterUpdateOptions) error {
+		params, err := base_options.StructToParams(opts)
+		router, err := modules.Routers.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterDeleteOptions{}, "router-delete", "Delete router", func(s *mcclient.ClientSession, opts *options.RouterDeleteOptions) error {
+		router, err := modules.Routers.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterActionJoinMeshNetworkOptions{}, "router-join-meshnetwork", "Router join meshnetwork", func(s *mcclient.ClientSession, opts *options.RouterActionJoinMeshNetworkOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routers.PerformAction(s, opts.ID, "join-mesh-network", params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterActionLeaveMeshNetworkOptions{}, "router-leave-meshnetwork", "Router leave meshnetwork", func(s *mcclient.ClientSession, opts *options.RouterActionLeaveMeshNetworkOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routers.PerformAction(s, opts.ID, "leave-mesh-network", params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterActionRegisterIfnameOptions{}, "router-register-ifname", "Router register new ifname", func(s *mcclient.ClientSession, opts *options.RouterActionRegisterIfnameOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routers.PerformAction(s, opts.ID, "register-ifname", params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterActionUnregisterIfnameOptions{}, "router-unregister-ifname", "Router unregister ifname", func(s *mcclient.ClientSession, opts *options.RouterActionUnregisterIfnameOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routers.PerformAction(s, opts.ID, "unregister-ifname", params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouterActionRealizeOptions{}, "router-realize", "Router realize", func(s *mcclient.ClientSession, opts *options.RouterActionRealizeOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routers.PerformAction(s, opts.ID, "realize", params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+}
--- a/cmd/climc/shell/cloudnet/routes.go
+++ b/cmd/climc/shell/cloudnet/routes.go
@@ -0,0 +1,74 @@
+// 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 cloudnet
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
+	base_options "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudnet"
+)
+
+func init() {
+	R(&options.RouteCreateOptions{}, "router-route-create", "Create router", func(s *mcclient.ClientSession, opts *options.RouteCreateOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Routes.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouteGetOptions{}, "router-route-show", "Show router", func(s *mcclient.ClientSession, opts *options.RouteGetOptions) error {
+		router, err := modules.Routes.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouteListOptions{}, "router-route-list", "List routers", func(s *mcclient.ClientSession, opts *options.RouteListOptions) error {
+		params, err := base_options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Routes.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Routes.GetColumns(s))
+		return nil
+	})
+	R(&options.RouteUpdateOptions{}, "router-route-update", "Update router", 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 {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RouteDeleteOptions{}, "router-route-delete", "Delete router", func(s *mcclient.ClientSession, opts *options.RouteDeleteOptions) error {
+		router, err := modules.Routes.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+}
--- a/cmd/climc/shell/cloudnet/rules.go
+++ b/cmd/climc/shell/cloudnet/rules.go
@@ -0,0 +1,74 @@
+// 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 cloudnet
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
+	base_options "yunion.io/x/onecloud/pkg/mcclient/options"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudnet"
+)
+
+func init() {
+	R(&options.RuleCreateOptions{}, "router-rule-create", "Create router rule", func(s *mcclient.ClientSession, opts *options.RuleCreateOptions) error {
+		params, err := base_options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		router, err := modules.Rules.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RuleGetOptions{}, "router-rule-show", "Show router rule", func(s *mcclient.ClientSession, opts *options.RuleGetOptions) error {
+		router, err := modules.Rules.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RuleListOptions{}, "router-rule-list", "List router rules", func(s *mcclient.ClientSession, opts *options.RuleListOptions) error {
+		params, err := base_options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Rules.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Rules.GetColumns(s))
+		return nil
+	})
+	R(&options.RuleUpdateOptions{}, "router-rule-update", "Update router rule", func(s *mcclient.ClientSession, opts *options.RuleUpdateOptions) error {
+		params, err := base_options.StructToParams(opts)
+		router, err := modules.Rules.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+	R(&options.RuleDeleteOptions{}, "router-rule-delete", "Delete router rule", func(s *mcclient.ClientSession, opts *options.RuleDeleteOptions) error {
+		router, err := modules.Rules.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(router)
+		return nil
+	})
+}
--- a/cmd/climc/shell/cloudproviderregions.go
+++ b/cmd/climc/shell/cloudproviderregions.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -37,7 +38,7 @@ func init() {

 			}
 		}
-		var result *modules.ListResult
+		var result *modulebase.ListResult
 		var err error
 		if len(args.Manager) > 0 {
 			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager, params)
--- a/cmd/climc/shell/cloudproviders.go
+++ b/cmd/climc/shell/cloudproviders.go
@@ -15,6 +15,8 @@
 package shell

 import (
+	"fmt"
+
 	"yunion.io/x/jsonutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -26,6 +28,11 @@ func init() {

 	type CloudproviderListOptions struct {
 		options.BaseListOptions
+
+		Usable bool `help:"Vpc & Network usable"`
+
+		HasObjectStorage bool `help:"filter cloudproviders that has object storage"`
+		NoObjectStorage  bool `help:"filter cloudproviders that has no object storage"`
 	}
 	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
 		var params *jsonutils.JSONDict
@@ -35,6 +42,16 @@ func init() {
 			if err != nil {
 				return err
 			}
+
+			if args.Usable {
+				params.Add(jsonutils.NewBool(true), "usable")
+			}
+
+			if args.HasObjectStorage {
+				params.Add(jsonutils.JSONTrue, "has_object_storage")
+			} else if args.NoObjectStorage {
+				params.Add(jsonutils.JSONFalse, "has_object_storage")
+			}
 		}
 		result, err := modules.Cloudproviders.List(s, params)
 		if err != nil {
@@ -187,4 +204,40 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type CloudproviderClientRCOptions struct {
+		ID string `help:"ID or name of cloud provider"`
+	}
+	R(&CloudproviderClientRCOptions{}, "cloud-provider-clirc", "Get client RC file of the cloud provider", func(s *mcclient.ClientSession, args *CloudproviderClientRCOptions) error {
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "clirc", nil)
+		if err != nil {
+			return err
+		}
+		rc := make(map[string]string)
+		err = result.Unmarshal(&rc)
+		if err != nil {
+			return err
+		}
+		for k, v := range rc {
+			fmt.Printf("export %s='%s'\n", k, v)
+		}
+		return nil
+	})
+
+	type CloudproviderStorageClassesOptions struct {
+		ID          string `help:"ID or Name of cloud provider" json:"-"`
+		Cloudregion string `help:"cloud region name or Id"`
+	}
+	R(&CloudproviderStorageClassesOptions{}, "cloud-provider-storage-classes", "Get list of supported storage classes of a cloud provider", func(s *mcclient.ClientSession, args *CloudproviderStorageClassesOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "storage-classes", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }
--- a/cmd/climc/shell/cloudregions.go
+++ b/cmd/climc/shell/cloudregions.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -26,8 +27,9 @@ func init() {
 	type CloudregionListOptions struct {
 		options.BaseListOptions

-		Usable    *bool `help:"List regions where networks are usable"`
-		UsableVpc *bool `help:"List regions where VPC are usable"`
+		Usable    *bool  `help:"List regions where networks are usable"`
+		UsableVpc *bool  `help:"List regions where VPC are usable"`
+		Service   string `help:"List regions which service has available skus" choices:"dbinstances|servers"`

 		City string `help:"List regions in the specified city"`
 	}
@@ -47,7 +49,7 @@ func init() {
 	type CloudregionCityListOptions struct {
 		Manager  string `help:"List objects belonging to the cloud provider"`
 		Account  string `help:"List objects belonging to the cloud account"`
-		Provider string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|Openstack"`
+		Provider string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|Openstack|Ucloud|ZStack"`
 		City     string `help:"List regions in the specified city"`

 		PublicCloud  *bool `help:"List objects belonging to public cloud" json:"public_cloud"`
@@ -55,6 +57,9 @@ func init() {

 		Usable    *bool `help:"List regions where networks are usable"`
 		UsableVpc *bool `help:"List regions where VPC are usable"`
+
+		Scope         string `help:"query scope" choices:"system|domain"`
+		ProjectDomain string `help:"query domain"`
 	}
 	R(&CloudregionCityListOptions{}, "cloud-region-cities", "List cities where cloud region resides", func(s *mcclient.ClientSession, args *CloudregionCityListOptions) error {
 		params, err := options.StructToParams(args)
@@ -65,7 +70,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modules.ListResult{}
+		listResult := modulebase.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err
@@ -83,7 +88,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modules.ListResult{}
+		listResult := modulebase.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err
@@ -173,8 +178,15 @@ func init() {
 		return nil
 	})

-	R(&CloudregionShowOptions{}, "cloud-region-capability", "Show region's capacibilities", func(s *mcclient.ClientSession, args *CloudregionShowOptions) error {
-		result, err := modules.Cloudregions.GetSpecific(s, args.ID, "capability", nil)
+	type CloudregionCapabiltyOptions struct {
+		ID     string `help:"ID or name of cloud region to check" json:"-"`
+		Domain string `help:"cloud region domain"`
+
+		ShowEmulated bool `help:"show emulated cloud region"`
+	}
+	R(&CloudregionCapabiltyOptions{}, "cloud-region-capability", "Show region's capacibilities", func(s *mcclient.ClientSession, args *CloudregionCapabiltyOptions) error {
+		query, err := options.StructToParams(args)
+		result, err := modules.Cloudregions.GetSpecific(s, args.ID, "capability", query)
 		if err != nil {
 			return err
 		}
--- a/cmd/climc/shell/contacts.go
+++ b/cmd/climc/shell/contacts.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -28,10 +29,11 @@ func init() {
 	 * 操作用户的通信地址（如果用户的通信地址不存在则进行添加；如果已存在则进行修改；如果设置空则进行删除。）
 	 */
 	type ContactsUpdateOptions struct {
-		UID         string `help:"The user you wanna add contact to (Keystone User ID)"`
-		CONTACTTYPE string `help:"The contact type email|mobile" choices:"email|mobile"`
-		CONTACT     string `help:"The contacts details mobile number or email address, if set it the empty str means delete"`
-		Status      string `help:"Enabled or disabled contact status" choices:"enable|disable"`
+		UID            string `help:"The user you wanna add contact to (Keystone User ID)"`
+		CONTACTTYPE    string `help:"The contact type email|mobile" choices:"email|mobile|dingtalk"`
+		CONTACT        string `help:"The contacts details mobile number or email address or dingtalk's userid, if set it the empty str means delete"`
+		Status         string `help:"Enabled or disabled contact status" choices:"enable|disable"`
+		UpdateDingtalk bool   `help:"if update dingtalk"`
 	}
 	R(&ContactsUpdateOptions{}, "contact-update", "Create, delete or update contact for user", func(s *mcclient.ClientSession, args *ContactsUpdateOptions) error {
 		arr := jsonutils.NewArray()
@@ -40,9 +42,9 @@ func init() {
 		tmpObj.Add(jsonutils.NewString(args.CONTACT), "contact")
 		if len(args.Status) > 0 {
 			if args.Status == "disable" {
-				tmpObj.Add(jsonutils.JSONFalse, "enabled")
+				tmpObj.Add(jsonutils.NewInt(0), "enabled")
 			} else {
-				tmpObj.Add(jsonutils.JSONTrue, "enabled")
+				tmpObj.Add(jsonutils.NewInt(1), "enabled")
 			}
 		}

@@ -50,6 +52,9 @@ func init() {

 		params := jsonutils.NewDict()
 		params.Add(arr, "contacts")
+		if args.UpdateDingtalk {
+			params.Add(jsonutils.JSONTrue, "update_dingtalk")
+		}

 		contact, err := modules.Contacts.PerformAction(s, args.UID, "update-contact", params)

@@ -63,7 +68,7 @@ func init() {

 	type ContactsDeleteOptions struct {
 		UID         string `help:"The user you wanna add contact to (Keystone User ID)"`
-		CONTACTTYPE string `help:"The contact type email|mobile" choices:"email|mobile"`
+		CONTACTTYPE string `help:"The contact type email|mobile|dingtalk" choices:"email|mobile|dingtalk"`
 	}
 	R(&ContactsDeleteOptions{}, "contact-delete", "Delete contact for user", func(s *mcclient.ClientSession, args *ContactsDeleteOptions) error {
 		arr := jsonutils.NewArray()
@@ -97,6 +102,7 @@ func init() {

 			}
 		}
+		params.Add(jsonutils.JSONTrue, "details")

 		result, err := modules.Contacts.List(s, params)
 		if err != nil {
@@ -125,6 +131,8 @@ func init() {
 			}
 		}

+		params.Add(jsonutils.JSONTrue, "details")
+
 		result, err := modules.Contacts.Get(s, args.UID, params)
 		if err != nil {
 			return err
@@ -132,7 +140,7 @@ func init() {

 		contactsStr, err := result.GetString("details")
 		if err != nil {
-			return err
+			return nil
 		}

 		contactsJson, err := jsonutils.ParseString(contactsStr)
@@ -145,7 +153,7 @@ func init() {
 			return err
 		}

-		printList(&modules.ListResult{Data: contacts}, nil)
+		printList(&modulebase.ListResult{Data: contacts}, nil)
 		return nil
 	})

--- a/cmd/climc/shell/copyright.go
+++ b/cmd/climc/shell/copyright.go
@@ -0,0 +1,59 @@
+// 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 shell
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+)
+
+func init() {
+	type CopyrightUpdateOptions struct {
+		Copyright string  `help:"The copyright"`
+		Email     string  `help:"The Email"`
+		Docs      *string `help:"the Docs website address"`
+	}
+
+	R(&CopyrightUpdateOptions{}, "copyright-update", "update copyright", func(s *mcclient.ClientSession, args *CopyrightUpdateOptions) error {
+		if !s.HasSystemAdminPrivilege() {
+			return fmt.Errorf("require admin privilege")
+		}
+
+		params := jsonutils.NewDict()
+		if args.Docs != nil {
+			params.Add(jsonutils.NewString(*args.Docs), "docs")
+		}
+
+		if len(args.Copyright) > 0 {
+			params.Add(jsonutils.NewString(args.Copyright), "copyright")
+		}
+
+		if len(args.Email) > 0 {
+			params.Add(jsonutils.NewString(args.Email), "email")
+		}
+
+		r, err := modules.Copyright.Update(s, "copyright", params)
+		if err != nil {
+			return err
+		}
+
+		printObject(r)
+		return nil
+	})
+}
--- a/cmd/climc/shell/credentials.go
+++ b/cmd/climc/shell/credentials.go
@@ -16,16 +16,19 @@ package shell

 import (
 	"fmt"
+	"time"

 	"yunion.io/x/jsonutils"

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

 func init() {
 	type CredentialListOptions struct {
-		Type       string `help:"credential type" choices:"totp|recovery|ec2"`
+		Scope      string `help:"scope" choices:"project|domain|system"`
+		Type       string `help:"credential type" choices:"totp|recovery|aksk"`
 		User       string `help:"filter by user"`
 		UserDomain string `help:"the domain of user"`
 	}
@@ -34,22 +37,14 @@ func init() {
 		if len(args.Type) > 0 {
 			query.Add(jsonutils.NewString(args.Type), "type")
 		}
-		var err error
+		if len(args.Scope) > 0 {
+			query.Add(jsonutils.NewString(args.Scope), "scope")
+		}
 		if len(args.User) > 0 {
-			domainId := "default"
 			if len(args.UserDomain) > 0 {
-				domainId, err = modules.Domains.GetId(s, args.UserDomain, nil)
-				if err != nil {
-					return err
-				}
+				query.Add(jsonutils.NewString(args.UserDomain), "domain_id")
 			}
-			userQuery := jsonutils.NewDict()
-			userQuery.Add(jsonutils.NewString(domainId), "domain_id")
-			userId, err := modules.UsersV3.GetId(s, args.User, userQuery)
-			if err != nil {
-				return err
-			}
-			query.Add(jsonutils.NewString(userId), "user_id")
+			query.Add(jsonutils.NewString(args.User), "user_id")
 		}
 		results, err := modules.Credentials.List(s, query)
 		if err != nil {
@@ -159,4 +154,126 @@ func init() {
 		fmt.Println("success")
 		return nil
 	})
+
+	type CredentialAkSkOptions struct {
+		User          string `help:"User"`
+		UserDomain    string `help:"domain of user"`
+		Project       string `help:"Project"`
+		ProjectDomain string `help:"domain of user"`
+	}
+	R(&CredentialAkSkOptions{}, "credential-create-aksk", "Create AccessKey/Secret credential", func(s *mcclient.ClientSession, args *CredentialAkSkOptions) error {
+		var uid string
+		var pid string
+		var err error
+		if len(args.User) > 0 {
+			uid, err = modules.UsersV3.FetchId(s, args.User, args.UserDomain)
+			if err != nil {
+				return err
+			}
+		}
+		if len(args.Project) > 0 {
+			pid, err = modules.Projects.FetchId(s, args.Project, args.ProjectDomain)
+			if err != nil {
+				return err
+			}
+		}
+		secret, err := modules.Credentials.CreateAccessKeySecret(s, uid, pid, time.Time{})
+		if err != nil {
+			return err
+		}
+		printObject(jsonutils.Marshal(&secret))
+		return nil
+	})
+
+	R(&CredentialAkSkOptions{}, "credential-get-aksk", "Get AccessKey/Secret credential for user and project", func(s *mcclient.ClientSession, args *CredentialAkSkOptions) error {
+		var uid string
+		var err error
+		if len(args.User) > 0 {
+			uid, err = modules.UsersV3.FetchId(s, args.User, args.UserDomain)
+			if err != nil {
+				return err
+			}
+		}
+		var pid string
+		if len(args.Project) > 0 {
+			pid, err = modules.Projects.FetchId(s, args.Project, args.ProjectDomain)
+			if err != nil {
+				return err
+			}
+		}
+		secrets, err := modules.Credentials.GetAccessKeySecrets(s, uid, pid)
+		if err != nil {
+			return err
+		}
+		result := modulebase.ListResult{}
+		result.Data = make([]jsonutils.JSONObject, len(secrets))
+		for i := range secrets {
+			result.Data[i] = jsonutils.Marshal(secrets[i])
+			result.Data[i].(*jsonutils.JSONDict).Add(jsonutils.NewString(secrets[i].KeyId), "key_id")
+			result.Data[i].(*jsonutils.JSONDict).Add(jsonutils.NewString(secrets[i].ProjectId), "project_id")
+			result.Data[i].(*jsonutils.JSONDict).Add(jsonutils.NewTimeString(secrets[i].TimeStamp), "time_stamp")
+		}
+		printList(&result, nil)
+		return nil
+	})
+
+	R(&CredentialAkSkOptions{}, "credential-remove-aksk", "Remove AccessKey/Secret credential for user and project", func(s *mcclient.ClientSession, args *CredentialAkSkOptions) error {
+		uid, err := modules.UsersV3.FetchId(s, args.User, args.UserDomain)
+		if err != nil {
+			return err
+		}
+		var pid string
+		if len(args.Project) > 0 {
+			pid, err = modules.Projects.FetchId(s, args.Project, args.ProjectDomain)
+			if err != nil {
+				return err
+			}
+		}
+		err = modules.Credentials.RemoveAccessKeySecrets(s, uid, pid)
+		if err != nil {
+			return err
+		}
+		fmt.Println("success")
+		return nil
+	})
+
+	type CredentialDeleteOptions struct {
+		ID string `help:"ID of credentail"`
+	}
+	R(&CredentialDeleteOptions{}, "credential-delete", "Delete credential", func(s *mcclient.ClientSession, args *CredentialDeleteOptions) error {
+		result, err := modules.Credentials.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type CredentialUpdateOptions struct {
+		ID      string `help:"ID of credentail"`
+		Enable  bool   `help:"Enable credential"`
+		Disable bool   `help:"Disable credential"`
+		Name    string `help:"new name of credential"`
+		Desc    string `help:"new description of credential"`
+	}
+	R(&CredentialUpdateOptions{}, "credential-update", "Enable/disable credential", func(s *mcclient.ClientSession, args *CredentialUpdateOptions) error {
+		params := jsonutils.NewDict()
+		if args.Enable {
+			params.Add(jsonutils.JSONTrue, "enabled")
+		} else if args.Disable {
+			params.Add(jsonutils.JSONFalse, "enabled")
+		}
+		if args.Name != "" {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		if args.Desc != "" {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
+		result, err := modules.Credentials.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }
--- a/cmd/climc/shell/dbinstance_accounts.go
+++ b/cmd/climc/shell/dbinstance_accounts.go
@@ -0,0 +1,64 @@
+// 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 shell
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type DBInstanceAccountListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceAccountListOptions{}, "dbinstance-account-list", "List DB instance accounts", func(s *mcclient.ClientSession, opts *DBInstanceAccountListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceAccounts.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceAccounts.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceAccountIdOptions struct {
+		ID string `help:"ID or Name of DBInstanceaccount"`
+	}
+
+	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-show", "Show DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
+		account, err := modules.DBInstanceAccounts.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(account)
+		return nil
+	})
+
+	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-delete", "Delete DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
+		account, err := modules.DBInstanceAccounts.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(account)
+		return nil
+	})
+
+}
--- a/cmd/climc/shell/dbinstance_backups.go
+++ b/cmd/climc/shell/dbinstance_backups.go
@@ -0,0 +1,91 @@
+// 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 shell
+
+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 DBInstanceBackupListOptions struct {
+		options.BaseListOptions
+		DBInstance  string `help:"ID or Name of DBInstance" json:"dbinstance"`
+		Cloudregion string `help:"ID or Name of cloudregion"`
+	}
+	R(&DBInstanceBackupListOptions{}, "dbinstance-backup-list", "List DB instance backups", func(s *mcclient.ClientSession, opts *DBInstanceBackupListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceBackups.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceBackups.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceBackupCreateOptions struct {
+		INSTANCE    string `help:"ID or Name of DBInstance" json:"dbinstance"`
+		NAME        string
+		Databases   []string
+		Description string
+	}
+
+	R(&DBInstanceBackupCreateOptions{}, "dbinstance-backup-create", "Create DB instance backup", func(s *mcclient.ClientSession, opts *DBInstanceBackupCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(opts.INSTANCE), "dbinstance")
+		params.Add(jsonutils.NewString(opts.NAME), "name")
+		params.Add(jsonutils.NewString(opts.Description), "description")
+		databases := jsonutils.NewArray()
+		for _, database := range opts.Databases {
+			databases.Add(jsonutils.NewString(database))
+		}
+		params.Add(databases, "databases")
+		result, err := modules.DBInstanceBackups.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceBackupIdOptions struct {
+		ID string
+	}
+
+	R(&DBInstanceBackupIdOptions{}, "dbinstance-backup-show", "Show DB instance backup", func(s *mcclient.ClientSession, opts *DBInstanceBackupIdOptions) error {
+		result, err := modules.DBInstanceBackups.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceBackupIdOptions{}, "dbinstance-backup-delete", "Delete DB instance backup", func(s *mcclient.ClientSession, opts *DBInstanceBackupIdOptions) error {
+		result, err := modules.DBInstanceBackups.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/dbinstance_databases.go
+++ b/cmd/climc/shell/dbinstance_databases.go
@@ -0,0 +1,74 @@
+// 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 shell
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type DBInstanceDatabaseListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceDatabaseListOptions{}, "dbinstance-database-list", "List DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceDatabases.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceDatabases.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceDatabaseCreateOptions struct {
+		NAME         string
+		DBINSTANCE   string `help:"ID or Name of DBInstance" json:"dbinstance"`
+		CharacterSet string `help:"CharacterSet for database"`
+	}
+
+	R(&DBInstanceDatabaseCreateOptions{}, "dbinstance-database-create", "Create DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseCreateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.DBInstanceDatabases.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceDatabaseIdOptions struct {
+		ID string
+	}
+
+	R(&DBInstanceDatabaseIdOptions{}, "dbinstance-database-delete", "Delete DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseIdOptions) error {
+		result, err := modules.DBInstanceDatabases.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}
--- a/cmd/climc/shell/dbinstance_skus.go
+++ b/cmd/climc/shell/dbinstance_skus.go
@@ -0,0 +1,58 @@
+// 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 shell
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type DBInstanceSkuListOption struct {
+		options.BaseListOptions
+		Engine        string
+		EngineVersion string
+		Category      string
+		StorageType   string
+		Cloudregion   string
+	}
+	R(&DBInstanceSkuListOption{}, "dbinstance-sku-list", "List dbinstance skus", func(s *mcclient.ClientSession, args *DBInstanceSkuListOption) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.DBInstanceSkus.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceSkus.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceSkuIdOption struct {
+		ID string `help:"DBInstance Id or name"`
+	}
+
+	R(&DBInstanceSkuIdOption{}, "dbinstance-sku-show", "Show dbinstance sku details", func(s *mcclient.ClientSession, args *DBInstanceSkuIdOption) error {
+		result, err := modules.DBInstanceSkus.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}
--- a/cmd/climc/shell/dbinstances.go
+++ b/cmd/climc/shell/dbinstances.go
@@ -0,0 +1,351 @@
+// 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 shell
+
+import (
+	"fmt"
+	"strings"
+
+	"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 DBInstanceListOptions struct {
+		options.BaseListOptions
+		BillingType string `help:"billing type" choices:"postpaid|prepaid"`
+	}
+	R(&DBInstanceListOptions{}, "dbinstance-list", "List DB instance", func(s *mcclient.ClientSession, opts *DBInstanceListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstance.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstance.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceCreateOptions struct {
+		NAME          string `help:"DBInstance Name"`
+		InstanceType  string `help:"InstanceType for DBInstance"`
+		VcpuCount     int    `help:"Core of cpu for DBInstance"`
+		VmemSizeMb    int    `help:"Memory size of DBInstance"`
+		Port          int    `help:"Port of DBInstance"`
+		Category      string `help:"Category of DBInstance"`
+		Network       string `help:"Network of DBInstance"`
+		Address       string `help:"Address of DBInstance"`
+		Engine        string `help:"Engine of DBInstance"`
+		EngineVersion string `help:"EngineVersion of DBInstance Engine"`
+		StorageType   string `help:"StorageTyep of DBInstance"`
+		Secgroup      string `help:"Secgroup name or Id for DBInstance"`
+		Zone          string `help:"ZoneId or name for DBInstance"`
+		DiskSizeGB    int    `help:"Storage size for DBInstance"`
+		Duration      string `help:"Duration for DBInstance"`
+		AllowDelete   *bool  `help:"not lock dbinstance" `
+	}
+
+	R(&DBInstanceCreateOptions{}, "dbinstance-create", "Create DB instance", func(s *mcclient.ClientSession, opts *DBInstanceCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		if opts.AllowDelete != nil && *opts.AllowDelete {
+			params.Add(jsonutils.JSONFalse, "disable_delete")
+		}
+		result, err := modules.DBInstance.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceRenewOptions struct {
+		ID       string `help:"ID or name of server to renew"`
+		DURATION string `help:"Duration of renew, ADMIN only command"`
+	}
+	R(&DBInstanceRenewOptions{}, "dbinstance-renew", "Renew a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceRenewOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.DURATION), "duration")
+		result, err := modules.DBInstance.PerformAction(s, args.ID, "renew", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceUpdateOptions struct {
+		ID          string `help:"ID or name of server to renew"`
+		Name        string
+		Description string
+		Delete      string `help:"Lock or not lock dbinstance" choices:"enable|disable"`
+	}
+	R(&DBInstanceUpdateOptions{}, "dbinstance-update", "Update a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceUpdateOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.Delete) > 0 {
+			if args.Delete == "disable" {
+				params.Add(jsonutils.JSONTrue, "disable_delete")
+			} else {
+				params.Add(jsonutils.JSONFalse, "disable_delete")
+			}
+		}
+		result, err := modules.DBInstance.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceChangeConfigOptions struct {
+		ID           string `help:"ID or name of server to renew"`
+		DiskSizeGb   int64  `help:"Change DBInstance storage size"`
+		VcpuCount    int64  `help:"Change DBInstance vcpu count"`
+		VmemSizeMb   int64  `help:"Change DBInstance vmem size mb"`
+		InstanceType string `help:"Change DBInstance instanceType"`
+		Category     string `help:"Change DBInstance category"`
+	}
+	R(&DBInstanceChangeConfigOptions{}, "dbinstance-change-config", "ChangeConfig a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceChangeConfigOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.Category) > 0 {
+			params.Add(jsonutils.NewString(args.Category), "category")
+		}
+		if len(args.InstanceType) > 0 {
+			params.Add(jsonutils.NewString(args.InstanceType), "instance_type")
+		}
+		if args.DiskSizeGb > 0 {
+			params.Add(jsonutils.NewInt(args.DiskSizeGb), "disk_size_gb")
+		}
+		if args.VcpuCount > 0 {
+			params.Add(jsonutils.NewInt(args.VcpuCount), "vcpu_count")
+		}
+		if args.VmemSizeMb > 0 {
+			params.Add(jsonutils.NewInt(args.VmemSizeMb), "vmeme_size_mb")
+		}
+		result, err := modules.DBInstance.PerformAction(s, args.ID, "change-config", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceIdOptions struct {
+		ID string `help:"ID of dbinstance"`
+	}
+
+	R(&DBInstanceIdOptions{}, "dbinstance-open-public-connection", "Open DB instance public connection", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.JSONTrue, "open")
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "public-connection", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-close-public-connection", "Close DB instance public connection", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.JSONFalse, "open")
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "public-connection", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceRecoveryOptions struct {
+		ID        string
+		BACKUP    string
+		Databases []string
+	}
+
+	R(&DBInstanceRecoveryOptions{}, "dbinstance-recovery", "Recovery DB instance database from backup", func(s *mcclient.ClientSession, opts *DBInstanceRecoveryOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("dbinstancebackup", jsonutils.NewString(opts.BACKUP))
+		dbs := jsonutils.NewDict()
+		for _, database := range opts.Databases {
+			if len(database) > 0 {
+				dbInfo := strings.Split(database, ":")
+				if len(dbInfo) == 1 {
+					dbs.Add(jsonutils.NewString(dbInfo[0]), dbInfo[0])
+				} else if len(dbInfo) == 2 {
+					dbs.Add(jsonutils.NewString(dbInfo[1]), dbInfo[0])
+				} else {
+					return fmt.Errorf("Invalid dbinfo: %s", database)
+				}
+			}
+		}
+		if dbs.Length() > 0 {
+			params.Add(dbs, "databases")
+		}
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "recovery", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-show", "Show DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-reboot", "Reboot DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "reboot", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceDeleteOptions struct {
+		ID         string `help:"DBInstance Id or name"`
+		KeepBackup bool   `help:"Keep dbinstance manual backup after delete dbinstance"`
+	}
+
+	R(&DBInstanceDeleteOptions{}, "dbinstance-delete", "Delete DB instance", func(s *mcclient.ClientSession, opts *DBInstanceDeleteOptions) error {
+		params := jsonutils.NewDict()
+		if opts.KeepBackup {
+			params.Add(jsonutils.JSONTrue, "keep_backup")
+		}
+		result, err := modules.DBInstance.Delete(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-purge", "Purge DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&DBInstanceIdOptions{}, "dbinstance-sync-status", "Sync status for DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "sync-status", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type DBInstanceNetworkListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+		Network    string `help:"Network ID or name"`
+	}
+	R(&DBInstanceNetworkListOptions{}, "dbinstance-network-list", "List DB instance networks", func(s *mcclient.ClientSession, opts *DBInstanceNetworkListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		var result *modulebase.ListResult
+		if len(opts.DBInstance) > 0 {
+			result, err = modules.DBInstanceNetworks.ListDescendent(s, opts.DBInstance, params)
+		} else if len(opts.Network) > 0 {
+			result, err = modules.DBInstanceNetworks.ListDescendent2(s, opts.Network, params)
+		} else {
+			result, err = modules.DBInstanceNetworks.List(s, params)
+		}
+
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceNetworks.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceParameterListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceParameterListOptions{}, "dbinstance-parameter-list", "List DB instance parameters", func(s *mcclient.ClientSession, opts *DBInstanceParameterListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceParameters.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceParameters.GetColumns(s))
+		return nil
+	})
+
+	type DBInstancePrivilegeListOptions struct {
+		options.BaseListOptions
+		DBInstanceaccount  string `help:"ID or Name of DBInstanceaccount" json:"dbinstanceaccount"`
+		DBInstancedatabase string `help:"ID or Name of DBInstancedatabase" json:"dbinstancedatabase"`
+	}
+	R(&DBInstancePrivilegeListOptions{}, "dbinstance-privilege-list", "List DB instance accounts", func(s *mcclient.ClientSession, opts *DBInstancePrivilegeListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstancePrivileges.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstancePrivileges.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceChangeOwnerOptions struct {
+		ID      string `help:"DBInstance to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
+	}
+	R(&DBInstanceChangeOwnerOptions{}, "dbinstance-change-owner", "Change owner porject of a dbinstance", func(s *mcclient.ClientSession, opts *DBInstanceChangeOwnerOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.DBInstance.PerformAction(s, opts.ID, "change-owner", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}
--- a/cmd/climc/shell/disks.go
+++ b/cmd/climc/shell/disks.go
@@ -34,6 +34,8 @@ func init() {
 		CloudType string `help:"Public cloud or private cloud" choices:"Public|Private"`

 		BillingType string `help:"billing type" choices:"postpaid|prepaid"`
+
+		SnapshotpolicyId string `help:"snapshotpolicy id"`
 	}
 	R(&DiskListOptions{}, "disk-list", "List virtual disks", func(s *mcclient.ClientSession, opts *DiskListOptions) error {
 		params, err := options.ListStructToParams(opts)
@@ -78,7 +80,8 @@ func init() {

 	type DiskDeleteOptions struct {
 		ID                    []string `help:"ID of disks to delete" metavar:"DISK"`
-		OverridePendingDelete bool     `help:"Delete disk directly instead of pending delete"`
+		OverridePendingDelete bool     `help:"Delete disk directly instead of pending delete" short-token:"f"`
+		DeleteSnapshots       bool     `help:"Delete disk snapshots before delete disk"`
 	}

 	R(&DiskDeleteOptions{}, "disk-delete", "Delete a disk", func(s *mcclient.ClientSession, args *DiskDeleteOptions) error {
@@ -86,17 +89,20 @@ func init() {
 		if args.OverridePendingDelete {
 			params.Add(jsonutils.JSONTrue, "override_pending_delete")
 		}
+		if args.DeleteSnapshots {
+			params.Add(jsonutils.JSONTrue, "delete_snapshots")
+		}
 		ret := modules.Disks.BatchDeleteWithParam(s, args.ID, params, nil)
 		printBatchResults(ret, modules.Disks.GetColumns(s))
 		return nil
 	})

-	R(&DiskDetailOptions{}, "disk-purge", "Delete a disk record in database, not actually do deletion", func(s *mcclient.ClientSession, args *DiskDetailOptions) error {
-		disk, e := modules.Disks.PerformAction(s, args.ID, "purge", nil)
-		if e != nil {
-			return e
-		}
-		printObject(disk)
+	type DiskBatchOpsOptions struct {
+		ID []string `help:"id list of disks to operate"`
+	}
+	R(&DiskBatchOpsOptions{}, "disk-purge", "Delete a disk record in database, not actually do deletion", func(s *mcclient.ClientSession, args *DiskBatchOpsOptions) error {
+		ret := modules.Disks.BatchPerformAction(s, args.ID, "purge", nil)
+		printBatchResults(ret, modules.Disks.GetColumns(s))
 		return nil
 	})

@@ -222,20 +228,6 @@ func init() {
 		printObject(disk)
 		return nil
 	})
-	type DiskCreateSnapshotOptions struct {
-		DISK          string `help:"ID or name of disk"`
-		SNAPSHOT_NAME string `help:"Snapshot name"`
-	}
-	R(&DiskCreateSnapshotOptions{}, "disk-create-snapshot", "Disk create snapshot", func(s *mcclient.ClientSession, args *DiskCreateSnapshotOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.SNAPSHOT_NAME), "name")
-		disk, err := modules.Disks.PerformAction(s, args.DISK, "create-snapshot", params)
-		if err != nil {
-			return err
-		}
-		printObject(disk)
-		return nil
-	})

 	type DiskSaveOptions struct {
 		ID     string `help:"ID or name of the disk" json:"-"`
@@ -273,4 +265,21 @@ func init() {
 		printObject(disk)
 		return nil
 	})
+
+	type DiskChangeOwnerOptions struct {
+		ID      string `help:"Disk to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
+	}
+	R(&DiskChangeOwnerOptions{}, "disk-change-owner", "Change owner porject of a disk", func(s *mcclient.ClientSession, opts *DiskChangeOwnerOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		srv, err := modules.Disks.PerformAction(s, opts.ID, "change-owner", params)
+		if err != nil {
+			return err
+		}
+		printObject(srv)
+		return nil
+	})
 }
--- a/cmd/climc/shell/domains.go
+++ b/cmd/climc/shell/domains.go
@@ -15,30 +15,21 @@
 package shell

 import (
-	"fmt"
-
 	"yunion.io/x/jsonutils"

 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )

 func init() {
 	type DomainListOptions struct {
-		Search string `help:"search domain name"`
-		Limit  int64  `help:"Items per page" default:"20"`
-		Offset int64  `help:"Offset"`
+		options.BaseListOptions
 	}
 	R(&DomainListOptions{}, "domain-list", "List domains", func(s *mcclient.ClientSession, args *DomainListOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "name__icontains")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.Domains.List(s, params)
 		if err != nil {
@@ -71,30 +62,7 @@ func init() {
 		printObject(result)
 		return nil
 	})
-	R(&DomainDetailOptions{}, "domain-config-show", "Show detail of a domain config", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
-		objId, err := modules.Domains.GetId(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		config, err := modules.Domains.GetConfig(s, objId)
-		if err != nil {
-			return err
-		}
-		fmt.Println(config.PrettyString())
-		return nil
-	})
-	R(&DomainDetailOptions{}, "domain-config-delete", "Delete a domain config", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
-		objId, err := modules.Domains.GetId(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		config, err := modules.Domains.DeleteConfig(s, objId)
-		if err != nil {
-			return err
-		}
-		printObject(config)
-		return nil
-	})
+
 	/* R(&DomainDetailOptions{}, "domain-config-sql", "Config a domain with SQL driver", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
 	    config := jsonutils.NewDict()
 	    config.Add(jsonutils.NewString("sql"), "config", "identity", "driver")
@@ -110,116 +78,6 @@ func init() {
 	    return nil
 	}) */

-	type DomainConfigLDAPOptions struct {
-		ID                      string   `help:"ID of domain to config"`
-		URL                     string   `help:"LDAP server URL"`
-		SUFFIX                  string   `help:"Suffix"`
-		QueryScope              string   `help:"Query scope, either one or sub" choices:"one|sub" default:"sub"`
-		PageSize                int      `help:"Page size, default 20" default:"20"`
-		User                    string   `help:"User"`
-		Password                string   `help:"Password"`
-		UserTreeDN              string   `help:"User tree distinguished name"`
-		UserFilter              string   `help:"user_filter"`
-		UserObjectclass         string   `help:"user_objectclass"`
-		UserIdAttribute         string   `help:"user_id_attribute"`
-		UserNameAttribute       string   `help:"user_name_attribute"`
-		UserEnabledAttribute    string   `help:"user_enabled_attribute"`
-		UserEnabledMask         int64    `help:"user_enabled_mask" default:"-1"`
-		UserEnabledDefault      string   `help:"user_enabled_default"`
-		UserEnabledInvert       string   `help:"user_enabled_invert" choices:"true|false"`
-		UserAdditionalAttribute []string `help:"user_additional_attribute_mapping"`
-		GroupTreeDN             string   `help:"User tree distinguished name"`
-		GroupFilter             string   `help:"group_filter"`
-		GroupObjectclass        string   `help:"group_objectclass"`
-		GroupIdAttribute        string   `help:"group_id_attribute"`
-		GroupNameAttribute      string   `help:"group_name_attribute"`
-		GroupMemberAttribute    string   `help:"group_member_attribute"`
-		GroupMembersAreIds      bool     `help:"group_members_are_ids"`
-	}
-	R(&DomainConfigLDAPOptions{}, "domain-config-ldap", "Config a domain with LDAP driver", func(s *mcclient.ClientSession, args *DomainConfigLDAPOptions) error {
-		config := jsonutils.NewDict()
-		config.Add(jsonutils.NewString("ldap"), "config", "identity", "driver")
-		config.Add(jsonutils.NewString(args.URL), "config", "ldap", "url")
-		config.Add(jsonutils.NewString(args.SUFFIX), "config", "ldap", "suffix")
-		if len(args.QueryScope) > 0 {
-			config.Add(jsonutils.NewString(args.QueryScope), "config", "ldap", "query_scope")
-		}
-		if args.PageSize > 0 {
-			config.Add(jsonutils.NewInt(int64(args.PageSize)), "config", "ldap", "page_size")
-		}
-		if len(args.User) > 0 {
-			config.Add(jsonutils.NewString(args.User), "config", "ldap", "user")
-		}
-		if len(args.Password) > 0 {
-			config.Add(jsonutils.NewString(args.Password), "config", "ldap", "password")
-		}
-		if len(args.UserTreeDN) > 0 {
-			config.Add(jsonutils.NewString(args.UserTreeDN), "config", "ldap", "user_tree_dn")
-		}
-		if len(args.UserFilter) > 0 {
-			config.Add(jsonutils.NewString(args.UserFilter), "config", "ldap", "user_filter")
-		}
-		if len(args.UserObjectclass) > 0 {
-			config.Add(jsonutils.NewString(args.UserObjectclass), "config", "ldap", "user_objectclass")
-		}
-		if len(args.UserIdAttribute) > 0 {
-			config.Add(jsonutils.NewString(args.UserIdAttribute), "config", "ldap", "user_id_attribute")
-		}
-		if len(args.UserNameAttribute) > 0 {
-			config.Add(jsonutils.NewString(args.UserNameAttribute), "config", "ldap", "user_name_attribute")
-		}
-		if len(args.UserEnabledAttribute) > 0 {
-			config.Add(jsonutils.NewString(args.UserEnabledAttribute), "config", "ldap", "user_enabled_attribute")
-		}
-		if args.UserEnabledMask >= 0 {
-			config.Add(jsonutils.NewInt(int64(args.UserEnabledMask)), "config", "ldap", "user_enabled_mask")
-		}
-		if len(args.UserEnabledDefault) > 0 {
-			config.Add(jsonutils.NewString(args.UserEnabledDefault), "config", "ldap", "user_enabled_default")
-		}
-		if len(args.UserEnabledInvert) > 0 {
-			if args.UserEnabledInvert == "true" {
-				config.Add(jsonutils.JSONTrue, "config", "ldap", "user_enabled_invert")
-			} else {
-				config.Add(jsonutils.JSONFalse, "config", "ldap", "user_enabled_invert")
-			}
-		}
-		if len(args.UserAdditionalAttribute) > 0 {
-			config.Add(jsonutils.NewStringArray(args.UserAdditionalAttribute), "config", "ldap", "user_additional_attribute_mapping")
-		}
-		if len(args.GroupTreeDN) > 0 {
-			config.Add(jsonutils.NewString(args.GroupTreeDN), "config", "ldap", "group_tree_dn")
-		}
-		if len(args.GroupFilter) > 0 {
-			config.Add(jsonutils.NewString(args.GroupFilter), "config", "ldap", "group_filter")
-		}
-		if len(args.GroupObjectclass) > 0 {
-			config.Add(jsonutils.NewString(args.GroupObjectclass), "config", "ldap", "group_objectclass")
-		}
-		if len(args.GroupIdAttribute) > 0 {
-			config.Add(jsonutils.NewString(args.GroupIdAttribute), "config", "ldap", "group_id_attribute")
-		}
-		if len(args.GroupNameAttribute) > 0 {
-			config.Add(jsonutils.NewString(args.GroupNameAttribute), "config", "ldap", "group_name_attribute")
-		}
-		if len(args.GroupMemberAttribute) > 0 {
-			config.Add(jsonutils.NewString(args.GroupMemberAttribute), "config", "ldap", "group_member_attribute")
-		}
-		if args.GroupMembersAreIds {
-			config.Add(jsonutils.JSONTrue, "config", "ldap", "group_members_are_ids")
-		}
-		objId, err := modules.Domains.GetId(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		nconf, err := modules.Domains.UpdateConfig(s, objId, config)
-		if err != nil {
-			return err
-		}
-		fmt.Println(nconf.PrettyString())
-		return nil
-	})
-
 	type DomainCreateOptions struct {
 		NAME     string `help:"Name of domain"`
 		Desc     string `help:"Description"`
--- a/cmd/climc/shell/elasticcache.go
+++ b/cmd/climc/shell/elasticcache.go
@@ -0,0 +1,386 @@
+// 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 shell
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	R(&options.BaseListOptions{}, "elastic-cache-list", "List elastisc cache instance", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCache.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, nil)
+		return nil
+	})
+
+	R(&options.ElasticCacheCreateOptions{}, "elastic-cache-create", "Create elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCache.Create(s, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-restart", "Restart elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "restart", nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-flush-instance", "Flush elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "flush-instance", nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-delete", "Delete elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCache.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	type ElasticCacheChangeSpecOptions struct {
+		options.ElasticCacheIdOptions
+		Sku string `help:"elastic cache sku id"`
+	}
+
+	R(&ElasticCacheChangeSpecOptions{}, "elastic-cache-change-spec", "Change elastisc cache instance specification", func(s *mcclient.ClientSession, opts *ElasticCacheChangeSpecOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("sku", jsonutils.NewString(opts.Sku))
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "change-spec", params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	type ElasticCacheMainteananceTimeOptions struct {
+		options.ElasticCacheIdOptions
+		START_TIME string `help:"elastic cache sku maintenance start time,format: HH:mm"`
+		END_TIME   string `help:"elastic cache sku maintenance end time, format: HH:mm"`
+	}
+
+	R(&ElasticCacheMainteananceTimeOptions{}, "elastic-cache-set-maintenance-time", "set elastisc cache instance maintenance time", func(s *mcclient.ClientSession, opts *ElasticCacheMainteananceTimeOptions) error {
+		params := jsonutils.NewDict()
+		start := fmt.Sprintf("%sZ", opts.START_TIME)
+		end := fmt.Sprintf("%sZ", opts.END_TIME)
+		params.Set("maintain_start_time", jsonutils.NewString(start))
+		params.Set("maintain_end_time", jsonutils.NewString(end))
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "set-maintain-time", params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-allocate-public-connect", "Allocate elastisc cache instance public access connection", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "allocate-public-connection", nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-enable-auth", "Enable elastisc cache instance auth", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("auth_mode", jsonutils.NewString("on"))
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "update-auth-mode", params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-disable-auth", "Disable elastisc cache instance auth", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("auth_mode", jsonutils.NewString("off"))
+		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "update-auth-mode", params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	type ElasticCacheAccountResetPasswordOptions struct {
+		options.ElasticCacheIdOptions
+		PASSWORD string `help:"elastic cache account password."`
+	}
+
+	R(&ElasticCacheAccountResetPasswordOptions{}, "elastic-cache-account-reset-password", "Reset elastisc cache instance account password", func(s *mcclient.ClientSession, opts *ElasticCacheAccountResetPasswordOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("password", jsonutils.NewString(opts.PASSWORD))
+		result, err := modules.ElasticCacheAccount.PerformAction(s, opts.ID, "reset-password", params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	type ElasticCacheBaseListOptions struct {
+		options.BaseListOptions
+		ElasticcacheId string `help:"elastic cache id"`
+	}
+
+	R(&ElasticCacheBaseListOptions{}, "elastic-cache-account-list", "List elastisc cache account", func(s *mcclient.ClientSession, opts *ElasticCacheBaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheAccount.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, nil)
+		return nil
+	})
+
+	R(&options.ElasticCacheAccountCreateOptions{}, "elastic-cache-account-create", "Create elastisc cache account", func(s *mcclient.ClientSession, opts *options.ElasticCacheAccountCreateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheAccount.Create(s, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-account-delete", "Delete elastisc cache account", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCacheAccount.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheBackupCreateOptions{}, "elastic-cache-backup-create", "Create elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheBackupCreateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheBackup.Create(s, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.BaseListOptions{}, "elastic-cache-backup-list", "List elastisc cache backup", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheBackup.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, nil)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-backup-delete", "Delete elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCacheBackup.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-backup-restore", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCacheBackup.PerformAction(s, opts.ID, "restore-instance", nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheAclCreateOptions{}, "elastic-cache-acl-create", "Create elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheAclCreateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheAcl.Create(s, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.ElasticCacheIdOptions{}, "elastic-cache-acl-delete", "Delete elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
+		result, err := modules.ElasticCacheAcl.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.BaseListOptions{}, "elastic-cache-acl-list", "List elastisc cache acl", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheAcl.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, nil)
+		return nil
+	})
+
+	R(&options.ElasticCacheAclUpdateOptions{}, "elastic-cache-acl-update", "Update elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheAclUpdateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		params.Remove("id")
+		result, err := modules.ElasticCacheAcl.Update(s, opts.Id, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	R(&options.BaseListOptions{}, "elastic-cache-parameter-list", "List elastisc cache parameters", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticCacheParameter.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, nil)
+		return nil
+	})
+
+	R(&options.ElasticCacheParameterUpdateOptions{}, "elastic-cache-parameter-update", "Update elastisc cache parameter", func(s *mcclient.ClientSession, opts *options.ElasticCacheParameterUpdateOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		params.Remove("id")
+		result, err := modules.ElasticCacheParameter.Update(s, opts.Id, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(result)
+		return nil
+	})
+
+	type ElasticCacheSkusListOptions struct {
+		options.BaseListOptions
+		Cloudregion   string  `help:"region Id or name"`
+		Usable        bool    `help:"Filter usable sku"`
+		Zone          string  `help:"zone Id or name"`
+		City          *string `help:"city name,eg. BeiJing"`
+		LocalCategory *string `help:"local category,eg. single"`
+		EngineVersion *string `help:"engine version,eg. 3.0"`
+		Cpu           *int    `help:"Cpu core count" json:"cpu_core_count"`
+		Mem           *int    `help:"Memory size in MB" json:"memory_size_mb"`
+		Name          string  `help:"Name of Sku"`
+	}
+
+	R(&ElasticCacheSkusListOptions{}, "elastic-cache-sku-list", "List elastisc cache sku", func(s *mcclient.ClientSession, opts *ElasticCacheSkusListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.ElasticcacheSkus.List(s, params)
+		if err != nil {
+			return err
+		}
+
+		printList(result, nil)
+		return nil
+	})
+}
--- a/cmd/climc/shell/elasticips.go
+++ b/cmd/climc/shell/elasticips.go
@@ -24,9 +24,11 @@ import (

 func init() {
 	type ElasticipListOptions struct {
-		Region string `help:"Show servers in cloudregion"`
+		Region string `help:"List eips in cloudregion"`

-		Usable *bool `help:"List all zones that is usable"`
+		Usable                    *bool  `help:"List all zones that is usable"`
+		UsableEipForAssociateType string `help:"With associate id filter which eip can associate"`
+		UsableEipForAssociateId   string `help:"With associate type filter which eip can associate"`

 		options.BaseListOptions
 	}
@@ -47,20 +49,32 @@ func init() {
 		MANAGER    string `help:"cloud provider"`
 		REGION     string `help:"cloud region in which EIP is allocated"`
 		NAME       string `help:"name of the EIP"`
-		BW         int    `help:"Bandwidth in Mbps"`
-		ChargeType string `help:"bandwidth charge type, either traffic or bandwidth" choices:"traffic|bandwidth"`
+		Bandwidth  int    `help:"Bandwidth in Mbps"`
+		Ip         string `help:"IP address of the EIP"`
+		Network    string `help:"Network of the EIP"`
+		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&EipCreateOptions{}, "eip-create", "Create an EIP", func(s *mcclient.ClientSession, args *EipCreateOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.MANAGER), "manager")
 		params.Add(jsonutils.NewString(args.REGION), "region")
 		params.Add(jsonutils.NewString(args.NAME), "name")
-		params.Add(jsonutils.NewInt(int64(args.BW)), "bandwidth")
+		if args.Bandwidth != 0 {
+			params.Add(jsonutils.NewInt(int64(args.Bandwidth)), "bandwidth")
+		}

 		if len(args.ChargeType) > 0 {
 			params.Add(jsonutils.NewString(args.ChargeType), "charge_type")
 		}

+		if len(args.Network) > 0 {
+			params.Add(jsonutils.NewString(args.Network), "network")
+		}
+
+		if len(args.Ip) > 0 {
+			params.Add(jsonutils.NewString(args.Ip), "ip")
+		}
+
 		result, err := modules.Elasticips.Create(s, params)
 		if err != nil {
 			return err
@@ -159,7 +173,7 @@ func init() {
 	type ServerCreateEipOptions struct {
 		ID         string `help:"server ID or name"`
 		BW         int    `help:"EIP bandwidth in Mbps"`
-		ChargeType string `help:"bandwidth charge type, either traffic or bandwidth" choices:"traffic|bandwidth"`
+		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&ServerCreateEipOptions{}, "server-create-eip", "allocate an EIP and associate EIP to server", func(s *mcclient.ClientSession, args *ServerCreateEipOptions) error {
 		params := jsonutils.NewDict()
--- a/cmd/climc/shell/endpoints.go
+++ b/cmd/climc/shell/endpoints.go
@@ -19,50 +19,26 @@ import (

 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )

 func init() {
 	type EndpointListOptions struct {
-		Limit     int64  `help:"Limit, default 0, i.e. no limit" default:"20"`
-		Offset    int64  `help:"Offset, default 0, i.e. no offset"`
+		options.BaseListOptions
 		Region    string `help:"Search by region"`
 		Service   string `help:"Search by service id or name"`
 		Interface string `help:"Search by interface"`
 	}
 	R(&EndpointListOptions{}, "endpoint-list", "List service endpoints", func(s *mcclient.ClientSession, args *EndpointListOptions) error {
-		mod, err := modules.GetModule(s, "endpoints")
+		query, err := options.ListStructToParams(args)
 		if err != nil {
 			return err
 		}
-		query := jsonutils.NewDict()
-		if args.Limit > 0 {
-			query.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			query.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.Region) > 0 {
-			query.Add(jsonutils.NewString(args.Region), "region_id")
-		}
-		if len(args.Service) > 0 {
-			srvMod, err := modules.GetModule(s, "services")
-			if err != nil {
-				return err
-			}
-			srvId, err := srvMod.GetId(s, args.Service, nil)
-			if err != nil {
-				return err
-			}
-			query.Add(jsonutils.NewString(srvId), "service_id")
-		}
-		if len(args.Interface) > 0 {
-			query.Add(jsonutils.NewString(args.Interface), "interface")
-		}
-		result, err := mod.List(s, query)
+		result, err := modules.EndpointsV3.List(s, query)
 		if err != nil {
 			return err
 		}
-		printList(result, mod.GetColumns(s))
+		printList(result, modules.EndpointsV3.GetColumns(s))
 		return nil
 	})

@@ -70,11 +46,7 @@ func init() {
 		ID string `help:"ID or name of endpoints"`
 	}
 	R(&EndpointDetailOptions{}, "endpoint-show", "Show details of an endpoint", func(s *mcclient.ClientSession, args *EndpointDetailOptions) error {
-		mod, err := modules.GetModule(s, "endpoints")
-		if err != nil {
-			return err
-		}
-		ep, err := mod.Get(s, args.ID, nil)
+		ep, err := modules.EndpointsV3.Get(s, args.ID, nil)
 		if err != nil {
 			return err
 		}
@@ -83,11 +55,7 @@ func init() {
 	})

 	R(&EndpointDetailOptions{}, "endpoint-delete", "Delete an endpoint", func(s *mcclient.ClientSession, args *EndpointDetailOptions) error {
-		mod, err := modules.GetModule(s, "endpoints")
-		if err != nil {
-			return err
-		}
-		ep, err := mod.Delete(s, args.ID, nil)
+		ep, err := modules.EndpointsV3.Delete(s, args.ID, nil)
 		if err != nil {
 			return err
 		}
@@ -98,7 +66,7 @@ func init() {
 	type EndpointCreateOptions struct {
 		SERVICE   string `help:"Service ID or Name"`
 		REGION    string `help:"Region"`
-		INTERFACE string `help:"Interface types" choices:"internal|public|admin"`
+		INTERFACE string `help:"Interface types" choices:"internal|public|admin|console"`
 		URL       string `help:"URL"`
 		Zone      string `help:"Zone"`
 		Name      string `help:"Name"`
--- a/cmd/climc/shell/events.go
+++ b/cmd/climc/shell/events.go
@@ -18,11 +18,13 @@ 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/modules/k8s"
 )

 type BaseEventListOptions struct {
+	Scope      string   `help:"scope" choices:"project|domain|system"`
 	Since      string   `help:"Show logs since specific date" metavar:"DATETIME"`
 	Until      string   `help:"Show logs until specific date" metavar:"DATETIME"`
 	Limit      int64    `help:"Limit number of logs" default:"20"`
@@ -31,6 +33,11 @@ type BaseEventListOptions struct {
 	Descending bool     `help:"Descending order"`
 	OrderBy    string   `help:"order by specific field"`
 	Action     []string `help:"Log action"`
+
+	User    []string `help:"filter by operator user"`
+	Project []string `help:"filter by owner project"`
+
+	PagingMarker string `help:"marker for pagination"`
 }

 type EventListOptions struct {
@@ -56,7 +63,11 @@ func doImageEventList(s *mcclient.ClientSession, args *EventListOptions) error {
 	return doEventList(modules.ImageLogs, s, args)
 }

-func doEventList(man modules.ResourceManager, s *mcclient.ClientSession, args *EventListOptions) error {
+func doIdentityEventList(s *mcclient.ClientSession, args *EventListOptions) error {
+	return doEventList(modules.IdentityLogs, s, args)
+}
+
+func doEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args *EventListOptions) error {
 	params := jsonutils.NewDict()
 	if len(args.Type) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
@@ -87,6 +98,18 @@ func doEventList(man modules.ResourceManager, s *mcclient.ClientSession, args *E
 	if len(args.Action) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Action), "action")
 	}
+	if len(args.User) > 0 {
+		params.Add(jsonutils.NewStringArray(args.User), "user")
+	}
+	if len(args.Project) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Project), "project")
+	}
+	if len(args.Scope) > 0 {
+		params.Add(jsonutils.NewString(args.Scope), "scope")
+	}
+	if len(args.PagingMarker) > 0 {
+		params.Add(jsonutils.NewString(args.PagingMarker), "paging_marker")
+	}
 	logs, err := man.List(s, params)
 	if err != nil {
 		return err
@@ -143,8 +166,18 @@ func init() {
 		return doComputeEventList(s, &nargs)
 	})

-	R(&TypeEventListOptions{}, "vcenter-event", "Show operation event logs of vcenter", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
-		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"vcenter"}}
+	R(&TypeEventListOptions{}, "cloud-provider-event", "Show operation event logs of cloudprovider", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"cloudprovider"}}
+		return doComputeEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "cloud-account-event", "Show operation event logs of cloudaccount", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"cloudaccount"}}
+		return doComputeEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "bucket-event", "Show operation event logs of bucket", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"bucket"}}
 		return doComputeEventList(s, &nargs)
 	})

@@ -167,4 +200,49 @@ func init() {
 		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"image"}}
 		return doImageEventList(s, &nargs)
 	})
+
+	R(&TypeEventListOptions{}, "user-event", "Show operation event logs of keystone users", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"user"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "group-event", "Show operation event logs of keystone groups", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"group"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "domain-event", "Show operation event logs of keystone domains", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"domain"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "project-event", "Show operation event logs of keystone projects", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"project"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "role-event", "Show operation event logs of keystone roles", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"role"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "policy-event", "Show operation event logs of keystone policies", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"policy"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "endpoint-event", "Show operation event logs of keystone endpoints", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"endpoint"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "service-event", "Show operation event logs of keystone services", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"service"}}
+		return doIdentityEventList(s, &nargs)
+	})
+
+	R(&TypeEventListOptions{}, "credential-event", "Show operation event logs of keystone credentials", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
+		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"credential"}}
+		return doIdentityEventList(s, &nargs)
+	})
 }
--- a/cmd/climc/shell/external_projects.go
+++ b/cmd/climc/shell/external_projects.go
@@ -57,10 +57,10 @@ func init() {
 		PROJECT string `help:"Local project ID or Name"`
 	}

-	R(&ExternalProjectUpdateOptions{}, "external-project-update", "Update external project point to local project", func(s *mcclient.ClientSession, args *ExternalProjectUpdateOptions) error {
+	R(&ExternalProjectUpdateOptions{}, "external-project-change-project", "Change external project point to local project", func(s *mcclient.ClientSession, args *ExternalProjectUpdateOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.PROJECT), "project")
-		result, err := modules.ExternalProjects.Update(s, args.ID, params)
+		result, err := modules.ExternalProjects.PerformAction(s, args.ID, "change-project", params)
 		if err != nil {
 			return err
 		}
--- a/cmd/climc/shell/groups.go
+++ b/cmd/climc/shell/groups.go
@@ -17,38 +17,22 @@ package shell
 import (
 	"yunion.io/x/jsonutils"

+	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )

 func init() {
 	type GroupListOptions struct {
-		Name   string `help:"Name of the groups to filter"`
-		Domain string `help:"Domain to filter"`
-		Limit  int64  `help:"Items per page" default:"20"`
-		Offset int64  `help:"Offset"`
-		Search string `help:"search text"`
+		options.BaseListOptions
+		Name          string `help:"Filter by name"`
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 	}
 	R(&GroupListOptions{}, "group-list", "List groups", func(s *mcclient.ClientSession, args *GroupListOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Domain) > 0 {
-			domainId, e := modules.Domains.GetId(s, args.Domain, nil)
-			if e != nil {
-				return e
-			}
-			params.Add(jsonutils.NewString(domainId), "domain_id")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "name__icontains")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.Groups.List(s, params)
 		if err != nil {
@@ -150,4 +134,94 @@ func init() {
 		return nil
 	})

+	R(&GroupShowOptions{}, "group-project-list", "List projects of group", func(s *mcclient.ClientSession, args *GroupShowOptions) error {
+		query := jsonutils.NewDict()
+		if len(args.Domain) > 0 {
+			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
+			if err != nil {
+				return err
+			}
+			query.Add(jsonutils.NewString(domainId), "domain_id")
+		}
+		uid, err := modules.Groups.GetId(s, args.ID, query)
+		if err != nil {
+			return err
+		}
+		projects, e := modules.Groups.GetProjects(s, uid)
+		if e != nil {
+			return e
+		}
+		printList(projects, modules.Projects.GetColumns(s))
+		return nil
+	})
+
+	type GroupJoinProjectOptions struct {
+		Group   string   `help:"Group Id or name" optional:"false" positional:"true"`
+		Project []string `help:"Projects to join" nargs:"+"`
+		Role    []string `help:"User join project with roles" nargs:"+"`
+	}
+	R(&GroupJoinProjectOptions{}, "group-join-project", "Group join projects with roles", func(s *mcclient.ClientSession, args *GroupJoinProjectOptions) error {
+		input := api.SJoinProjectsInput{}
+		input.Projects = args.Project
+		input.Roles = args.Role
+		result, err := modules.Groups.PerformAction(s, args.Group, "join", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type GroupLeaveProjectsOptions struct {
+		Group   string   `help:"group id or name" optional:"false" positional:"true"`
+		Project string   `help:"project id or name" optional:"false" positional:"true"`
+		Role    []string `help:"roles to remove" nargs:"+"`
+	}
+	R(&GroupLeaveProjectsOptions{}, "group-leave-project", "Leave a group from projects", func(s *mcclient.ClientSession, args *GroupLeaveProjectsOptions) error {
+		input := api.SLeaveProjectsInput{}
+		input.ProjectRoles = make([]api.SProjectRole, len(args.Role))
+		for i := range args.Role {
+			input.ProjectRoles[i].Project = args.Project
+			input.ProjectRoles[i].Role = args.Role[i]
+		}
+		result, err := modules.Groups.PerformAction(s, args.Group, "leave", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type GroupBindGuestsOptions struct {
+		ID    string   `help:"ID"`
+		Guest []string `help:"ID or Name of Guest"`
+	}
+
+	R(&GroupBindGuestsOptions{}, "instance-group-bind-guests", "bind instancegroup to guests",
+		func(s *mcclient.ClientSession, opts *GroupBindGuestsOptions) error {
+			params, err := options.StructToParams(opts)
+			if err != nil {
+				return err
+			}
+			sp, err := modules.InstanceGroup.PerformAction(s, opts.ID, "bind-guests", params)
+			if err != nil {
+				return err
+			}
+			printObject(sp)
+			return nil
+		})
+
+	R(&GroupBindGuestsOptions{}, "instance-group-unbind-guests", "bind instancegroup to guests",
+		func(s *mcclient.ClientSession, opts *GroupBindGuestsOptions) error {
+			params, err := options.StructToParams(opts)
+			if err != nil {
+				return err
+			}
+			sp, err := modules.InstanceGroup.PerformAction(s, opts.ID, "unbind-guests", params)
+			if err != nil {
+				return err
+			}
+			printObject(sp)
+			return nil
+		})
 }
--- a/cmd/climc/shell/hostcachedimages.go
+++ b/cmd/climc/shell/hostcachedimages.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -38,7 +39,7 @@ func init() {

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

 func init() {
@@ -37,7 +38,7 @@ func init() {
 		Occupied  bool   `help:"show occupid host" json:"-"`
 		Enabled   bool   `help:"Show enabled host only" json:"-"`
 		Disabled  bool   `help:"Show disabled host only" json:"-"`
-		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei"`
+		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei|ucloud"`
 		AnyMac    string `help:"Mac matches one of the host's interface"`

 		IsBaremetal *bool `help:"filter host list by is_baremetal=true|false"`
@@ -48,6 +49,12 @@ func init() {

 		Hypervisor string `help:"filter hosts by hypervisor"`

+		StorageNotAttached bool `help:"List hosts not attach specified storage"`
+
+		Uuid string `help:"find host with given system uuid"`
+
+		CdromBoot *bool `help:"filter hosts list by cdrom_boot=true|false"`
+
 		options.BaseListOptions
 	}
 	R(&HostListOptions{}, "host-list", "List hosts", func(s *mcclient.ClientSession, opts *HostListOptions) error {
@@ -66,6 +73,9 @@ func init() {
 		} else if opts.Disabled {
 			params.Add(jsonutils.NewInt(0), "enabled")
 		}
+		if len(opts.Uuid) > 0 {
+			params.Add(jsonutils.NewString(opts.Uuid), "uuid")
+		}
 		result, err := modules.Hosts.List(s, params)
 		if err != nil {
 			return err
@@ -131,6 +141,12 @@ func init() {
 		return nil
 	})

+	R(&HostOpsOptions{}, "host-ipmi-probe", "Do ipmi probe host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "ipmi-probe", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
 	R(&HostDetailOptions{}, "host-ipmi", "Get IPMI information of a host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
 		result, err := modules.Hosts.GetSpecific(s, args.ID, "ipmi", nil)
 		if err != nil {
@@ -183,7 +199,9 @@ func init() {
 		MemoryReserved    string  `help:"Memory reserved"`
 		CpuReserved       int64   `help:"CPU reserved"`
 		HostType          string  `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
-		AccessIp          string  `help:"Change access ip, CAUTION!!!!"`
+		// AccessIp          string  `help:"Change access ip, CAUTION!!!!"`
+		AccessMac string `help:"Change baremetal access MAC, CAUTION!!!!"`
+		Uuid      string `help:"Change baremetal UUID,  CAUTION!!!!"`
 	}
 	R(&HostUpdateOptions{}, "host-update", "Update information of a host", func(s *mcclient.ClientSession, args *HostUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -208,8 +226,11 @@ func init() {
 		if len(args.HostType) > 0 {
 			params.Add(jsonutils.NewString(args.HostType), "host_type")
 		}
-		if len(args.AccessIp) > 0 {
-			params.Add(jsonutils.NewString(args.AccessIp), "access_ip")
+		if len(args.AccessMac) > 0 {
+			params.Add(jsonutils.NewString(args.AccessMac), "access_mac")
+		}
+		if len(args.Uuid) > 0 {
+			params.Add(jsonutils.NewString(args.Uuid), "uuid")
 		}
 		if params.Size() == 0 {
 			return fmt.Errorf("Not data to update")
@@ -333,6 +354,7 @@ func init() {
 		ID     string `help:"ID or Name of host"`
 		WIRE   string `help:"ID or Name of wire to attach"`
 		MAC    string `help:"Mac address of NIC"`
+		INDEX  int64  `help:"nic index"`
 		Type   string `help:"Nic type" choices:"admin|ipmi"`
 		IpAddr string `help:"IP address"`
 	}
@@ -341,6 +363,7 @@ func init() {
 		params.Add(jsonutils.NewString(args.WIRE), "wire")
 		params.Add(jsonutils.NewString(args.MAC), "mac")
 		params.Add(jsonutils.JSONTrue, "link_up")
+		params.Add(jsonutils.NewInt(args.INDEX), "index")
 		if len(args.Type) > 0 {
 			params.Add(jsonutils.NewString(args.Type), "nic_type")
 		}
@@ -465,8 +488,20 @@ func init() {
 		MAC        string `help:"Default MAC address of baremetal"`
 		Rack       string `help:"Rack number of baremetal"`
 		Slots      string `help:"Slots number of baremetal"`
+		IpmiUser   string `help:"IPMI user name"`
 		IpmiPasswd string `help:"IPMI user password"`
 		IpmiAddr   string `help:"IPMI IP address"`
+
+		AccessIp   string `help:"Access IP address"`
+		AccessNet  string `help:"Access network"`
+		AccessWire string `help:"Access wire"`
+
+		NoProbe   bool `help:"just save the record, do not probe"`
+		NoPrepare bool `help:"just probe, do not reboot baremetal to prepare"`
+
+		DisablePxeBoot bool `help:"set enable_pxe_boot to false, which is true by default"`
+
+		Uuid string `help:"host uuid"`
 	}
 	R(&HostCreateOptions{}, "host-create", "Create a baremetal host", func(s *mcclient.ClientSession, args *HostCreateOptions) error {
 		params := jsonutils.NewDict()
@@ -479,12 +514,36 @@ func init() {
 		if len(args.Slots) > 0 {
 			params.Add(jsonutils.NewString(args.Slots), "slots")
 		}
+		if len(args.IpmiUser) > 0 {
+			params.Add(jsonutils.NewString(args.IpmiUser), "ipmi_username")
+		}
 		if len(args.IpmiPasswd) > 0 {
 			params.Add(jsonutils.NewString(args.IpmiPasswd), "ipmi_password")
 		}
 		if len(args.IpmiAddr) > 0 {
 			params.Add(jsonutils.NewString(args.IpmiAddr), "ipmi_ip_addr")
 		}
+		if len(args.AccessIp) > 0 {
+			params.Add(jsonutils.NewString(args.AccessIp), "access_ip")
+		}
+		if len(args.AccessNet) > 0 {
+			params.Add(jsonutils.NewString(args.AccessNet), "access_net")
+		}
+		if len(args.AccessWire) > 0 {
+			params.Add(jsonutils.NewString(args.AccessWire), "access_wire")
+		}
+		if args.NoProbe {
+			params.Add(jsonutils.JSONTrue, "no_probe")
+		}
+		if args.NoPrepare {
+			params.Add(jsonutils.JSONTrue, "no_prepare")
+		}
+		if args.DisablePxeBoot {
+			params.Add(jsonutils.JSONFalse, "enable_pxe_boot")
+		}
+		if len(args.Uuid) > 0 {
+			params.Add(jsonutils.NewString(args.Uuid), "uuid")
+		}
 		result, err := modules.Hosts.Create(s, params)
 		if err != nil {
 			return err
@@ -532,4 +591,53 @@ func init() {
 		printObject(spec)
 		return nil
 	})
+
+	type HostJnlpOptions struct {
+		ID   string `help:"ID or name of host"`
+		Save string `help:"save xml into this file"`
+	}
+	R(&HostJnlpOptions{}, "host-jnlp", "Get host jnlp file contentn", func(s *mcclient.ClientSession, args *HostJnlpOptions) error {
+		spec, err := modules.Hosts.GetSpecific(s, args.ID, "jnlp", nil)
+		if err != nil {
+			return err
+		}
+		jnlp, err := spec.GetString("jnlp")
+		if err != nil {
+			return err
+		}
+		if len(args.Save) > 0 {
+			return fileutils2.FilePutContents(args.Save, jnlp, false)
+		} else {
+			fmt.Println(jnlp)
+		}
+		return nil
+	})
+
+	type HostInsertIsoOptions struct {
+		ID    string `help:"ID or name of host" json:"-"`
+		Image string `help:"ID or name or ISO image name" json:"image"`
+		Boot  bool   `help:"Boot from ISO on next reset" json:"boot"`
+	}
+	R(&HostInsertIsoOptions{}, "host-insert-iso", "Insert ISO into virtual cd-rom of host", func(s *mcclient.ClientSession, args *HostInsertIsoOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Hosts.PerformAction(s, args.ID, "insert-iso", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type HostEjectIsoOptions struct {
+		ID string `help:"ID or name of host" json:"-"`
+	}
+	R(&HostEjectIsoOptions{}, "host-eject-iso", "Eject ISO from virtual cd-rom of host", func(s *mcclient.ClientSession, args *HostEjectIsoOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Hosts.PerformAction(s, args.ID, "eject-iso", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }
--- a/cmd/climc/shell/hoststorages.go
+++ b/cmd/climc/shell/hoststorages.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -38,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modules.ListResult
+		var result *modulebase.ListResult
 		var err error
 		// if len(args.Storage) > 0 {
 		// 	params.Add(jsonutils.NewString(args.Storage), "storage")
--- a/cmd/climc/shell/hostwires.go
+++ b/cmd/climc/shell/hostwires.go
@@ -18,6 +18,7 @@ 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"
 )
@@ -38,7 +39,7 @@ func init() {

 			}
 		}
-		var result *modules.ListResult
+		var result *modulebase.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Hostwires.ListDescendent(s, args.Host, params)
@@ -70,15 +71,15 @@ func init() {
 	type HostWireUpdateOptions struct {
 		HOST      string `help:"ID or Name of Host"`
 		WIRE      string `help:"ID or Name of Wire"`
-		Mac       string `help:"Mac address"`
+		MacAddr   string `help:"Mac address"`
 		Interface string `help:"Interface"`
 		Bridge    string `help:"Bridge"`
 		IsMaster  string `help:"Master interface" choices:"true|false"`
 	}
 	R(&HostWireUpdateOptions{}, "host-wire-update", "Update host wire information", func(s *mcclient.ClientSession, args *HostWireUpdateOptions) error {
 		params := jsonutils.NewDict()
-		if len(args.Mac) > 0 {
-			params.Add(jsonutils.NewString(args.Mac), "mac_addr")
+		if len(args.MacAddr) > 0 {
+			params.Add(jsonutils.NewString(args.MacAddr), "mac_addr")
 		}
 		if len(args.Interface) > 0 {
 			params.Add(jsonutils.NewString(args.Interface), "interface")
--- a/cmd/climc/shell/identityproviders.go
+++ b/cmd/climc/shell/identityproviders.go
@@ -0,0 +1,297 @@
+// 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 shell
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	api "yunion.io/x/onecloud/pkg/apis/identity"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type IdentityProviderListOptions struct {
+		options.BaseListOptions
+	}
+	R(&IdentityProviderListOptions{}, "idp-list", "List all identity provider", func(s *mcclient.ClientSession, args *IdentityProviderListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		results, err := modules.IdentityProviders.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(results, modules.IdentityProviders.GetColumns(s))
+		return nil
+	})
+
+	type IdentityProviderDetailOptions struct {
+		ID string `help:"Id or name of identity provider to show"`
+	}
+	R(&IdentityProviderDetailOptions{}, "idp-show", "Show details of idp", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		detail, err := modules.IdentityProviders.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(detail)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-config-show", "Show detail of a domain config", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		conf, err := modules.IdentityProviders.GetSpecific(s, args.ID, "config", nil)
+		if err != nil {
+			return err
+		}
+		fmt.Println(conf.PrettyString())
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-enable", "Enable an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.PerformAction(s, args.ID, "enable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-disable", "Disable an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.PerformAction(s, args.ID, "disable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-delete", "Delete an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-sync", "Sync an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.PerformAction(s, args.ID, "sync", nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigLDAPOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SLDAPIdpConfigOptions
+	}
+	R(&IdentityProviderConfigLDAPOptions{}, "idp-config-ldap", "Config an Identity provider with LDAP driver", func(s *mcclient.ClientSession, args *IdentityProviderConfigLDAPOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "ldap")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+	type IdentityProviderCreateLDAPOptions struct {
+		NAME string `help:"name of identity provider" json:"-"`
+
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
+		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
+
+		TargetDomain string `help:"target domain without creating new domain" json:"-"`
+
+		api.SLDAPIdpConfigOptions
+	}
+	R(&IdentityProviderCreateLDAPOptions{}, "idp-create-ldap", "Create an identity provider with LDAP driver", func(s *mcclient.ClientSession, args *IdentityProviderCreateLDAPOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+
+		if len(args.TargetDomain) > 0 {
+			params.Add(jsonutils.NewString(args.TargetDomain), "target_domain")
+		}
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.NewString("ldap"), "driver")
+		params.Add(jsonutils.Marshal(args), "config", "ldap")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigLDAPSingleDomainOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SLDAPIdpConfigSingleDomainOptions
+	}
+	R(&IdentityProviderConfigLDAPSingleDomainOptions{}, "idp-config-ldap-single-domain", "Config an Identity provider with LDAP driver/single domain template", func(s *mcclient.ClientSession, args *IdentityProviderConfigLDAPSingleDomainOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "ldap")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+	type IdentityProviderCreateLDAPSingleDomainOptions struct {
+		NAME     string `help:"name of identity provider" json:"-"`
+		TEMPLATE string `help:"configuration template name" choices:"msad_one_domain|openldap_one_domain" json:"-"`
+
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
+		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
+
+		TargetDomain string `help:"target domain without creating new domain" json:"-"`
+
+		api.SLDAPIdpConfigSingleDomainOptions
+	}
+	R(&IdentityProviderCreateLDAPSingleDomainOptions{}, "idp-create-ldap-single-domain", "Create an identity provider with LDAP driver/single domain template", func(s *mcclient.ClientSession, args *IdentityProviderCreateLDAPSingleDomainOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		params.Add(jsonutils.NewString("ldap"), "driver")
+		params.Add(jsonutils.NewString(args.TEMPLATE), "template")
+
+		if len(args.TargetDomain) > 0 {
+			params.Add(jsonutils.NewString(args.TargetDomain), "target_domain")
+		}
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.Marshal(args), "config", "ldap")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigLDAPMultiDomainOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SLDAPIdpConfigMultiDomainOptions
+	}
+	R(&IdentityProviderConfigLDAPMultiDomainOptions{}, "idp-config-ldap-multi-domain", "Config an Identity provider with LDAP driver/multi domain template", func(s *mcclient.ClientSession, args *IdentityProviderConfigLDAPMultiDomainOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "ldap")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+	type IdentityProviderCreateLDAPMultiDomainOptions struct {
+		NAME     string `help:"name of identity provider" json:"-"`
+		TEMPLATE string `help:"configuration template name" choices:"msad_multi_domain" json:"-"`
+
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
+		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
+
+		api.SLDAPIdpConfigMultiDomainOptions
+	}
+	R(&IdentityProviderCreateLDAPMultiDomainOptions{}, "idp-create-ldap-multi-domain", "Create an identity provider with LDAP driver/single domain template", func(s *mcclient.ClientSession, args *IdentityProviderCreateLDAPMultiDomainOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		params.Add(jsonutils.NewString("ldap"), "driver")
+		params.Add(jsonutils.NewString(args.TEMPLATE), "template")
+
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.Marshal(args), "config", "ldap")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderCreateCASOptions struct {
+		NAME string `help:"name of identity provider" json:"-"`
+
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
+		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
+
+		TargetDomain string `help:"target domain without creating new domain" json:"-"`
+
+		api.SCASIdpConfigOptions
+	}
+	R(&IdentityProviderCreateCASOptions{}, "idp-create-cas", "Create an identity provider with CAS driver", func(s *mcclient.ClientSession, args *IdentityProviderCreateCASOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+
+		if len(args.TargetDomain) > 0 {
+			params.Add(jsonutils.NewString(args.TargetDomain), "target_domain")
+		}
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.NewString("cas"), "driver")
+		params.Add(jsonutils.Marshal(args), "config", "cas")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigCASOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SCASIdpConfigOptions
+	}
+	R(&IdentityProviderConfigCASOptions{}, "idp-config-cas", "Config an Identity provider with CAS driver", func(s *mcclient.ClientSession, args *IdentityProviderConfigCASOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "cas")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+}
--- a/cmd/climc/shell/imageguest.go
+++ b/cmd/climc/shell/imageguest.go
@@ -0,0 +1,233 @@
+// 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 shell
+
+import (
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+
+	type GuestImageCreateOptions struct {
+		NAME        string `help:"Name of guest image"`
+		ImageNumber int    `help:"common image number of guest image"`
+		Protected   bool   `help:"if guest image is protected"`
+	}
+
+	R(&GuestImageCreateOptions{}, "guest-image-create", "Create guest image's metadata", func(s *mcclient.ClientSession,
+		args *GuestImageCreateOptions) error {
+
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		if args.ImageNumber > 0 {
+			params.Add(jsonutils.NewInt(int64(args.ImageNumber)), "image_number")
+		}
+		if args.Protected {
+			params.Add(jsonutils.JSONTrue, "protected")
+		}
+		ret, err := modules.GuestImages.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	},
+	)
+
+	type GuestImageListOptions struct {
+		options.BaseListOptions
+
+		Name string `help:"Name filter"`
+	}
+
+	R(&GuestImageListOptions{}, "guest-image-list", "List guest images", func(s *mcclient.ClientSession,
+		args *GuestImageListOptions) error {
+
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		params.Add(jsonutils.JSONTrue, "details")
+		rets, err := modules.GuestImages.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(rets, modules.GuestImages.GetColumns(s))
+		return nil
+	},
+	)
+
+	type GuestImageDeleteOptions struct {
+		ID                    []string `help:"Image ID or name"`
+		OverridePendingDelete *bool    `help:"Delete image directly instead of pending delete" short-token:"f"`
+	}
+	R(&GuestImageDeleteOptions{}, "guest-image-delete", "Delete a image", func(s *mcclient.ClientSession,
+		args *GuestImageDeleteOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		ret := modules.GuestImages.BatchDeleteWithParam(s, args.ID, params, nil)
+		printBatchResults(ret, modules.GuestImages.GetColumns(s))
+		return nil
+	})
+
+	type GuestImageCancelDeleteOptions struct {
+		ID string `help:"Guest Image id or name"`
+	}
+	R(&GuestImageCancelDeleteOptions{}, "guest-image-cancel-delete", "Cancel pending delete images",
+		func(s *mcclient.ClientSession,
+			args *GuestImageCancelDeleteOptions) error {
+			if image, e := modules.GuestImages.PerformAction(s, args.ID, "cancel-delete", nil); e != nil {
+				return e
+			} else {
+				printObject(image)
+			}
+			return nil
+		},
+	)
+
+	type GuestImageUpdateOptions struct {
+		ID             string `help:"id of guest image"`
+		Name           string `help:"new name of guest image"`
+		Protected      string `help:"delete protection" choices:"enable|disable"`
+		OsType         string `help:"os type"`
+		OsDistribution string `help:"os distribution"`
+		DiskDriver     string `help:"disk driver"`
+		NetDriver      string `help:"net driver"`
+	}
+	R(&GuestImageUpdateOptions{}, "guest-image-update", "update guest image", func(s *mcclient.ClientSession,
+		args *GuestImageUpdateOptions) error {
+
+		params := jsonutils.NewDict()
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+		if len(args.Protected) > 0 {
+			if args.Protected == "enable" {
+				params.Add(jsonutils.JSONTrue, "protected")
+			} else {
+				params.Add(jsonutils.JSONFalse, "protected")
+			}
+		}
+		properties := jsonutils.NewDict()
+		if len(args.OsType) > 0 {
+			properties.Add(jsonutils.NewString(args.OsType), "os_type")
+		}
+		if len(args.OsDistribution) > 0 {
+			properties.Add(jsonutils.NewString(args.OsDistribution), "os_distribution")
+		}
+		if len(args.DiskDriver) > 0 {
+			properties.Add(jsonutils.NewString(args.DiskDriver), "disk_driver")
+		}
+		if len(args.NetDriver) > 0 {
+			properties.Add(jsonutils.NewString(args.NetDriver), "net_driver")
+		}
+		params.Add(properties, "properties")
+		_, err := modules.GuestImages.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
+	type GuestImageOptions struct {
+		ID string `help:"Guest Image id or name"`
+	}
+	R(&GuestImageOptions{}, "guest-image-mark-protected", "Mark image protected", func(s *mcclient.ClientSession,
+		args *GuestImageOptions) error {
+
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.JSONTrue, "protected")
+		result, err := modules.GuestImages.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&GuestImageOptions{}, "guest-image-mark-unprotected", "Mark image protected", func(s *mcclient.ClientSession,
+		args *GuestImageOptions) error {
+
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.JSONFalse, "protected")
+		result, err := modules.GuestImages.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type GuestImageOperationOptions struct {
+		ID []string `help:"Guest Image ID or Name"`
+	}
+
+	type GuestImagePublicOptions struct {
+		GuestImageOperationOptions
+		Scope          string   `help:"sharing scope" choices:"system|domain"`
+		ShareToProject []string `help:"Share to prject"`
+	}
+
+	R(&GuestImageOperationOptions{}, "guest-image-private", "Make a guest image private",
+		func(s *mcclient.ClientSession, args *GuestImageOperationOptions) error {
+			if len(args.ID) == 0 {
+				return errors.Error("No guest image ID provided")
+			} else if len(args.ID) == 1 {
+				result, err := modules.GuestImages.PerformAction(s, args.ID[0], "private", nil)
+				if err != nil {
+					return err
+				}
+				printObject(result)
+			} else {
+				results := modules.GuestImages.BatchPerformAction(s, args.ID, "private", nil)
+				printBatchResults(results, modules.GuestImages.GetColumns(s))
+			}
+			return nil
+		},
+	)
+
+	R(&GuestImagePublicOptions{}, "guest-image-public", "Make a guest image public",
+		func(s *mcclient.ClientSession, args *GuestImagePublicOptions) error {
+			params, err := options.StructToParams(args)
+			if err != nil {
+				return err
+			}
+			if len(args.ID) == 0 {
+				return errors.Error("No guest image ID provided")
+			} else if len(args.ID) == 1 {
+				result, err := modules.GuestImages.PerformAction(s, args.ID[0], "public", params)
+				if err != nil {
+					return err
+				}
+				printObject(result)
+			} else {
+				results := modules.GuestImages.BatchPerformAction(s, args.ID, "public", params)
+				printBatchResults(results, modules.GuestImages.GetColumns(s))
+			}
+			return nil
+		},
+	)
+}
--- a/cmd/climc/shell/images.go
+++ b/cmd/climc/shell/images.go
@@ -23,16 +23,17 @@ 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"
 )

 type ImageOptionalOptions struct {
-	Public             bool     `help:"Make image public"`
-	Private            bool     `help:"Make image private"`
 	Format             string   `help:"Image format" choices:"raw|qcow2|iso|vmdk|docker|vhd"`
 	Protected          bool     `help:"Prevent image from being deleted"`
 	Unprotected        bool     `help:"Allow image to be deleted"`
+	Standard           bool     `help:"Mark image as a standard image"`
+	Nonstandard        bool     `help:"Mark image as a non-standard image"`
 	MinDisk            int64    `help:"Disk size after expanded, in MB" metavar:"MIN_DISK_SIZE_MB"`
 	MinRam             int64    `help:"Minimal memory size required" metavar:"MIN_RAM_MB"`
 	VirtualSize        int64    `help:"Disk size after expanded, in MB"`
@@ -55,11 +56,6 @@ type ImageOptionalOptions struct {
 }

 func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDict, args ImageOptionalOptions) error {
-	if args.Public && !args.Private {
-		params.Add(jsonutils.NewString("true"), "is-public")
-	} else if !args.Public && args.Private {
-		params.Add(jsonutils.NewString("false"), "is-public")
-	}
 	if len(args.Format) > 0 {
 		params.Add(jsonutils.NewString("bare"), "container-format")
 		params.Add(jsonutils.NewString(args.Format), "disk-format")
@@ -69,6 +65,11 @@ func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDi
 	} else if !args.Protected && args.Unprotected {
 		params.Add(jsonutils.NewString("false"), "protected")
 	}
+	if args.Standard && !args.Nonstandard {
+		params.Add(jsonutils.JSONTrue, "is_standard")
+	} else if !args.Standard && args.Nonstandard {
+		params.Add(jsonutils.JSONFalse, "is_standard")
+	}
 	if args.MinDisk > 0 {
 		params.Add(jsonutils.NewString(fmt.Sprintf("%d", args.MinDisk)), "min_disk")
 	}
@@ -134,9 +135,12 @@ func init() {
 	type ImageListOptions struct {
 		options.BaseListOptions

-		IsPublic string   `help:"filter images public or not(True, False or None)" choices:"true|false|none"`
-		Format   []string `help:"Disk formats"`
-		Name     string   `help:"Name filter"`
+		IsPublic   string   `help:"filter images public or not(True, False or None)" choices:"true|false"`
+		IsStandard string   `help:"filter images standard or non-standard" choices:"true|false"`
+		Protected  string   `help:"filter images by protected" choices:"true|false"`
+		IsUefi     bool     `help:"list uefi image"`
+		Format     []string `help:"Disk formats"`
+		Name       string   `help:"Name filter"`
 	}
 	R(&ImageListOptions{}, "image-list", "List images", func(s *mcclient.ClientSession, args *ImageListOptions) error {
 		params, err := args.Params()
@@ -146,6 +150,15 @@ func init() {
 		if len(args.IsPublic) > 0 {
 			params.Add(jsonutils.NewString(args.IsPublic), "is_public")
 		}
+		if len(args.IsStandard) > 0 {
+			params.Add(jsonutils.NewString(args.IsStandard), "is_standard")
+		}
+		if len(args.Protected) > 0 {
+			params.Add(jsonutils.NewString(args.Protected), "protected")
+		}
+		if args.IsUefi {
+			params.Add(jsonutils.JSONTrue, "uefi")
+		}
 		if len(args.Tenant) > 0 {
 			tid, e := modules.Projects.GetId(s, args.Tenant, nil)
 			if e != nil {
@@ -215,19 +228,7 @@ func init() {
 	}

 	R(&ImageUpdateOptions{}, "image-update", "Update images meta infomation", func(s *mcclient.ClientSession, args *ImageUpdateOptions) error {
-		/* img, e := modules.Images.Get(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		idstr, e := img.GetString("id")
-		if e != nil {
-			return e
-		}*/
 		params := jsonutils.NewDict()
-		/* properties, _ := img.Get("properties")
-		if properties != nil {
-			params.Add(properties, "properties")
-		}*/
 		if len(args.Name) > 0 {
 			params.Add(jsonutils.NewString(args.Name), "name")
 		}
@@ -268,7 +269,7 @@ func init() {

 	type ImageDeleteOptions struct {
 		ID                    []string `help:"Image ID or name"`
-		OverridePendingDelete *bool    `help:"Delete image directly instead of pending delete"`
+		OverridePendingDelete *bool    `help:"Delete image directly instead of pending delete" short-token:"f"`
 	}
 	R(&ImageDeleteOptions{}, "image-delete", "Delete a image", func(s *mcclient.ClientSession, args *ImageDeleteOptions) error {
 		params, err := options.StructToParams(args)
@@ -316,9 +317,6 @@ func init() {
 		// if len(args.Format) == 0 {
 		// 	return fmt.Errorf("Please specify image format")
 		//}
-		if len(args.OsType) == 0 {
-			return fmt.Errorf("Please specify OS type")
-		}
 		err := addImageOptionalOptions(s, params, args.ImageOptionalOptions)
 		if err != nil {
 			return err
@@ -388,7 +386,7 @@ func init() {
 		} else {
 			sink = os.Stdout
 		}
-		meta, src, err := modules.Images.Download(s, imgId, args.Format, args.Torrent)
+		meta, src, size, err := modules.Images.Download(s, imgId, args.Format, args.Torrent)
 		if err != nil {
 			return err
 		}
@@ -398,6 +396,7 @@ func init() {
 		}
 		if len(args.Output) > 0 {
 			printObject(meta)
+			fmt.Println("Image size: ", size)
 		}
 		return nil
 	})
@@ -418,17 +417,26 @@ func init() {
 		return nil
 	})

-	R(&ImageOperationOptions{}, "image-public", "Make a image public", func(s *mcclient.ClientSession, args *ImageOperationOptions) error {
+	type ImagePublicOptions struct {
+		ID             []string `help:"ID or name of image" json:"-"`
+		Scope          string   `help:"sharing scope" choices:"system|domain"`
+		ShareToProject []string `help:"Share to prject"`
+	}
+	R(&ImagePublicOptions{}, "image-public", "Make a image public", func(s *mcclient.ClientSession, args *ImagePublicOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
 		if len(args.ID) == 0 {
 			return fmt.Errorf("No image ID provided")
 		} else if len(args.ID) == 1 {
-			result, err := modules.Images.PerformAction(s, args.ID[0], "public", nil)
+			result, err := modules.Images.PerformAction(s, args.ID[0], "public", params)
 			if err != nil {
 				return err
 			}
 			printObject(result)
 		} else {
-			results := modules.Images.BatchPerformAction(s, args.ID, "public", nil)
+			results := modules.Images.BatchPerformAction(s, args.ID, "public", params)
 			printBatchResults(results, modules.Images.GetColumns(s))
 		}
 		return nil
@@ -442,7 +450,7 @@ func init() {
 				continue
 			}
 			arrays, _ := result.(*jsonutils.JSONArray).GetArray()
-			listResult := modules.ListResult{Data: arrays}
+			listResult := modulebase.ListResult{Data: arrays}
 			printList(&listResult, []string{})
 		}
 		return nil
@@ -450,18 +458,16 @@ func init() {

 	R(&ImageOperationOptions{}, "image-mark-standard", "Mark image standard", func(s *mcclient.ClientSession, args *ImageOperationOptions) error {
 		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONTrue, "is-public")
-		params.Add(jsonutils.JSONTrue, "protected")
-		results := modules.Images.BatchPerformAction(s, args.ID, "mark-public-protected", params)
+		params.Add(jsonutils.JSONTrue, "is_standard")
+		results := modules.Images.BatchPerformAction(s, args.ID, "mark-standard", params)
 		printBatchResults(results, modules.Images.GetColumns(s))
 		return nil
 	})

 	R(&ImageOperationOptions{}, "image-mark-unstandard", "Mark image not standard", func(s *mcclient.ClientSession, args *ImageOperationOptions) error {
 		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONFalse, "is-public")
-		params.Add(jsonutils.JSONFalse, "protected")
-		results := modules.Images.BatchPerformAction(s, args.ID, "mark-public-protected", params)
+		params.Add(jsonutils.JSONFalse, "is_standard")
+		results := modules.Images.BatchPerformAction(s, args.ID, "mark-standard", params)
 		printBatchResults(results, modules.Images.GetColumns(s))
 		return nil
 	})
@@ -490,5 +496,4 @@ func init() {
 		printObject(srv)
 		return nil
 	})
-
 }
--- a/cmd/climc/shell/instance_group.go
+++ b/cmd/climc/shell/instance_group.go
@@ -0,0 +1,127 @@
+// 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 shell
+
+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 InstanceGroupListOptions struct {
+		options.BaseListOptions
+
+		ServiceType string `help:"Service Type"`
+		ParentId    string `help:"Parent ID"`
+		ZoneId      string `help:"Zone ID"`
+		Guest       string `help:"Guest ID or Name"`
+	}
+
+	R(&InstanceGroupListOptions{}, "instance-group-list", "List instance group", func(s *mcclient.ClientSession,
+		args *InstanceGroupListOptions) error {
+
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.InstanceGroup.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.InstanceGroup.GetColumns(s))
+		return nil
+	})
+
+	type InstanceGroupShowOptions struct {
+		ID string `help:"ID or Name of instance group"`
+	}
+	R(&InstanceGroupShowOptions{}, "instance-group-show", "Show details of a instance group",
+		func(s *mcclient.ClientSession, args *InstanceGroupShowOptions) error {
+
+			result, err := modules.InstanceGroup.GetById(s, args.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(result)
+			return nil
+		})
+
+	type InstanceGroupCreateOptions struct {
+		NAME string `help:"name of instance group"`
+
+		ZoneId          string `help:"zone id" json:"zone_id"`
+		ServiceType     string `help:"service type"`
+		ParentId        string `help:"parent id"`
+		SchedStrategy   string `help:"scheduler strategy"`
+		Granularity     string `help:"the upper limit number of guests with this group in a host"`
+		ForceDispersion bool   `help:"force to make guest dispersion"`
+	}
+
+	R(&InstanceGroupCreateOptions{}, "instance-group-create", "Create a instance group",
+		func(s *mcclient.ClientSession, args *InstanceGroupCreateOptions) error {
+			params, err := options.StructToParams(args)
+			if err != nil {
+				return err
+			}
+			result, err := modules.InstanceGroup.Create(s, params)
+			if err != nil {
+				return err
+			}
+			printObject(result)
+			return nil
+		},
+	)
+
+	R(&InstanceGroupShowOptions{}, "instance-group-delete", "delete a instance group",
+		func(s *mcclient.ClientSession, args *InstanceGroupShowOptions) error {
+			result, err := modules.InstanceGroup.Delete(s, args.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(result)
+			return nil
+		},
+	)
+
+	type InstanceGroupUpdateOptions struct {
+		ID              string `help:"ID or Name of servers to update" json:"-"`
+		Name            string `help:"New name to change"`
+		Granularity     string `help:"the upper limit number of guests with this group in a host"`
+		ForceDispersion string `help:"force to make guest dispersion" choices:"yes|no" json:"-"`
+	}
+
+	R(&InstanceGroupUpdateOptions{}, "instance-group-update", "update a instance group",
+		func(s *mcclient.ClientSession, args *InstanceGroupUpdateOptions) error {
+			params, err := options.StructToParams(args)
+			if err != nil {
+				return err
+			}
+			if args.ForceDispersion == "yes" {
+				params.Set("force_dispersion", jsonutils.JSONTrue)
+			} else {
+				params.Set("force_dispersion", jsonutils.JSONFalse)
+			}
+			ret, err := modules.InstanceGroup.Update(s, args.ID, params)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+}
--- a/cmd/climc/shell/instance_snapshots.go
+++ b/cmd/climc/shell/instance_snapshots.go
@@ -0,0 +1,63 @@
+// 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 shell
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type InstanceSnapshotsListOptions struct {
+		options.BaseListOptions
+
+		GuestId string `help:"guest id" json:"guest_id"`
+	}
+	R(&InstanceSnapshotsListOptions{}, "instance-snapshot-list", "Show instance snapshots", func(s *mcclient.ClientSession, args *InstanceSnapshotsListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.InstanceSnapshots.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.InstanceSnapshots.GetColumns(s))
+		return nil
+	})
+
+	type InstanceSnapshotDeleteOptions struct {
+		ID []string `help:"Delete snapshot id"`
+	}
+	R(&InstanceSnapshotDeleteOptions{}, "instance-snapshot-delete", "Delete snapshots", func(s *mcclient.ClientSession, args *InstanceSnapshotDeleteOptions) error {
+		ret := modules.InstanceSnapshots.BatchDelete(s, args.ID, nil)
+		printBatchResults(ret, modules.InstanceSnapshots.GetColumns(s))
+		return nil
+	})
+
+	type InstanceSnapshotShowOptions struct {
+		ID string `help:"ID or Name of snapshot"`
+	}
+	R(&InstanceSnapshotShowOptions{}, "snapshot-show", "Show snapshot details", func(s *mcclient.ClientSession, args *InstanceSnapshotShowOptions) error {
+		result, err := modules.InstanceSnapshots.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}
--- a/cmd/climc/shell/itsm_deployment.go
+++ b/cmd/climc/shell/itsm_deployment.go
@@ -0,0 +1,93 @@
+// 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 shell
+
+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 DeploymentCreateOptions struct {
+		FILE     string `help:"The local bpmn filename to Upload"`
+		TenantID string `help:"ID of tenant"`
+	}
+	R(&DeploymentCreateOptions{}, "process-deployment-create", "Create deployment by upload BPMN file", func(s *mcclient.ClientSession, args *DeploymentCreateOptions) error {
+		// TODO
+		return nil
+	})
+
+	/**
+	 * 删除指定ID的部署
+	 */
+	type DeploymentDeleteOptions struct {
+		ID      string `help:"ID of process deployment"`
+		Cascade bool   `help:"Whether to cascade delete process instance, history process instance and jobs" required:"true" choices:"true|false"`
+	}
+	R(&DeploymentDeleteOptions{}, "process-deployment-delete", "Delete process deployment by ID", func(s *mcclient.ClientSession, args *DeploymentDeleteOptions) error {
+		params := jsonutils.NewDict()
+		if args.Cascade {
+			params.Add(jsonutils.JSONTrue, "cascade")
+		} else {
+			params.Add(jsonutils.JSONFalse, "cascade")
+		}
+		result, e := modules.ProcessDeployments.Delete(s, args.ID, nil)
+		if e != nil {
+			return e
+		}
+		printObject(result)
+		return nil
+	})
+
+	/**
+	 * 列出部署
+	 */
+	type DeploymentListOptions struct {
+		options.BaseListOptions
+	}
+	R(&DeploymentListOptions{}, "process-deployment-list", "List process deployment", func(s *mcclient.ClientSession, args *DeploymentListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.ProcessDeployments.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.ProcessDeployments.GetColumns(s))
+		return nil
+	})
+
+	/**
+	 * 查看指定ID的部署
+	 */
+	type DeploymentShowOptions struct {
+		ID string `help:"ID of the process deployment"`
+	}
+	R(&DeploymentShowOptions{}, "process-deployment-show", "Show deployment", func(s *mcclient.ClientSession, args *DeploymentShowOptions) error {
+		result, err := modules.ProcessDeployments.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/itsm_histroic_process_instance.go
+++ b/cmd/climc/shell/itsm_histroic_process_instance.go
@@ -0,0 +1,84 @@
+// 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 shell
+
+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 HistoricProcessInstanceListOptions struct {
+		ProcessDefinitionKey string `help:"Process definition key"`
+		UserId               string `help:"ID of user"`
+		options.BaseListOptions
+	}
+	R(&HistoricProcessInstanceListOptions{}, "historic-process-instance-list", "List historic process definition", func(s *mcclient.ClientSession, args *HistoricProcessInstanceListOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.ProcessDefinitionKey) > 0 {
+			params.Add(jsonutils.NewString(args.ProcessDefinitionKey), "process_definition_key")
+		}
+		if len(args.UserId) > 0 {
+			params.Add(jsonutils.NewString(args.UserId), "user_id")
+		}
+		result, err := modules.HistoricProcessInstance.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.HistoricProcessInstance.GetColumns(s))
+		return nil
+	})
+
+	/**
+	 * 查看指定ID的历史流程实例
+	 */
+	type HistoricProcessInstanceShowOptions struct {
+		ID string `help:"ID of the historic process instance"`
+	}
+	R(&HistoricProcessInstanceShowOptions{}, "historic-process-instance-show", "Show historic process definition", func(s *mcclient.ClientSession, args *HistoricProcessInstanceShowOptions) error {
+		result, err := modules.HistoricProcessInstance.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type HistoricProcessInstanceStaticticsOptions struct {
+		ID string `help:"ID of user"`
+	}
+	R(&HistoricProcessInstanceStaticticsOptions{}, "historic-process-instance-statistics", "Delete all contacts for the user", func(s *mcclient.ClientSession, args *HistoricProcessInstanceStaticticsOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.ID), "user_id")
+
+		rst, err := modules.HistoricProcessInstance.GetStatistics(s, params)
+
+		if err != nil {
+			return err
+		}
+
+		printObject(rst)
+		return nil
+	})
+}
--- a/cmd/climc/shell/itsm_histroic_task_instance.go
+++ b/cmd/climc/shell/itsm_histroic_task_instance.go
@@ -0,0 +1,67 @@
+// 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 shell
+
+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 HistoricProcessInstanceListOptions struct {
+		ProcessInstanceId string `help:"ID of process instance"`
+		UserId            string `help:"ID of user"`
+		options.BaseListOptions
+	}
+	R(&HistoricProcessInstanceListOptions{}, "historic-task-instance-list", "List historic process instance", func(s *mcclient.ClientSession, args *HistoricProcessInstanceListOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.ProcessInstanceId) > 0 {
+			params.Add(jsonutils.NewString(args.ProcessInstanceId), "process_instance_id")
+		}
+		if len(args.UserId) > 0 {
+			params.Add(jsonutils.NewString(args.UserId), "user_id")
+		}
+		result, err := modules.HistoricTaskInstances.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.HistoricTaskInstances.GetColumns(s))
+		return nil
+	})
+
+	/**
+	 * 查看指定ID的历史任务实例
+	 */
+	type HistoricProcessInstanceShowOptions struct {
+		ID string `help:"ID of the historic task instance"`
+	}
+	R(&HistoricProcessInstanceShowOptions{}, "historic-task-instance-show", "Show historic task instance", func(s *mcclient.ClientSession, args *HistoricProcessInstanceShowOptions) error {
+		result, err := modules.HistoricTaskInstances.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/itsm_process_definition.go
+++ b/cmd/climc/shell/itsm_process_definition.go
@@ -0,0 +1,107 @@
+// 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 shell
+
+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() {
+	/**
+	 * 删除指定ID的流程定义
+	 */
+	type ProcessDefinitionDeleteOptions struct {
+		ID      string `help:"ID of process definition, deletes the process definition which belongs to the given process definition id"`
+		Cascade bool   `help:"Whether to cascade delete process instance, if set to true, all process instances (including) history are deleted" required:"true" choices:"true|false"`
+	}
+	R(&ProcessDefinitionDeleteOptions{}, "process-definition-delete", "Delete process definition by ID", func(s *mcclient.ClientSession, args *ProcessDefinitionDeleteOptions) error {
+		params := jsonutils.NewDict()
+		if args.Cascade {
+			params.Add(jsonutils.JSONTrue, "cascade")
+		} else {
+			params.Add(jsonutils.JSONFalse, "cascade")
+		}
+		result, e := modules.ProcessDefinitions.Delete(s, args.ID, nil)
+		if e != nil {
+			return e
+		}
+		printObject(result)
+		return nil
+	})
+
+	/**
+	 * 修改指定的流程定义的激活/挂起状态
+	 */
+	type NodealertUpdateOptions struct {
+		ID    string `help:"ID of process definition"`
+		state string `help:"State of the process definition" choices:"activate|suspend"`
+	}
+	R(&NodealertUpdateOptions{}, "process-definition-change-state", "Update the state of the process definition", func(s *mcclient.ClientSession, args *NodealertUpdateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.state), "state")
+		result, err := modules.ProcessDefinitions.Put(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	/**
+	 * 列出流程定义
+	 */
+	type ProcessDefinitionListOptions struct {
+		ProcessDefinitionKey string `help:"Key of process definition"`
+		UserId               string `help:"ID of user who start the process definition"`
+		options.BaseListOptions
+	}
+	R(&ProcessDefinitionListOptions{}, "process-definition-list", "List process definition", func(s *mcclient.ClientSession, args *ProcessDefinitionListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.ProcessDefinitionKey) > 0 {
+			params.Add(jsonutils.NewString(args.ProcessDefinitionKey), "process_definition_key")
+		}
+		if len(args.UserId) > 0 {
+			params.Add(jsonutils.NewString(args.UserId), "user_id")
+		}
+		result, err := modules.ProcessDefinitions.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.ProcessDefinitions.GetColumns(s))
+		return nil
+	})
+
+	/**
+	 * 查看指定ID的流程定义
+	 */
+	type ProcessDefinitionShowOptions struct {
+		ID string `help:"ID of the process definition"`
+	}
+	R(&ProcessDefinitionShowOptions{}, "process-definition-show", "Show process definition", func(s *mcclient.ClientSession, args *ProcessDefinitionShowOptions) error {
+		result, err := modules.ProcessDefinitions.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/itsm_process_instance.go
+++ b/cmd/climc/shell/itsm_process_instance.go
@@ -0,0 +1,123 @@
+// 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 shell
+
+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 ProcessInstanceCreateOptions struct {
+		PROCESS_DEFINITION_KEY string `help:"Key of the process definition"`
+		INITIATOR              string `help:"ID of user who launch the process instance"`
+		SERVER_CREATE_PARAMTER string `help:"Onecloud server create spec json string"`
+		UserId                 string `help:"ID of user"`
+		RoleId                 string `help:"ID of role"`
+		ProjectId              string `help:"ID of project"`
+		Percent                string `help:"Great than Percent of nrOfCompletedInstances/nrOfInstances"`
+	}
+	R(&ProcessInstanceCreateOptions{}, "process-instance-create", "Create process instance", func(s *mcclient.ClientSession, args *ProcessInstanceCreateOptions) error {
+		variables_params := jsonutils.NewDict()
+		variables_params.Add(jsonutils.NewString(args.PROCESS_DEFINITION_KEY), "process_definition_key")
+		variables_params.Add(jsonutils.NewString(args.INITIATOR), "initiator")
+		variables_params.Add(jsonutils.NewString(args.SERVER_CREATE_PARAMTER), "server-create-paramter")
+		if len(args.UserId) > 0 {
+			variables_params.Add(jsonutils.NewString(args.UserId), "user-id")
+		} else {
+			if len(args.RoleId) > 0 {
+				variables_params.Add(jsonutils.NewString(args.RoleId), "role-id")
+			}
+			if len(args.ProjectId) > 0 {
+				variables_params.Add(jsonutils.NewString(args.ProjectId), "project-id")
+			}
+		}
+		if len(args.Percent) > 0 {
+			variables_params.Add(jsonutils.NewString(args.Percent), "percent")
+		}
+		params := jsonutils.NewDict()
+		params.Add(variables_params, "variables")
+		result, err := modules.ProcessInstance.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	/**
+	 * 删除指定ID的流程实例
+	 */
+	type ProcessInstanceDeleteOptions struct {
+		ID           string `help:"ID of process process"`
+		DeleteReason string `help:"Reason why delete the process instance" required:"true" choices:"true|false"`
+	}
+	R(&ProcessInstanceDeleteOptions{}, "process-instance-delete", "Delete process instance by ID", func(s *mcclient.ClientSession, args *ProcessInstanceDeleteOptions) error {
+		params := jsonutils.NewDict()
+		if len(args.DeleteReason) > 0 {
+			params.Add(jsonutils.NewString(args.DeleteReason), "delete_reason")
+		}
+		result, e := modules.ProcessInstance.Delete(s, args.ID, nil)
+		if e != nil {
+			return e
+		}
+		printObject(result)
+		return nil
+	})
+
+	/**
+	 * 列出流程实例
+	 */
+	type ProcessInstanceListOptions struct {
+		ProcessDefinitionId string `help:"ID of process definition"`
+		options.BaseListOptions
+	}
+	R(&ProcessInstanceListOptions{}, "process-instance-list", "List process instance", func(s *mcclient.ClientSession, args *ProcessInstanceListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.ProcessDefinitionId) > 0 {
+			params.Add(jsonutils.NewString(args.ProcessDefinitionId), "process_definition_id")
+		}
+		result, err := modules.ProcessInstance.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.ProcessInstance.GetColumns(s))
+		return nil
+	})
+
+	/**
+	 * 查看指定ID的流程实例
+	 */
+	type ProcessInstanceShowOptions struct {
+		ID string `help:"ID of the process instance"`
+	}
+	R(&ProcessInstanceShowOptions{}, "process-instance-show", "Show process instance", func(s *mcclient.ClientSession, args *ProcessInstanceShowOptions) error {
+		result, err := modules.ProcessInstance.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/itsm_tasks.go
+++ b/cmd/climc/shell/itsm_tasks.go
@@ -0,0 +1,95 @@
+// 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 shell
+
+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 TaskOperOperateOptions struct {
+		ID                string `help:"ID of task"`
+		APPROVAL_DECISION bool   `help:"Approval decision"`
+		ApprovalProposal  string `help:"Approval proposal"`
+	}
+	R(&TaskOperOperateOptions{}, "process-task-operate", "Operate task", func(s *mcclient.ClientSession, args *TaskOperOperateOptions) error {
+		variables_params := jsonutils.NewDict()
+		if args.APPROVAL_DECISION {
+			variables_params.Add(jsonutils.JSONTrue, "approved")
+		} else {
+			variables_params.Add(jsonutils.JSONFalse, "approved")
+		}
+		if len(args.ApprovalProposal) > 0 {
+			variables_params.Add(jsonutils.NewString(args.ApprovalProposal), "comment")
+		}
+		params := jsonutils.NewDict()
+		params.Add(variables_params, "variables")
+		result, err := modules.ProcessTasks.Put(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	/**
+	 * 列出任务
+	 */
+	type TaskListOptions struct {
+		UserId  string `help:"Id of user"`
+		GroupId string `help:"ID of group"`
+		options.BaseListOptions
+	}
+	R(&TaskListOptions{}, "process-task-list", "List task", func(s *mcclient.ClientSession, args *TaskListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		if len(args.UserId) > 0 {
+			params.Add(jsonutils.NewString(args.UserId), "user_id")
+		}
+		if len(args.GroupId) > 0 {
+			params.Add(jsonutils.NewString(args.GroupId), "group_id")
+		}
+		result, err := modules.ProcessTasks.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.ProcessTasks.GetColumns(s))
+		return nil
+	})
+
+	/**
+	 * 查看指定ID的任务
+	 */
+	type TaskShowOptions struct {
+		ID string `help:"ID of the task"`
+	}
+	R(&TaskShowOptions{}, "process-task-show", "Show task details", func(s *mcclient.ClientSession, args *TaskShowOptions) error {
+		result, err := modules.ProcessTasks.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}
--- a/cmd/climc/shell/k8s/certs.go
+++ b/cmd/climc/shell/k8s/certs.go
@@ -0,0 +1,41 @@
+// 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 k8s
+
+import (
+	"fmt"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
+)
+
+func initKubeCerts() {
+	cmdN := func(action string) string {
+		return fmt.Sprintf("kubecert-%s", action)
+	}
+	R(&o.CertListOptions{}, cmdN("list"), "List k8s cluster certificates key pairs", func(s *mcclient.ClientSession, args *o.CertListOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeCerts.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(ret, k8s.KubeCerts.GetColumns(s))
+		return nil
+	})
+}
--- a/cmd/climc/shell/k8s/clusters.go
+++ b/cmd/climc/shell/k8s/clusters.go
@@ -16,9 +16,6 @@ package k8s

 import (
 	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"

 	"yunion.io/x/jsonutils"

@@ -27,63 +24,21 @@ import (
 	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
 )

-func initCluster() {
-	cmdN := func(suffix string) string {
-		return kubeResourceCmdN("cluster", suffix)
+func initKubeCluster() {
+	cmdN := func(action string) string {
+		return fmt.Sprintf("kubecluster-%s", action)
 	}
-
-	R(&o.ClusterListOptions{}, cmdN("list"), "List k8s infra clusters", func(s *mcclient.ClientSession, args *o.ClusterListOptions) error {
-		result, err := k8s.Clusters.List(s, args.Params())
+	R(&o.ClusterListOptions{}, cmdN("list"), "List k8s clusters", func(s *mcclient.ClientSession, args *o.ClusterListOptions) error {
+		result, err := k8s.KubeClusters.List(s, args.Params())
 		if err != nil {
 			return err
 		}
-		printList(result, k8s.Clusters.GetColumns(s))
-		return nil
-	})
-
-	R(&o.ClusterCreateOptions{}, cmdN("create"), "Create k8s cluster", func(s *mcclient.ClientSession, args *o.ClusterCreateOptions) error {
-		cluster, err := k8s.Clusters.Create(s, args.Params())
-		if err != nil {
-			return err
-		}
-		printObject(cluster)
-		return nil
-	})
-
-	R(&o.ClusterImportOptions{}, cmdN("import"), "Import exists YKE deployed kubernetes cluster", func(s *mcclient.ClientSession, args *o.ClusterImportOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		cluster, err := k8s.Clusters.PerformAction(s, args.NAME, "import", params)
-		if err != nil {
-			return err
-		}
-		printObject(cluster)
-		return nil
-	})
-
-	R(&o.ClusterUpdateOptions{}, cmdN("update"), "Update k8s cluster", func(s *mcclient.ClientSession, args *o.ClusterUpdateOptions) error {
-		cluster, err := k8s.Clusters.Update(s, args.NAME, args.Params())
-		if err != nil {
-			return err
-		}
-		printObject(cluster)
-		return nil
-	})
-
-	R(&o.ClusterDeployOptions{}, cmdN("deploy"), "Start deploy a cluster", func(s *mcclient.ClientSession, args *o.ClusterDeployOptions) error {
-		ret, err := k8s.Clusters.PerformAction(s, args.ID, "deploy", args.Params())
-		if err != nil {
-			return err
-		}
-		printObject(ret)
+		printList(result, k8s.KubeClusters.GetColumns(s))
 		return nil
 	})

 	R(&o.IdentOptions{}, cmdN("show"), "Show details of a cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		result, err := k8s.Clusters.Get(s, args.ID, nil)
+		result, err := k8s.KubeClusters.Get(s, args.ID, nil)
 		if err != nil {
 			return err
 		}
@@ -91,14 +46,75 @@ func initCluster() {
 		return nil
 	})

-	R(&o.ClusterDeleteOptions{}, cmdN("delete"), "Delete cluster", func(s *mcclient.ClientSession, args *o.ClusterDeleteOptions) error {
-		ret := k8s.Clusters.BatchDeleteWithParam(s, args.ID, nil, nil)
-		printBatchResults(ret, k8s.Clusters.GetColumns(s))
+	R(&o.KubeClusterCreateOptions{}, cmdN("create"), "Create k8s cluster", func(s *mcclient.ClientSession, args *o.KubeClusterCreateOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		cluster, err := k8s.KubeClusters.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(cluster)
 		return nil
 	})

-	R(&o.ClusterKubeconfigOptions{}, cmdN("kubeconfig"), "Generate kubeconfig of a cluster", func(s *mcclient.ClientSession, args *o.ClusterKubeconfigOptions) error {
-		ret, err := k8s.Clusters.PerformAction(s, args.ID, "generate-kubeconfig", args.Params())
+	R(&o.KubeClusterImportOptions{}, cmdN("import"), "Import k8s cluster", func(s *mcclient.ClientSession, args *o.KubeClusterImportOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		cluster, err := k8s.KubeClusters.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(cluster)
+		return nil
+	})
+
+	R(&o.ClusterDeleteOptions{}, cmdN("delete"), "Delete cluster", func(s *mcclient.ClientSession, args *o.ClusterDeleteOptions) error {
+		ret := k8s.KubeClusters.BatchDeleteWithParam(s, args.ID, nil, nil)
+		printBatchResults(ret, k8s.KubeClusters.GetColumns(s))
+		return nil
+	})
+
+	R(&o.KubeClusterAddMachinesOptions{}, cmdN("add-machines"), "Add machines to cluster", func(s *mcclient.ClientSession, args *o.KubeClusterAddMachinesOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "add-machines", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.KubeClusterDeleteMachinesOptions{}, cmdN("delete-machines"), "Delete machines in cluster", func(s *mcclient.ClientSession, args *o.KubeClusterDeleteMachinesOptions) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "delete-machines", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.IdentOptions{}, cmdN("terminate"), "Terminate cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "terminate", nil)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.IdentOptions{}, cmdN("kubeconfig"), "Generate kubeconfig of a cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "kubeconfig", nil)
 		if err != nil {
 			return err
 		}
@@ -110,12 +126,12 @@ func initCluster() {
 		return nil
 	})

-	R(&o.IdentOptions{}, cmdN("engineconfig"), "Get kubernetes engine config of a cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.Clusters.GetSpecific(s, args.ID, "engine-config", nil)
+	R(&o.IdentOptions{}, cmdN("addons"), "Get addon manifest of a cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "addons", nil)
 		if err != nil {
 			return err
 		}
-		conf, err := ret.GetString("config")
+		conf, err := ret.GetString("addons")
 		if err != nil {
 			return err
 		}
@@ -123,94 +139,39 @@ func initCluster() {
 		return nil
 	})

-	R(&o.IdentOptions{}, cmdN("webhookauthurl"), "Get cluster kubernetes api server webhook auth url", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.Clusters.GetSpecific(s, args.ID, "webhook-auth-url", nil)
-		if err != nil {
-			return err
-		}
-		url, err := ret.GetString("url")
-		if err != nil {
-			return err
-		}
-		fmt.Println(url)
-		return nil
-	})
-
-	R(&o.ClusterAddNodesOptions{}, cmdN("addnodes"), "Add nodes to cluster", func(s *mcclient.ClientSession, args *o.ClusterAddNodesOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := k8s.Clusters.PerformAction(s, args.ID, "add-nodes", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.ClusterDeleteNodesOptions{}, cmdN("delete-nodes"), "Delete nodes in cluster", func(s *mcclient.ClientSession, args *o.ClusterDeleteNodesOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		ret, err := k8s.Clusters.PerformAction(s, args.ID, "delete-nodes", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.IdentOptions{}, cmdN("engineconfig-edit"), "Edit and update kubernetes engine config of a cluster", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.Clusters.GetSpecific(s, args.ID, "engine-config", nil)
-		if err != nil {
-			return err
-		}
-		conf, err := ret.GetString("config")
-		if err != nil {
-			return err
-		}
-		tempfile, err := ioutil.TempFile("", fmt.Sprintf("%s-engineconfig", args.ID))
-		if err != nil {
-			return err
-		}
-		defer os.Remove(tempfile.Name())
-
-		if _, err := tempfile.Write([]byte(conf)); err != nil {
-			return err
-		}
-		if err := tempfile.Close(); err != nil {
-			return err
-		}
-
-		cmd := exec.Command("vim", tempfile.Name())
-		cmd.Stdin = os.Stdin
-		cmd.Stdout = os.Stdout
-		if err := cmd.Run(); err != nil {
-			return err
-		}
-
+	R(&o.ClusterK8sVersions{}, cmdN("k8s-versions"), "Get kubernetes deployable versions", func(s *mcclient.ClientSession, args *o.ClusterK8sVersions) error {
 		params := jsonutils.NewDict()
-		configBytes, err := ioutil.ReadFile(tempfile.Name())
+		params.Add(jsonutils.NewString(args.PROVIDER), "provider")
+		ret, err := k8s.KubeClusters.Get(s, "k8s-versions", params)
 		if err != nil {
 			return err
 		}
-		params.Add(jsonutils.NewString(string(configBytes)), "config")
-		result, err := k8s.Clusters.PerformAction(s, args.ID, "update-engine-config", params)
-		if err != nil {
-			return err
-		}
-		conf, err = result.GetString("config")
-		if err != nil {
-			return err
-		}
-		fmt.Println(conf)
+		fmt.Println(ret.String())
 		return nil
 	})

-	R(&o.IdentOptions{}, cmdN("sync-config"), "Sync kubernetes cluster by engineconfig", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.Clusters.PerformAction(s, args.ID, "sync-config", nil)
+	R(&o.ClusterK8sVersions{}, cmdN("usable-instances"), "Get deploy usable instance", func(s *mcclient.ClientSession, args *o.ClusterK8sVersions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.PROVIDER), "provider")
+		ret, err := k8s.KubeClusters.Get(s, "usable-instances", params)
+		if err != nil {
+			return err
+		}
+		fmt.Println(ret.String())
+		return nil
+	})
+
+	R(&o.ClusterCheckOptions{}, cmdN("check-system-ready"), "Check system cluster status", func(s *mcclient.ClientSession, args *o.ClusterCheckOptions) error {
+		ret, err := k8s.KubeClusters.PerformClassAction(s, "check-system-ready", nil)
+		if err != nil {
+			return err
+		}
+		fmt.Println(ret.String())
+		return nil
+	})
+
+	R(&o.IdentOptions{}, cmdN("apply-addons"), "Apply base requirements addons", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "apply-addons", nil)
 		if err != nil {
 			return err
 		}
@@ -218,12 +179,26 @@ func initCluster() {
 		return nil
 	})

-	R(&o.ClusterRestartAgentsOptions{}, cmdN("restart-agent"), "Restart node agents in cluster", func(s *mcclient.ClientSession, args *o.ClusterRestartAgentsOptions) error {
-		params, err := args.Params()
+	R(&o.IdentOptions{}, cmdN("syncstatus"), "Sync cluster status", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "syncstatus", nil)
 		if err != nil {
 			return err
 		}
-		ret, err := k8s.Clusters.PerformAction(s, args.ID, "restart-agent", params)
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.IdentOptions{}, cmdN("public"), "Make cluster public", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "public", nil)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.IdentOptions{}, cmdN("private"), "Make cluster private", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "private", nil)
 		if err != nil {
 			return err
 		}
--- a/cmd/climc/shell/k8s/cronjob.go
+++ b/cmd/climc/shell/k8s/cronjob.go
@@ -27,7 +27,7 @@ func initCronJob() {
 		&o.CronJobCreateOptions{},
 		cmdN("create"),
 		"Create cronjob resource",
-		func(s *mcclient.ClientSession, args *o.JobCreateOptions) error {
+		func(s *mcclient.ClientSession, args *o.CronJobCreateOptions) error {
 			params, err := args.Params()
 			if err != nil {
 				return err
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`您的{{ .os_type }}镜像{{ .name }}上传成功`
				`@@ -0,0 +1 @@`
				`DESCRIPTION="Yunion Cloud Keystone Identity server"`
				`@@ -0,0 +1,2 @@`
				`DESCRIPTION="Yunion Cloud noitfy Service"`
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}`
				`@@ -0,0 +1 @@`
				`您的{{ .brand }}主机{{ .name }}系统崩溃了`
				`@@ -0,0 +1 @@`
				`DESCRIPTION="Yunion Cloud S3 Gateway Service"`