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,7 +3,20 @@
 # 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:
@@ -35,6 +48,8 @@ jobs:
           path: _output/
 
   test:
+    requires:
+      - check
     docker:
       - image: yunionio/onecloud-ci:v1.0.2
         environment:
@@ -59,5 +74,10 @@ 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

@@ -8,17 +8,17 @@ BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 
 ifeq ($(ONECLOUD_CI_BUILD),)
-  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')
+	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
+	GIT_COMMIT:=x
+	GIT_BRANCH:=x
+	GIT_VERSION:=x
+	BUILD_TREE_STATE:=clean
+	BUILD_DATE=2099-07-01T07:11:09Z
 endif
 
 LDFLAGS := "-w \
@@ -44,8 +44,8 @@ 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
@@ -58,6 +58,9 @@ 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
 
 
@@ -68,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
 
@@ -83,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
@@ -110,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:
@@ -118,8 +117,50 @@ clean:
 
 
 fmt:
-	@$(if $(ONECLOUD_CI_BUILD),:,find) . -type f -name "*.go" -not -path "./_output/*" \
-		-not -path "./vendor/*" | xargs $(XARGS_FLAGS) 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,
@@ -144,9 +185,6 @@ mod:
 	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/s3cli/vars

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

build/s3gateway/vars

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

cmd/climc/climc.go

@@ -49,14 +49,19 @@ 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"`
@@ -124,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 {
@@ -178,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
 		}

cmd/climc/shell/actions.go

@@ -36,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 {
@@ -60,9 +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/buckets.go

@@ -213,15 +213,12 @@ func init() {
 	})
 
 	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"`
-		Key string `help:"Optional object key"`
+		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, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
+		params := jsonutils.Marshal(args)
 		result, err := modules.Buckets.PerformAction(s, args.ID, "acl", params)
 		if err != nil {
 			return err
@@ -264,4 +261,32 @@ func init() {
 		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

@@ -189,6 +189,28 @@ func init() {
 		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"`

cmd/climc/shell/copyright.go

@@ -16,6 +16,7 @@ package shell
 
 import (
 	"fmt"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"

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/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)
@@ -259,33 +261,6 @@ 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"`
-	}
-	R(&DiskApplySnapshotPolicy{}, "disk-apply-snapshot-policy", "Set disk snapshot policy", func(s *mcclient.ClientSession, args *DiskApplySnapshotPolicy) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		disk, err := modules.Disks.PerformAction(s, args.ID, "apply-snapshot-policy", 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)
-		return nil
-	})
 
 	type DiskChangeOwnerOptions struct {
 		ID      string `help:"Disk to change owner" json:"-"`

cmd/climc/shell/events.go

@@ -32,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 {
@@ -92,9 +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

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/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/loadbalancercachedacls.go

@@ -90,6 +90,29 @@ func init() {
 		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 {

cmd/climc/shell/loadbalancercachedcertificates.go

@@ -47,6 +47,28 @@ func init() {
 		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 {

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/natgateways.go

@@ -43,4 +43,30 @@ func init() {
 		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

@@ -60,7 +60,8 @@ func init() {
 		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.SourceCIDR), "source_cidr")
+		params.Add(jsonutils.NewString(args.NetworkID), "network_id")
 
 		result, err := modules.NatSTable.Create(s, params)
 		if err != nil {

cmd/climc/shell/networkinterfacenetworks.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"
 )

cmd/climc/shell/networks.go

@@ -210,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"`
@@ -229,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/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

@@ -34,6 +34,9 @@ type QuotaBaseOptions struct {
 	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() {

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/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/servers.go

@@ -23,6 +23,7 @@ import (
 	"path/filepath"
 
 	yaml "gopkg.in/yaml.v2"
+
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
@@ -1001,4 +1002,57 @@ func init() {
 		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

@@ -101,6 +101,8 @@ func init() {
 
 		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)

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/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"
@@ -361,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/cryptool/main.go

@@ -20,9 +20,8 @@ import (
 
 	"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 {

cmd/s3cli/main.go

@@ -20,8 +20,12 @@ import (
 
 	"yunion.io/x/structarg"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
+	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud/objectstore"
+	"yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph"
 	_ "yunion.io/x/onecloud/pkg/multicloud/objectstore/shell"
+	"yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
@@ -31,6 +35,7 @@ type BaseOptions struct {
 	AccessUrl  string `help:"Access url" default:"$S3_ACCESS_URL"`
 	AccessKey  string `help:"Access key" default:"$S3_ACCESS_KEY"`
 	Secret     string `help:"Secret" default:"$S3_SECRET"`
+	Backend    string `help:"Backend driver" default:"$S3_BACKEND"`
 	SUBCOMMAND string `help:"s3cli subcommand" subcommand:"true"`
 }
 
@@ -75,7 +80,7 @@ func showErrorAndExit(e error) {
 	os.Exit(1)
 }
 
-func newClient(options *BaseOptions) (*objectstore.SObjectStoreClient, error) {
+func newClient(options *BaseOptions) (cloudprovider.ICloudRegion, error) {
 	if len(options.AccessUrl) == 0 {
 		return nil, fmt.Errorf("Missing accessUrl")
 	}
@@ -88,6 +93,11 @@ func newClient(options *BaseOptions) (*objectstore.SObjectStoreClient, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
+	if options.Backend == api.CLOUD_PROVIDER_CEPH {
+		return ceph.NewCephRados("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
+	} else if options.Backend == api.CLOUD_PROVIDER_XSKY {
+		return xsky.NewXskyClient("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
+	}
 	return objectstore.NewObjectStoreClient("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
 }
 
@@ -116,7 +126,7 @@ func main() {
 			if options.SUBCOMMAND == "help" {
 				e = subcmd.Invoke(suboptions)
 			} else {
-				var client *objectstore.SObjectStoreClient
+				var client cloudprovider.ICloudRegion
 				client, e = newClient(options)
 				if e != nil {
 					showErrorAndExit(e)

cmd/ucloudcli/main.go

@@ -17,10 +17,10 @@ package main
 import (
 	"fmt"
 	"os"
-	"yunion.io/x/onecloud/pkg/multicloud/ucloud"
 
 	"yunion.io/x/structarg"
 
+	"yunion.io/x/onecloud/pkg/multicloud/ucloud"
 	_ "yunion.io/x/onecloud/pkg/multicloud/ucloud/shell"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )

docs/bucket/access.yaml

@@ -0,0 +1,11 @@
+get:
+  summary: 获取存储桶的后端访问信息，例如ceph RADOS的endpint/ak/sk信息等
+  parameters:
+    - $ref: '../parameters/bucket.yaml#/bucket_name'
+  responses:
+    200:
+      description: 指定存储桶访问信息
+      schema:
+        $ref: "../schemas/bucket.yaml#/BucketAccessInfoResponse"
+  tags:
+    - buckets

docs/identity/group_join.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 将组以多个角色加入多个项目
+  parameters:
+    - $ref: '../parameters/group.yaml#/group_id'
+    - name: group
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectJoinRequestInput"
+  responses:
+    200:
+      description: 组信息
+      schema:
+        $ref: "../schemas/group.yaml#/GroupGetResponse"
+  tags:
+    - groups

docs/identity/group_leave.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 将组的多个角色从多个项目中删除
+  parameters:
+    - $ref: '../parameters/group.yaml#/group_id'
+    - name: group
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectLeaveRequestInput"
+  responses:
+    200:
+      description: 组信息
+      schema:
+        $ref: "../schemas/group.yaml#/GroupGetResponse"
+  tags:
+    - groups

docs/identity/project_join.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 将多个用户和组以多个角色加入指定项目
+  parameters:
+    - $ref: '../parameters/project.yaml#/project_id'
+    - name: project
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectJoinUserGroupRequestInput"
+  responses:
+    200:
+      description: 项目信息
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectGetResponse"
+  tags:
+    - projects

docs/identity/project_leave.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 将多个用户和组以多个角色从指定项目删除
+  parameters:
+    - $ref: '../parameters/project.yaml#/project_id'
+    - name: project
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectRemoveUserGroupRequestInput"
+  responses:
+    200:
+      description: 项目信息
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectGetResponse"
+  tags:
+    - projects

docs/identity/projectgrouprole.yaml

@@ -1,4 +1,5 @@
 put:
+  deprecated: true
   summary: 将组以指定角色加入项目
   parameters:
     - $ref: '../parameters/identity.yaml#/project_id'
@@ -11,6 +12,7 @@ put:
     - roles
 
 delete:
+  deprecated: true
   summary: 将组在项目中的角色删除
   parameters:
     - $ref: '../parameters/identity.yaml#/project_id'

docs/identity/projectuserrole.yaml

@@ -1,4 +1,5 @@
 put:
+  deprecated: true
   summary: 将用户以指定角色加入项目
   parameters:
     - $ref: '../parameters/identity.yaml#/project_id'
@@ -11,6 +12,7 @@ put:
     - roles
 
 delete:
+  deprecated: true
   summary: 将用户在项目中的角色删除
   parameters:
     - $ref: '../parameters/identity.yaml#/project_id'

docs/identity/user_join.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 将用户以多个角色加入多个项目
+  parameters:
+    - $ref: '../parameters/user.yaml#/user_id'
+    - name: user
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectJoinRequestInput"
+  responses:
+    200:
+      description: 用户信息
+      schema:
+        $ref: "../schemas/user.yaml#/UserGetResponse"
+  tags:
+    - users

docs/identity/user_leave.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 将用户的多个角色从多个项目中删除
+  parameters:
+    - $ref: '../parameters/user.yaml#/user_id'
+    - name: user
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/project.yaml#/ProjectLeaveRequestInput"
+  responses:
+    200:
+      description: 用户信息
+      schema:
+        $ref: "../schemas/user.yaml#/UserGetResponse"
+  tags:
+    - users

docs/index.yaml

@@ -165,6 +165,8 @@ paths:
     $ref: "./instance/user-data.yaml"
   /servers/{instanceId}/vnc:
     $ref: "./instance/vnc.yaml"
+  /servers/{instanceId}/io-throttle:
+    $ref: "./instance/io-throttle.yaml"
 
   /images:
     $ref: "./image/images.yaml"
@@ -177,6 +179,10 @@ paths:
     $ref: "./natgateway/natgateways.yaml"
   /natgateways/{natgatewayId}:
     $ref: "./natgateway/natgateway.yaml"
+  /natgateways/{natgatewayId}/dnat-resources:
+    $ref: "./natgateway/dnat-resources.yaml"
+  /natgateways/{natgatewayId}/snat-resources:
+    $ref: "./natgateway/snat-resources.yaml"
   /natdentries:
     $ref: "./natgateway/dnatentries.yaml"
   /natdentries/{dnatentryId}:
@@ -186,20 +192,37 @@ paths:
   /natsentries/{snatentryId}:
     $ref: "./natgateway/snatentry.yaml"
 
+  /snapshotpolicies:
+    $ref: "./snapshotpolicy/snapshotpolicies.yaml"
+  /snapshotpolicies/{snapshotpolicyId}:
+    $ref: "./snapshotpolicy/snapshotpolicy.yaml"
+  /disks/{disk_id}/snapshotpolicies:
+    $ref: "./snapshotpolicy/snapshotpolicydisk.yaml"
+  /snapshotpolicies/{snapshotpolicy_id}/disks:
+    $ref: "./snapshotpolicy/snapshotpolicydisk2.yaml"
+  /disks/{disk_id}/snapshotpolicies/{snapshotpolicy_id}:
+    $ref: "./snapshotpolicy/snapshotpolicydisk3.yaml"
+  /snapshotpolicies/{snapshotpolicyId}/bind-disks:
+    $ref: "./snapshotpolicy/bind-disk.yaml"
+  /snapshotpolicies/{snapshotpolicyId}/unbind-disks:
+    $ref: "./snapshotpolicy/unbind-disk.yaml"
+  /snapshotpolicies/{snapshotpolicyId}/cache:
+    $ref: "./snapshotpolicy/cache.yaml"
+
   /loadbalancers:
     $ref: "./loadbalancer/loadbalancers.yaml"
   /loadbalancers/{loadbalancerId}:
     $ref: "./loadbalancer/loadbalancer.yaml"
 
   /cached_loadbalancer_acls:
-    $ref: "./loadbalancer/loadbalancercachedacl.yaml"
-  /cached_loadbalancer_acls/{loadbalancerlistenerId}:
     $ref: "./loadbalancer/loadbalancercachedacls.yaml"
+  /cached_loadbalancer_acls/{loadbalancercachedaclId}:
+    $ref: "./loadbalancer/loadbalancercachedacl.yaml"
 
   /cached_loadbalancercertificates:
+    $ref: "./loadbalancer/loadbalancercachedcertificates.yaml"
+  /cached_loadbalancercertificates/{loadbalancercachedcertificateId}:
     $ref: "./loadbalancer/loadbalancercachedcertificate.yaml"
-  /cached_loadbalancercertificates/{loadbalancerlistenerId}:
-    $ref: "./loadbalancer/loadbalancercachedcertificates.yaml"  
 
   /loadbalancerlisteners:
     $ref: "./loadbalancer/loadbalancerlisteners.yaml"
@@ -227,14 +250,22 @@ paths:
     $ref: "./identity/domain.yaml"
 
   /users:
-    $ref: "./identity/users.yaml" 
+    $ref: "./identity/users.yaml"
   /users/{user_id}:
-    $ref: "./identity/user.yaml" 
+    $ref: "./identity/user.yaml"
+  /users/{user_id}/join:
+    $ref: "./identity/user_join.yaml"
+  /users/{user_id}/leave:
+    $ref: "./identity/user_leave.yaml"
 
   /groups:
     $ref: "./identity/groups.yaml"
   /groups/{group_id}:
     $ref: "./identity/group.yaml"
+  /groups/{group_id}/join:
+    $ref: "./identity/group_join.yaml"
+  /groups/{group_id}/leave:
+    $ref: "./identity/group_leave.yaml"
   /groups/{group_id}/users/{user_id}:
     $ref: "./identity/groupuser.yaml"
 
@@ -242,6 +273,10 @@ paths:
     $ref: "./identity/projects.yaml"
   /projects/{project_id}:
     $ref: "./identity/project.yaml"
+  /projects/{project_id}/join:
+    $ref: "./identity/project_join.yaml"
+  /projects/{project_id}/leave:
+    $ref: "./identity/project_leave.yaml"
 
   /roles:
     $ref: "./identity/roles.yaml"
@@ -307,7 +342,6 @@ paths:
   /networkinterfaces/{networkinterfaceId}/networks:
     $ref: "./networkinterface/networks.yaml"
 
-
   /buckets:
     $ref: "./bucket/buckets.yaml"
   /buckets/{bucketName}:
@@ -324,6 +358,10 @@ paths:
     $ref: "./bucket/tempurl.yaml"
   /buckets/{bucketName}/acl:
     $ref: "./bucket/acl.yaml"
+  /buckets/{bucketName}/limit:
+    $ref: "./bucket/limit.yaml"
+  /buckets/{bucketName}/access-info:
+    $ref: "./bucket/access.yaml"
 
   /dbinstances:
     $ref: "./dbinstance/dbinstances.yaml"

docs/instance/io-throttle.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 虚拟机磁盘IO限速
+  parameters: 
+    - $ref: '../parameters/instance.yaml#/instanceId'
+    - in: body
+      name: server
+      required: true
+      schema:
+        $ref: '../schemas/instance.yaml#/InstanceIoThrottle' 
+  responses:
+    200:
+      description: 实例信息
+      schema:
+        $ref: '../schemas/instance.yaml#/InstanceResponse'
+  tags:
+    - instance

docs/loadbalancer/loadbalancercachedacls.yaml

@@ -8,4 +8,18 @@ get:
       schema:
         $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedAclListResponse"
   tags:
-    - loadbalanceracls
+    - loadbalanceracls
+post:
+  summary: 同步ACL到指定公有云
+  parameters:
+    - name: cachedloadbalanceracl
+      in: body
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedAclCreateRequest"
+  responses:
+    200:
+      description: 新创建的公有云ACL
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedAclResponse"
+  tags:
+    - loadbalanceracls

docs/loadbalancer/loadbalancercachedcertificate.yaml

@@ -18,4 +18,4 @@ delete:
       schema:
         $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedCertificateResponse"
   tags:
-    - loadbalancercertificates
+    - loadbalancercertificates

docs/loadbalancer/loadbalancercachedcertificates.yaml

@@ -8,4 +8,18 @@ get:
       schema:
         $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedCertificateListResponse"
   tags:
-    - loadbalancercertificates
+    - loadbalancercertificates
+post:
+  summary: 同步SSL证书到指定公有云
+  parameters:
+    - name: cachedloadbalancercertificate
+      in: body
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedCertificateCreateRequest"
+  responses:
+    200:
+      description: 新创建的公有云SSL证书
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedCertificateResponse"
+  tags:
+    - loadbalancercertificates

docs/natgateway/dnat-resources.yaml

@@ -0,0 +1,13 @@
+post:
+  summary: NAT网关下DNAT规则EIP的集合
+  parameters:
+    - $ref: "../parameters/natgateway.yaml#/natgatewayId"
+  responses:
+    200:
+      description: DNAT规则EIP集合
+      schema:
+        - $ref: "../schemas/natgateway.yaml#/DNATResources"
+  tags:
+    - natgateway
+
+

docs/natgateway/dnatentries.yaml

@@ -3,9 +3,7 @@ get:
   parameters:
     - $ref: "../parameters/common.yaml#/offset"
     - $ref: "../parameters/common.yaml#/limit"
-    - $ref: "../parameters/common.yaml#/provider"
     - $ref: "../parameters/common.yaml#/account"
-    - $ref: "../parameters/common.yaml#/cloudprovider"
     - $ref: "../parameters/common.yaml#/brand"
 
     - $ref: "../parameters/natgateway.yaml#/natgateway"

docs/natgateway/snat-resources.yaml

@@ -0,0 +1,11 @@
+post:
+  summary: NAT网关下SNAT规则EIP的集合
+  parameters:
+    - $ref: "../parameters/natgateway.yaml#/natgatewayId"
+  responses:
+    200:
+      description: SNAT规则EIP集合
+      schema:
+        - $ref: "../schemas/natgateway.yaml#/SNATResources"
+  tags:
+    - natgateway

docs/natgateway/snatentries.yaml

@@ -4,11 +4,8 @@ get:
     - $ref: "../parameters/common.yaml#/limit"
     - $ref: "../parameters/common.yaml#/offset"
     - $ref: "../parameters/common.yaml#/network"
-    - $ref: "../parameters/common.yaml#/provider"
     - $ref: "../parameters/common.yaml#/account"
-    - $ref: "../parameters/common.yaml#/cloudprovider"
     - $ref: "../parameters/common.yaml#/brand"
-
     - $ref: "../parameters/natgateway.yaml#/natgateway"
 
   responses:

docs/parameters/disk.yaml

@@ -0,0 +1,57 @@
+diskId:
+  name: diskId
+  required: true
+  in: path
+  type: string
+  description: 磁盘名称或ID
+unused:
+  name: unused
+  required: false
+  in: query
+  type: boolean
+  description: 列出未挂载磁盘
+share:
+  name: share
+  required: false
+  in: query
+  type: boolean
+  description: 列出共享磁盘
+local:
+  name: local
+  required: false
+  in: query
+  type: boolean
+  description: 列出本地磁盘
+guest:
+  name: guest
+  required: false
+  in: query
+  type: string
+  description: 列出改虚拟机的磁盘
+storage:
+  name: storage
+  required: false
+  in: query
+  type: string
+  description: 列出改存储的磁盘
+type:
+  name: type
+  required: false
+  in: query
+  type: string
+  enum: [sys,data,swap,volume]
+  description: 列出改类型的磁盘
+cloud_type:
+  name: cloud_type
+  required: false
+  in: query
+  type: string
+  enum: [Public,Private]
+  description: 列出公有云或私有云的磁盘
+snapshotpolicy_id:
+  name: snapshotpolicy_id
+  required: false
+  in: query
+  type: string
+  description: 列出绑定了此快照策略的磁盘
+

docs/parameters/serversku.yaml

@@ -18,4 +18,5 @@ usable:
   name: usable
   in: query
   type: boolean
-  description: 过滤所在region底下有ip子网的套餐
+  description: 过滤所在region底下有ip子网的套餐
+

docs/parameters/snapshotpolicy.yaml

@@ -0,0 +1,28 @@
+snapshotpolicyId:
+  name: snapshotpolicyId
+  required: true
+  in: path
+  description: 自动快照策略的ID
+diskId:
+  name: diskId
+  in: path
+  description: 磁盘的ID
+retention_days:
+  name: retention_days
+  in: query
+  type: integer
+  description: 快照的保存时间（永久保存选-1）
+repeat_weekdays:
+  name: repeat_weekdays
+  in: query
+  type: array
+  items:
+    type: integer
+  description: 做快照的时间（周几）
+time_points:
+  name: time_points
+  in: query
+  type: array
+  items:
+    type: integer
+  description: 做快照的时间（每天几点）

docs/schemas/auth.yaml

@@ -260,11 +260,37 @@ TokenV3:
         $ref: './roleassignments.yaml#/DomainObject'
     user:
       type: object
-      $ref: './roleassignments.yaml#/DomainObject'
+      properties:
+        id:
+          type: string
+          description: 用户ID
+        name:
+          type: string
+          description: 用户名称
+        displayname:  
+          type: string
+          description: 用户显示名称
+        email:
+          type: string
+          description: 用户的电子邮箱
+        mobile:
+          type: string
+          description: 用户的手机号
+        domain:
+          type: object
+          description: 资源归属的域信息
+          $ref: './roleassignments.yaml#/Domain'
+    policies:
+      type: object
+      $ref: './roleassignments.yaml#/PolicyObject'
     projects:
       type: array
       items:
         $ref: './roleassignments.yaml#/DomainObject'
+    role_assignments:
+      type: array
+      items:
+        $ref: './roleassignments.yaml#/RoleAssignment'
     catalog:
       type: array
       items:

docs/schemas/bucket.yaml

@@ -206,3 +206,24 @@ BucketSetACLInput:
       key:
         type: string
         description: 如果设置对象的ACL，则此字段指定对象的key
+
+BucketSetLimitInput:
+  type: object
+  properties:
+    limit:
+      type: object
+      description: 桶的存储限制
+      properties:
+        size_bytes:
+          type: integer
+          description: 容量上限，为0则无限制
+        object_count:
+          type: integer
+          description: 对象数量限制，为0则无限制
+
+BucketAccessInfoResponse:
+  type: object
+  properties:
+    bucket:
+      type: object
+      description: 桶的后端访问信息，例如ceph RADOS的endpoint/access_key/secret信息等。具体形式由存储后端决定。

docs/schemas/instance.yaml

@@ -114,6 +114,17 @@ InstanceAddSecgroup:
       example: 38dc8e80-14e5-4629-81c1-3847320ae821
       description: 待绑定的安全组名称或ID
 
+InstanceIoThrottle:
+  type: object
+  properties:
+    iops:
+      type: integer
+      example: 1000
+      description: 最高iops
+    bps:
+      type: integer
+      example: 1000
+      description: 最高bps，单位MB
 
 InstanceRevokeSecgroup:
   type: object
@@ -641,6 +652,13 @@ InstanceCreate:
       type: array
       items:
         $ref: '#/InstanceDisk'
+    secgroups:
+      type: array
+      description: 安全组列表
+      items:
+        type: string
+        example: default
+        description: 安全组名称或ID,建议使用ID
 
 
 InstanceDisk:

docs/schemas/loadbalancer.yaml

@@ -89,13 +89,13 @@ LoadbalancerListResponse:
     loadbalancers:
       type: array
       items:
-        $ref: '#/Loadbalancer'
+        $ref: "#/Loadbalancer"
 LoadbalancerResponse:
   type: object
   properties:
     loadbalancer:
       type: object
-      $ref: '#/Loadbalancer'
+      $ref: "#/Loadbalancer"
 
 LoadbalancerListenerCreateRequest:
   type: object
@@ -137,13 +137,13 @@ LoadbalancerListenerListResponse:
     loadbalancerlisteners:
       type: array
       items:
-        $ref: '#/LoadbalancerListener'
+        $ref: "#/LoadbalancerListener"
 LoadbalancerListenerResponse:
   type: object
   properties:
     loadbalancerlistener:
       type: object
-      $ref: '#/LoadbalancerListener'
+      $ref: "#/LoadbalancerListener"
 
 LoadbalancerBackendGroupListResponse:
   type: object
@@ -151,13 +151,13 @@ LoadbalancerBackendGroupListResponse:
     loadbalancerbackendgroups:
       type: array
       items:
-        $ref: '#/LoadbalancerBackendGroup'
+        $ref: "#/LoadbalancerBackendGroup"
 LoadbalancerBackendGroupResponse:
   type: object
   properties:
     loadbalancerbackendgroup:
       type: object
-      $ref: '#/LoadbalancerBackendGroup'
+      $ref: "#/LoadbalancerBackendGroup"
 
 LoadbalancerBackendCreateRequest:
   type: object
@@ -202,13 +202,13 @@ LoadbalancerBackendListResponse:
     loadbalancerbackends:
       type: array
       items:
-        $ref: '#/LoadbalancerBackend'
+        $ref: "#/LoadbalancerBackend"
 LoadbalancerBackendResponse:
   type: object
   properties:
     loadbalancerbackend:
       type: object
-      $ref: '#/LoadbalancerBackend'
+      $ref: "#/LoadbalancerBackend"
 
 LoadbalancerAclEntry:
   type: object
@@ -221,15 +221,36 @@ LoadbalancerAclEntry:
     comment:
       type: string
       description: 注释
-      readOnly: true  
+      readOnly: true
 
 LoadbalancerAclEntries:
   type: array
   items:
-    $ref: '#/LoadbalancerAclEntry'
-
+    $ref: "#/LoadbalancerAclEntry"
+LoadbalancerCachedAclCreateRequest:
+  type: object
+  properties:
+    cachedloadbalanceracl:
+      type: object
+      required:
+        - cloudregion
+        - cloudprovider
+        - acl
+      properties:
+        cloudregion:
+          type: string
+          description: 指定公有云region
+        cloudprovider:
+          type: string
+          description: 指定云账号订阅ID
+        acl:
+          type: string
+          description: 指定需要同步的ACL ID
+        listener:
+          type: string
+          description: 指定负载均衡监听器ID，华为云必须指定该参数。
 LoadbalancerCachedAcl:
-    allOf:
+  allOf:
     - $ref: "./common.yaml#/SharableVirtualResourceBaseResponse"
     - $ref: "./common.yaml#/ExternalizedResourceBaseResponse"
     - type: object
@@ -238,10 +259,10 @@ LoadbalancerCachedAcl:
           type: string
           description: 所属的本地访问控制uuid
         acl_entries:
-            $ref: "#/LoadbalancerAclEntries"
+          $ref: "#/LoadbalancerAclEntries"
 
 LoadbalancerCachedAclResponse:
-    $ref: "#/LoadbalancerCachedAcl"
+  $ref: "#/LoadbalancerCachedAcl"
 
 LoadbalancerCachedAclListResponse:
   type: object
@@ -251,8 +272,28 @@ LoadbalancerCachedAclListResponse:
       items:
         $ref: "#/LoadbalancerCachedAcl"
 
+LoadbalancerCachedCertificateCreateRequest:
+  type: object
+  properties:
+    cachedloadbalancercertificate:
+      type: object
+      required:
+        - cloudregion
+        - cloudprovider
+        - certificate
+      properties:
+        cloudregion:
+          type: string
+          description: 指定公有云region
+        cloudprovider:
+          type: string
+          description: 指定云账号订阅ID
+        certificate:
+          type: string
+          description: 指定需要同步的SSL证书 ID
+
 LoadbalancerCachedCertificateResponse:
-    allOf:
+  allOf:
     - $ref: "./common.yaml#/SharableVirtualResourceBaseResponse"
     - $ref: "./common.yaml#/ExternalizedResourceBaseResponse"
     - type: object
@@ -273,11 +314,11 @@ LoadbalancerCachedCertificateResponse:
         publicKey_bitLen:
           type: int
           description: 公钥长度
-          readOnly: true  
+          readOnly: true
         signature_algorithm:
           type: string
           description: 签名算法
-          readOnly: true  
+          readOnly: true
         fingerprint:
           type: string
           example: sha1:da:39:a3:ee:5e:6b:4b:0d:32:55:bf:ef:95:60:18:90:af:d8:07:09
@@ -287,22 +328,22 @@ LoadbalancerCachedCertificateResponse:
           type: string
           example: 2019-05-23T11:50:33.000000Z
           description: 最早生效时间
-          readOnly: true  
+          readOnly: true
         not_after:
           type: string
           example: 2020-05-23T11:50:33.000000Z
           description: 失效时间
-          readOnly: true  
+          readOnly: true
         common_name:
           type: string
           example: www.onecloud.com
           description: 域名
-          readOnly: true  
+          readOnly: true
         subject_alternative_names:
           type: string
-          example: ''
+          example: ""
           description: 附加域名
-          readOnly: true             
+          readOnly: true
 
 LoadbalancerCachedCertificateListResponse:
   type: object
@@ -310,4 +351,4 @@ LoadbalancerCachedCertificateListResponse:
     cached_loadbalancercertificates:
       type: array
       items:
-        $ref: "#/LoadbalancerCachedCertificateResponse"        
+        $ref: "#/LoadbalancerCachedCertificateResponse"

docs/schemas/natgateway.yaml

@@ -51,7 +51,7 @@ NatGateway:
     nat_spec:
       type: string
       description: NAT网关规格
-      example: Small
+      example: small
     region:
       type: string
       description: 所属的区域
@@ -154,8 +154,8 @@ DNatEntry:
       example: tcp
     name:
       type: string
-      description: DNAT名称
-      example: 111.230.80.43/udp/32
+      description: DNAT名称(处理过的)
+      example: hello-ea27c0ce-5870-49f3-8d57-f53e63f40361
     natgateway:
       type: string
       description: 所属NAT网关名称
@@ -168,6 +168,10 @@ DNatEntry:
       type: string
       description: DNAT状态
       example: available
+    real_name:
+      type: string
+      description: DNAT真实的名称
+      example: hello
 
 DNatEntryListResponse:
   type: object
@@ -215,7 +219,8 @@ SNatEntry:
       description: 公网IP
     name:
       type: string
-      example: snat-2zeqqfcow4t67ahduei7x
+      description: SNAT名称（经过处理的）
+      example: hello-ea27c0ce-5870-49f3-8d57-f53e63f40361
     natgateway:
       type: string
       example: test-nat
@@ -225,9 +230,7 @@ SNatEntry:
       example: 4daf9886-ebe6-4a8a-8082-3bd623d1c857
       description: 所属NAT网关ID
     network:
-      type: string
-      example: test-network
-      description: 所属子网名称
+      $ref: 'network.yaml#/Network'
     network_id:
       type: string
       example: 7caf732e-93fc-42c0-89d2-86aac2970c38
@@ -240,6 +243,10 @@ SNatEntry:
       type: string
       example: available
       description: SNAT状态
+    real_name:
+      type: string
+      example: hello
+      description: SNAT真实的名称
 
 SNatEntryListResponse:
   type: object
@@ -335,7 +342,7 @@ SNatEntryCreate:
         network_id:
           type: string
           example: 648a6baa-9827-49b1-8831-278a889154a1
-          description: 所属网络ID
+          description: 所属网络ID(与source_cidr互斥，只需要传入一个)
         ip:
           type: string
           example: 49.4.12.184
@@ -343,8 +350,31 @@ SNatEntryCreate:
         external_ip_id:
           type: string
           example: ""
-          description: 公网IP对应的ID，除了华为云，可以为空
+          description: 公网IP对应的ID
         source_cidr:
           type: string
           example: 192.168.1.0/24
-          description: 映射到公网IP的内网网段
+          description: 映射到公网IP的内网网段(和network_id互斥，只需要传入一个）
+
+DNATResources:
+  type: object
+  properties:
+    eips:
+      type: array
+      items:
+        type: string
+      example: [34.23.125.45, 23.45.123.56]
+
+SNATResources:
+  type: object
+  properties:
+    eips:
+      type: array
+      items:
+        type: string
+      example: [34.23.125.45, 23.45.123.56]
+    networks:
+      type: array
+      items:
+        type: string
+      example: []

docs/schemas/networkinterfacenetwork.yaml

@@ -5,6 +5,10 @@ NetworkinterfaceNetwork:
       type: string
       example: "192.168.0.240"
       description: 弹性网卡IP地址
+    network:
+      type: string 
+      example: test-network 
+      description: 子网名称
     network_id:
       type: string
       example: 19b09a31-1884-4b3f-84cd-ac03827c567d
@@ -38,4 +42,4 @@ NetworkinterfaceResponse:
   properties:
     networkinterfacenetwork:
       type: object
-      $ref: '#/NetworkinterfaceNetwork'
+      $ref: '#/NetworkinterfaceNetwork'

docs/schemas/project.yaml

@@ -57,3 +57,84 @@ Project:
     can_delete:
       type: boolean
       description: 是否可以删除
+
+ProjectJoinRequestInput:
+  type: object
+  description: 用户或组批量加入项目的请求body
+  properties:
+    projects:
+      type: array
+      description: 项目列表
+      items:
+        type: string
+    roles:
+      type: array
+      description: 角色列表
+      items:
+        type: string
+
+ProjectLeaveRequestInput:
+  type: object
+  description: 用户或组批量移除项目的请求body
+  properties:
+    project_roles:
+      type: array
+      description: 移除的项目和角色列表
+      items:
+        type: object
+        properties:
+          project:
+            type: string
+            description: 项目ID或名称
+          role:
+            type: string
+            description: 角色ID或名称
+
+ProjectJoinUserGroupRequestInput:
+  type: object
+  description: 将多个用户或组批量加入指定项目的请求body
+  properties:
+    users:
+      type: array
+      description: 加入的用户列表
+      items:
+        type: string
+    groups:
+      type: array
+      description: 加入的组列表
+      items:
+        type: string
+    roles:
+      type: array
+      description: 加入的角色列表
+      items:
+        type: string
+
+ProjectRemoveUserGroupRequestInput:
+  type: object
+  description: 将多个用户或组从指定项目移除的请求body
+  properties:
+    user_roles:
+      type: array
+      description: 用户和角色列表
+      items:
+        type: object
+        properties:
+          user:
+            type: string
+            description: 用户ID或名称
+          role:
+            type: string
+            description: 角色ID或名称
+    group_roles:
+      type: array
+      description: 组和角色列表
+      items:
+        type: object
+        properties:
+          group:
+            type: string
+            description: 组ID或名称
+          role:
+            type: string
+            description: 角色ID或名称

docs/schemas/roleassignments.yaml

@@ -13,7 +13,7 @@ RoleAssignmentListResponse:
     role_assignments:
       type: array
       items:
-        $ref: "#/RoleAssignment"
+        $ref: "./roleassignments.yaml#/RoleAssignment"
 
 RoleAssignment:
   type: object
@@ -22,35 +22,42 @@ RoleAssignment:
     scope:
       type: object
       description: 角色分配的范围
-      $ref: '#/Scope'
+      $ref: './roleassignments.yaml#/Scope'
     user:
       type: object
       description: 角色分配的用户
-      $ref: '#/DomainObject'
+      $ref: './roleassignments.yaml#/DomainObject'
     group:
       type: object
       description: 角色分配的组
-      $ref: '#/DomainObject'
+      $ref: './roleassignments.yaml#/DomainObject'
     role:
       type: object
       description: 角色
-      $ref: '#/DomainObject'
+      $ref: './roleassignments.yaml#/DomainObject'
     policies:
       type: object
       description: 匹配的权限列表
-      properties:
-        project:
-          type: array
-          items:
-            type: string
-        domain:
-          type: array
-          items:
-            type: string
-        system:
-          type: array
-          items:
-            type: string
+      $ref: './roleassignments.yaml#/PolicyObject'
+
+
+PolicyObject:
+  type: object
+  description: 匹配的权限列表
+  properties:
+    project:
+      type: array
+      items:
+        type: string
+    domain:
+      type: array
+      items:
+        type: string
+    system:
+      type: array
+      items:
+        type: string
+
 
 Scope:
   type: object

docs/schemas/snapshotpolicy.yaml

@@ -0,0 +1,206 @@
+CanDelete:
+  type: string
+  example: true
+  description: 可否删除
+CanUpdate:
+  type: string
+  example: false
+  description: 可否更新
+CreatedAt:
+  type: string
+  example: 2019-05-30T08:46:12.000000Z
+  description: 资源创建时间
+UpdatedAt:
+  type: string
+  example: 2019-05-30T08:46:12.000000Z
+  description: 资源最近一次更新时间
+
+SnapshotPolicy:
+  type: object
+  description: 自动快照策略
+  properties:
+    id:
+      type: string
+      example: ea27c0ce-5870-49f3-8d57-f53e63f40361
+      description: 自动快照策略ID
+      readOnly: true
+    name:
+      type: string
+      description: 自动快照策略名称
+      example: snapshotpolicy-jo5pskhg
+    retention_days:
+      type: integer
+      example: 10
+      description: 快照保存的时间(-1为永久保存)
+    repeat_weekdays:
+      type: array
+      items:
+        type: integer
+      example: [1, 2]
+      description: 做快照的时间(每周的周几)
+    time_points:
+      type: array
+      items:
+        type: integer
+      example: [2]
+      description: 做快照的时间(每天的几点)
+    is_activated:
+      type: boolean
+      example: true
+      description: 是否启用快照策略
+    binding_disk_count:
+      type: integer
+      example: 3
+      description: 自动快照策略绑定的磁盘数量
+    can_delete:
+      $ref: '#/CanDelete'
+    can_update:
+      $ref: '#/CanUpdate'
+    created_at:
+      $ref: '#/CreatedAt'
+    updated_at:
+      $ref: '#/UpdatedAt'
+    is_emulated:
+      type: boolean
+      example: false
+      description: 是否是虚拟出来的实例
+    status:
+      type: string
+      example: init
+      description: 状态
+    update_version:
+      type: integer
+      example: 2
+      description: 资源被更新的次数
+
+SnapshotPolicyCreate:
+  type: object
+  properties:
+    snapshotpolicy:
+      type: object
+      required:
+        - name
+        - retention_days
+        - repeat_weekdays
+        - time_points
+        - is_activated
+      properties:
+        name:
+          type: string
+          example: snapshotpolicy-jo5pskhg
+          description: 自动快照策略名称
+        retention_days:
+          type: integer
+          example: 10
+          description: 快照保存的时间(-1为永久保存)
+        repeat_weekdays:
+          type: array
+          items:
+            type: integer
+          example: [1, 2]
+          description: 做快照的时间(每周的周几)
+        time_points:
+          type: array
+          items:
+            type: integer
+          example: [2]
+          description: 做快照的时间(每天的几点)
+        is_activated:
+          type: boolean
+          example: true
+          description: 是否启用快照策略
+
+SnapshotPolicyListResponse:
+  type: object
+  properties:
+    limit:
+      type: integer
+      example: 20
+    total:
+      type: integer
+      example: 12
+    snapshotpolicies:
+      type: array
+      items:
+        $ref: '#/SnapshotPolicy'
+
+
+SnapshotPolicyResponse:
+  type: object
+  properties:
+    snapshotpolicy:
+      type: object
+      $ref: '#/SnapshotPolicy'
+
+SnapshotPolicyDisk:
+  type: object
+  properties:
+    can_delete:
+      $ref: '#/CanDelete'
+    can_update:
+      $ref: '#/CanUpdate'
+    created_at:
+      $ref: '#/CreatedAt'
+    updated_at:
+      $ref: '#/UpdatedAt'
+    status:
+      type: string
+      example: init
+      description: 状态
+    snapshotpolicy_id:
+      type: string
+      example: -be8b-4f0f-8885-797930266c6539210785
+      description: 自动快照策略ID
+    disk_id:
+      type: string
+      example: f7749379-34b1-4219-8835-257615cf34f6
+      description: 磁盘ID
+    disk:
+      $ref: 'disk.yaml#/Disk'
+
+SnapshotPolicyDiskResponse:
+  type: object
+  properties:
+    snapshotpolicydisk:
+      type: object
+      $ref: '#/SnapshotPolicyDisk'
+
+SnapshotPolicyDiskListResponse:
+  type: object
+  properties:
+    total:
+      type: integer
+      example: 20
+    snapshotpolicydisks:
+      type: array
+      items:
+        $ref: '#/SnapshotPolicyDisk'
+
+SnapshotPolicyBindDisk:
+  type: object
+  required:
+    - disk.0
+  properties:
+    disk.0:
+      type: string
+      example: vv100455-79ef-43a3-8fc3-23adc74b8b87
+      description: 待绑定的disk的ID
+    disk.1:
+      type: string
+      example: dd100399-79ef-43a3-8fc3-23adc74b8b87
+      description: 待绑定的disk的ID
+
+SnapshotPolicyCache:
+  type: object
+  required:
+    - region_id
+    - provider_id
+  properties:
+    region_id:
+      type: string
+      example: d2ea8591-68b2-4066-802d-c896d1828417
+      description: Region ID
+    provider_id:
+      type: string
+      example: 42fde9ca-8642-4318-8c84-2ead0bdc78d2
+      description: Provider ID

docs/serversku/serverskus.yaml

@@ -32,4 +32,4 @@ post:
         $ref: "../schemas/serversku.yaml#ServerSkuResponse"
 
   tags:
-    - serverskus
+    - serverskus

docs/snapshotpolicy/bind-disk.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 批量绑定磁盘
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+    - in: body
+      name: disks
+      required: true
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyBindDisk'
+  responses:
+    200:
+      description: 自动快照策略
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyResponse'
+  tags:
+    - snapshotpolicy

docs/snapshotpolicy/cache.yaml

@@ -0,0 +1,17 @@
+post:
+  summary: 将本地的自动快照策略同步到云上
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+    - in: body
+      name: snapshotpolicy
+      required: true
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyCache'
+  responses:
+    200:
+      description: 自动快照策略
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyResponse'
+  tags:
+    - snapshotpolicy
+

docs/snapshotpolicy/snapshotpolicies.yaml

@@ -0,0 +1,32 @@
+get:
+  summary:  按指定条件列出快照策略
+  parameters:
+    - $ref: "../parameters/common.yaml#/offset"
+    - $ref: "../parameters/common.yaml#/limit"
+    - $ref: "../parameters/snapshotpolicy.yaml#/retention_days"
+    - $ref: "../parameters/snapshotpolicy.yaml#/repeat_weekdays"
+    - $ref: "../parameters/snapshotpolicy.yaml#/time_points"
+
+  responses:
+    200:
+      description: 快照策略列表信息
+      schema:
+        $ref: "../schemas/snapshotpolicy.yaml#/SnapshotPolicyListResponse"
+  tags:
+    - snapshotpolicy
+
+post:
+  summary: 创建自动快照策略
+  parameters:
+    - in: body
+      name: snapshotpolicy
+      required: true
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyCreate'
+  responses:
+    200:
+      description: 新建自动快照策略的信息
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyResponse'
+  tags:
+    - snapshotpolicy

docs/snapshotpolicy/snapshotpolicy.yaml

@@ -0,0 +1,22 @@
+get:
+  summary: 获取指定自动快照策略信息
+  parameters:
+    - $ref: "../parameters/snapshotpolicy.yaml#/snapshotpolicyId"
+  responses:
+    200:
+      description: 自动快照策略信息
+      schema:
+        $ref: "../schemas/snapshotpolicy.yaml#/SnapshotPolicyResponse"
+  tags:
+    - snapshotpolicy
+
+delete:
+  summary: 删除指定自动快照
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+  responses:
+    200:
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyResponse'
+  tags:
+    - snapshotpolicy

docs/snapshotpolicy/snapshotpolicydisk.yaml

@@ -0,0 +1,11 @@
+get:
+  summary: 列出指定磁盘下所有绑定的自动快照策略
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/diskId'
+  responses:
+    200:
+      description: 自动快照策略ID列表
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyDiskListResponse'
+  tags:
+    - snapshotpolicy

docs/snapshotpolicy/snapshotpolicydisk2.yaml

@@ -0,0 +1,11 @@
+get:
+  summary: 列出指定自动快照策略所有绑定的磁盘
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+  responses:
+    200:
+      description: 自动快照策略ID列表
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyDiskListResponse'
+  tags:
+    - snapshotpolicy

docs/snapshotpolicy/snapshotpolicydisk3.yaml

@@ -0,0 +1,23 @@
+post:
+  summary: 绑定指定磁盘和自动快照策略
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/diskId'
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+  responses:
+    200:
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyDiskResponse'
+  tags:
+    - snapshotpolicy
+
+delete:
+  summary: 解绑指定磁盘和自动快照策略
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/diskId'
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+  responses:
+    200:
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyDiskResponse'
+  tags:
+    - snapshotpolicy

docs/snapshotpolicy/unbind-disk.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 批量解绑磁盘
+  parameters:
+    - $ref: '../parameters/snapshotpolicy.yaml#/snapshotpolicyId'
+    - in: body
+      name: disks
+      required: true
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyBindDisk'
+  responses:
+    200:
+      description: 自动快照策略
+      schema:
+        $ref: '../schemas/snapshotpolicy.yaml#/SnapshotPolicyResponse'
+  tags:
+    - snapshotpolicy

go.mod

@@ -4,7 +4,7 @@ go 1.12
 
 require (
 	github.com/360EntSecGroup-Skylar/excelize v1.4.0
-	github.com/Azure/azure-sdk-for-go v19.1.0+incompatible
+	github.com/Azure/azure-sdk-for-go v36.1.0+incompatible
 	github.com/Azure/go-autorest v10.15.5+incompatible
 	github.com/DataDog/dd-trace-go v0.6.1 // indirect
 	github.com/DataDog/zstd v1.3.4 // indirect
@@ -27,13 +27,10 @@ require (
 	github.com/c-bata/go-prompt v0.2.1
 	github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94
 	github.com/coredns/coredns v1.3.0
-	github.com/coreos/bbolt v1.3.3 // indirect
-	github.com/coreos/etcd v3.3.10+incompatible // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/denisenkom/go-mssqldb v0.0.0-20190806190131-db2462fef53b // indirect
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
 	github.com/dimchansky/utfbom v1.1.0 // indirect
 	github.com/dnaeon/go-vcr v1.0.1 // indirect
 	github.com/dnstap/golang-dnstap v0.0.0-20170829151710-2cf77a2b5e11 // indirect
@@ -56,10 +53,7 @@ require (
 	github.com/golang-plus/testing v1.0.0 // indirect
 	github.com/golang-plus/uuid v1.0.0
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
-	github.com/golang/protobuf v1.3.1
-	github.com/google/btree v1.0.0 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
+	github.com/golang/protobuf v1.3.2
 	github.com/google/gopacket v1.1.17
 	github.com/google/uuid v1.1.0 // indirect
 	github.com/googleapis/gnostic v0.2.0 // indirect
@@ -69,9 +63,6 @@ require (
 	github.com/gorilla/websocket v1.4.0
 	github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282
 	github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
-	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.9.2 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/hako/durafmt v0.0.0-20180520121703-7b7ae1e72ead
 	github.com/huandu/xstrings v1.2.0 // indirect
@@ -79,13 +70,10 @@ require (
 	github.com/jinzhu/gorm v1.9.1
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.0.1 // indirect
-	github.com/jonboulle/clockwork v0.1.0 // indirect
-	github.com/json-iterator/go v1.1.5 // indirect
 	github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c
 	github.com/kr/pty v1.1.3
 	github.com/lib/pq v1.2.0 // indirect
 	github.com/libvirt/libvirt-go-xml v5.2.0+incompatible
-	github.com/marstr/guid v1.1.0 // indirect
 	github.com/mattn/go-runewidth v0.0.4 // indirect
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/mattn/go-tty v0.0.0-20181127064339-e4f871175a2f // indirect
@@ -95,11 +83,8 @@ require (
 	github.com/mholt/caddy v0.10.11
 	github.com/miekg/dns v1.1.1
 	github.com/minio/minio-go v6.0.14+incompatible
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/moul/http2curl v1.0.0
-	github.com/mozillazg/go-httpheader v0.2.1 // indirect
 	github.com/mozillazg/go-pinyin v0.15.0
 	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
 	github.com/opentracing/opentracing-go v1.0.2 // indirect
@@ -114,28 +99,23 @@ require (
 	github.com/shirou/gopsutil v2.18.10+incompatible
 	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9
-	github.com/soheilhy/cmux v0.1.4 // indirect
-	github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/stretchr/testify v1.3.0
 	github.com/tencentcloud/tencentcloud-sdk-go v0.0.0-20181108132626-805d01dd0e2e
-	github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190717101923-c5c1f9751e7f
+	github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c
 	github.com/ugorji/go v0.0.0-20161130061742-9c7f9b7a2bc3 // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible
 	github.com/vmware/govmomi v0.19.0
-	github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
-	go.etcd.io/bbolt v1.3.3 // indirect
-	go.etcd.io/etcd v3.3.10+incompatible
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
 	go.uber.org/atomic v1.4.0 // indirect
-	go.uber.org/multierr v1.1.0 // indirect
-	go.uber.org/zap v1.10.0 // indirect
 	golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4
-	golang.org/x/net v0.0.0-20190603091049-60506f45cf65
-	golang.org/x/sys v0.0.0-20190620070143-6f217b454f45
-	google.golang.org/grpc v1.19.0
+	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
+	golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
+	google.golang.org/grpc v1.23.1
 	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
@@ -148,11 +128,12 @@ require (
 	k8s.io/client-go v9.0.0+incompatible
 	k8s.io/klog v0.1.0 // indirect
 	k8s.io/kubernetes v1.12.3
-	sigs.k8s.io/yaml v1.1.0 // indirect
-	yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051
+	yunion.io/x/jsonutils v0.0.0-20191005115334-bb1c187fc0e7
 	yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d
-	yunion.io/x/pkg v0.0.0-20190726033806-b564cfdcc224
-	yunion.io/x/s3cli v0.0.0-20190812034537-1e65a6651a3e
-	yunion.io/x/sqlchemy v0.0.0-20190813100902-cfa59aeabbfe
+	yunion.io/x/pkg v0.0.0-20191112153320-4346cc308eed
+	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
+	yunion.io/x/sqlchemy v0.0.0-20191119025555-5948646b39e6
 	yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3
 )
+
+replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859

go.sum

@@ -6,8 +6,8 @@ cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7h
 github.com/360EntSecGroup-Skylar/excelize v1.4.0 h1:43rak9uafmwSJpXfFO1heKQph8tP3nlfWJWFQQtW1R0=
 github.com/360EntSecGroup-Skylar/excelize v1.4.0/go.mod h1:R8KYLmGns0vDPe6/HyphW0mzW+MFexlGDafU0ykVEnU=
 github.com/Azure/azure-sdk-for-go v5.0.0-beta.0.20161118192335-3b1282355199+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v19.1.0+incompatible h1:ysqLW+tqZjJWOTE74heH/pDRbr4vlN3yV+dqQYgpyxw=
-github.com/Azure/azure-sdk-for-go v19.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
+github.com/Azure/azure-sdk-for-go v36.1.0+incompatible h1:smHlbChr/JDmsyUqELZXLs0YIgpXecIGdUibuc2983s=
+github.com/Azure/azure-sdk-for-go v36.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-autorest v10.15.5+incompatible h1:vdxx6wM1rVkKt/3niByPVjguoLWkWImOcJNvEykgBzY=
 github.com/Azure/go-autorest v10.15.5+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -17,6 +17,7 @@ github.com/DataDog/zstd v1.3.4 h1:LAGHkXuvC6yky+C2CUG2tD7w8QlrUwpue8XwIh0X4AY=
 github.com/DataDog/zstd v1.3.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
 github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3 h1:gImoAO1xAcC1oDlYmD/X7dggsodGf2DFJOVE5m0ssms=
 github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3/go.mod h1:u0H9gMieFLxkUy8RS0X8VbFWyPs2815qQAaitRbj6x0=
+github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod h1:1pk82RBxDY/JZnPQrtqHlUFfCctgdorsd9M06fMynOM=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
 github.com/RoaringBitmap/roaring v0.4.16 h1:NholfewybRLOwACgfqfzn/N5xa6keKNs4fP00t0cwLo=
 github.com/RoaringBitmap/roaring v0.4.16/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
@@ -78,6 +79,9 @@ github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
@@ -90,21 +94,21 @@ github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2 h1:1B/+1BcRhOMG1KH/Y
 github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo=
 github.com/c-bata/go-prompt v0.2.1 h1:HTPxmnfY4y5x3Myo7Gq4ce989jfnvZIBgdBp6y8bjYM=
 github.com/c-bata/go-prompt v0.2.1/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
-github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 h1:m3fyIqe28zGggNHc9hE2R3Zk/CJC3Lg8KFSNfXu8mpk=
-github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94/go.mod h1:DhWkbjUxN0QRc0xQvpI9QhzqQSzYysRuZVcqSfiStds=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y=
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/coredns/coredns v1.3.0 h1:Ubjr8ZrOpEj95/A9dqQqQAG2k5DWEFdg2ZB3tUXuULA=
 github.com/coredns/coredns v1.3.0/go.mod h1:zASH/MVDgR6XZTbxvOnsZfffS+31vg6Ackf/wo1+AM0=
-github.com/coreos/bbolt v1.3.3 h1:n6AiVyVRKQFNb6mJlwESEvvLoDyiTzXX7ORAUlkeBdY=
-github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04=
-github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a h1:W8b4lQ4tFF21aspRGoBuCNV6V2fFJBF+pm1J6OY8Lys=
 github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -119,6 +123,7 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG
 github.com/dnstap/golang-dnstap v0.0.0-20170829151710-2cf77a2b5e11 h1:m8nX8hsUghn853BJ5qB0lX+VvS6LTJPksWyILFZRYN4=
 github.com/dnstap/golang-dnstap v0.0.0-20170829151710-2cf77a2b5e11/go.mod h1:s1PfVYYVmTMgCSPtho4LKBDecEHJWtiVDPNv78Z985U=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@@ -171,6 +176,8 @@ github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0 h1:xU6/SpYbvkNYiptHJYEDRseDLvYE7wSqhYYNy0QSUzI=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang-plus/errors v1.0.0 h1:9Rh4itnph6OYO7wm9u3FUTLMFMKCoL07+bLiYKELxWw=
 github.com/golang-plus/errors v1.0.0/go.mod h1:YTFZjOTBcUFieeZe4q+7Umfu/sceSr3XQyBIkTkzpd8=
 github.com/golang-plus/testing v1.0.0 h1:azmFWFV44LHK/j/jAkNTbzB2G2b6HdmqF358r73m8kg=
@@ -179,6 +186,7 @@ github.com/golang-plus/uuid v1.0.0 h1:ga84hG89vda++AGpup4N/cbfbM3O4d3R5ON9/jcN6A
 github.com/golang-plus/uuid v1.0.0/go.mod h1:pBDDRrdgRHHqyYlj1d1i2gwyBq62Zc+sP2cDiCDkBLI=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
@@ -187,6 +195,8 @@ github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -198,12 +208,13 @@ github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
-github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
+github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
 github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
@@ -221,6 +232,7 @@ github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd/go.mod h1:qkLSc0A5EXSP6B04TrN4oQoxqFI7A8XvoXSlJi8cwk8=
@@ -229,12 +241,12 @@ github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282 h1:KFqmdzEPbU7Uck2t
 github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f h1:ShTPMJQes6tubcjzGMODIVG5hlrCeImaBnZzKF2N8SM=
 github.com/gregjones/httpcache v0.0.0-20181110185634-c63ab54fda8f/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmonfrMlCDdsejg4CZE7c=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 h1:z53tR0945TRRQO/fLEVPI6SMv7ZflF0TEaTAoU7tOzg=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.9.2 h1:S+ef0492XaIknb8LMjcwgW2i3cNTzDYMmDrOThOJNWc=
-github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=
+github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
 github.com/hako/durafmt v0.0.0-20180520121703-7b7ae1e72ead h1:Y9WOGZY2nw5ksbEf5AIpk+vK52Tdg/VN/rHFRfEeeGQ=
@@ -246,6 +258,8 @@ github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0
 github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/gorm v1.9.1 h1:lDSDtsCt5AGGSKTs8AHlSDbbgif4G4+CKJ8ETBDVHTA=
 github.com/jinzhu/gorm v1.9.1/go.mod h1:Vla75njaFJ8clLU1W44h34PjIkijhjHIYnZxMqCdxqo=
@@ -257,14 +271,16 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5i
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
-github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
+github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c h1:N7A4JCA2G+j5fuFxCsJqjFU/sZe0mj8H0sSoSwbaikw=
 github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c/go.mod h1:Nn5wlyECw3iJrzi0AhIWg+AJUb4PlRQVW4/3XHH1LZA=
@@ -283,13 +299,14 @@ github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/libvirt/libvirt-go-xml v5.2.0+incompatible h1:ALyVpa0/lFfFaUpb5l0fNBohufmQG6jsOGRCl/nKEi8=
 github.com/libvirt/libvirt-go-xml v5.2.0+incompatible/go.mod h1:oBlgD3xOA01ihiK5stbhFzvieyW+jVS6kbbsMVF623A=
-github.com/marstr/guid v1.1.0 h1:/M4H/1G4avsieL6BbUwCOBzulmoeKVP5ux/3mQNnbyI=
-github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-sqlite3 v1.7.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -321,10 +338,13 @@ github.com/minio/minio-go/v6 v6.0.33 h1:CNThMAZ9bN6OEIP8DulqlYpaXKJ18rgG/Cqm14Q4
 github.com/minio/minio-go/v6 v6.0.33/go.mod h1:vaNT59cWULS37E+E9zkuN/BVnKHyXtVGS+b04Boc66Y=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/moul/http2curl v1.0.0 h1:dRMWoAtb+ePxMlLkrCbAqh4TlPHXvoGUSQ323/9Zahs=
@@ -336,6 +356,7 @@ github.com/mozillazg/go-pinyin v0.15.0/go.mod h1:bO+dztNW6O2lSJdYLha7LO3bujXzjjU
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -366,15 +387,23 @@ github.com/pquerna/otp v1.2.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 h1:D+CiwcpGTW6pL6bv6KI3KbyEyCKyS+1JWS2h8PNDnGA=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
+github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f h1:BVwpUVJDADN2ufcGik7W992pyps0wZ888b/y9GXcLTU=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.2.0 h1:kUZDBDTdBVBYBj5Tmh2NZLlF60mfjA27rM34b+cVwNU=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 h1:/K3IL0Z1quvmJ7X0A1AwNEK7CRkVK3YwfOU/QAL4WGg=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhDYGoxY8uLVpewe1GDZ2vu2Tr/vTdVAkFQ=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
@@ -407,6 +436,11 @@ github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
+github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -419,19 +453,21 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/syncthing/syncthing v0.14.48-rc.4/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402eqvEIasMQOE8nFOxy7M=
 github.com/tencentcloud/tencentcloud-sdk-go v0.0.0-20181108132626-805d01dd0e2e h1:CtKVGXKh2bfmepZ/YogAjvL/CrSy9NGZET500K7arf4=
 github.com/tencentcloud/tencentcloud-sdk-go v0.0.0-20181108132626-805d01dd0e2e/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4=
-github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190717101923-c5c1f9751e7f h1:TzE7Cs9HhTyfot4WIoMnbD1rWfD4Jkwy2M3Zs66CaRE=
-github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190717101923-c5c1f9751e7f/go.mod h1:/4BhymH1yO6ljUGQgcKsd7L3W+pdKRxoRiOuoZPLnGg=
+github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4 h1:wVKDVTKxaf0ll8ONv22Q+cazYSSmcWt7JJOeQD0LoKQ=
+github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4/go.mod h1:wk2XFUg6egk4tSDNZtXeKfe2G6690UVyt163PuUxBZk=
 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e h1:T5PdfK/M1xyrHwynxMIVMWLS7f/qHwfslZphxtGnw7s=
 github.com/texttheater/golang-levenshtein v0.0.0-20180516184445-d188e65d659e/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU=
 github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c h1:5q7IHeqvAA4hWR1CfpTOS7RFsTDC36TaSZ8Dvc00bPk=
 github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c/go.mod h1:M/I710pXKQToMdqt/D+mJ4QsnW6WDaajyB6DWFmDXBs=
 github.com/ugorji/go v0.0.0-20161130061742-9c7f9b7a2bc3 h1:KfqgRfYvGRyKOQUx8GphSC8D6vVoBndzco3rESP8I4k=
 github.com/ugorji/go v0.0.0-20161130061742-9c7f9b7a2bc3/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmware/govmomi v0.19.0 h1:CR6tEByWCPOnRoRyhLzuHaU+6o2ybF3qufNRWS/MGrY=
@@ -444,11 +480,14 @@ github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX
 github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859 h1:wu596gn6sV3j5wy+GDfiG8nwtzIDpalJihfmC/TjoYc=
+github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859/go.mod h1:8XuBae5AzsgotLArJSewMruYVaQs8AlfsK5jBCG8T9Y=
 go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/etcd v3.3.10+incompatible h1:qXVcIR1kU3CYLD8zXDseOmBNwg0uaui53e4Wg4uj0rk=
-go.etcd.io/etcd v3.3.10+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI=
+go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 h1:lWF4f9Nypl1ZqSb4gLeh/DGvBYVaUYHuiB93teOmwgc=
+go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
@@ -468,6 +507,7 @@ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -484,6 +524,8 @@ golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65 h1:+rhAzEzT3f4JtomfC371qB+0Ola2caSKcY69NUBZrRQ=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -493,6 +535,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6 h1:bjcUS9ztw9kFmmIxJInhon/0Is3p+EHBKNgquIzo1OI=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180724212812-e072cadbbdc8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -509,8 +553,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190418153312-f0ce4c0180be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606122018-79a91cf218c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190620070143-6f217b454f45 h1:Dl2hc890lrizvUppGbRWhnIh2f8jOTCQpY5IKWRS0oM=
-golang.org/x/sys v0.0.0-20190620070143-6f217b454f45/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456 h1:ng0gs1AKnRRuEMZoTLLlbOd+C17zUDepwGQBb/n+JVg=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To=
@@ -518,11 +562,14 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
@@ -534,12 +581,15 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0 h1:cfg4PD8YEdSFnm7qLV4++93WcmhH2nIUhMjhdCvl3j8=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk=
+google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
 gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
@@ -563,6 +613,7 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.0.0-20181004124137-fd83cbc87e76 h1:cGc6jt7tNK7a2WfgNKjxjoU/UXXr9Q7JTqvCupZ+6+Y=
 k8s.io/api v0.0.0-20181004124137-fd83cbc87e76/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/apimachinery v0.0.0-20181215012845-4d029f033399 h1:xdXaRQ7uNX4x6NpvxXASvlVXtKa8+WbCXK7Hjr6XZ6c=
@@ -577,17 +628,19 @@ sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051 h1:vtZw2iwGrsARNSwRTREGjmr2BWPdxbmXVkb3kI1qu28=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
+yunion.io/x/jsonutils v0.0.0-20191005115334-bb1c187fc0e7 h1:9NcHs2OFMyN8O8SmJ3sFm5AJSVXP3u1N3avJsbyX3RI=
+yunion.io/x/jsonutils v0.0.0-20191005115334-bb1c187fc0e7/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
 yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b h1:Z9z+7iegu0HXuL+S8taVWRd1P4b9JJOgPXIeoqYrj7c=
 yunion.io/x/log v0.0.0-20190514041436-04ce53b17c6b/go.mod h1:+gauLs73omeJAPlsXcevLsJLKixV+sR/E7WSYTSx1fE=
 yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d h1:59zrDL7Ft+hDukguJRmLr/Gdu/9V75x+yX99ovZwfaA=
 yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d/go.mod h1:LC6f/4FozL0iaAbnFt2eDX9jlsyo3WiOUPm03d7+U4U=
 yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf h1:OsKC+2ghZHwp+Ztm/MwKlLKKRiE7QcPG8eTp0GmsHbg=
 yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
-yunion.io/x/pkg v0.0.0-20190726033806-b564cfdcc224 h1:dAeUov/CtKcPaOapGVG7+NRqmUF2fr2O3Onb+ID5HS4=
-yunion.io/x/pkg v0.0.0-20190726033806-b564cfdcc224/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
-yunion.io/x/s3cli v0.0.0-20190812034537-1e65a6651a3e h1:Jk82txl4vaL/MoVV3+GweEcCmLOcqo5XYF8tlBD/1hY=
-yunion.io/x/s3cli v0.0.0-20190812034537-1e65a6651a3e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
-yunion.io/x/sqlchemy v0.0.0-20190813100902-cfa59aeabbfe h1:gslRYwVFAQI29PZL56mfBe+zpgbtIMSL1zSEnBbF1bI=
-yunion.io/x/sqlchemy v0.0.0-20190813100902-cfa59aeabbfe/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
+yunion.io/x/pkg v0.0.0-20191112153320-4346cc308eed h1:seECXVsAP+wTuxIo8VpyQ9U2zPPf0fsxb1zvmbsLo90=
+yunion.io/x/pkg v0.0.0-20191112153320-4346cc308eed/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
+yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo=
+yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
+yunion.io/x/sqlchemy v0.0.0-20191119025555-5948646b39e6 h1:vgltfojqVRXxWiBt+8bgrSmO7F0cSNAbG6Ktn1SLIq8=
+yunion.io/x/sqlchemy v0.0.0-20191119025555-5948646b39e6/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
 yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3 h1:bfC8EhXYvyGYldRWlzxiCM39Zfj3s3+zham9mW2h2LE=
 yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=

pkg/ansibleserver/models/ansibleplaybooks.go

@@ -53,14 +53,15 @@ const (
 type SAnsiblePlaybook struct {
 	db.SVirtualResourceBase
 
-	Playbook  *ansible.Playbook `nullable:"false" create:"required" get:"user" update:"user"`
+	Playbook  *ansible.Playbook `length:"text" nullable:"false" create:"required" get:"user" update:"user"`
 	Output    string            `length:"medium" get:"user"`
 	StartTime time.Time         `list:"user"`
 	EndTime   time.Time         `list:"user"`
 }
 
 const (
-	OutputMaxBytes = 64*1024*1024 - 1
+	OutputMaxBytes   = 64*1024*1024 - 1
+	PlaybookMaxBytes = 64*1024 - 1
 )
 
 type SAnsiblePlaybookManager struct {
@@ -224,8 +225,6 @@ func (apb *SAnsiblePlaybook) runPlaybook(ctx context.Context, userCred mcclient.
 	}
 	pb.OutputWriter(&ansiblePlaybookOutputRecorder{apb})
 
-	man.sessions.Add(apb.Id, pb)
-
 	_, err := db.Update(apb, func() error {
 		apb.StartTime = time.Now()
 		apb.EndTime = time.Time{}
@@ -236,7 +235,8 @@ func (apb *SAnsiblePlaybook) runPlaybook(ctx context.Context, userCred mcclient.
 	if err != nil {
 		log.Errorf("run playbook: update db failed before run: %v", err)
 	}
-	// NOTE host state check? run only on online hosts and running guests, skip others
+
+	man.sessions.Add(apb.Id, pb)
 	go func() {
 		defer func() {
 			man.sessionsMux.Lock()
@@ -270,6 +270,15 @@ func (apb *SAnsiblePlaybook) stopPlaybook(ctx context.Context, userCred mcclient
 	man.sessionsMux.Lock()
 	defer man.sessionsMux.Unlock()
 	if !man.sessions.Has(apb.Id) {
+		if apb.Status == AnsiblePlaybookStatusRunning {
+			_, err := db.Update(apb, func() error {
+				apb.Status = AnsiblePlaybookStatusUnknown
+				return nil
+			})
+			if err != nil {
+				log.Errorf("updating ansible playbook status to unknown failed: %v", err)
+			}
+		}
 		return fmt.Errorf("playbook is not running")
 	}
 	// the playbook will be removed from session map in runPlaybook() on return from run

pkg/ansibleserver/models/ansibleplaybooks_validator.go

@@ -87,8 +87,12 @@ func (v *ValidatorAnsiblePlaybook) Validate(data *jsonutils.JSONDict) error {
 			}
 		}
 	}
-	v.Playbook = pb
 	pbJson := jsonutils.Marshal(pb)
+	if serialized := pbJson.String(); len(serialized) > PlaybookMaxBytes {
+		return httperrors.NewBadRequestError("playbook too big, got %d bytes, exceeding %d",
+			len(serialized), PlaybookMaxBytes)
+	}
+	v.Playbook = pb
 	data.Set("playbook", pbJson)
 	return nil
 }

pkg/ansibleserver/service/handlers.go

@@ -39,6 +39,8 @@ func InitHandlers(app *appsrv.Application) {
 	db.InitAllManagers()
 
 	db.RegisterModelManager(db.OpsLog)
+	db.RegisterModelManager(db.UserCacheManager)
+	db.RegisterModelManager(db.TenantCacheManager)
 	for _, manager := range []db.IModelManager{
 		models.AnsiblePlaybookManager,
 	} {

pkg/apigateway/handler/auth.go

@@ -21,9 +21,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
+	"yunion.io/x/pkg/errors"
 
 	"yunion.io/x/onecloud/pkg/apigateway/clientman"
 	"yunion.io/x/onecloud/pkg/apigateway/constants"
@@ -103,15 +103,17 @@ func (h *AuthHandlers) Bind(app *appsrv.Application) {
 func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWriter, req *http.Request) (*jsonutils.JSONDict, error) {
 	adminToken := auth.AdminCredential()
 	if adminToken == nil {
-		return nil, errors.New("failed to get admin credential")
+		return nil, errors.Error("failed to get admin credential")
 	}
 	regions := adminToken.GetRegions()
 	if len(regions) == 0 {
-		return nil, errors.New("region is empty")
+		return nil, errors.Error("region is empty")
 	}
 	regionsJson := jsonutils.NewStringArray(regions)
 	s := auth.GetAdminSession(ctx, regions[0], "")
-	result, e := modules.Domains.List(s, nil)
+	filters := jsonutils.NewDict()
+	filters.Add(jsonutils.NewInt(1000), "limit")
+	result, e := modules.Domains.List(s, filters)
 	if e != nil {
 		return nil, errors.Wrap(e, "list domain")
 	}
@@ -127,6 +129,34 @@ func (h *AuthHandlers) GetRegionsResponse(ctx context.Context, w http.ResponseWr
 	resp := jsonutils.NewDict()
 	resp.Add(domains, "domains")
 	resp.Add(regionsJson, "regions")
+
+	filters = jsonutils.NewDict()
+	filters.Add(jsonutils.NewStringArray([]string{"cas"}), "driver")
+	filters.Add(jsonutils.JSONTrue, "enabled")
+	filters.Add(jsonutils.NewInt(1000), "limit")
+	idps, err := modules.IdentityProviders.List(s, filters)
+	if err != nil {
+		return nil, errors.Wrap(err, "list idp")
+	}
+	retIdps := make([]jsonutils.JSONObject, 0)
+	for i := range idps.Data {
+		retIdp := jsonutils.NewDict()
+		id, _ := idps.Data[i].GetString("id")
+		name, _ := idps.Data[i].GetString("name")
+		driver, _ := idps.Data[i].GetString("driver")
+		retIdp.Add(jsonutils.NewString(id), "id")
+		retIdp.Add(jsonutils.NewString(name), "name")
+		retIdp.Add(jsonutils.NewString(driver), "driver")
+		conf, err := modules.IdentityProviders.GetSpecific(s, id, "config", nil)
+		if err != nil {
+			return nil, errors.Wrap(err, "idp get config spec")
+		}
+		retIdp.Update(conf)
+		retIdps = append(retIdps, retIdp)
+	}
+
+	resp.Add(jsonutils.NewArray(retIdps...), "idps")
+
 	return resp, nil
 }
 
@@ -218,62 +248,52 @@ func isUserEnableTotp(ctx context.Context, req *http.Request, token mcclient.Tok
 	return jsonutils.QueryBoolean(usr, "enable_mfa", true)
 }
 
-func (h *AuthHandlers) doPasswordLogin(ctx context.Context, w http.ResponseWriter, req *http.Request, uname string, body jsonutils.JSONObject) mcclient.TokenCredential {
-	if h.preLoginHook != nil {
-		if err := h.preLoginHook(ctx, req, uname, body); err != nil {
-			httperrors.GeneralServerError(w, err)
-			return nil
-		}
-	}
-
-	passwd, e := body.GetString("password")
-	if e != nil {
-		httperrors.InvalidInputError(w, "get password in body")
-		return nil
-	}
-	if len(uname) == 0 || len(passwd) == 0 {
-		httperrors.InvalidInputError(w, "username or password is empty")
-		return nil
-	}
-
-	tenant, uname := parseLoginUser(uname)
-	// var token mcclient.TokenCredential
-	domain, _ := body.GetString("domain")
+func (h *AuthHandlers) doCredentialLogin(ctx context.Context, req *http.Request, body jsonutils.JSONObject) (mcclient.TokenCredential, error) {
+	var token mcclient.TokenCredential
+	var err error
+	var tenant string
 	cliIp := netutils2.GetHttpRequestIp(req)
-	token, err := auth.Client().AuthenticateWeb(uname, passwd, domain, "", "", cliIp)
+	if body.Contains("username") {
+		uname, _ := body.GetString("username")
+
+		if h.preLoginHook != nil {
+			if err = h.preLoginHook(ctx, req, uname, body); err != nil {
+				return nil, err
+			}
+		}
+
+		var passwd string
+		passwd, err = body.GetString("password")
+		if err != nil {
+			return nil, httperrors.NewInputParameterError("get password in body")
+		}
+		if len(uname) == 0 || len(passwd) == 0 {
+			return nil, httperrors.NewInputParameterError("username or password is empty")
+		}
+
+		tenant, uname = parseLoginUser(uname)
+		// var token mcclient.TokenCredential
+		domain, _ := body.GetString("domain")
+		token, err = auth.Client().AuthenticateWeb(uname, passwd, domain, "", "", cliIp)
+	} else if body.Contains("cas_ticket") {
+		ticket, _ := body.GetString("cas_ticket")
+		if len(ticket) == 0 {
+			return nil, httperrors.NewInputParameterError("cas_ticket is empty")
+		}
+		token, err = auth.Client().AuthenticateCAS(ticket, "", "", "", cliIp)
+	} else {
+		return nil, httperrors.NewInputParameterError("missing credential")
+	}
 	if err != nil {
 		switch httperr := err.(type) {
 		case *httputils.JSONClientError:
 			if httperr.Code == 409 {
-				httperrors.GeneralServerError(w, err)
-				return nil
+				return nil, err
 			}
 		}
-		httperrors.InvalidCredentialError(w, "username/password incorrect")
-		return nil
+		return nil, httperrors.NewInvalidCredentialError("username/password incorrect")
 	}
-	/* if token == nil { // invalid domain, try all domains
-		s := auth.GetAdminSession(ctx, fetchRegion(req), "")
-		domains, e := modules.Domains.List(s, nil)
-		if e != nil {
-			httperrors.InternalServerError(w, "获取认证源列表失败")
-			return nil
-		}
-		for _, d := range domains.Data {
-			domain, e = d.GetString("name")
-			if e == nil {
-				token, e = auth.Client().Authenticate(uname, passwd, domain, "")
-				if e == nil {
-					break
-				}
-			}
-		}
-	}
-	if token == nil {
-		httperrors.InvalidCredentialError(w, "用户名/密码错误")
-		return nil
-	}
-	*/
+	uname := token.GetUserName()
 	if len(tenant) > 0 {
 		s := auth.GetAdminSession(ctx, FetchRegion(req), "")
 		jsonProj, e := modules.Projects.GetById(s, tenant, nil)
@@ -317,7 +337,7 @@ func (h *AuthHandlers) doPasswordLogin(ctx context.Context, w http.ResponseWrite
 			log.Errorf("GetProjects for login user error %s project count %d", e, len(projects.Data))
 		}
 	}
-	return token
+	return token, nil
 }
 
 func parseLoginUser(uname string) (string, string) {
@@ -339,7 +359,7 @@ func isUserAllowWebconsole(ctx context.Context, w http.ResponseWriter, req *http
 		return false
 	}
 	if !jsonutils.QueryBoolean(usr, "allow_web_console", true) {
-		httperrors.ForbiddenError(w, "forbidden user %q login from web")
+		httperrors.ForbiddenError(w, "forbidden user %q login from web", usr.String())
 		return false
 	}
 	return true
@@ -391,13 +411,21 @@ func (h *AuthHandlers) postLoginHandler(ctx context.Context, w http.ResponseWrit
 		httperrors.InvalidInputError(w, "fetch json for request: %v", e)
 		return
 	}
-	uname, e := body.GetString("username")
 	var token mcclient.TokenCredential
 	otpVerified := false
-	if e != nil { // switch project
+	if body.Contains("tenantId") { // switch project
 		token, otpVerified = doTenantLogin(ctx, w, req, body)
-	} else { // user/password authenticate
-		token = h.doPasswordLogin(ctx, w, req, uname, body)
+	} else if body.Contains("username") || body.Contains("cas_ticket") {
+		// user/password authenticate
+		// cas authentication
+		token, e = h.doCredentialLogin(ctx, req, body)
+		if e != nil {
+			httperrors.GeneralServerError(w, e)
+			return
+		}
+	} else {
+		httperrors.InvalidInputError(w, "no login credential")
+		return
 	}
 	if token == nil {
 		return
@@ -478,10 +506,29 @@ func (h *AuthHandlers) postLogoutHandler(ctx context.Context, w http.ResponseWri
 
 func FetchRegion(req *http.Request) string {
 	r, e := req.Cookie("region")
-	if e != nil {
+	if e == nil && len(r.Value) > 0 {
+		return r.Value
+	}
+	if len(options.Options.DefaultRegion) > 0 {
 		return options.Options.DefaultRegion
 	}
-	return r.Value
+	adminToken := auth.AdminCredential()
+	if adminToken == nil {
+		log.Errorf("FetchRegion: nil adminTken")
+		return ""
+	}
+	regions := adminToken.GetRegions()
+	if len(regions) == 0 {
+		log.Errorf("FetchRegion: empty region list")
+		return ""
+	}
+	for _, r := range regions {
+		if len(r) > 0 {
+			return r
+		}
+	}
+	log.Errorf("FetchRegion: no valid region")
+	return ""
 }
 
 func fetchDomain(req *http.Request) string {
@@ -641,6 +688,7 @@ func getUserInfo(ctx context.Context, s *mcclient.ClientSession, token mcclient.
 	query := jsonutils.NewDict()
 	query.Add(jsonutils.JSONNull, "effective")
 	query.Add(jsonutils.JSONNull, "include_names")
+	query.Add(jsonutils.JSONNull, "include_system")
 	query.Add(jsonutils.NewInt(0), "limit")
 	query.Add(jsonutils.NewString(token.GetUserId()), "user", "id")
 	roleAssigns, err := modules.RoleAssignments.List(s, query)

pkg/apigateway/handler/auth_totp.go

@@ -20,6 +20,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"net/http"
+	"net/url"
 
 	"github.com/skip2/go-qrcode"
 
@@ -42,7 +43,14 @@ import (
 func toQrcode(secret string, token mcclient.TokenCredential) (string, error) {
 	_secret := base32.StdEncoding.EncodeToString([]byte(secret))
 	// https://github.com/google/google-authenticator/wiki/Key-Uri-Format
-	uri := fmt.Sprintf("otpauth://totp/Onecloud:%s?secret=%s&issuer=Onecloud", token.GetUserName(), _secret)
+	// issuer Onecloud.Domain
+	issuer := "Onecloud"
+	if len(token.GetDomainName()) > 0 {
+		issuer = fmt.Sprintf("Onecloud.%s", token.GetDomainName())
+		issuer = url.PathEscape(issuer)
+	}
+
+	uri := fmt.Sprintf("otpauth://totp/%s:%s?secret=%s&issuer=%s", issuer, token.GetUserName(), _secret, issuer)
 
 	c, err := qrcode.Encode(uri, qrcode.High, 256)
 	if err != nil {

pkg/apigateway/handler/misc.go

@@ -30,10 +30,9 @@ import (
 
 	"yunion.io/x/onecloud/pkg/appctx"
 	"yunion.io/x/onecloud/pkg/appsrv"
+	"yunion.io/x/onecloud/pkg/httperrors"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
-
-	"yunion.io/x/onecloud/pkg/httperrors"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 

pkg/apis/compute/api.go

@@ -174,6 +174,7 @@ type ServerCreateInput struct {
 	EipBw              int             `json:"eip_bw,omitzero"`
 	EipChargeType      string          `json:"eip_charge_type,omitempty"`
 	Eip                string          `json:"eip,omitempty"`
+	Secgroups          []string        `json:"secgroups"`
 
 	OsType string `json:"os_type"`
 	// Fill by server
@@ -216,6 +217,20 @@ type ServerDeployInput struct {
 	AutoStart     *bool           `json:"auto_start"`
 }
 
+type GuestBatchMigrateRequest struct {
+	apis.Meta
+
+	GuestIds   []string
+	PreferHost string
+}
+
+type GuestBatchMigrateParams struct {
+	Id          string
+	LiveMigrate bool
+	RescueMode  bool
+	OldStatus   string
+}
+
 type HostLoginInfo struct {
 	apis.Meta