Merge pull request #5397 from swordqiu/automated-cherry-pick-of-#5392-upstream-release-2.11

Automated cherry pick of #5392: fix: scoped resource should override FetchOwnerId

.circleci/Dockerfile

@@ -13,9 +13,9 @@ RUN true \
 
 WORKDIR /opt
 RUN true \
-	&& wget https://dl.google.com/go/go1.12.6.linux-amd64.tar.gz \
-	&& tar xzf go1.12.6.linux-amd64.tar.gz \
-	&& rm -vf  go1.12.6.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

.circleci/config.yml

@@ -3,9 +3,24 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
+  check:
+    docker:
+      - 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,31 +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: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

.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

Makefile

@@ -7,11 +7,19 @@ 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) \
@@ -36,14 +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
 
 
@@ -54,12 +71,6 @@ 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
 
@@ -69,18 +80,20 @@ test:
 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
@@ -96,7 +109,7 @@ output_dir:
 	@mkdir -p $(BUILD_DIR)
 
 
-.PHONY: all build prepare_dir clean fmt rpm
+.PHONY: all build prepare_dir clean rpm
 
 
 clean:
@@ -104,8 +117,50 @@ 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,
@@ -126,13 +181,10 @@ dep:
 	@$(MAKE) mod
 
 mod:
-	go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -r -e 's|.*(yunion.io/x/[a-z]+) v.*|\1|p'))
+	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_IMAGE_VERSION?=latest
 

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

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

build/host-deployer/vars

@@ -0,0 +1,2 @@
+DESCRIPTION="Yunion Host Deploy Agent"
+SERVICE="yes"

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

build/host/vars

@@ -1 +1,2 @@
-DESCRIPTION="Yunion Host Command Line Utility"
+DESCRIPTION="Yunion Host Command Line Utility"
+SERVICE="yes"

build/ldapcli/vars

@@ -0,0 +1 @@
+DESCRIPTION="LDAP Command Line Utility"

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。

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 }}或控制面板控制台访问云主机。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_CREATED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经创建成功。
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED

@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}已经删除。
+您的{{ .brand }}主机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_DELETED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经删除。
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除。

build/region/root/opt/yunion/share/notify_templates/compute/content/SERVER_PANICKED

@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}系统崩溃了: {{ .reason }}

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 }}或控制面板控制台访问云主机。

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。

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED

@@ -1 +1 @@
-{{ .hypervisor }}主机{{ .Name }}创建成功
+{{ .brand }}主机{{ .Name }}创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_CREATED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经创建成功
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经创建成功

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED

@@ -1 +1 @@
-{{ .hypervisor }}主机{{ .name }}删除通知
+{{ .brand }}主机{{ .name }}删除通知

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_DELETED_ADMIN

@@ -1 +1 @@
-项目{{ .tenant }}的{{ .hypervisor }}主机{{ .name }}已经删除
+项目{{ .tenant }}的{{ .brand }}主机{{ .name }}已经删除

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_PANICKED

@@ -0,0 +1 @@
+您的{{ .brand }}主机{{ .name }}系统崩溃了

build/region/root/opt/yunion/share/notify_templates/compute/title/SERVER_REBUILD_ROOT

@@ -1 +1 @@
-{{ .hypervisor }}主机{{ .name }}重装系统成功
+{{ .brand }}主机{{ .name }}重装系统成功

build/s3cli/vars

@@ -0,0 +1 @@
+DESCRIPTION="S3 Cli Command Line Utility"

build/s3gateway/vars

@@ -0,0 +1 @@
+DESCRIPTION="Yunion Cloud S3 Gateway Service"

build/zstackcli/vars

@@ -0,0 +1 @@
+DESCRIPTION="Zstack Command Line Utility"

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)
 }
 

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()
+}

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
 	}

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)
 }
 

cmd/climc/climc.go

@@ -49,18 +49,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]"`
 	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]"`
 
-	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]"`
 	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"`
 }
 
@@ -114,7 +120,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)
 }
 
@@ -122,20 +129,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 {
@@ -176,12 +181,19 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	}
 
 	if cacheToken == nil {
-		token, err := client.AuthenticateWithSource(options.OsUsername,
-			options.OsPassword,
-			options.OsDomainName,
-			options.OsProjectName,
-			options.OsProjectDomain,
-			mcclient.AuthSourceCli)
+		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
 		}
@@ -273,6 +285,7 @@ func main() {
 		return
 	}
 
+	shell.OutputFormat(options.OutputFormat)
 	ensureSessionFactory := func() *mcclient.ClientSession {
 		session, err := newClientSession(options)
 		if err != nil {

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")
 	}

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,7 @@ 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-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 +56,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
@@ -65,7 +65,7 @@ func init() {
 		return nil
 	})
 
-	R(&BaremetalAgentOpsOperations{}, "baremetal-agent-delete", "Delete baremetal agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
+	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

cmd/climc/shell/buckets.go

@@ -0,0 +1,292 @@
+// 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/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 := modules.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
+	})
+}

cmd/climc/shell/cloudaccounts.go

@@ -178,6 +178,39 @@ func init() {
 		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"`
@@ -316,6 +349,19 @@ 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 {
@@ -329,6 +375,19 @@ func init() {
 		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"`
 	}
@@ -483,6 +542,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"`

cmd/climc/shell/cloudproviders.go

@@ -28,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
@@ -37,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 {
@@ -208,4 +223,21 @@ func init() {
 		}
 		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
+	})
 }

cmd/climc/shell/contacts.go

@@ -29,7 +29,7 @@ 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"`
+		CONTACTTYPE string `help:"The contact type" 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"`
 	}
@@ -63,7 +63,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" choices:"email|mobile"`
 	}
 	R(&ContactsDeleteOptions{}, "contact-delete", "Delete contact for user", func(s *mcclient.ClientSession, args *ContactsDeleteOptions) error {
 		arr := jsonutils.NewArray()

cmd/climc/shell/copyright.go

@@ -16,6 +16,7 @@ package shell
 
 import (
 	"fmt"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -24,8 +25,9 @@ import (
 
 func init() {
 	type CopyrightUpdateOptions struct {
-		Copyright string `help:"The copyright"`
-		Email     string `help:"The Email"`
+		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 {
@@ -34,6 +36,10 @@ func init() {
 		}
 
 		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")
 		}
@@ -42,17 +48,12 @@ func init() {
 			params.Add(jsonutils.NewString(args.Email), "email")
 		}
 
-		r, err := modules.Copyright.Create(s, params)
+		r, err := modules.Copyright.Update(s, "copyright", params)
 		if err != nil {
 			return err
 		}
 
-		pretty := jsonutils.NewDict()
-		cp, _ := r.GetString("copyright")
-		email, _ := r.GetString("email")
-		pretty.Set("copyright", jsonutils.NewString(cp))
-		pretty.Set("email", jsonutils.NewString(email))
-		printObject(pretty)
+		printObject(r)
 		return nil
 	})
 }

cmd/climc/shell/credentials.go

@@ -16,6 +16,7 @@ package shell
 
 import (
 	"fmt"
+	"time"
 
 	"yunion.io/x/jsonutils"
 
@@ -25,7 +26,8 @@ import (
 
 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 +36,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 +153,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 := modules.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
+	})
 }

cmd/climc/shell/dbinstances.go

@@ -0,0 +1,174 @@
+// 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 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 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 *modules.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 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 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 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
+	})
+
+	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
+	})
+
+}

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,7 @@ 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"`
 	}
 
 	R(&DiskDeleteOptions{}, "disk-delete", "Delete a disk", func(s *mcclient.ClientSession, args *DiskDeleteOptions) error {
@@ -222,20 +224,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,31 +261,21 @@ func init() {
 		printObject(disk)
 		return nil
 	})
-	type DiskApplySnapshotPolicy struct {
-		ID             string `help:"ID or name of disk" json:"-"`
-		Snapshotpolicy string `help:"ID or name of snapshot policy"`
+
+	type DiskChangeOwnerOptions struct {
+		ID      string `help:"Disk to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
 	}
-	R(&DiskApplySnapshotPolicy{}, "disk-apply-snapshot-policy", "Set disk snapshot policy", func(s *mcclient.ClientSession, args *DiskApplySnapshotPolicy) error {
-		params, err := options.StructToParams(args)
+	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
 		}
-		disk, err := modules.Disks.PerformAction(s, args.ID, "apply-snapshot-policy", params)
+		srv, err := modules.Disks.PerformAction(s, opts.ID, "change-owner", params)
 		if err != nil {
 			return err
 		}
-		printObject(disk)
-		return nil
-	})
-	type DiskCancelSnapshotPolicy struct {
-		ID string `help:"ID or name of disk"`
-	}
-	R(&DiskCancelSnapshotPolicy{}, "disk-cancel-snapshot-policy", "Cancel disk snapshot policy", func(s *mcclient.ClientSession, args *DiskCancelSnapshotPolicy) error {
-		disk, err := modules.Disks.PerformAction(s, args.ID, "cancel-snapshot-policy", nil)
-		if err != nil {
-			return err
-		}
-		printObject(disk)
+		printObject(srv)
 		return nil
 	})
 }

cmd/climc/shell/elasticips.go

@@ -52,7 +52,7 @@ func init() {
 		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, either traffic or bandwidth" choices:"traffic|bandwidth"`
+		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()
@@ -173,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()

cmd/climc/shell/events.go

@@ -23,6 +23,7 @@ import (
 )
 
 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 +32,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 {
@@ -91,6 +97,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
@@ -147,8 +165,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)
 	})
 

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
 		}

cmd/climc/shell/groups.go

@@ -17,6 +17,7 @@ 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"
@@ -133,4 +134,61 @@ 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
+	})
 }

cmd/climc/shell/hosts.go

@@ -127,6 +127,12 @@ func init() {
 		return nil
 	})
 
+	R(&HostOpsOptions{}, "host-sync-config", "Synchronize config of a host", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
+		results := modules.Hosts.BatchPerformAction(s, args.ID, "sync-config", nil)
+		printBatchResults(results, modules.Hosts.GetColumns(s))
+		return nil
+	})
+
 	R(&HostOpsOptions{}, "host-prepare", "Prepare a host for installation", func(s *mcclient.ClientSession, args *HostOpsOptions) error {
 		results := modules.Hosts.BatchPerformAction(s, args.ID, "prepare", nil)
 		printBatchResults(results, modules.Hosts.GetColumns(s))
@@ -186,6 +192,10 @@ func init() {
 		CpuReserved       int64   `help:"CPU reserved"`
 		HostType          string  `help:"Change host type, CAUTION!!!!" choices:"hypervisor|kubelet|esxi|baremetal"`
 		AccessIp          string  `help:"Change access ip, CAUTION!!!!"`
+
+		IpmiUsername string `help:"IPMI user"`
+		IpmiPassword string `help:"IPMI password"`
+		IpmiIpAddr   string `help:"IPMI ip_addr"`
 	}
 	R(&HostUpdateOptions{}, "host-update", "Update information of a host", func(s *mcclient.ClientSession, args *HostUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -213,6 +223,15 @@ func init() {
 		if len(args.AccessIp) > 0 {
 			params.Add(jsonutils.NewString(args.AccessIp), "access_ip")
 		}
+		if len(args.IpmiUsername) > 0 {
+			params.Add(jsonutils.NewString(args.IpmiUsername), "ipmi_username")
+		}
+		if len(args.IpmiPassword) > 0 {
+			params.Add(jsonutils.NewString(args.IpmiPassword), "ipmi_password")
+		}
+		if len(args.IpmiIpAddr) > 0 {
+			params.Add(jsonutils.NewString(args.IpmiIpAddr), "ipmi_ip_addr")
+		}
 		if params.Size() == 0 {
 			return fmt.Errorf("Not data to update")
 		}
@@ -335,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"`
 	}
@@ -343,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")
 		}

cmd/climc/shell/hostwires.go

@@ -70,15 +70,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")

cmd/climc/shell/identityproviders.go

@@ -17,12 +17,12 @@ 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"
-
-	"yunion.io/x/jsonutils"
 )
 
 func init() {
@@ -114,17 +114,17 @@ func init() {
 		return nil
 	})
 
-	type IdentityProviderCreateOptions struct {
+	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"`
+		TargetDomain string `help:"target domain without creating new domain" json:"-"`
 
 		api.SLDAPIdpConfigOptions
 	}
-	R(&IdentityProviderCreateOptions{}, "idp-create-ldap", "Create an identity provider with LDAP driver", func(s *mcclient.ClientSession, args *IdentityProviderCreateOptions) error {
+	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")
 
@@ -170,7 +170,7 @@ func init() {
 		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"`
+		TargetDomain string `help:"target domain without creating new domain" json:"-"`
 
 		api.SLDAPIdpConfigSingleDomainOptions
 	}
@@ -245,4 +245,53 @@ func init() {
 		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
+	})
+
 }

cmd/climc/shell/images.go

@@ -28,11 +28,11 @@ import (
 )
 
 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 +55,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 +64,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 +134,11 @@ 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"`
+		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 +148,12 @@ 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 len(args.Tenant) > 0 {
 			tid, e := modules.Projects.GetId(s, args.Tenant, nil)
 			if e != nil {
@@ -215,19 +223,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 +264,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)
@@ -385,7 +381,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
 		}
@@ -395,6 +391,7 @@ func init() {
 		}
 		if len(args.Output) > 0 {
 			printObject(meta)
+			fmt.Println("Image size: ", size)
 		}
 		return nil
 	})
@@ -415,17 +412,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
@@ -447,18 +453,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
 	})

cmd/climc/shell/itsm_tasks.go

@@ -28,7 +28,7 @@ func init() {
 	 */
 	type TaskOperOperateOptions struct {
 		ID                string `help:"ID of task"`
-		APPROVAL_DECISION bool   `help:"Approval decision" choices:"true|false"`
+		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 {

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
 		}

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

cmd/climc/shell/k8s/daemonset.go

@@ -18,6 +18,6 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
 )
 
-func initK8sNode() {
-	initK8sClusterResource("node", k8s.K8sNodes)
+func initDaemonSet() {
+	initK8sNamespaceResource("daemonset", k8s.DaemonSets)
 }

cmd/climc/shell/k8s/deployment.go

@@ -41,5 +41,22 @@ func initDeployment() {
 			return nil
 		})
 
-	cmd.AddR(createCmd)
+	updateCmd := NewCommand(
+		&o.DeploymentUpdateOptions{},
+		cmdN("update"),
+		"Update deployment resource",
+		func(s *mcclient.ClientSession, args *o.DeploymentUpdateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := k8s.Deployments.Update(s, args.NAME, params)
+			if err != nil {
+				return err
+			}
+			printObjectYAML(ret)
+			return nil
+		})
+
+	cmd.AddR(createCmd, updateCmd)
 }

cmd/climc/shell/k8s/k8s.go

@@ -29,10 +29,8 @@ import (
 
 func init() {
 	// cluster resources
-	initCluster()
 	initKubeCluster()
 	initKubeMachine()
-	initNode()
 	initKubeCerts()
 
 	// helm resources
@@ -47,6 +45,7 @@ func init() {
 	initConfigMap()
 	initDeployment()
 	initStatefulset()
+	initDaemonSet()
 	initPod()
 	initService()
 	initIngress()
@@ -59,6 +58,8 @@ func init() {
 	initJob()
 	initCronJob()
 
+	initRbac()
+
 	initApp()
 }
 
@@ -79,7 +80,7 @@ func kubeResourceCmdN(prefix, suffix string) string {
 
 func clusterContext(clusterId string) modules.ManagerContext {
 	return modules.ManagerContext{
-		InstanceManager: k8s.Clusters,
+		InstanceManager: k8s.KubeClusters,
 		InstanceId:      clusterId,
 	}
 }

cmd/climc/shell/k8s/kubeclusters.go

@@ -1,195 +0,0 @@
-// 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/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
-	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
-)
-
-func initKubeCluster() {
-	cmdN := func(action string) string {
-		return fmt.Sprintf("kubecluster-%s", action)
-	}
-	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.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.KubeClusters.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	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.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.Clusters.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
-		}
-		conf, err := ret.GetString("kubeconfig")
-		if err != nil {
-			return err
-		}
-		fmt.Println(conf)
-		return 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("addons")
-		if err != nil {
-			return err
-		}
-		fmt.Println(conf)
-		return nil
-	})
-
-	R(&o.ClusterK8sVersions{}, cmdN("k8s-versions"), "Get kubernetes deployable versions", func(s *mcclient.ClientSession, args *o.ClusterK8sVersions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.PROVIDER), "provider")
-		ret, err := k8s.KubeClusters.Get(s, "k8s-versions", params)
-		if err != nil {
-			return err
-		}
-		fmt.Println(ret.String())
-		return 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
-		}
-		printObject(ret)
-		return nil
-	})
-
-	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
-		}
-		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
-		}
-		printObject(ret)
-		return nil
-	})
-}

cmd/climc/shell/k8s/machines.go

@@ -26,7 +26,7 @@ func initKubeMachine() {
 	cmdN := func(action string) string {
 		return fmt.Sprintf("kubemachine-%s", action)
 	}
-	R(&o.NodeListOptions{}, cmdN("list"), "List k8s node machines", func(s *mcclient.ClientSession, args *o.NodeListOptions) error {
+	R(&o.MachineListOptions{}, cmdN("list"), "List k8s node machines", func(s *mcclient.ClientSession, args *o.MachineListOptions) error {
 		params, err := args.Params()
 		if err != nil {
 			return err

cmd/climc/shell/k8s/nodes.go

@@ -15,78 +15,9 @@
 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 initNode() {
-	cmdN := func(suffix string) string {
-		return kubeResourceCmdN("node", suffix)
-	}
-	R(&o.NodeListOptions{}, cmdN("list"), "List k8s infra nodes", func(s *mcclient.ClientSession, args *o.NodeListOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-		result, err := k8s.Nodes.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, k8s.Nodes.GetColumns(s))
-		return nil
-	})
-
-	R(&o.NodeCreateOptions{}, cmdN("create"), "Create k8s cluster node", func(s *mcclient.ClientSession, args *o.NodeCreateOptions) error {
-		params := args.Params()
-		node, err := k8s.Nodes.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(node)
-		return nil
-	})
-
-	R(&o.IdentOptions{}, cmdN("delete"), "Delete node", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.Nodes.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&o.IdentOptions{}, cmdN("show"), "Show node details", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		obj, err := k8s.Nodes.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(obj)
-		return nil
-	})
-
-	R(&o.IdentsOptions{}, cmdN("purge"), "Purge a node record in database, not actually do deletion", func(s *mcclient.ClientSession, args *o.IdentsOptions) error {
-		ret := k8s.Nodes.BatchPerformAction(s, args.ID, "purge", nil)
-		printBatchResults(ret, k8s.Nodes.GetColumns(s))
-		return nil
-	})
-
-	R(&o.IdentOptions{}, cmdN("dockerconfig"), "Get docker daemon config", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
-		ret, err := k8s.Nodes.GetSpecific(s, args.ID, "docker-config", nil)
-		if err != nil {
-			return err
-		}
-		fmt.Println(ret)
-		return nil
-	})
-
-	R(&o.NodeConfigDockerRegistryOptions{}, cmdN("config-docker-registry"), "Config node docker daemon registry",
-		func(s *mcclient.ClientSession, args *o.NodeConfigDockerRegistryOptions) error {
-			params := args.Params()
-			ret := k8s.Nodes.BatchPerformAction(s, args.ID, "config-docker-registry", params)
-			printBatchResults(ret, k8s.Nodes.GetColumns(s))
-			return nil
-		})
+func initK8sNode() {
+	initK8sClusterResource("node", k8s.K8sNodes)
 }

cmd/climc/shell/k8s/raw.go

@@ -21,6 +21,7 @@ import (
 	"os/exec"
 
 	"github.com/ghodss/yaml"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/k8s/rbac.go

@@ -0,0 +1,29 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package k8s
+
+import (
+	//"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+	//o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
+)
+
+func initRbac() {
+	//cmdRole := initK8sNamespaceResource("rbacrole", k8s.RbacRoles)
+	initK8sNamespaceResource("rbacrole", k8s.RbacRoles)
+	initK8sNamespaceResource("rbacrolebinding", k8s.RbacRoleBindings)
+	initK8sNamespaceResource("serviceaccount", k8s.ServiceAccounts)
+	//cmdRoleN := cmdRole.CommandNameFactory
+}

cmd/climc/shell/k8s/releases.go

@@ -36,7 +36,7 @@ func initRelease() {
 		return nil
 	})
 
-	R(&o.ResourceGetOptions{}, cmdN("show"), "Get helm release details", func(s *mcclient.ClientSession, args *o.ResourceGetOptions) error {
+	R(&o.NamespaceResourceGetOptions{}, cmdN("show"), "Get helm release details", func(s *mcclient.ClientSession, args *o.NamespaceResourceGetOptions) error {
 		ret, err := k8s.Releases.Get(s, args.NAME, args.Params())
 		if err != nil {
 			return err

cmd/climc/shell/keypairs.go

@@ -52,7 +52,7 @@ func init() {
 
 	type KeypairCreate struct {
 		NAME   string `help:"Name of keypair to be created"`
-		Scheme string `help:"Scheme of keypair, RSA or DSA, default is RSA" choices:"RSA|DSA" default:"RSA"`
+		Scheme string `help:"Scheme of keypair, default is RSA" choices:"RSA|DSA" default:"RSA"`
 		Desc   string `help:"Short description of keypair"`
 	}
 

cmd/climc/shell/loadbalanceragents.go

@@ -131,4 +131,12 @@ func init() {
 		printLbagent(lbagent)
 		return nil
 	})
+	R(&options.LoadbalancerAgentActionUndeployOptions{}, "lbagent-undeploy", "Undeploy lbagent", func(s *mcclient.ClientSession, opts *options.LoadbalancerAgentActionUndeployOptions) error {
+		lbagent, err := modules.LoadbalancerAgents.PerformAction(s, opts.ID, "undeploy", nil)
+		if err != nil {
+			return err
+		}
+		printLbagent(lbagent)
+		return nil
+	})
 }

cmd/climc/shell/loadbalancercachedacls.go

@@ -0,0 +1,132 @@
+// 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() {
+	lbAclConvert := func(jd *jsonutils.JSONDict) error {
+		jaeso, err := jd.Get("acl_entries")
+		if err != nil {
+			return err
+		}
+		aclEntries := options.AclEntries{}
+		err = jaeso.Unmarshal(&aclEntries)
+		if err != nil {
+			return err
+		}
+		aclTextLines := aclEntries.String()
+		jd.Set("acl_entries", jsonutils.NewString(aclTextLines))
+		return nil
+	}
+
+	printLbAcl := func(jsonObj jsonutils.JSONObject) {
+		jd, ok := jsonObj.(*jsonutils.JSONDict)
+		if !ok {
+			printObject(jsonObj)
+			return
+		}
+		err := lbAclConvert(jd)
+		if err != nil {
+			printObject(jsonObj)
+			return
+		}
+		printObject(jd)
+	}
+	printLbAclList := func(list *modules.ListResult, columns []string) {
+		data := list.Data
+		for _, jsonObj := range data {
+			jd := jsonObj.(*jsonutils.JSONDict)
+			err := lbAclConvert(jd)
+			if err != nil {
+				printList(list, columns)
+				return
+			}
+		}
+		printList(list, columns)
+	}
+
+	R(&options.LoadbalancerAclGetOptions{}, "lbacl-cache-show", "Show cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclGetOptions) error {
+		lbacl, err := modules.LoadbalancerCachedAcls.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printLbAcl(lbacl)
+		return nil
+	})
+
+	type CachedLoadbalancerAclListOptions struct {
+		options.LoadbalancerAclListOptions
+		AclId string `help:"local acl id" `
+	}
+
+	R(&CachedLoadbalancerAclListOptions{}, "lbacl-cache-list", "List cached lbacls", func(s *mcclient.ClientSession, opts *CachedLoadbalancerAclListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.LoadbalancerCachedAcls.List(s, params)
+		if err != nil {
+			return err
+		}
+		printLbAclList(result, modules.LoadbalancerCachedAcls.GetColumns(s))
+		return nil
+	})
+
+	type LoadbalancerCachedAclCreateOptions struct {
+		CLOUDPROVIDER string `help:"cloud provider id"`
+		CLOUDREGION   string `help:"cloud region id"`
+		ACL           string `help:"acl id"`
+		Listener      string `help:"cloud listener id, required by huawei"`
+	}
+
+	R(&LoadbalancerCachedAclCreateOptions{}, "lbacl-cache-create", "Create cached lbacl", func(s *mcclient.ClientSession, opts *LoadbalancerCachedAclCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		lbacl, err := modules.LoadbalancerCachedAcls.Create(s, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(lbacl)
+		return nil
+	})
+
+	R(&options.LoadbalancerAclDeleteOptions{}, "lbacl-cache-purge", "Purge cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclDeleteOptions) error {
+		lbacl, err := modules.LoadbalancerCachedAcls.PerformAction(s, opts.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printLbAcl(lbacl)
+		return nil
+	})
+	R(&options.LoadbalancerAclDeleteOptions{}, "lbacl-cache-delete", "Delete cached lbacl", func(s *mcclient.ClientSession, opts *options.LoadbalancerAclDeleteOptions) error {
+		lbacl, err := modules.LoadbalancerCachedAcls.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printLbAcl(lbacl)
+		return nil
+	})
+}

cmd/climc/shell/loadbalancercachedcertificates.go

@@ -0,0 +1,88 @@
+// 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() {
+	R(&options.LoadbalancerCertificateGetOptions{}, "lbcert-cache-show", "Show cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateGetOptions) error {
+		lbcert, err := modules.LoadbalancerCachedCertificates.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(lbcert)
+		return nil
+	})
+
+	type LoadbalancerCertificateListOptions struct {
+		options.LoadbalancerCertificateListOptions
+		CertificateId string `help:"related certificate id"`
+	}
+
+	R(&LoadbalancerCertificateListOptions{}, "lbcert-cache-list", "List cached lbcerts", func(s *mcclient.ClientSession, opts *LoadbalancerCertificateListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.LoadbalancerCachedCertificates.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.LoadbalancerCachedCertificates.GetColumns(s))
+		return nil
+	})
+
+	type LoadbalancerCachedCertificateCreateOptions struct {
+		CLOUDPROVIDER string `help:"cloud provider id"`
+		CLOUDREGION   string `help:"cloud region id"`
+		CERTIFICATE   string `help:"certificate id"`
+	}
+
+	R(&LoadbalancerCachedCertificateCreateOptions{}, "lbcert-cache-create", "Create cached lbcert", func(s *mcclient.ClientSession, opts *LoadbalancerCachedCertificateCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		lbcert, err := modules.LoadbalancerCachedCertificates.Create(s, params)
+		if err != nil {
+			return err
+		}
+
+		printObject(lbcert)
+		return nil
+	})
+
+	R(&options.LoadbalancerCertificateDeleteOptions{}, "lbcert-cache-delete", "Delete cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateDeleteOptions) error {
+		lbcert, err := modules.LoadbalancerCachedCertificates.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(lbcert)
+		return nil
+	})
+	R(&options.LoadbalancerCertificateDeleteOptions{}, "lbcert-cache-purge", "Purge cached lbcert", func(s *mcclient.ClientSession, opts *options.LoadbalancerCertificateDeleteOptions) error {
+		lbcert, err := modules.LoadbalancerCachedCertificates.PerformAction(s, opts.ID, "purge", nil)
+		if err != nil {
+			return err
+		}
+		printObject(lbcert)
+		return nil
+	})
+}

cmd/climc/shell/loadbalancerclusters.go

@@ -33,6 +33,18 @@ func init() {
 		printObject(lbcluster)
 		return nil
 	})
+	R(&options.LoadbalancerClusterUpdateOptions{}, "lbcluster-update", "Update lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterUpdateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		lbcluster, err := modules.LoadbalancerClusters.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(lbcluster)
+		return nil
+	})
 	R(&options.LoadbalancerClusterGetOptions{}, "lbcluster-show", "Show lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterGetOptions) error {
 		lbcluster, err := modules.LoadbalancerClusters.Get(s, opts.ID, nil)
 		if err != nil {

cmd/climc/shell/loadbalancerlistenerrules.go

@@ -89,4 +89,11 @@ func init() {
 		printObject(lblistenerrule)
 		return nil
 	})
+	R(&options.LoadbalancerListenerRuleGetBackendStatusOptions{}, "lblistenerrule-backend-status", "Get lblistenerrule backend status", func(s *mcclient.ClientSession, opts *options.LoadbalancerListenerRuleGetBackendStatusOptions) error {
+		backendStatus, err := modules.LoadbalancerListenerRules.GetSpecific(s, opts.ID, "backend-status", nil)
+		if err != nil {
+			return err
+		}
+		return printLbBackendStatus(backendStatus)
+	})
 }

cmd/climc/shell/loadbalancerlisteners.go

@@ -15,6 +15,8 @@
 package shell
 
 import (
+	"fmt"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -22,6 +24,34 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
+func printLbBackendStatus(backendStatus jsonutils.JSONObject) error {
+	arr, ok := backendStatus.(*jsonutils.JSONArray)
+	if !ok {
+		return fmt.Errorf("want json array, got %s", backendStatus.String())
+	}
+	objList, err := arr.GetArray()
+	if err != nil {
+		return err
+	}
+	listResult := &modules.ListResult{
+		Data: objList,
+	}
+	columns := []string{
+		"id",
+		"name",
+		"backend_type",
+		"backend_id",
+		"address",
+		"port",
+		"weight",
+		"check_time",
+		"check_status",
+		"check_code",
+	}
+	printList(listResult, columns)
+	return nil
+}
+
 func init() {
 
 	R(&options.LoadbalancerListenerCreateOptions{}, "lblistener-create", "Create lblistener", func(s *mcclient.ClientSession, opts *options.LoadbalancerListenerCreateOptions) error {
@@ -99,4 +129,11 @@ func init() {
 		printObject(lblistener)
 		return nil
 	})
+	R(&options.LoadbalancerListenerGetBackendStatusOptions{}, "lblistener-backend-status", "Get lblistene backend status", func(s *mcclient.ClientSession, opts *options.LoadbalancerListenerGetBackendStatusOptions) error {
+		backendStatus, err := modules.LoadbalancerListeners.GetSpecific(s, opts.ID, "backend-status", nil)
+		if err != nil {
+			return err
+		}
+		return printLbBackendStatus(backendStatus)
+	})
 }

cmd/climc/shell/natdtable.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/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.NatDTableListOptions{}, "dnat-list", "List DNAT entries", func(s *mcclient.ClientSession, opts *options.NatDTableListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.NatDTable.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.NatDTable.GetColumns(s))
+		return nil
+	})
+	R(&options.NatDDeleteShowOptions{}, "dnat-delete", "Delete a DNAT", func(s *mcclient.ClientSession, args *options.NatDDeleteShowOptions) error {
+		results, err := modules.NatDTable.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(results)
+		return nil
+	})
+	R(&options.NatDDeleteShowOptions{}, "dnat-show", "Show a DNAT", func(s *mcclient.ClientSession, args *options.NatDDeleteShowOptions) error {
+		results, err := modules.NatDTable.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(results)
+		return nil
+	})
+
+	R(&options.NatDCreateOptions{}, "dnat-create", "Create a DNAT", func(s *mcclient.ClientSession, args *options.NatDCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		params.Add(jsonutils.NewString(args.NATGATEWAYID), "natgateway_id")
+		params.Add(jsonutils.NewString(args.INTERNALIP), "internal_ip")
+		params.Add(jsonutils.NewString(args.INTERNALPORT), "internal_port")
+		params.Add(jsonutils.NewString(args.EXTERNALIP), "external_ip")
+		params.Add(jsonutils.NewString(args.EXTERNALIPID), "external_ip_id")
+		params.Add(jsonutils.NewString(args.EXTERNALPORT), "external_port")
+		params.Add(jsonutils.NewString(args.IPPROTOCOL), "ip_protocol")
+
+		result, err := modules.NatDTable.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+}

cmd/climc/shell/natgateways.go

@@ -34,4 +34,39 @@ func init() {
 		printList(result, modules.NatGateways.GetColumns(s))
 		return nil
 	})
+
+	R(&options.NatGatewayShowOptions{}, "natgateway-show", "Show a NAT gateway", func(s *mcclient.ClientSession, args *options.NatGatewayShowOptions) error {
+		results, err := modules.NatGateways.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(results)
+		return nil
+	})
+
+	type NatGatewayListEipOptions struct {
+		ID string `help:"ID"`
+	}
+
+	R(&NatGatewayListEipOptions{}, "natgateway-dnat-resources", "list resources in dnats of natgateway",
+		func(s *mcclient.ClientSession, opts *NatGatewayListEipOptions) error {
+
+			ret, err := modules.NatGateways.PerformAction(s, opts.ID, "dnat-resources", nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&NatGatewayListEipOptions{}, "natgateway-snat-resources", "list resources in snats of natgateway",
+		func(s *mcclient.ClientSession, opts *NatGatewayListEipOptions) error {
+
+			ret, err := modules.NatGateways.PerformAction(s, opts.ID, "snat-resources", nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
 }

cmd/climc/shell/natstable.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/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.NatSTableListOptions{}, "snat-list", "List SNAT entries", func(s *mcclient.ClientSession, opts *options.NatSTableListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.NatSTable.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.NatSTable.GetColumns(s))
+		return nil
+	})
+	R(&options.NatSDeleteShowOptions{}, "snat-delete", "Delete a SNAT", func(s *mcclient.ClientSession, args *options.NatSDeleteShowOptions) error {
+		results, err := modules.NatSTable.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(results)
+		return nil
+	})
+
+	R(&options.NatSDeleteShowOptions{}, "snat-show", "Show a SNAT", func(s *mcclient.ClientSession, args *options.NatSDeleteShowOptions) error {
+		results, err := modules.NatSTable.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(results)
+		return nil
+	})
+
+	R(&options.NatSCreateOptions{}, "snat-create", "Create a SNAT", func(s *mcclient.ClientSession, args *options.NatSCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		params.Add(jsonutils.NewString(args.NATGATEWAYID), "natgateway_id")
+		params.Add(jsonutils.NewString(args.IP), "ip")
+		params.Add(jsonutils.NewString(args.EXTERNALIPID), "external_ip_id")
+		params.Add(jsonutils.NewString(args.SourceCIDR), "source_cidr")
+		params.Add(jsonutils.NewString(args.NetworkID), "network_id")
+
+		result, err := modules.NatSTable.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+}

cmd/climc/shell/networkinterfacenetworks.go

@@ -0,0 +1,47 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+)
+
+func init() {
+
+	type NetworkinterfaceNetworkListOptions struct {
+		Networkinterface string `help:"ID or Name of Server"`
+		Network          string `help:"Network ID or name"`
+	}
+	R(&NetworkinterfaceNetworkListOptions{}, "networkinterface-network-list", "List server network pairs", func(s *mcclient.ClientSession, args *NetworkinterfaceNetworkListOptions) error {
+		params := jsonutils.NewDict()
+		var result *modules.ListResult
+		var err error
+		if len(args.Networkinterface) > 0 {
+			result, err = modules.Networkinterfacenetworks.ListDescendent(s, args.Networkinterface, params)
+		} else if len(args.Network) > 0 {
+			result, err = modules.Networkinterfacenetworks.ListDescendent2(s, args.Network, params)
+		} else {
+			result, err = modules.Networkinterfacenetworks.List(s, params)
+		}
+		if err != nil {
+			return err
+		}
+		printList(result, modules.Networkinterfacenetworks.GetColumns(s))
+		return nil
+	})
+}

cmd/climc/shell/networkinterfaces.go

@@ -22,16 +22,34 @@ import (
 
 func init() {
 
-	R(&options.NatDTableListOptions{}, "natdtable-list", "List DNAT tables", func(s *mcclient.ClientSession, opts *options.NatDTableListOptions) error {
+	type NetworkinterfaceListOptions struct {
+		options.BaseListOptions
+	}
+
+	R(&NetworkinterfaceListOptions{}, "network-interface-list", "List networkinterfaces", func(s *mcclient.ClientSession, opts *NetworkinterfaceListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
 		}
-		result, err := modules.NatDTables.List(s, params)
+		result, err := modules.Networkinterfaces.List(s, params)
 		if err != nil {
 			return err
 		}
-		printList(result, modules.NatDTables.GetColumns(s))
+		printList(result, modules.Networkinterfaces.GetColumns(s))
 		return nil
 	})
+
+	type NetworkinterfaceIdOptions struct {
+		ID string `help:"Id or name of networkinterface"`
+	}
+
+	R(&NetworkinterfaceIdOptions{}, "network-interface-show", "Show networkinterface detail", func(s *mcclient.ClientSession, args *NetworkinterfaceIdOptions) error {
+		result, err := modules.Networkinterfaces.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/networks.go

@@ -35,6 +35,7 @@ func init() {
 		Vpc        string `help:"search networks belongs to a VPC"`
 		Region     string `help:"search networks belongs to a CloudRegion" json:"cloudregion"`
 		City       string `help:"search networks belongs to a city"`
+		Usable     *bool  `help:"search usable networks"`
 		ServerType string `help:"search networks belongs to a ServerType" choices:"guest|baremetal|container|pxe|ipmi"`
 	}
 	R(&NetworkListOptions{}, "network-list", "List networks", func(s *mcclient.ClientSession, opts *NetworkListOptions) error {
@@ -209,6 +210,7 @@ func init() {
 		NETMASK     int64  `help:"Length of network mask"`
 		Gateway     string `help:"Default gateway"`
 		VlanId      int64  `help:"Vlan ID" default:"1"`
+		IfnameHint  string `help:"Hint for ifname generation"`
 		AllocPolicy string `help:"Address allocation policy" choices:"none|stepdown|stepup|random"`
 		ServerType  string `help:"Server type" choices:"baremetal|guest|container|pxe|ipmi"`
 		Desc        string `help:"Description" metavar:"DESCRIPTION"`
@@ -228,6 +230,9 @@ func init() {
 		if len(args.ServerType) > 0 {
 			params.Add(jsonutils.NewString(args.ServerType), "server_type")
 		}
+		if len(args.IfnameHint) > 0 {
+			params.Add(jsonutils.NewString(args.IfnameHint), "ifname_hint")
+		}
 		if len(args.AllocPolicy) > 0 {
 			params.Add(jsonutils.NewString(args.AllocPolicy), "alloc_policy")
 		}

cmd/climc/shell/notification.go

@@ -30,9 +30,9 @@ func init() {
 
 	type NotificationCreateOptions struct {
 		UID         string `help:"The user you wanna sent to (Keystone User ID)"`
-		CONTACTTYPE string `help:"User's contacts type, cloud be email|mobile|dingtalk|webconsole" choices:"email|mobile|dingtalk|webconsole"`
+		CONTACTTYPE string `help:"User's contacts type" choices:"email|mobile|dingtalk|webconsole"`
 		TOPIC       string `help:"Title or topic of the notification"`
-		PRIORITY    string `help:"Priority of the notification maybe normal|important|fatal" choices:"normal|important|fatal"`
+		PRIORITY    string `help:"Priority of the notification" choices:"normal|important|fatal"`
 		MSG         string `help:"The content of the notification"`
 		Remark      string `help:"Remark or description of the notification"`
 		Group       bool   `help:"Send to group"`
@@ -57,7 +57,34 @@ func init() {
 		}
 		return nil
 	})
+	/**
+	 * 发送全局通知
+	 */
+	type NotificationBroadcastOptions struct {
 
+		// CONTACTTYPE string `help:"User's contacts type, cloud be email|mobile|dingtalk|/webconsole" choices:"email|mobile|dingtalk|webconsole"`
+		Topic    string `required:"true" help:"Title or topic of the notification"`
+		Priority string `help:"Priority of the notification" choices:"normal|important|fatal" default:"normal"`
+		Msg      string `help:"The content of the notification"`
+		Remark   string `help:"Remark or description of the notification"`
+		// Group    bool   `help:"Send to group"`
+	}
+
+	R(&NotificationBroadcastOptions{}, "notify-broadcast", "Send a notification to all online users", func(s *mcclient.ClientSession, args *NotificationBroadcastOptions) error {
+		msg := notify.SNotifyMessage{}
+		msg.Broadcast = true
+		msg.ContactType = notify.TNotifyChannel("webconsole")
+		msg.Topic = args.Topic
+		msg.Priority = notify.TNotifyPriority(args.Priority)
+		msg.Msg = args.Msg
+		msg.Remark = args.Remark
+
+		err := notify.Notifications.Send(s, msg)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
 	/**
 	 * 修改通知发送任务的状态
 	 */

cmd/climc/shell/parameters.go

@@ -24,6 +24,7 @@ import (
 
 func init() {
 	type ParametersListOptions struct {
+		Name        string `help:"List parameter of specificated name"`
 		NamespaceId string `help:"List parameter of specificated namespace id, ADMIN only"`
 		User        string `help:"List parameter of specificated user id, ADMIN only" token:"user-id"`
 		Service     string `help:"List parameter of specificated service id, ADMIN only"`
@@ -36,6 +37,10 @@ func init() {
 			return err
 		}
 
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+
 		var result *modules.ListResult
 		if len(args.NamespaceId) > 0 {
 			params.Add(jsonutils.NewString(args.NamespaceId), "namespace_id")

cmd/climc/shell/policies.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
 
 	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/cloudcommon/policy"
@@ -59,6 +60,7 @@ func init() {
 		FILE     string `help:"path to policy file"`
 		Enabled  bool   `help:"create policy enabled"`
 		Disabled bool   `help:"create policy disabled"`
+		Desc     string `help:"policy description"`
 	}
 	R(&PolicyCreateOptions{}, "policy-create", "Create a new policy", func(s *mcclient.ClientSession, args *PolicyCreateOptions) error {
 		policyBytes, err := ioutil.ReadFile(args.FILE)
@@ -77,6 +79,9 @@ func init() {
 		} else if args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
 
 		result, err := modules.Policies.Create(s, params)
 		if err != nil {
@@ -94,6 +99,7 @@ func init() {
 		Type     string `help:"policy type"`
 		Enabled  bool   `help:"update policy enabled"`
 		Disabled bool   `help:"update policy disabled"`
+		Desc     string `help:"Description"`
 	}
 	updateFunc := func(s *mcclient.ClientSession, args *PolicyPatchOptions) error {
 		policyId, err := modules.Policies.GetId(s, args.ID, nil)
@@ -116,6 +122,9 @@ func init() {
 		} else if args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
+		if len(args.Desc) > 0 {
+			params.Add(jsonutils.NewString(args.Desc), "description")
+		}
 		result, err := modules.Policies.Patch(s, policyId, params)
 		if err != nil {
 			return err
@@ -293,6 +302,10 @@ func init() {
 		Ip            string   `help:"login IP"`
 	}
 	R(&PolicyExplainOptions{}, "policy-explain", "Explain policy result", func(s *mcclient.ClientSession, args *PolicyExplainOptions) error {
+		err := log.SetLogLevelByString(log.Logger(), "debug")
+		if err != nil {
+			log.Fatalf("Set log level %q: %v", "debug", err)
+		}
 		auth.InitFromClientSession(s)
 		policy.EnableGlobalRbac(15*time.Second, 15*time.Second, false)
 		if args.Debug {

cmd/climc/shell/projects.go

@@ -17,6 +17,7 @@ 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"
@@ -364,6 +365,7 @@ func init() {
 		return nil
 	})*/
 
+	// Deprecated
 	type ProjectBatchJoinOptions struct {
 		Ids      []string `help:"user ids or group ids"`
 		Resource string   `help:"resource type" choices:"users|groups"`
@@ -378,4 +380,55 @@ func init() {
 		}
 		return nil
 	})
+
+	type ProjectAddUserGroupOptions struct {
+		Project string   `help:"ID or name of project to add users/groups" positional:"true" optional:"false"`
+		User    []string `help:"ID of user to add"`
+		Group   []string `help:"ID of group to add"`
+		Role    []string `help:"ID of role to add"`
+	}
+	R(&ProjectAddUserGroupOptions{}, "project-add-user-group", "Batch add users/groups to project", func(s *mcclient.ClientSession, args *ProjectAddUserGroupOptions) error {
+		input := api.SProjectAddUserGroupInput{}
+		input.Users = args.User
+		input.Groups = args.Group
+		input.Roles = args.Role
+		err := input.Validate()
+		if err != nil {
+			return err
+		}
+		result, err := modules.Projects.PerformAction(s, args.Project, "join", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ProjectRemoveUserGroup struct {
+		Project string   `help:"ID or name of project to remove user/group" optional:"false" positional:"true"`
+		User    string   `help:"user to remove"`
+		Group   string   `help:"group to remove"`
+		Role    []string `help:"roles to remove"`
+	}
+	R(&ProjectRemoveUserGroup{}, "project-remove-user-group", "Remove users/groups from project", func(s *mcclient.ClientSession, args *ProjectRemoveUserGroup) error {
+		input := api.SProjectRemoveUserGroupInput{}
+		input.UserRoles = make([]api.SUserRole, len(args.Role))
+		input.GroupRoles = make([]api.SGroupRole, len(args.Role))
+		for i := range args.Role {
+			input.UserRoles[i].User = args.User
+			input.UserRoles[i].Role = args.Role[i]
+			input.GroupRoles[i].Group = args.Group
+			input.GroupRoles[i].Role = args.Role[i]
+		}
+		err := input.Validate()
+		if err != nil {
+			return err
+		}
+		result, err := modules.Projects.PerformAction(s, args.Project, "leave", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/quotas.go

@@ -33,6 +33,10 @@ type QuotaBaseOptions struct {
 	IsolatedDevice int64 `help:"Isolated device count" json:"isolated_device,omitzero"`
 	Snapshot       int64 `help:"Snapshot count" json:"snapshot,omitzero"`
 	Image          int64 `help:"Template count" json:"image,omitzero"`
+	Secgroup       int64 `help:"Secgroup count" json:"secgroup,omitzero"`
+	Bucket         int64 `help:"bucket count" json:"bucket,omitzero"`
+	ObjectGB       int64 `help:"object size in GB" json:"object_gb,omitzero"`
+	ObjectCnt      int64 `help:"object count" json:"object_cnt,omitzero"`
 }
 
 func init() {
@@ -61,7 +65,9 @@ func init() {
 
 	type QuotaSetOptions struct {
 		Tenant        string `help:"Tenant name or ID to set quota" json:"tenant,omitempty"`
-		ProjectDomain string `help:"Domain name or ID to set quota" json:"domain,omitempty"`
+		ProjectDomain string `help:"Domain name or ID to set quota" json:",omitempty"`
+		Action        string `help:"quota set action" choices:"add|reset|replace"`
+		Cascade       bool   `help:"cascade set quota so that auto increment domain quota if total project quota exceeds parent domain quota"`
 		QuotaBaseOptions
 	}
 	R(&QuotaSetOptions{}, "quota-set", "Set quota for tenant", func(s *mcclient.ClientSession, args *QuotaSetOptions) error {

cmd/climc/shell/reservedips.go

@@ -80,4 +80,18 @@ func init() {
 		return nil
 	})
 
+	type ReservedIpUpdateOptions struct {
+		ID    string `help:"ID of reserved ip" json:"-"`
+		Notes string `help:"notes"`
+	}
+	R(&ReservedIpUpdateOptions{}, "reserved-ip-update", "update reserved ip notes", func(s *mcclient.ClientSession, args *ReservedIpUpdateOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.ReservedIPs.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/role_assignments.go

@@ -25,6 +25,7 @@ func init() {
 	type RoleAssignmentsOptions struct {
 		Effective     bool   `help:"Include role assignment of group members"`
 		System        bool   `help:"Include system user account"`
+		Policy        bool   `help:"Show matched policies"`
 		Domain        string `help:"Role assignments for domain"`
 		User          string `help:"For user"`
 		UserDomain    string `help:"Domain for user"`
@@ -46,6 +47,9 @@ func init() {
 		if args.System {
 			query.Add(jsonutils.JSONNull, "include_system")
 		}
+		if args.Policy {
+			query.Add(jsonutils.JSONNull, "include_policies")
+		}
 		if len(args.Domain) > 0 {
 			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
 			if err != nil {

cmd/climc/shell/schedtags.go

@@ -75,6 +75,7 @@ func init() {
 		NAME     string `help:"Name of new schedtag"`
 		Strategy string `help:"Policy" choices:"require|exclude|prefer|avoid"`
 		Desc     string `help:"Description"`
+		Scope    string `help:"Resource scope" choices:"system|domain|project"`
 		Type     string `help:"Resource type" choices:"hosts|storages|networks"`
 	}
 	R(&SchedtagCreateOptions{}, "schedtag-create", "Create a schedule tag", func(s *mcclient.ClientSession, args *SchedtagCreateOptions) error {
@@ -89,6 +90,9 @@ func init() {
 		if len(args.Type) > 0 {
 			params.Add(jsonutils.NewString(args.Type), "resource_type")
 		}
+		if len(args.Scope) > 0 {
+			params.Add(jsonutils.NewString(args.Scope), "scope")
+		}
 		schedtag, err := modules.Schedtags.Create(s, params)
 		if err != nil {
 			return err
@@ -129,4 +133,24 @@ func init() {
 		return nil
 	})
 
+	type SetScopeOptions struct {
+		ID      []string `help:"ID or Name of schetag"`
+		Project string   `help:"ID or Name of project"`
+		Domain  string   `help:"ID or Name of domain"`
+		System  bool     `help:"Set to system scope"`
+	}
+	R(&SetScopeOptions{}, "schedtag-set-scope", "Set schedtag scope", func(s *mcclient.ClientSession, args *SetScopeOptions) error {
+		params := jsonutils.NewDict()
+		domainId := args.Domain
+		projectId := args.Project
+		if args.System {
+			domainId = ""
+			projectId = ""
+		}
+		params.Add(jsonutils.NewString(domainId), "domain")
+		params.Add(jsonutils.NewString(projectId), "project")
+		ret := modules.Schedtags.BatchPerformAction(s, args.ID, "set-scope", params)
+		printBatchResults(ret, modules.Schedtags.GetColumns(s))
+		return nil
+	})
 }

cmd/climc/shell/secgroups.go

@@ -26,9 +26,7 @@ import (
 
 func init() {
 	type SecGroupsListOptions struct {
-		Equals       string `help:"Secgroup ID or Name, filter secgroups whose rules equals the specified one"`
-		OrderByCache string `help:"Order by cache count" choices:"desc|asc"`
-		OrderByGuest string `help:"Order by guest count" choices:"desc|asc"`
+		Equals string `help:"Secgroup ID or Name, filter secgroups whose rules equals the specified one"`
 		options.BaseListOptions
 	}
 
@@ -45,12 +43,6 @@ func init() {
 		if len(args.Equals) > 0 {
 			params.Add(jsonutils.NewString(args.Equals), "equals")
 		}
-		if len(args.OrderByCache) > 0 {
-			params.Add(jsonutils.NewString(args.OrderByCache), "order_by_cache")
-		}
-		if len(args.OrderByGuest) > 0 {
-			params.Add(jsonutils.NewString(args.OrderByGuest), "order_by_guest")
-		}
 		result, err := modules.SecGroups.List(s, params)
 		if err != nil {
 			return err

cmd/climc/shell/servernetworks.go

@@ -21,6 +21,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/util/regutils"
 
+	"yunion.io/x/onecloud/pkg/cloudcommon/cmdline"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
@@ -220,7 +221,11 @@ func init() {
 		} else {
 			return fmt.Errorf("Please specify Ip or Mac")
 		}
-		params.Add(jsonutils.NewString(args.NETDESC), "net_desc")
+		conf, err := cmdline.ParseNetworkConfig(args.NETDESC, 0)
+		if err != nil {
+			return err
+		}
+		params.Add(conf.JSON(conf), "net_desc")
 		srv, err := modules.Servers.PerformAction(s, args.SERVER, "change-ipaddr", params)
 		if err != nil {
 			return err

cmd/climc/shell/servers.go

@@ -23,6 +23,7 @@ import (
 	"path/filepath"
 
 	yaml "gopkg.in/yaml.v2"
+
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
@@ -535,21 +536,13 @@ func init() {
 	})
 
 	type ServerChangeOwnerOptions struct {
-		ID      string `help:"Server to change owner"`
-		PROJECT string `help:"Project ID or change"`
-		RawId   bool   `help:"User raw ID, instead of name"`
+		ID      string `help:"Server to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
 	}
 	R(&ServerChangeOwnerOptions{}, "server-change-owner", "Change owner porject of a server", func(s *mcclient.ClientSession, opts *ServerChangeOwnerOptions) error {
-		params := jsonutils.NewDict()
-		if opts.RawId {
-			projid, err := modules.Projects.GetId(s, opts.PROJECT, nil)
-			if err != nil {
-				return err
-			}
-			params.Add(jsonutils.NewString(projid), "tenant")
-			params.Add(jsonutils.JSONTrue, "raw_id")
-		} else {
-			params.Add(jsonutils.NewString(opts.PROJECT), "tenant")
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
 		}
 		srv, err := modules.Servers.PerformAction(s, opts.ID, "change-owner", params)
 		if err != nil {
@@ -984,4 +977,82 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	R(&options.ServerIdOptions{}, "server-remote-nics", "Show remote nics of a server", func(s *mcclient.ClientSession, opts *options.ServerIdOptions) error {
+		result, err := modules.Servers.GetSpecific(s, opts.ID, "remote-nics", nil)
+		if err != nil {
+			return err
+		}
+		listResult := modules.ListResult{}
+		listResult.Data, _ = result.GetArray()
+		printList(&listResult, nil)
+		return nil
+	})
+
+	type ServerSyncFixNicsOptions struct {
+		ID string   `help:"ID or name of VM" json:"-"`
+		IP []string `help:"IP address of each NIC" json:"ip"`
+	}
+	R(&ServerSyncFixNicsOptions{}, "server-sync-fix-nics", "Fix missing IP for each nics after syncing VNICS", func(s *mcclient.ClientSession, opts *ServerSyncFixNicsOptions) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Servers.PerformAction(s, opts.ID, "sync-fix-nics", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerResizeDiskOptions struct {
+		Server string `help:"ID or name of VM" json:"-" optional:"false" positional:"true"`
+		Disk   string `help:"ID or name of disk to resize" json:"disk" optional:"false" positional:"true"`
+		Size   string `help:"new size of disk in MB" json:"size" optional:"false" positional:"true"`
+	}
+	R(&ServerResizeDiskOptions{}, "server-resize-disk", "Resize attached disk of a server", func(s *mcclient.ClientSession, args *ServerResizeDiskOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Servers.PerformAction(s, args.Server, "resize-disk", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerIoThrottle struct {
+		ID   string `help:"ID or name of VM" json:"-"`
+		BPS  int    `help:"bps(MB) of throttle" json:"bps"`
+		IOPS int    `help:"iops of throttle" json:"iops"`
+	}
+	R(&ServerIoThrottle{}, "server-io-throttle", "Guest io set throttle", func(s *mcclient.ClientSession, opts *ServerIoThrottle) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Servers.PerformAction(s, opts.ID, "io-throttle", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerQemuParams struct {
+		ID               string `help:"ID or name of VM"`
+		DisableIsaSerial string `help:"disable isa serial device" choices:"true|false"`
+		DisablePvpanic   string `help:"disable pvpanic device" choices:"true|false"`
+	}
+
+	R(&ServerQemuParams{}, "server-set-qemu-params", "config qemu params", func(s *mcclient.ClientSession,
+		opts *ServerQemuParams) error {
+		params := jsonutils.NewDict()
+		if len(opts.DisableIsaSerial) > 0 {
+			params.Set("disable_isa_serial", jsonutils.NewString(opts.DisableIsaSerial))
+		}
+		if len(opts.DisablePvpanic) > 0 {
+			params.Set("disable_pvpanic", jsonutils.NewString(opts.DisablePvpanic))
+		}
+		result, err := modules.Servers.PerformAction(s, opts.ID, "set-qemu-params", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/skus.go

@@ -23,12 +23,13 @@ import (
 func init() {
 	type ServerSkusListOptions struct {
 		options.BaseListOptions
-		Region string  `help:"region Id or name"`
-		Zone   string  `help:"zone Id or name"`
-		City   *string `help:"city name,eg. BeiJing"`
-		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"`
+		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"`
+		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(&ServerSkusListOptions{}, "server-sku-list", "List all avaiable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusListOptions) error {
 		params, err := options.ListStructToParams(args)
@@ -43,10 +44,10 @@ func init() {
 		return nil
 	})
 
-	type ServerSkusShowOptions struct {
+	type ServerSkusIdOptions struct {
 		ID string `help:"ID or Name of SKU to show"`
 	}
-	R(&ServerSkusShowOptions{}, "server-sku-show", "show details of a avaiable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusShowOptions) error {
+	R(&ServerSkusIdOptions{}, "server-sku-show", "show details of a avaiable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusIdOptions) error {
 		result, err := modules.ServerSkus.Get(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -55,9 +56,28 @@ func init() {
 		return nil
 	})
 
+	R(&ServerSkusIdOptions{}, "server-sku-enable", "Enable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusIdOptions) error {
+		result, err := modules.ServerSkus.PerformAction(s, args.ID, "enable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&ServerSkusIdOptions{}, "server-sku-disable", "Disable Server SKU", func(s *mcclient.ClientSession, args *ServerSkusIdOptions) error {
+		result, err := modules.ServerSkus.PerformAction(s, args.ID, "disable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	type ServerSkusCreateOptions struct {
-		CpuCoreCount int `help:"Cpu Count" required:"true" positional:"true"`
-		MemorySizeMB int `help:"Memory MB" required:"true" positional:"true"`
+		Name         string `help:"ServerSku name"`
+		CpuCoreCount int    `help:"Cpu Count" required:"true" positional:"true"`
+		MemorySizeMB int    `help:"Memory MB" required:"true" positional:"true"`
 
 		OsName               *string `help:"OS name/type" choices:"Linux|Windows|Any" default:"Any"`
 		InstanceTypeCategory *string `help:"instance type category" choices:"general_purpose|compute_optimized|memory_optimized|storage_optimized|hardware_accelerated|high_memory|high_storage"`
@@ -79,8 +99,10 @@ func init() {
 		GPUCount      *int    `help:"GPU count"`
 		GPUAttachable *bool   `help:"Allow attach GPU"`
 
-		Zone   *string `help:"Zone ID or name"`
-		Region *string `help:"Region ID or name"`
+		Zone        *string `help:"Zone ID or name"`
+		Cloudregion *string `help:"Cloudregion ID or name"`
+		Provider    string  `help:"provider"`
+		Brand       string  `help:"brand"`
 	}
 	R(&ServerSkusCreateOptions{}, "server-sku-create", "Create a server sku record", func(s *mcclient.ClientSession, args *ServerSkusCreateOptions) error {
 		params, err := options.StructToParams(args)
@@ -149,15 +171,7 @@ func init() {
 		return nil
 	})
 
-	type ServerSkuSpecsListOptions struct {
-		Provider       string  `help:"List objects from the provider" choices:"OneCloud|VMware|Aliyun|Qcloud|Azure|Aws|Huawei|Openstack|Ucloud|ZStack" json:"provider"`
-		PublicCloud    *bool   `help:"List objects belonging to public cloud" json:"public_cloud"`
-		Zone           string  `help:"zone Id or name"`
-		PostpaidStatus *string `help:"skus available status for postpaid instance" choices:"available|soldout"`
-		PrepaidStatus  *string `help:"skus available status for prepaid instance"  choices:"available|soldout"`
-		IngoreCache    bool    `help:"query without cache"`
-	}
-	R(&ServerSkuSpecsListOptions{}, "server-sku-specs-list", "List all avaiable Server SKU specifications", func(s *mcclient.ClientSession, args *ServerSkuSpecsListOptions) error {
+	R(&ServerSkusListOptions{}, "server-sku-specs-list", "List all avaiable Server SKU specifications", func(s *mcclient.ClientSession, args *ServerSkusListOptions) error {
 		params, err := options.ListStructToParams(args)
 		if err != nil {
 			return err

cmd/climc/shell/snapshot_policy.go

@@ -16,6 +16,7 @@ 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"
@@ -51,9 +52,7 @@ func init() {
 	})
 
 	type SnapshotPolicyCreateOptions struct {
-		NAME        string
-		Manager     string `help:"Manager id or name"`
-		Cloudregion string `help:"Cloudregion id or name"`
+		NAME string
 
 		RetentionDays  int   `help:"snapshot retention days"`
 		RepeatWeekdays []int `help:"snapshot create days on week"`
@@ -70,21 +69,56 @@ func init() {
 		return nil
 	})
 
-	type SnapshotPolicyApplyOptions struct {
-		ID   string   `help:"ID or Name of SnapshotPolicy" json:"-"`
-		Disk []string `help:"Disks id to apply snapshot policy"`
+	type SnapshotPolicyBindDisksOptions struct {
+		ID   string   `help:"ID"`
+		Disk []string `help:"ids of disk"`
 	}
 
-	R(&SnapshotPolicyApplyOptions{}, "snapshot-policy-apply", "Apply snapshot policy to disks", func(s *mcclient.ClientSession, args *SnapshotPolicyApplyOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		snapshot, err := modules.SnapshotPoliciy.PerformAction(s, args.ID, "apply-to-disk", params)
-		if err != nil {
-			return err
-		}
-		printObject(snapshot)
-		return nil
-	})
+	R(&SnapshotPolicyBindDisksOptions{}, "snapshot-policy-bind-disk", "bind snapshotpolicy to disks",
+		func(s *mcclient.ClientSession, opts *SnapshotPolicyBindDisksOptions) error {
+			params, err := options.StructToParams(opts)
+			if err != nil {
+				return err
+			}
+			sp, err := modules.SnapshotPoliciy.PerformAction(s, opts.ID, "bind-disks", params)
+			if err != nil {
+				return err
+			}
+			printObject(sp)
+			return nil
+		})
+
+	R(&SnapshotPolicyBindDisksOptions{}, "snapshot-policy-unbind-disk", "bind snapshotpolicy to disks",
+		func(s *mcclient.ClientSession, opts *SnapshotPolicyBindDisksOptions) error {
+			params, err := options.StructToParams(opts)
+			if err != nil {
+				return err
+			}
+			sp, err := modules.SnapshotPoliciy.PerformAction(s, opts.ID, "unbind-disks", params)
+			if err != nil {
+				return err
+			}
+			printObject(sp)
+			return nil
+		})
+
+	type SnapshotPolicyCacheOptions struct {
+		ID       string `help:"SnasphotPolicy ID"`
+		REGIONID string `help:"Region ID"`
+		PROVIDER string `help:"Provider ID"`
+	}
+	R(&SnapshotPolicyCacheOptions{}, "snapshot-policy-cache", "upload local snapshotpolicy to cloud",
+		func(s *mcclient.ClientSession, opts *SnapshotPolicyCacheOptions) error {
+			params, err := options.StructToParams(opts)
+			if err != nil {
+				return err
+			}
+			sp, err := modules.SnapshotPoliciy.PerformAction(s, opts.ID, "cache", params)
+			if err != nil {
+				return err
+			}
+			printObject(sp)
+			return nil
+		},
+	)
 }

cmd/climc/shell/snapshotpolicy_disk.go

@@ -0,0 +1,80 @@
+// 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 SSnapshotpolicyDiskListOfDiskOption struct {
+		DISKID string `help:"disk id"`
+	}
+	R(&SSnapshotpolicyDiskListOfDiskOption{}, "disk-snapshot-policy-list", "List snapshot policy attached",
+		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskListOfDiskOption) error {
+			result, err := modules.SnapshotPolicyDisk.ListDescendent(s, opts.DISKID, jsonutils.NewDict())
+			if err != nil {
+				return err
+			}
+			printList(result, modules.SnapshotPolicyDisk.GetColumns(s))
+			return nil
+		},
+	)
+
+	type SSnapshotpolicyDiskListOfSnapshotpolicyOption struct {
+		SNAPSHOTPOLICYID string `help:"snapshot policy id"`
+	}
+	R(&SSnapshotpolicyDiskListOfSnapshotpolicyOption{}, "snapshot-policy-disk-list", "List disk attached",
+		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskListOfSnapshotpolicyOption) error {
+			result, err := modules.SnapshotPolicyDisk.ListDescendent2(s, opts.SNAPSHOTPOLICYID, jsonutils.NewDict())
+			if err != nil {
+				return err
+			}
+			printList(result, modules.SnapshotPolicyDisk.GetColumns(s))
+			return nil
+		},
+	)
+
+	type SSnapshotpolicyDiskAttachOption struct {
+		DISKID           string `help:"disk id"`
+		SNAPSHOTPOLICYID string `help:"snapshot policy id"`
+	}
+	R(&SSnapshotpolicyDiskAttachOption{}, "disk-snapshot-policy-attach", "attach snapshot policy to disk",
+		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskAttachOption) error {
+			_, err := modules.SnapshotPolicyDisk.Attach(s, opts.DISKID, opts.SNAPSHOTPOLICYID, jsonutils.NewDict())
+			if err != nil {
+				return err
+			}
+			return nil
+		},
+	)
+
+	type SSnapshotpolicyDiskDetachOption struct {
+		DISKID           string `help:"disk id"`
+		SNAPSHOTPOLICYID string `help:"snapshot policy id"`
+	}
+	R(&SSnapshotpolicyDiskDetachOption{}, "disk-snapshot-policy-detach", "detach snapshot policy to disk",
+		func(s *mcclient.ClientSession, opts *SSnapshotpolicyDiskDetachOption) error {
+			_, err := modules.SnapshotPolicyDisk.Detach(s, opts.DISKID, opts.SNAPSHOTPOLICYID, jsonutils.NewDict())
+			if err != nil {
+				return err
+			}
+			return nil
+		},
+	)
+}

cmd/climc/shell/snapshots.go

@@ -46,14 +46,11 @@ func init() {
 	})
 
 	type SnapshotDeleteOptions struct {
-		ID string `help:"Delete snapshot id"`
+		ID []string `help:"Delete snapshot id"`
 	}
 	R(&SnapshotDeleteOptions{}, "snapshot-delete", "Delete snapshots", func(s *mcclient.ClientSession, args *SnapshotDeleteOptions) error {
-		result, err := modules.Snapshots.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
+		ret := modules.Snapshots.BatchDelete(s, args.ID, nil)
+		printBatchResults(ret, modules.Snapshots.GetColumns(s))
 		return nil
 	})
 	type DiskDeleteSnapshotsOptions struct {

cmd/climc/shell/storages.go

@@ -53,34 +53,23 @@ func init() {
 	})
 
 	type StorageUpdateOptions struct {
-		ID          string  `help:"ID or Name of storage to update"`
-		Name        string  `help:"New Name of storage"`
-		Desc        string  `help:"Description" metavar:"<DESCRIPTION>"`
-		CommitBound float64 `help:"Upper bound of storage overcommit rate"`
-		StorageType string  `help:"Storage type" choices:"local|nas|vsan|rbd|baremetal"`
-		MediumType  string  `help:"Medium type, either ssd or rotate" choices:"ssd|rotate"`
-		Reserved    string  `help:"Reserved storage space"`
+		ID                    string  `help:"ID or Name of storage to update"`
+		Name                  string  `help:"New Name of storage"`
+		Desc                  string  `help:"Description"`
+		CommitBound           float64 `help:"Upper bound of storage overcommit rate"`
+		MediumType            string  `help:"Medium type" choices:"ssd|rotate"`
+		RbdRadosMonOpTimeout  int64   `help:"ceph rados_mon_op_timeout"`
+		RbdRadosOsdOpTimeout  int64   `help:"ceph rados_osd_op_timeout"`
+		RbdClientMountTimeout int64   `help:"ceph client_mount_timeout"`
+		RbdKey                string  `help:"ceph rbd key"`
+		Reserved              string  `help:"Reserved storage space"`
 	}
 	R(&StorageUpdateOptions{}, "storage-update", "Update a storage", func(s *mcclient.ClientSession, args *StorageUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Desc) > 0 {
-			params.Add(jsonutils.NewString(args.Desc), "description")
-		}
-		if args.CommitBound > 0 {
-			params.Add(jsonutils.NewFloat(args.CommitBound), "cmtbound")
-		}
-		if len(args.StorageType) > 0 {
-			params.Add(jsonutils.NewString(args.StorageType), "storage_type")
-		}
-		if len(args.MediumType) > 0 {
-			params.Add(jsonutils.NewString(args.MediumType), "medium_type")
-		}
-		if len(args.Reserved) > 0 {
-			params.Add(jsonutils.NewString(args.Reserved), "reserved")
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
 		}
+
 		result, err := modules.Storages.Update(s, args.ID, params)
 		if err != nil {
 			return err
@@ -90,37 +79,34 @@ func init() {
 	})
 
 	type StorageCreateOptions struct {
-		NAME         string `help:"Name of the Storage"`
-		ZONE         string `help:"Zone id of storage"`
-		Capacity     int64  `help:"Capacity of the Storage"`
-		MediumType   string `help:"Medium type, either ssd or rotate" choices:"ssd|rotate"`
-		StorageType  string `help:"Storage type" choices:"local|nas|vsan|rbd|nfs|gpfs|baremetal"`
-		MonHost      string `help:"Ceph mon_host config"`
-		Key          string `help:"Ceph key config"`
-		Pool         string `help:"Ceph Pool Name"`
-		NfsHost      string `help:"NFS host"`
-		NfsSharedDir string `help:"NFS shared dir"`
+		NAME                  string `help:"Name of the Storage"`
+		ZONE                  string `help:"Zone id of storage"`
+		Capacity              int64  `help:"Capacity of the Storage"`
+		MediumType            string `help:"Medium type" choices:"ssd|rotate"`
+		StorageType           string `help:"Storage type" choices:"local|nas|vsan|rbd|nfs|gpfs|baremetal"`
+		RbdMonHost            string `help:"Ceph mon_host config"`
+		RbdRadosMonOpTimeout  int64  `help:"ceph rados_mon_op_timeout"`
+		RbdRadosOsdOpTimeout  int64  `help:"ceph rados_osd_op_timeout"`
+		RbdClientMountTimeout int64  `help:"ceph client_mount_timeout"`
+		RbdKey                string `help:"Ceph key config"`
+		RbdPool               string `help:"Ceph Pool Name"`
+		NfsHost               string `help:"NFS host"`
+		NfsSharedDir          string `help:"NFS shared dir"`
 	}
 	R(&StorageCreateOptions{}, "storage-create", "Create a Storage", func(s *mcclient.ClientSession, args *StorageCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NAME), "name")
-		params.Add(jsonutils.NewString(args.ZONE), "zone")
-		params.Add(jsonutils.NewInt(args.Capacity), "capacity")
-		params.Add(jsonutils.NewString(args.StorageType), "storage_type")
-		params.Add(jsonutils.NewString(args.MediumType), "medium_type")
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+
 		if args.StorageType == "rbd" {
-			if args.MonHost == "" || args.Key == "" || args.Pool == "" {
+			if args.RbdMonHost == "" || args.RbdKey == "" || args.RbdPool == "" {
 				return fmt.Errorf("Not enough arguments, missing mon_host、key or pool")
 			}
-			params.Add(jsonutils.NewString(args.MonHost), "rbd_mon_host")
-			params.Add(jsonutils.NewString(args.Key), "rbd_key")
-			params.Add(jsonutils.NewString(args.Pool), "rbd_pool")
 		} else if args.StorageType == "nfs" {
 			if len(args.NfsHost) == 0 || len(args.NfsSharedDir) == 0 {
 				return fmt.Errorf("Storage type nfs missing conf host or shared dir")
 			}
-			params.Add(jsonutils.NewString(args.NfsHost), "nfs_host")
-			params.Add(jsonutils.NewString(args.NfsSharedDir), "nfs_shared_dir")
 		}
 		storage, err := modules.Storages.Create(s, params)
 		if err != nil {

cmd/climc/shell/usages.go

@@ -26,9 +26,11 @@ type GeneralUsageOptions struct {
 	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack"`
 	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|DStack"`
 	Project  string   `help:"show usage of specified project"`
-	Domain   string   `help:"show usage of specified domain"`
-	CloudEnv string   `help:"show usage of specified cloudenv, e.g. public_cloud/private_cloud/on_premise" choices:"public|private|onpremise"`
-	Scope    string   `help:"show usage of specified privilege scope, e.g. system/domain/project" choices:"system|domain|project"`
+
+	ProjectDomain string `help:"show usage of specified domain"`
+
+	CloudEnv string `help:"show usage of specified cloudenv" choices:"public|private|onpremise"`
+	Scope    string `help:"show usage of specified privilege scope" choices:"system|domain|project"`
 }
 
 func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
@@ -53,8 +55,8 @@ func init() {
 		params := fetchHostTypeOptions(args)
 		if args.Project != "" {
 			params.Add(jsonutils.NewString(args.Project), "project")
-		} else if args.Domain != "" {
-			params.Add(jsonutils.NewString(args.Domain), "domain")
+		} else if args.ProjectDomain != "" {
+			params.Add(jsonutils.NewString(args.ProjectDomain), "project_domain")
 		}
 		if len(args.Scope) > 0 {
 			params.Add(jsonutils.NewString(args.Scope), "scope")

cmd/climc/shell/users.go

@@ -17,6 +17,7 @@ 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"
@@ -27,6 +28,7 @@ func init() {
 		options.BaseListOptions
 		Name          string `help:"Filter by name"`
 		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
+		Role          string `help:"Filter by role"`
 	}
 	R(&UserListOptions{}, "user-list", "List users", func(s *mcclient.ClientSession, args *UserListOptions) error {
 		params, err := options.ListStructToParams(args)
@@ -360,4 +362,41 @@ func init() {
 		return nil
 	})
 
+	type UserJoinProjectOptions struct {
+		User    string   `help:"User Id or name" optional:"false" positional:"true"`
+		Project []string `help:"Projects to join" nargs:"+"`
+		Role    []string `help:"User join project with roles" nargs:"+"`
+	}
+	R(&UserJoinProjectOptions{}, "user-join-project", "User join projects with roles", func(s *mcclient.ClientSession, args *UserJoinProjectOptions) error {
+		input := api.SJoinProjectsInput{}
+		input.Projects = args.Project
+		input.Roles = args.Role
+		result, err := modules.UsersV3.PerformAction(s, args.User, "join", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type UserLeaveProjectsOptions struct {
+		User    string   `help:"user 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(&UserLeaveProjectsOptions{}, "user-leave-project", "Leave a user from projects", func(s *mcclient.ClientSession, args *UserLeaveProjectsOptions) 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.UsersV3.PerformAction(s, args.User, "leave", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/utils.go

@@ -15,6 +15,9 @@
 package shell
 
 import (
+	"fmt"
+	"os"
+	"sort"
 	"strings"
 
 	"yunion.io/x/jsonutils"
@@ -24,12 +27,64 @@ import (
 	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
+const (
+	OUTPUT_FORMAT_TABLE         = "table"         // pretty table
+	OUTPUT_FORMAT_FLATTEN_TABLE = "flatten-table" // pretty table with flattened keys
+	OUTPUT_FORMAT_JSON          = "json"          // json string
+	OUTPUT_FORMAT_KV            = "kv"            // "key: value" as separate line
+	OUTPUT_FORMAT_FLATTEN_KV    = "flatten-kv"    // kv with flattened keys
+)
+
+var outputFormat = OUTPUT_FORMAT_TABLE
+
+func OutputFormat(s string) {
+	outputFormat = s
+}
+
 func printList(list *modules.ListResult, columns []string) {
 	printutils.PrintJSONList(list, columns)
 }
 
 func printObject(obj jsonutils.JSONObject) {
-	printutils.PrintJSONObject(obj)
+	switch outputFormat {
+	case OUTPUT_FORMAT_TABLE:
+		printutils.PrintJSONObject(obj)
+	case OUTPUT_FORMAT_KV:
+		printObjectFmtKv(obj)
+	case OUTPUT_FORMAT_JSON:
+		fmt.Print(obj.String())
+		fmt.Print("\n")
+	case OUTPUT_FORMAT_FLATTEN_TABLE:
+		printObjectRecursive(obj)
+	case OUTPUT_FORMAT_FLATTEN_KV:
+		printObjectRecursiveEx(obj, printObjectFmtKv)
+	default:
+		fmt.Fprintf(os.Stderr, "unknown output format: %q\n", outputFormat)
+	}
+}
+
+func printObjectFmtKv(obj jsonutils.JSONObject) {
+	m, _ := obj.GetMap()
+	maxWidth := 0
+	keys := make([]string, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+		if maxWidth < len(k) {
+			maxWidth = len(k)
+		}
+	}
+	sort.Strings(keys)
+	for _, k := range keys {
+		var s string
+		objV := m[k]
+		if objS, ok := objV.(*jsonutils.JSONString); ok {
+			s, _ = objS.GetString()
+			s = strings.TrimRight(s, "\n")
+		} else {
+			s = objV.String()
+		}
+		fmt.Printf("%*s: %s\n", maxWidth, k, s)
+	}
 }
 
 func printObjectRecursive(obj jsonutils.JSONObject) {

cmd/climc/shell/wires.go

@@ -54,6 +54,7 @@ func init() {
 		Name string `help:"Name of wire"`
 		Desc string `metavar:"<DESCRIPTION>" help:"Description"`
 		Bw   int64  `help:"Bandwidth in mbps"`
+		Mtu  int64  `help:"mtu in bytes"`
 	}
 	R(&WireUpdateOptions{}, "wire-update", "Update wire", func(s *mcclient.ClientSession, args *WireUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -66,6 +67,9 @@ func init() {
 		if args.Bw > 0 {
 			params.Add(jsonutils.NewInt(args.Bw), "bandwidth")
 		}
+		if args.Mtu > 0 {
+			params.Add(jsonutils.NewInt(args.Mtu), "mtu")
+		}
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}
@@ -82,12 +86,16 @@ func init() {
 		Vpc  string `help:"VPC ID or Name" default:"default"`
 		NAME string `help:"Name of wire"`
 		BW   int64  `help:"Bandwidth in mbps"`
+		Mtu  int64  `help:"mtu in bytes"`
 		Desc string `metavar:"<DESCRIPTION>" help:"Description"`
 	}
 	R(&WireCreateOptions{}, "wire-create", "Create a wire", func(s *mcclient.ClientSession, args *WireCreateOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
 		params.Add(jsonutils.NewInt(args.BW), "bandwidth")
+		if args.Mtu > 0 {
+			params.Add(jsonutils.NewInt(args.Mtu), "mtu")
+		}
 		if len(args.Vpc) > 0 {
 			params.Add(jsonutils.NewString(args.Vpc), "vpc")
 		}

cmd/cryptool/main.go

@@ -18,12 +18,10 @@ import (
 	"fmt"
 	"os"
 
-	"yunion.io/x/log"
 	"yunion.io/x/structarg"
 
-	"yunion.io/x/onecloud/pkg/util/shellutils"
-
 	_ "yunion.io/x/onecloud/cmd/cryptool/shell"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 type BaseOptions struct {
@@ -68,7 +66,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)
 }
 

cmd/esxicli/main.go

@@ -18,11 +18,10 @@ import (
 	"fmt"
 	"os"
 
-	"yunion.io/x/log"
 	"yunion.io/x/structarg"
 
-	"yunion.io/x/onecloud/pkg/util/esxi"
-	_ "yunion.io/x/onecloud/pkg/util/esxi/shell"
+	"yunion.io/x/onecloud/pkg/multicloud/esxi"
+	_ "yunion.io/x/onecloud/pkg/multicloud/esxi/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)
 }
 

cmd/host-deployer/main.go

@@ -0,0 +1,22 @@
+// 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/hostman/hostdeployer/deployserver"
+
+func main() {
+	deployer := deployserver.NewDeployService()
+	deployer.StartService()
+}

cmd/huaweicli/main.go

@@ -18,11 +18,10 @@ import (
 	"fmt"
 	"os"
 
-	"yunion.io/x/log"
 	"yunion.io/x/structarg"
 
-	"yunion.io/x/onecloud/pkg/util/huawei"
-	_ "yunion.io/x/onecloud/pkg/util/huawei/shell"
+	"yunion.io/x/onecloud/pkg/multicloud/huawei"
+	_ "yunion.io/x/onecloud/pkg/multicloud/huawei/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
@@ -73,7 +72,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)
 }
 

cmd/ipmicli/main.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 	"os"
 
-	"yunion.io/x/log"
 	"yunion.io/x/structarg"
 
 	"yunion.io/x/onecloud/pkg/baremetal/utils/ipmitool"
@@ -37,8 +36,9 @@ type BaseOptions struct {
 	SUBCOMMAND string `help:"ipmicli subcommand" subcommand:"true"`
 }
 
-func showErrorAndExit(err error) {
-	log.Errorf("%s", err)
+func showErrorAndExit(e error) {
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
 	os.Exit(1)
 }