Merge pull request #5066 from swordqiu/automated-cherry-pick-of-#5065-upstream-release-2.10.0

Automated cherry pick of #5065: fix: allow empty domain for windows deployment

.circleci/Dockerfile

@@ -13,9 +13,9 @@ RUN true \
 
 WORKDIR /opt
 RUN true \
-	&& wget https://dl.google.com/go/go1.12.1.linux-amd64.tar.gz \
-	&& tar xzf go1.12.1.linux-amd64.tar.gz \
-	&& rm -vf  go1.12.1.linux-amd64.tar.gz \
+	&& wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz \
+	&& tar xzf go1.13.3.linux-amd64.tar.gz \
+	&& rm -vf  go1.13.3.linux-amd64.tar.gz \
 	&& true
 ENV GOROOT="/opt/go"
 ENV PATH="/opt/go/bin:${PATH}"
@@ -24,6 +24,16 @@ RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /
 USER build
 ENV HOME /home/build
 WORKDIR /home/build
+USER build
 
 ENV GOPATH="/home/build/go"
 ENV PATH="${GOPATH}/bin:${PATH}"
+
+RUN true \
+	&& mkdir -p "$GOPATH" \
+	&& d="$GOPATH/src/golang.org/x/tools" \
+	&& mkdir -p "$d" \
+	&& git clone --branch yun --depth 8 https://github.com/yousong/tools "$d" \
+	&& cd "$d" \
+	&& go install ./cmd/goimports \
+	&& true

.circleci/config.yml

@@ -3,9 +3,24 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
-  build:
+  check:
     docker:
-      - image: yunionio/onecloud-ci:20190328
+      - image: yunionio/onecloud-ci:v1.0.3
+        environment:
+          ONECLOUD_CI_BUILD: "1"
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
+    steps:
+      - checkout
+      - run:
+          command: |
+            make check
+  build:
+    requires:
+      - check
+    docker:
+      - image: yunionio/onecloud-ci:v1.0.2
+        environment:
+          ONECLOUD_CI_BUILD: "1"
 
     #### TEMPLATE_NOTE: go expects specific checkout path representing url
     #### expecting it in the form of
@@ -15,29 +30,54 @@ jobs:
     parallelism: 4
     steps:
       - checkout
+      - restore_cache:
+          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
       - run:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
             make $targets
             ls -lh _output/bin/
+      - save_cache:
+          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
+      - store_artifacts:
+          path: _output/
 
   test:
+    requires:
+      - check
     docker:
-      - image: yunionio/onecloud-ci:20190328
+      - image: yunionio/onecloud-ci:v1.0.2
+        environment:
+          GO111MODULE: "on"
     working_directory: /home/build/go/src/yunion.io/x/onecloud
     steps:
       - checkout
+      - restore_cache:
+          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
       - run:
           name: unit_test
-          command: make test
-      - run:
-          name: generate_code_coverage
-          command: ./scripts/coverage.sh --codecov
+          command: |
+            ./scripts/coverage.sh --codecov
+      - save_cache:
+          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /home/build/.cache/go-build
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - build
-      - test
+      - check
+      - build:
+          requires:
+            - check
+      - test:
+          requires:
+            - check

.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

Gopkg.toml

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

Makefile

@@ -1,18 +1,25 @@
 #####################################################
 
 REPO_PREFIX := yunion.io/x/onecloud
-VENDOR_PATH := $(REPO_PREFIX)/vendor
-VERSION_PKG := $(VENDOR_PATH)/yunion.io/x/pkg/util/version
+VERSION_PKG := yunion.io/x/pkg/util/version
 ROOT_DIR := $(CURDIR)
 BUILD_DIR := $(ROOT_DIR)/_output
 BIN_DIR := $(BUILD_DIR)/bin
 BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 
-GIT_COMMIT := $(shell git rev-parse --short HEAD)
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
-GIT_VERSION := $(shell git describe --tags --abbrev=14 $(GIT_COMMIT)^{commit})
-GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
-BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+ifeq ($(ONECLOUD_CI_BUILD),)
+	GIT_COMMIT := $(shell git rev-parse --short HEAD)
+	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
+	GIT_VERSION := $(shell git describe --tags --abbrev=14 $(GIT_COMMIT)^{commit})
+	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
+	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
+else
+	GIT_COMMIT:=x
+	GIT_BRANCH:=x
+	GIT_VERSION:=x
+	BUILD_TREE_STATE:=clean
+	BUILD_DATE=2099-07-01T07:11:09Z
+endif
 
 LDFLAGS := "-w \
 	-X $(VERSION_PKG).gitVersion=$(GIT_VERSION) \
@@ -26,7 +33,8 @@ LDFLAGS := "-w \
 
 #####################################################
 
-GO_BUILD := go build -ldflags $(LDFLAGS)
+GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
+GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test
 
@@ -36,13 +44,17 @@ CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
 ifdef LIBQEMUIO_PATH
-    X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
-    X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
+	X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+	X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
+export GO111MODULE:=on
 export CGO_CFLAGS = ${X_CGO_CFLAGS}
 export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
 
+cmdTargets:=$(filter-out cmd/host-image,$(wildcard cmd/*))
+rpmTargets:=$(foreach b,$(patsubst cmd/%,%,$(cmdTargets)),$(if $(shell [ -f "$(CURDIR)/build/$(b)/vars" ] && echo 1),rpm/$(b)))
+
 all: build
 
 
@@ -53,33 +65,29 @@ install: prepare_dir
 	done
 
 
-build: gendoc
-	$(MAKE) $(filter-out cmd/host-image, $(wildcard cmd/*))
-
-gendoc:
-	@sh build/gendoc.sh
-
 gencopyright:
 	@sh scripts/gencopyright.sh pkg cmd
 
 test:
-	@go test $(shell go list ./... | egrep -v 'host-image|hostimage')
+	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
 
 vet:
 	go vet ./...
 
-cmd/%: prepare_dir fmt
+cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
+rpm/%: cmd/%
+	$(BUILD_SCRIPT) $*
 
-pkg/%: prepare_dir fmt
+pkg/%: prepare_dir
 	$(GO_INSTALL) $(REPO_PREFIX)/$@
 
+build:
+	$(MAKE) $(cmdTargets)
 
-# a hack
 rpm:
-	$(MAKE) $(patsubst %,cmd/%,$(filter-out $@,$(MAKECMDGOALS)))
-	$(foreach cmd,$(filter-out $@,$(MAKECMDGOALS)),$(BUILD_SCRIPT) $(cmd);)
+	$(MAKE) $(rpmTargets)
 
 rpmclean:
 	rm -fr $(BUILD_DIR)/rpms
@@ -94,14 +102,8 @@ bin_dir: output_dir
 output_dir:
 	@mkdir -p $(BUILD_DIR)
 
-dep_clean:
-	rm -fr $(GOPATH)/pkg/dep/sources/*
 
-dep_install:
-	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
-
-
-.PHONY: all build prepare_dir clean fmt rpm
+.PHONY: all build prepare_dir clean rpm
 
 
 clean:
@@ -109,22 +111,118 @@ clean:
 
 
 fmt:
-	@find . -type f -name "*.go" -not -path "./_output/*" \
-		-not -path "./vendor/*" | xargs gofmt -s -w
+	@git ls-files --exclude '*' '*.go' \
+		| grep -v '^vendor/' \
+		| xargs $(XARGS_FLAGS) gofmt -w
 
+fmt-check: fmt
+	@if git status --short | grep -E '^.M .*/[^.]+.go'; then \
+		git diff | cat; \
+		echo "$@: working tree modified (possibly by gofmt)" >&2 ; \
+		false ; \
+	fi
+.PHONY: fmt fmt-check
+
+gendocgo:
+	@sh build/gendoc.sh
+
+adddocgo:
+	@git ls-files --others '*/doc.go' | xargs $(XARGS_FLAGS) -- git add
+
+gendocgo-check: gendocgo
+	@n="$$(git ls-files --others '*/doc.go' | wc -l)"; \
+	if test "$$n" -gt 0; then \
+		git ls-files --others '*/doc.go' | sed -e 's/^/  /'; \
+		echo "$@: untracked doc.go file(s) exist in working directory" >&2 ; \
+		false ; \
+	fi
+.PHONY: gendocgo adddocgo gendocgo-check
+
+goimports-check:
+	@goimports -w -local "yunion.io/x/:yunion.io/x/onecloud" pkg cmd; \
+	if git status --short | grep -E '^.M .*/[^.]+.go'; then \
+		git diff | cat; \
+		echo "$@: working tree modified (possibly by goimports)" >&2 ; \
+		echo "$@: " >&2 ; \
+		echo "$@: import spec should be grouped in order: std, 3rd-party, yunion.io/x, yunion.io/x/onecloud" >&2 ; \
+		echo "$@: see \"yun\" branch at https://github.com/yousong/tools" >&2 ; \
+		false ; \
+	fi
+.PHONY: goimports-check
+
+check: fmt-check
+check: gendocgo-check
+check: goimports-check
+.PHONY: check
+
+
+define depDeprecated
+OneCloud now requires using go-mod for dependency management.  dep target,
+vendor files will be removed in future versions
+
+Follow the following link to find out more about go-mod
+
+ - https://blog.golang.org/using-go-modules
+ - https://github.com/golang/go/wiki/Modules
+
+Switching to "make mod"...
+
+endef
+
+dep: export depDeprecated:=$(depDeprecated)
 dep:
-	cd $(ROOT_DIR) && dep ensure -v -update $(shell for p in $$(ls vendor/yunion.io/x/); do echo "yunion.io/x/$$p"; done | xargs)
+	@echo "$$depDeprecated"
+	@$(MAKE) mod
 
-%:
-	@:
+mod:
+	go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z][a-z]*\) v.*|\1|p'))
+	go mod tidy
+	go mod vendor -v
 
-# Use docker build binaries
-# Args:
-#   WHAT: Directory names to build
-#
-#
-# Example:
-# make docker_build
-# make docker_build WHAT='cmd/climc cmd/region'
-docker_build:
-	$(ROOT_DIR)/build/docker_build.sh $(WHAT)
+
+DOCKER_BUILD_IMAGE_VERSION?=latest
+
+define dockerBuildCmd
+set -o errexit
+set -o pipefail
+cd /home/build/onecloud
+export GOFLAGS=-mod=vendor
+make $(1)
+endef
+
+docker-build: export dockerBuildCmd:=$(call dockerBuildCmd,$(F))
+docker-build:
+	echo "$$dockerBuildCmd"
+	docker rm --force onecloud-ci-build &>/dev/null || true
+	docker run \
+		--name onecloud-ci-build \
+		--rm \
+		--volume $(CURDIR):/home/build/onecloud \
+		yunionio/onecloud-ci:$(DOCKER_BUILD_IMAGE_VERSION) \
+		/bin/bash -c "$$dockerBuildCmd"
+	chown -R $$(id -u):$$(id -g) _output
+	ls -lh _output/bin
+
+# NOTE we need a way to stop and remove the container started by docker-build.
+# No --tty, --stop-signal won't work
+docker-build-stop:
+	docker stop --time 0 onecloud-ci-build || true
+
+.PHONY: docker-build
+.PHONY: docker-build-stop
+
+define helpText
+Build with docker
+
+	make docker-build F='-j4'
+	make docker-build F='-j4 cmd/region cmd/climc'
+	make docker-build-stop
+
+Tidy up go modules and vendor directory
+
+	make mod
+endef
+
+help: export helpText:=$(helpText)
+help:
+	@echo "$$helpText"

README.md

@@ -1,4 +1,10 @@
 # Yunion OneCloud
 
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) [![Build Status](https://travis-ci.org/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud)
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud)
+[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
+[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
+[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
+
+# 文档
+
+- 文档中心，https://docs.yunion.cn/
+- API文档，https://docs.yunion.cn/api/

build/ansibleserver/root/etc/yunion/ansibleserver.conf.sample

@@ -0,0 +1,10 @@
+region = 'Yunion'
+address = '10.168.222.136'
+port = 8890
+auth_uri = 'http://10.168.222.136:35357/v3'
+admin_user = 'yunionansible'
+admin_password = 'xxxxxxxxxxxxxxxx'
+admin_tenant_name = 'system'
+sql_connection = 'mysql+pymysql://yunionansible:9YuQL9KEZn1mppaK@localhost:3306/yunionansible?charset=utf8'
+
+auto_sync_table = True

build/ansibleserver/vars

@@ -0,0 +1,5 @@
+DESCRIPTION="Yunion Ansible Controller"
+
+REQUIRES=(
+	"ansible"
+)

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/docker_build.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-SRC_ROOT=$(realpath $(dirname "${BASH_SOURCE[0]}")/..)
-BIN_DIR=$SRC_ROOT/_output/bin
-WORK_DIR="/go/src/yunion.io/x/onecloud"
-CMDS=$@
-
-docker run --rm -it \
-    -w $WORK_DIR \
-    -v $SRC_ROOT:$WORK_DIR \
-    d3lx/golang:yunion \
-    make $CMDS
-
-echo "Build finish"
-ls -alh $BIN_DIR

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

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

build/host-deployer/vars

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

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

@@ -0,0 +1,21 @@
+[Unit]
+Description=Yunion Cloud Host Agent server
+Documentation=https://docs.yunion.cn
+After=network-online.target
+Wants=network-online.target
+After=network.target yunion-host-deployer.service
+
+[Service]
+Type=simple
+User=root
+Group=root
+ExecStart=/opt/yunion/bin/host --config /etc/yunion/host.conf
+WorkingDirectory=/opt/yunion/bin
+KillMode=process
+Restart=always
+RestartSec=30
+LimitNOFILE=500000
+LimitNPROC=500000
+
+[Install]
+WantedBy=multi-user.target

build/host/vars

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

build/keystone/vars

@@ -0,0 +1 @@
+DESCRIPTION="Yunion Cloud Keystone Identity server"

build/ldapcli/vars

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

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

@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
+您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

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

@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
+您的{{ .brand }}主机{{ .name }}已经创建成功，服务器IP地址为{{ .ips }}，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问ssh密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。

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

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

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

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

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

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

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

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

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

@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。
+您的{{ .brand }}主机{{ .name }}重装系统成功，{{ if .account }}初始帐号为{{ .account }}，{{ end }}{{ if .keypair }}访问密钥为{{ .keypair }}，{{ end }}{{ if .password }}初始密码为{{ .password }}，{{ end }}请使用{{ if .windows }}远程桌面连接器(RDC){{ else }}SSH{{ end }}或控制面板控制台访问云主机。

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

@@ -1 +1 @@
-您的{{ .hypervisor }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。
+您的{{ .brand }}主机{{ .name }}的套餐类型已经更改为 CPU:{{ index .flavor_info "cpu" }}核，内存:{{ index .flavor_info "memory" }}M，数据盘:{{ index .flavor_info "datadisk" }}G，带宽: {{ index .flavor_info "ebw" }}M。

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

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

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

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

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

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

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

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

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

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

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

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

build/zstackcli/vars

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

cmd/ansibleserver/main.go

@@ -12,9 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package models
+package main
 
-type GroupJointModel struct {
-	JointBaseModel
-	GroupID string `json:"group_id" gorm:"not null"`
+import (
+	"yunion.io/x/onecloud/pkg/ansibleserver/service"
+)
+
+func main() {
+	service.StartService()
 }

cmd/azurecli/main.go

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

cmd/climc/climc.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	prompt "github.com/c-bata/go-prompt"
+	"github.com/c-bata/go-prompt"
 
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/util/version"
@@ -52,13 +52,16 @@ type BaseOptions struct {
 	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]"`
+	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]"`
 	OsAuthURL      string `default:"$OS_AUTH_URL" help:"Defaults to env[OS_AUTH_URL]"`
 	OsRegionName   string `default:"$OS_REGION_NAME" help:"Defaults to env[OS_REGION_NAME]"`
 	OsZoneName     string `default:"$OS_ZONE_NAME" help:"Defaults to env[OS_ZONE_NAME]"`
 	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL"`
 	ApiVersion     string `default:"$API_VERSION" help:"override default modules service api version"`
+	OutputFormat   string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|flatten-table|flatten-kv" help:"output format"`
 	SUBCOMMAND     string `help:"climc subcommand" subcommand:"true"`
 }
 
@@ -131,9 +134,9 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	}
 	// 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")
-	}
+	// if len(options.OsProjectName) == 0 {
+	// 	return nil, fmt.Errorf("Missing OS_PROJECT_NAME")
+	// }
 
 	logLevel := "info"
 	if options.Debug {
@@ -174,10 +177,12 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 	}
 
 	if cacheToken == nil {
-		token, err := client.Authenticate(options.OsUsername,
+		token, err := client.AuthenticateWithSource(options.OsUsername,
 			options.OsPassword,
 			options.OsDomainName,
-			options.OsProjectName)
+			options.OsProjectName,
+			options.OsProjectDomain,
+			mcclient.AuthSourceCli)
 		if err != nil {
 			return nil, err
 		}
@@ -269,6 +274,7 @@ func main() {
 		return
 	}
 
+	shell.OutputFormat(options.OutputFormat)
 	ensureSessionFactory := func() *mcclient.ClientSession {
 		session, err := newClientSession(options)
 		if err != nil {

cmd/climc/shell/actions.go

@@ -24,6 +24,7 @@ import (
 )
 
 type BaseActionListOptions struct {
+	Scope      string   `help:"scope" choices:"project|domain|system"`
 	Since      string   `help:"Show logs since specific date" metavar:"DATETIME"`
 	Until      string   `help:"Show logs until specific date" metavar:"DATETIME"`
 	Limit      int64    `help:"Limit number of logs" default:"20"`
@@ -35,6 +36,11 @@ type BaseActionListOptions struct {
 	Admin      bool     `help:"admin mode"`
 	Succ       bool     `help:"Show success action log only"`
 	Fail       bool     `help:"Show failed action log only"`
+
+	User    []string `help:"filter by operator user"`
+	Project []string `help:"filter by owner project"`
+
+	PagingMarker string `help:"marker for pagination"`
 }
 
 type ActionListOptions struct {
@@ -59,6 +65,18 @@ func doActionList(s *mcclient.ClientSession, args *ActionListOptions) error {
 	if len(args.Search) > 0 {
 		params.Add(jsonutils.NewString(args.Search), "search")
 	}
+	if len(args.User) > 0 {
+		params.Add(jsonutils.NewStringArray(args.User), "user")
+	}
+	if len(args.Project) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Project), "project")
+	}
+	if len(args.Scope) > 0 {
+		params.Add(jsonutils.NewString(args.Scope), "scope")
+	}
+	if len(args.PagingMarker) > 0 {
+		params.Add(jsonutils.NewString(args.PagingMarker), "paging_marker")
+	}
 	if len(args.Since) > 0 {
 		params.Add(jsonutils.NewString(args.Since), "since")
 	}

cmd/climc/shell/ansible.go

@@ -94,7 +94,7 @@ func doList(s *mcclient.ClientSession, args *AnsibleHostsOptions) error {
 	output.Add(children, "all", "children")
 	output.Add(hosts, "ungrouped", "hosts")
 
-	fmt.Printf("%s", output.PrettyString())
+	fmt.Printf("%s\n", output.PrettyString())
 
 	return nil
 }
@@ -123,7 +123,7 @@ func doHost(s *mcclient.ClientSession, host string, args *AnsibleHostsOptions) e
 		hostVar.Add(jsonutils.NewString(args.UserBecome), "ansible_become_user")
 	}
 
-	fmt.Printf("%s", hostVar.PrettyString())
+	fmt.Printf("%s\n", hostVar.PrettyString())
 
 	return nil
 }

cmd/climc/shell/ansibleplaybooks.go

@@ -0,0 +1,108 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	//"fmt"
+	//"strings"
+
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	printAnsiblePlaybookObject := func(obj jsonutils.JSONObject) {
+		dict := obj.(*jsonutils.JSONDict)
+		pbJson, err := dict.Get("playbook")
+		if err != nil {
+			printObject(obj)
+			return
+		}
+		pbStr := pbJson.YAMLString()
+		dict.Set("playbook", jsonutils.NewString(pbStr))
+		printObject(obj)
+	}
+	R(&options.AnsiblePlaybookCreateOptions{}, "ansibleplaybook-create", "Create ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookCreateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apb, err := modules.AnsiblePlaybooks.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-show", "Show ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookListOptions{}, "ansibleplaybook-list", "List ansible playbooks", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookListOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apbs, err := modules.AnsiblePlaybooks.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(apbs, modules.AnsiblePlaybooks.GetColumns(s))
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-delete", "Delete ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookUpdateOptions{}, "ansibleplaybook-update", "Update ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookUpdateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		apb, err := modules.AnsiblePlaybooks.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-run", "Run ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.PerformAction(s, opts.ID, "run", nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+	R(&options.AnsiblePlaybookIdOptions{}, "ansibleplaybook-stop", "Stop ansible playbook", func(s *mcclient.ClientSession, opts *options.AnsiblePlaybookIdOptions) error {
+		apb, err := modules.AnsiblePlaybooks.PerformAction(s, opts.ID, "stop", nil)
+		if err != nil {
+			return err
+		}
+		printAnsiblePlaybookObject(apb)
+		return nil
+	})
+}

cmd/climc/shell/capabilities.go

@@ -17,13 +17,20 @@ package shell
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type CapabilitiesOptions struct {
+		Domain string `help:"ID or name of domain"`
+		Scope  string `help:"query scope" choices:"system|domain|project"`
 	}
 	R(&CapabilitiesOptions{}, "capabilities", "Show backend capabilities", func(s *mcclient.ClientSession, args *CapabilitiesOptions) error {
-		result, err := modules.Capabilities.List(s, nil)
+		query, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Capabilities.List(s, query)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/cloudaccounts.go

@@ -544,4 +544,24 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type CloudaccountPublicOptions struct {
+		ID string `help:"ID or name of cloud account"`
+	}
+	R(&CloudaccountPublicOptions{}, "cloud-account-public", "Mark this cloud account public ", func(s *mcclient.ClientSession, args *CloudaccountPublicOptions) error {
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "public", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+	R(&CloudaccountPublicOptions{}, "cloud-account-private", "Mark this cloud account private", func(s *mcclient.ClientSession, args *CloudaccountPublicOptions) error {
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "private", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/cloudproviders.go

@@ -15,6 +15,8 @@
 package shell
 
 import (
+	"fmt"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -26,6 +28,7 @@ func init() {
 
 	type CloudproviderListOptions struct {
 		options.BaseListOptions
+		Usable bool `help:"Vpc & Network usable"`
 	}
 	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
 		var params *jsonutils.JSONDict
@@ -35,6 +38,10 @@ func init() {
 			if err != nil {
 				return err
 			}
+
+			if args.Usable {
+				params.Add(jsonutils.NewBool(true), "usable")
+			}
 		}
 		result, err := modules.Cloudproviders.List(s, params)
 		if err != nil {
@@ -187,4 +194,23 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type CloudproviderClientRCOptions struct {
+		ID string `help:"ID or name of cloud provider"`
+	}
+	R(&CloudproviderClientRCOptions{}, "cloud-provider-clirc", "Get client RC file of the cloud provider", func(s *mcclient.ClientSession, args *CloudproviderClientRCOptions) error {
+		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "clirc", nil)
+		if err != nil {
+			return err
+		}
+		rc := make(map[string]string)
+		err = result.Unmarshal(&rc)
+		if err != nil {
+			return err
+		}
+		for k, v := range rc {
+			fmt.Printf("export %s='%s'\n", k, v)
+		}
+		return nil
+	})
 }

cmd/climc/shell/cloudregions.go

@@ -55,6 +55,9 @@ func init() {
 
 		Usable    *bool `help:"List regions where networks are usable"`
 		UsableVpc *bool `help:"List regions where VPC are usable"`
+
+		Scope         string `help:"query scope" choices:"system|domain"`
+		ProjectDomain string `help:"query domain"`
 	}
 	R(&CloudregionCityListOptions{}, "cloud-region-cities", "List cities where cloud region resides", func(s *mcclient.ClientSession, args *CloudregionCityListOptions) error {
 		params, err := options.StructToParams(args)
@@ -173,8 +176,15 @@ func init() {
 		return nil
 	})
 
-	R(&CloudregionShowOptions{}, "cloud-region-capability", "Show region's capacibilities", func(s *mcclient.ClientSession, args *CloudregionShowOptions) error {
-		result, err := modules.Cloudregions.GetSpecific(s, args.ID, "capability", nil)
+	type CloudregionCapabiltyOptions struct {
+		ID     string `help:"ID or name of cloud region to check" json:"-"`
+		Domain string `help:"cloud region domain"`
+
+		ShowEmulated bool `help:"show emulated cloud region"`
+	}
+	R(&CloudregionCapabiltyOptions{}, "cloud-region-capability", "Show region's capacibilities", func(s *mcclient.ClientSession, args *CloudregionCapabiltyOptions) error {
+		query, err := options.StructToParams(args)
+		result, err := modules.Cloudregions.GetSpecific(s, args.ID, "capability", query)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/contacts.go

@@ -29,7 +29,7 @@ func init() {
 	 */
 	type ContactsUpdateOptions struct {
 		UID         string `help:"The user you wanna add contact to (Keystone User ID)"`
-		CONTACTTYPE string `help:"The contact type email|mobile" choices:"email|mobile"`
+		CONTACTTYPE string `help:"The contact type" choices:"email|mobile"`
 		CONTACT     string `help:"The contacts details mobile number or email address, if set it the empty str means delete"`
 		Status      string `help:"Enabled or disabled contact status" choices:"enable|disable"`
 	}
@@ -63,7 +63,7 @@ func init() {
 
 	type ContactsDeleteOptions struct {
 		UID         string `help:"The user you wanna add contact to (Keystone User ID)"`
-		CONTACTTYPE string `help:"The contact type email|mobile" choices:"email|mobile"`
+		CONTACTTYPE string `help:"The contact type" choices:"email|mobile"`
 	}
 	R(&ContactsDeleteOptions{}, "contact-delete", "Delete contact for user", func(s *mcclient.ClientSession, args *ContactsDeleteOptions) error {
 		arr := jsonutils.NewArray()

cmd/climc/shell/copyright.go

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

cmd/climc/shell/disks.go

@@ -78,7 +78,7 @@ func init() {
 
 	type DiskDeleteOptions struct {
 		ID                    []string `help:"ID of disks to delete" metavar:"DISK"`
-		OverridePendingDelete bool     `help:"Delete disk directly instead of pending delete"`
+		OverridePendingDelete bool     `help:"Delete disk directly instead of pending delete" short-token:"f"`
 	}
 
 	R(&DiskDeleteOptions{}, "disk-delete", "Delete a disk", func(s *mcclient.ClientSession, args *DiskDeleteOptions) error {
@@ -222,20 +222,6 @@ func init() {
 		printObject(disk)
 		return nil
 	})
-	type DiskCreateSnapshotOptions struct {
-		DISK          string `help:"ID or name of disk"`
-		SNAPSHOT_NAME string `help:"Snapshot name"`
-	}
-	R(&DiskCreateSnapshotOptions{}, "disk-create-snapshot", "Disk create snapshot", func(s *mcclient.ClientSession, args *DiskCreateSnapshotOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.SNAPSHOT_NAME), "name")
-		disk, err := modules.Disks.PerformAction(s, args.DISK, "create-snapshot", params)
-		if err != nil {
-			return err
-		}
-		printObject(disk)
-		return nil
-	})
 
 	type DiskSaveOptions struct {
 		ID     string `help:"ID or name of the disk" json:"-"`
@@ -300,4 +286,21 @@ func init() {
 		printObject(disk)
 		return nil
 	})
+
+	type DiskChangeOwnerOptions struct {
+		ID      string `help:"Disk to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
+	}
+	R(&DiskChangeOwnerOptions{}, "disk-change-owner", "Change owner porject of a disk", func(s *mcclient.ClientSession, opts *DiskChangeOwnerOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		srv, err := modules.Disks.PerformAction(s, opts.ID, "change-owner", params)
+		if err != nil {
+			return err
+		}
+		printObject(srv)
+		return nil
+	})
 }

cmd/climc/shell/domains.go

@@ -15,31 +15,21 @@
 package shell
 
 import (
-	"fmt"
-
 	"yunion.io/x/jsonutils"
 
-	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type DomainListOptions struct {
-		Search string `help:"search domain name"`
-		Limit  int64  `help:"Items per page" default:"20"`
-		Offset int64  `help:"Offset"`
+		options.BaseListOptions
 	}
 	R(&DomainListOptions{}, "domain-list", "List domains", func(s *mcclient.ClientSession, args *DomainListOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "name__icontains")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.Domains.List(s, params)
 		if err != nil {
@@ -72,30 +62,7 @@ func init() {
 		printObject(result)
 		return nil
 	})
-	R(&DomainDetailOptions{}, "domain-config-show", "Show detail of a domain config", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
-		objId, err := modules.Domains.GetId(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		config, err := modules.Domains.GetConfig(s, objId)
-		if err != nil {
-			return err
-		}
-		fmt.Println(config.PrettyString())
-		return nil
-	})
-	R(&DomainDetailOptions{}, "domain-config-delete", "Delete a domain config", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
-		objId, err := modules.Domains.GetId(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		config, err := modules.Domains.DeleteConfig(s, objId)
-		if err != nil {
-			return err
-		}
-		printObject(config)
-		return nil
-	})
+
 	/* R(&DomainDetailOptions{}, "domain-config-sql", "Config a domain with SQL driver", func(s *mcclient.ClientSession, args *DomainDetailOptions) error {
 	    config := jsonutils.NewDict()
 	    config.Add(jsonutils.NewString("sql"), "config", "identity", "driver")
@@ -111,26 +78,6 @@ func init() {
 	    return nil
 	}) */
 
-	type DomainConfigLDAPOptions struct {
-		ID string `help:"ID of domain to config" json:"-"`
-		api.SDomainLDAPConfigOptions
-	}
-	R(&DomainConfigLDAPOptions{}, "domain-config-ldap", "Config a domain with LDAP driver", func(s *mcclient.ClientSession, args *DomainConfigLDAPOptions) error {
-		config := jsonutils.NewDict()
-		config.Add(jsonutils.NewString("ldap"), "config", "identity", "driver")
-		config.Add(jsonutils.Marshal(args), "config", "ldap")
-		objId, err := modules.Domains.GetId(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		nconf, err := modules.Domains.UpdateConfig(s, objId, config)
-		if err != nil {
-			return err
-		}
-		fmt.Println(nconf.PrettyString())
-		return nil
-	})
-
 	type DomainCreateOptions struct {
 		NAME     string `help:"Name of domain"`
 		Desc     string `help:"Description"`

cmd/climc/shell/elasticips.go

@@ -24,9 +24,11 @@ import (
 
 func init() {
 	type ElasticipListOptions struct {
-		Region string `help:"Show servers in cloudregion"`
+		Region string `help:"List eips in cloudregion"`
 
-		Usable *bool `help:"List all zones that is usable"`
+		Usable                    *bool  `help:"List all zones that is usable"`
+		UsableEipForAssociateType string `help:"With associate id filter which eip can associate"`
+		UsableEipForAssociateId   string `help:"With associate type filter which eip can associate"`
 
 		options.BaseListOptions
 	}
@@ -50,7 +52,7 @@ func init() {
 		Bandwidth  int    `help:"Bandwidth in Mbps"`
 		Ip         string `help:"IP address of the EIP"`
 		Network    string `help:"Network of the EIP"`
-		ChargeType string `help:"bandwidth charge type, either traffic or bandwidth" choices:"traffic|bandwidth"`
+		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&EipCreateOptions{}, "eip-create", "Create an EIP", func(s *mcclient.ClientSession, args *EipCreateOptions) error {
 		params := jsonutils.NewDict()
@@ -171,7 +173,7 @@ func init() {
 	type ServerCreateEipOptions struct {
 		ID         string `help:"server ID or name"`
 		BW         int    `help:"EIP bandwidth in Mbps"`
-		ChargeType string `help:"bandwidth charge type, either traffic or bandwidth" choices:"traffic|bandwidth"`
+		ChargeType string `help:"bandwidth charge type" choices:"traffic|bandwidth"`
 	}
 	R(&ServerCreateEipOptions{}, "server-create-eip", "allocate an EIP and associate EIP to server", func(s *mcclient.ClientSession, args *ServerCreateEipOptions) error {
 		params := jsonutils.NewDict()

cmd/climc/shell/endpoints.go

@@ -19,36 +19,20 @@ import (
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type EndpointListOptions struct {
-		Limit     int64  `help:"Limit, default 0, i.e. no limit" default:"20"`
-		Offset    int64  `help:"Offset, default 0, i.e. no offset"`
+		options.BaseListOptions
 		Region    string `help:"Search by region"`
 		Service   string `help:"Search by service id or name"`
 		Interface string `help:"Search by interface"`
 	}
 	R(&EndpointListOptions{}, "endpoint-list", "List service endpoints", func(s *mcclient.ClientSession, args *EndpointListOptions) error {
-		query := jsonutils.NewDict()
-		if args.Limit > 0 {
-			query.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			query.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.Region) > 0 {
-			query.Add(jsonutils.NewString(args.Region), "region_id")
-		}
-		if len(args.Service) > 0 {
-			srvId, err := modules.ServicesV3.GetId(s, args.Service, nil)
-			if err != nil {
-				return err
-			}
-			query.Add(jsonutils.NewString(srvId), "service_id")
-		}
-		if len(args.Interface) > 0 {
-			query.Add(jsonutils.NewString(args.Interface), "interface")
+		query, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.EndpointsV3.List(s, query)
 		if err != nil {
@@ -82,7 +66,7 @@ func init() {
 	type EndpointCreateOptions struct {
 		SERVICE   string `help:"Service ID or Name"`
 		REGION    string `help:"Region"`
-		INTERFACE string `help:"Interface types" choices:"internal|public|admin"`
+		INTERFACE string `help:"Interface types" choices:"internal|public|admin|console"`
 		URL       string `help:"URL"`
 		Zone      string `help:"Zone"`
 		Name      string `help:"Name"`

cmd/climc/shell/events.go

@@ -23,6 +23,7 @@ import (
 )
 
 type BaseEventListOptions struct {
+	Scope      string   `help:"scope" choices:"project|domain|system"`
 	Since      string   `help:"Show logs since specific date" metavar:"DATETIME"`
 	Until      string   `help:"Show logs until specific date" metavar:"DATETIME"`
 	Limit      int64    `help:"Limit number of logs" default:"20"`
@@ -31,6 +32,11 @@ type BaseEventListOptions struct {
 	Descending bool     `help:"Descending order"`
 	OrderBy    string   `help:"order by specific field"`
 	Action     []string `help:"Log action"`
+
+	User    []string `help:"filter by operator user"`
+	Project []string `help:"filter by owner project"`
+
+	PagingMarker string `help:"marker for pagination"`
 }
 
 type EventListOptions struct {
@@ -91,6 +97,18 @@ func doEventList(man modules.ResourceManager, s *mcclient.ClientSession, args *E
 	if len(args.Action) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Action), "action")
 	}
+	if len(args.User) > 0 {
+		params.Add(jsonutils.NewStringArray(args.User), "user")
+	}
+	if len(args.Project) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Project), "project")
+	}
+	if len(args.Scope) > 0 {
+		params.Add(jsonutils.NewString(args.Scope), "scope")
+	}
+	if len(args.PagingMarker) > 0 {
+		params.Add(jsonutils.NewString(args.PagingMarker), "paging_marker")
+	}
 	logs, err := man.List(s, params)
 	if err != nil {
 		return err

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,43 +17,22 @@ package shell
 import (
 	"yunion.io/x/jsonutils"
 
+	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type GroupListOptions struct {
-		Admin  bool   `help:"admin mode"`
-		Name   string `help:"Name of the groups to filter"`
-		Domain string `help:"Domain to filter"`
-		Limit  int64  `help:"Items per page" default:"20"`
-		Offset int64  `help:"Offset"`
-		Search string `help:"search text"`
+		options.BaseListOptions
+		Name          string `help:"Filter by name"`
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 	}
 	R(&GroupListOptions{}, "group-list", "List groups", func(s *mcclient.ClientSession, args *GroupListOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Domain) > 0 {
-			domainId, e := modules.Domains.GetId(s, args.Domain, nil)
-			if e != nil {
-				return e
-			}
-			params.Add(jsonutils.NewString(domainId), "domain_id")
-			params.Add(jsonutils.JSONTrue, "admin")
-		}
-		if args.Admin {
-			params.Add(jsonutils.JSONTrue, "admin")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "name__icontains")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.Groups.List(s, params)
 		if err != nil {
@@ -155,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

@@ -48,6 +48,8 @@ func init() {
 
 		Hypervisor string `help:"filter hosts by hypervisor"`
 
+		StorageNotAttached bool `help:"List hosts not attach specified storage"`
+
 		options.BaseListOptions
 	}
 	R(&HostListOptions{}, "host-list", "List hosts", func(s *mcclient.ClientSession, opts *HostListOptions) error {
@@ -125,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))
@@ -184,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()
@@ -211,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")
 		}
@@ -333,6 +354,7 @@ func init() {
 		ID     string `help:"ID or Name of host"`
 		WIRE   string `help:"ID or Name of wire to attach"`
 		MAC    string `help:"Mac address of NIC"`
+		INDEX  int64  `help:"nic index"`
 		Type   string `help:"Nic type" choices:"admin|ipmi"`
 		IpAddr string `help:"IP address"`
 	}
@@ -341,6 +363,7 @@ func init() {
 		params.Add(jsonutils.NewString(args.WIRE), "wire")
 		params.Add(jsonutils.NewString(args.MAC), "mac")
 		params.Add(jsonutils.JSONTrue, "link_up")
+		params.Add(jsonutils.NewInt(args.INDEX), "index")
 		if len(args.Type) > 0 {
 			params.Add(jsonutils.NewString(args.Type), "nic_type")
 		}

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

@@ -0,0 +1,248 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"fmt"
+
+	"yunion.io/x/jsonutils"
+
+	api "yunion.io/x/onecloud/pkg/apis/identity"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type IdentityProviderListOptions struct {
+		options.BaseListOptions
+	}
+	R(&IdentityProviderListOptions{}, "idp-list", "List all identity provider", func(s *mcclient.ClientSession, args *IdentityProviderListOptions) error {
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
+		}
+		results, err := modules.IdentityProviders.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(results, modules.IdentityProviders.GetColumns(s))
+		return nil
+	})
+
+	type IdentityProviderDetailOptions struct {
+		ID string `help:"Id or name of identity provider to show"`
+	}
+	R(&IdentityProviderDetailOptions{}, "idp-show", "Show details of idp", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		detail, err := modules.IdentityProviders.Get(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(detail)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-config-show", "Show detail of a domain config", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		conf, err := modules.IdentityProviders.GetSpecific(s, args.ID, "config", nil)
+		if err != nil {
+			return err
+		}
+		fmt.Println(conf.PrettyString())
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-enable", "Enable an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.PerformAction(s, args.ID, "enable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-disable", "Disable an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.PerformAction(s, args.ID, "disable", nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-delete", "Delete an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.Delete(s, args.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	R(&IdentityProviderDetailOptions{}, "idp-sync", "Sync an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderDetailOptions) error {
+		idp, err := modules.IdentityProviders.PerformAction(s, args.ID, "sync", nil)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigLDAPOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SLDAPIdpConfigOptions
+	}
+	R(&IdentityProviderConfigLDAPOptions{}, "idp-config-ldap", "Config an Identity provider with LDAP driver", func(s *mcclient.ClientSession, args *IdentityProviderConfigLDAPOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "ldap")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+	type IdentityProviderCreateOptions 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"`
+
+		api.SLDAPIdpConfigOptions
+	}
+	R(&IdentityProviderCreateOptions{}, "idp-create-ldap", "Create an identity provider with LDAP driver", func(s *mcclient.ClientSession, args *IdentityProviderCreateOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+
+		if len(args.TargetDomain) > 0 {
+			params.Add(jsonutils.NewString(args.TargetDomain), "target_domain")
+		}
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.NewString("ldap"), "driver")
+		params.Add(jsonutils.Marshal(args), "config", "ldap")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigLDAPSingleDomainOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SLDAPIdpConfigSingleDomainOptions
+	}
+	R(&IdentityProviderConfigLDAPSingleDomainOptions{}, "idp-config-ldap-single-domain", "Config an Identity provider with LDAP driver/single domain template", func(s *mcclient.ClientSession, args *IdentityProviderConfigLDAPSingleDomainOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "ldap")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+	type IdentityProviderCreateLDAPSingleDomainOptions struct {
+		NAME     string `help:"name of identity provider" json:"-"`
+		TEMPLATE string `help:"configuration template name" choices:"msad_one_domain|openldap_one_domain" json:"-"`
+
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
+		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
+
+		TargetDomain string `help:"target domain without creating new domain"`
+
+		api.SLDAPIdpConfigSingleDomainOptions
+	}
+	R(&IdentityProviderCreateLDAPSingleDomainOptions{}, "idp-create-ldap-single-domain", "Create an identity provider with LDAP driver/single domain template", func(s *mcclient.ClientSession, args *IdentityProviderCreateLDAPSingleDomainOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		params.Add(jsonutils.NewString("ldap"), "driver")
+		params.Add(jsonutils.NewString(args.TEMPLATE), "template")
+
+		if len(args.TargetDomain) > 0 {
+			params.Add(jsonutils.NewString(args.TargetDomain), "target_domain")
+		}
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.Marshal(args), "config", "ldap")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+	type IdentityProviderConfigLDAPMultiDomainOptions struct {
+		ID string `help:"ID of idp to config" json:"-"`
+		api.SLDAPIdpConfigMultiDomainOptions
+	}
+	R(&IdentityProviderConfigLDAPMultiDomainOptions{}, "idp-config-ldap-multi-domain", "Config an Identity provider with LDAP driver/multi domain template", func(s *mcclient.ClientSession, args *IdentityProviderConfigLDAPMultiDomainOptions) error {
+		config := jsonutils.NewDict()
+		config.Add(jsonutils.Marshal(args), "config", "ldap")
+		nconf, err := modules.IdentityProviders.PerformAction(s, args.ID, "config", config)
+		if err != nil {
+			return err
+		}
+		fmt.Println(nconf.PrettyString())
+		return nil
+	})
+
+	type IdentityProviderCreateLDAPMultiDomainOptions struct {
+		NAME     string `help:"name of identity provider" json:"-"`
+		TEMPLATE string `help:"configuration template name" choices:"msad_multi_domain" json:"-"`
+
+		AutoCreateProject   bool `help:"automatically create a default project when importing domain" json:"-"`
+		NoAutoCreateProject bool `help:"do not create default project when importing domain" json:"-"`
+
+		api.SLDAPIdpConfigMultiDomainOptions
+	}
+	R(&IdentityProviderCreateLDAPMultiDomainOptions{}, "idp-create-ldap-multi-domain", "Create an identity provider with LDAP driver/single domain template", func(s *mcclient.ClientSession, args *IdentityProviderCreateLDAPMultiDomainOptions) error {
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.NAME), "name")
+		params.Add(jsonutils.NewString("ldap"), "driver")
+		params.Add(jsonutils.NewString(args.TEMPLATE), "template")
+
+		if args.AutoCreateProject {
+			params.Add(jsonutils.JSONTrue, "auto_create_project")
+		} else if args.NoAutoCreateProject {
+			params.Add(jsonutils.JSONFalse, "auto_create_project")
+		}
+
+		params.Add(jsonutils.Marshal(args), "config", "ldap")
+
+		idp, err := modules.IdentityProviders.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(idp)
+		return nil
+	})
+
+}

cmd/climc/shell/images.go

@@ -28,11 +28,11 @@ import (
 )
 
 type ImageOptionalOptions struct {
-	Public             bool     `help:"Make image public"`
-	Private            bool     `help:"Make image private"`
 	Format             string   `help:"Image format" choices:"raw|qcow2|iso|vmdk|docker|vhd"`
 	Protected          bool     `help:"Prevent image from being deleted"`
 	Unprotected        bool     `help:"Allow image to be deleted"`
+	Standard           bool     `help:"Mark image as a standard image"`
+	Nonstandard        bool     `help:"Mark image as a non-standard image"`
 	MinDisk            int64    `help:"Disk size after expanded, in MB" metavar:"MIN_DISK_SIZE_MB"`
 	MinRam             int64    `help:"Minimal memory size required" metavar:"MIN_RAM_MB"`
 	VirtualSize        int64    `help:"Disk size after expanded, in MB"`
@@ -55,11 +55,6 @@ type ImageOptionalOptions struct {
 }
 
 func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDict, args ImageOptionalOptions) error {
-	if args.Public && !args.Private {
-		params.Add(jsonutils.NewString("true"), "is-public")
-	} else if !args.Public && args.Private {
-		params.Add(jsonutils.NewString("false"), "is-public")
-	}
 	if len(args.Format) > 0 {
 		params.Add(jsonutils.NewString("bare"), "container-format")
 		params.Add(jsonutils.NewString(args.Format), "disk-format")
@@ -69,6 +64,11 @@ func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDi
 	} else if !args.Protected && args.Unprotected {
 		params.Add(jsonutils.NewString("false"), "protected")
 	}
+	if args.Standard && !args.Nonstandard {
+		params.Add(jsonutils.JSONTrue, "is_standard")
+	} else if !args.Standard && args.Nonstandard {
+		params.Add(jsonutils.JSONFalse, "is_standard")
+	}
 	if args.MinDisk > 0 {
 		params.Add(jsonutils.NewString(fmt.Sprintf("%d", args.MinDisk)), "min_disk")
 	}
@@ -134,9 +134,11 @@ func init() {
 	type ImageListOptions struct {
 		options.BaseListOptions
 
-		IsPublic string   `help:"filter images public or not(True, False or None)" choices:"true|false|none"`
-		Format   []string `help:"Disk formats"`
-		Name     string   `help:"Name filter"`
+		IsPublic   string   `help:"filter images public or not(True, False or None)" choices:"true|false"`
+		IsStandard string   `help:"filter images standard or non-standard" choices:"true|false"`
+		Protected  string   `help:"filter images by protected" choices:"true|false"`
+		Format     []string `help:"Disk formats"`
+		Name       string   `help:"Name filter"`
 	}
 	R(&ImageListOptions{}, "image-list", "List images", func(s *mcclient.ClientSession, args *ImageListOptions) error {
 		params, err := args.Params()
@@ -146,6 +148,12 @@ func init() {
 		if len(args.IsPublic) > 0 {
 			params.Add(jsonutils.NewString(args.IsPublic), "is_public")
 		}
+		if len(args.IsStandard) > 0 {
+			params.Add(jsonutils.NewString(args.IsStandard), "is_standard")
+		}
+		if len(args.Protected) > 0 {
+			params.Add(jsonutils.NewString(args.Protected), "protected")
+		}
 		if len(args.Tenant) > 0 {
 			tid, e := modules.Projects.GetId(s, args.Tenant, nil)
 			if e != nil {
@@ -215,19 +223,7 @@ func init() {
 	}
 
 	R(&ImageUpdateOptions{}, "image-update", "Update images meta infomation", func(s *mcclient.ClientSession, args *ImageUpdateOptions) error {
-		/* img, e := modules.Images.Get(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		idstr, e := img.GetString("id")
-		if e != nil {
-			return e
-		}*/
 		params := jsonutils.NewDict()
-		/* properties, _ := img.Get("properties")
-		if properties != nil {
-			params.Add(properties, "properties")
-		}*/
 		if len(args.Name) > 0 {
 			params.Add(jsonutils.NewString(args.Name), "name")
 		}
@@ -268,7 +264,7 @@ func init() {
 
 	type ImageDeleteOptions struct {
 		ID                    []string `help:"Image ID or name"`
-		OverridePendingDelete *bool    `help:"Delete image directly instead of pending delete"`
+		OverridePendingDelete *bool    `help:"Delete image directly instead of pending delete" short-token:"f"`
 	}
 	R(&ImageDeleteOptions{}, "image-delete", "Delete a image", func(s *mcclient.ClientSession, args *ImageDeleteOptions) error {
 		params, err := options.StructToParams(args)
@@ -316,9 +312,6 @@ func init() {
 		// if len(args.Format) == 0 {
 		// 	return fmt.Errorf("Please specify image format")
 		//}
-		if len(args.OsType) == 0 {
-			return fmt.Errorf("Please specify OS type")
-		}
 		err := addImageOptionalOptions(s, params, args.ImageOptionalOptions)
 		if err != nil {
 			return err
@@ -418,17 +411,26 @@ func init() {
 		return nil
 	})
 
-	R(&ImageOperationOptions{}, "image-public", "Make a image public", func(s *mcclient.ClientSession, args *ImageOperationOptions) error {
+	type ImagePublicOptions struct {
+		ID             []string `help:"ID or name of image" json:"-"`
+		Scope          string   `help:"sharing scope" choices:"system|domain"`
+		ShareToProject []string `help:"Share to prject"`
+	}
+	R(&ImagePublicOptions{}, "image-public", "Make a image public", func(s *mcclient.ClientSession, args *ImagePublicOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
 		if len(args.ID) == 0 {
 			return fmt.Errorf("No image ID provided")
 		} else if len(args.ID) == 1 {
-			result, err := modules.Images.PerformAction(s, args.ID[0], "public", nil)
+			result, err := modules.Images.PerformAction(s, args.ID[0], "public", params)
 			if err != nil {
 				return err
 			}
 			printObject(result)
 		} else {
-			results := modules.Images.BatchPerformAction(s, args.ID, "public", nil)
+			results := modules.Images.BatchPerformAction(s, args.ID, "public", params)
 			printBatchResults(results, modules.Images.GetColumns(s))
 		}
 		return nil
@@ -450,18 +452,16 @@ func init() {
 
 	R(&ImageOperationOptions{}, "image-mark-standard", "Mark image standard", func(s *mcclient.ClientSession, args *ImageOperationOptions) error {
 		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONTrue, "is-public")
-		params.Add(jsonutils.JSONTrue, "protected")
-		results := modules.Images.BatchPerformAction(s, args.ID, "mark-public-protected", params)
+		params.Add(jsonutils.JSONTrue, "is_standard")
+		results := modules.Images.BatchPerformAction(s, args.ID, "mark-standard", params)
 		printBatchResults(results, modules.Images.GetColumns(s))
 		return nil
 	})
 
 	R(&ImageOperationOptions{}, "image-mark-unstandard", "Mark image not standard", func(s *mcclient.ClientSession, args *ImageOperationOptions) error {
 		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONFalse, "is-public")
-		params.Add(jsonutils.JSONFalse, "protected")
-		results := modules.Images.BatchPerformAction(s, args.ID, "mark-public-protected", params)
+		params.Add(jsonutils.JSONFalse, "is_standard")
+		results := modules.Images.BatchPerformAction(s, args.ID, "mark-standard", params)
 		printBatchResults(results, modules.Images.GetColumns(s))
 		return nil
 	})

cmd/climc/shell/itsm_tasks.go

@@ -28,7 +28,7 @@ func init() {
 	 */
 	type TaskOperOperateOptions struct {
 		ID                string `help:"ID of task"`
-		APPROVAL_DECISION bool   `help:"Approval decision" choices:"true|false"`
+		APPROVAL_DECISION bool   `help:"Approval decision"`
 		ApprovalProposal  string `help:"Approval proposal"`
 	}
 	R(&TaskOperOperateOptions{}, "process-task-operate", "Operate task", func(s *mcclient.ClientSession, args *TaskOperOperateOptions) error {

cmd/climc/shell/k8s/raw.go

@@ -20,6 +20,8 @@ import (
 	"os"
 	"os/exec"
 
+	"github.com/ghodss/yaml"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -74,7 +76,11 @@ func initRaw() {
 		if err != nil {
 			return err
 		}
-		body, err := jsonutils.Parse(content)
+		jsonBytes, err := yaml.YAMLToJSON(content)
+		if err != nil {
+			return err
+		}
+		body, err := jsonutils.Parse(jsonBytes)
 		if err != nil {
 			return err
 		}
@@ -90,16 +96,16 @@ func initRaw() {
 	})
 
 	R(&RawOpt{}, "k8s-edit", "Edit k8s resource instance", func(s *mcclient.ClientSession, args *RawOpt) error {
-		obj, err := k8s.RawResource.Get(s, args.KIND, args.Namespace, args.NAME, args.Cluster)
+		yamlBytes, err := k8s.RawResource.GetYAML(s, args.KIND, args.Namespace, args.NAME, args.Cluster)
 		if err != nil {
 			return err
 		}
-		tempfile, err := ioutil.TempFile("", fmt.Sprintf("k8s-%s-%s.json", args.KIND, args.NAME))
+		tempfile, err := ioutil.TempFile("", fmt.Sprintf("k8s-%s-%s.yaml", args.KIND, args.NAME))
 		if err != nil {
 			return err
 		}
 		defer os.Remove(tempfile.Name())
-		if _, err := tempfile.Write([]byte(obj.PrettyString())); err != nil {
+		if _, err := tempfile.Write(yamlBytes); err != nil {
 			return err
 		}
 		if err := tempfile.Close(); err != nil {

cmd/climc/shell/keypairs.go

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

cmd/climc/shell/loadbalanceragents.go

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

cmd/climc/shell/loadbalancerclusters.go

@@ -0,0 +1,76 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	R(&options.LoadbalancerClusterCreateOptions{}, "lbcluster-create", "Create lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		lbcluster, err := modules.LoadbalancerClusters.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(lbcluster)
+		return nil
+	})
+	R(&options.LoadbalancerClusterUpdateOptions{}, "lbcluster-update", "Update lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterUpdateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		lbcluster, err := modules.LoadbalancerClusters.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(lbcluster)
+		return nil
+	})
+	R(&options.LoadbalancerClusterGetOptions{}, "lbcluster-show", "Show lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterGetOptions) error {
+		lbcluster, err := modules.LoadbalancerClusters.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(lbcluster)
+		return nil
+	})
+	R(&options.LoadbalancerClusterListOptions{}, "lbcluster-list", "List lbclusters", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.LoadbalancerClusters.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.LoadbalancerClusters.GetColumns(s))
+		return nil
+	})
+	R(&options.LoadbalancerClusterDeleteOptions{}, "lbcluster-delete", "Show lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterDeleteOptions) error {
+		lbagent, err := modules.LoadbalancerClusters.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(lbagent)
+		return 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/modules.go

@@ -12,27 +12,28 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package algorithm
+package shell
 
 import (
 	"fmt"
 
-	"yunion.io/x/onecloud/pkg/scheduler/cache/candidate"
-	"yunion.io/x/onecloud/pkg/scheduler/core"
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
-func ToHostCandidate(c core.Candidater) (*candidate.HostDesc, error) {
-	d, ok := c.(*candidate.HostDesc)
-	if !ok {
-		return nil, fmt.Errorf("Can't convert %#v to '*candidate.HostDesc'", c)
+func init() {
+	type ModuleListOptions struct {
 	}
-	return d, nil
-}
-
-func ToBaremetalCandidate(c core.Candidater) (*candidate.BaremetalDesc, error) {
-	d, ok := c.(*candidate.BaremetalDesc)
-	if !ok {
-		return nil, fmt.Errorf("Can't convert %#v to '*candidate.BaremetalDesc'", c)
-	}
-	return d, nil
+	R(&ModuleListOptions{}, "module-list", "List all modules", func(s *mcclient.ClientSession, args *ModuleListOptions) error {
+		modules, jointModules := modules.GetRegisterdModules()
+		json := jsonutils.Marshal(modules)
+		fmt.Println("Modules")
+		fmt.Println(json.PrettyString())
+		json2 := jsonutils.Marshal(jointModules)
+		fmt.Println("Joint modules")
+		fmt.Println(json2.PrettyString())
+		return nil
+	})
 }

cmd/climc/shell/networks.go

@@ -35,6 +35,7 @@ func init() {
 		Vpc        string `help:"search networks belongs to a VPC"`
 		Region     string `help:"search networks belongs to a CloudRegion" json:"cloudregion"`
 		City       string `help:"search networks belongs to a city"`
+		Usable     *bool  `help:"search usable networks"`
 		ServerType string `help:"search networks belongs to a ServerType" choices:"guest|baremetal|container|pxe|ipmi"`
 	}
 	R(&NetworkListOptions{}, "network-list", "List networks", func(s *mcclient.ClientSession, opts *NetworkListOptions) error {
@@ -165,8 +166,17 @@ func init() {
 		return nil
 	})
 
-	R(&NetworkShowOptions{}, "network-public", "Make a network public", func(s *mcclient.ClientSession, args *NetworkShowOptions) error {
-		result, err := modules.Networks.PerformAction(s, args.ID, "public", nil)
+	type NetworkShareOptions struct {
+		NetworkShowOptions
+		Scope          string   `help:"sharing scope" choices:"system|domain"`
+		ShareToProject []string `help:"Share to prject"`
+	}
+	R(&NetworkShareOptions{}, "network-public", "Make a network public", func(s *mcclient.ClientSession, args *NetworkShareOptions) error {
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Networks.PerformAction(s, args.ID, "public", params)
 		if err != nil {
 			return err
 		}
@@ -200,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"`
@@ -219,6 +230,9 @@ func init() {
 		if len(args.ServerType) > 0 {
 			params.Add(jsonutils.NewString(args.ServerType), "server_type")
 		}
+		if len(args.IfnameHint) > 0 {
+			params.Add(jsonutils.NewString(args.IfnameHint), "ifname_hint")
+		}
 		if len(args.AllocPolicy) > 0 {
 			params.Add(jsonutils.NewString(args.AllocPolicy), "alloc_policy")
 		}

cmd/climc/shell/notification.go

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

cmd/climc/shell/parameters.go

@@ -24,6 +24,7 @@ import (
 
 func init() {
 	type ParametersListOptions struct {
+		Name        string `help:"List parameter of specificated name"`
 		NamespaceId string `help:"List parameter of specificated namespace id, ADMIN only"`
 		User        string `help:"List parameter of specificated user id, ADMIN only" token:"user-id"`
 		Service     string `help:"List parameter of specificated service id, ADMIN only"`
@@ -36,13 +37,20 @@ func init() {
 			return err
 		}
 
+		if len(args.Name) > 0 {
+			params.Add(jsonutils.NewString(args.Name), "name")
+		}
+
 		var result *modules.ListResult
 		if len(args.NamespaceId) > 0 {
 			params.Add(jsonutils.NewString(args.NamespaceId), "namespace_id")
+			params.Add(jsonutils.NewString("system"), "scope")
 			result, err = modules.Parameters.List(s, params)
 		} else if len(args.User) > 0 {
+			params.Add(jsonutils.NewString("system"), "scope")
 			result, err = modules.Parameters.ListInContext(s, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {
+			params.Add(jsonutils.NewString("system"), "scope")
 			result, err = modules.Parameters.ListInContext(s, params, &modules.ServicesV3, args.Service)
 		} else {
 			result, err = modules.Parameters.List(s, params)
@@ -64,19 +72,22 @@ func init() {
 
 	R(&ParametersShowOptions{}, "parameter-show", "show a parameter", func(s *mcclient.ClientSession, args *ParametersShowOptions) error {
 		params := jsonutils.NewDict()
-		if len(args.NamespaceId) > 0 {
+		/*if len(args.NamespaceId) > 0 {
 			params.Add(jsonutils.JSONTrue, "admin")
 			params.Add(jsonutils.NewString(args.NamespaceId), "namespace_id")
-		}
+		}*/
 
 		var parameter jsonutils.JSONObject
 		var err error
 		if len(args.NamespaceId) > 0 {
+			params.Add(jsonutils.NewString("system"), "scope")
 			params.Add(jsonutils.NewString(args.NamespaceId), "namespace_id")
 			parameter, err = modules.Parameters.Get(s, args.NAME, params)
 		} else if len(args.User) > 0 {
+			params.Add(jsonutils.NewString("system"), "scope")
 			parameter, err = modules.Parameters.GetInContext(s, args.NAME, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {
+			params.Add(jsonutils.NewString("system"), "scope")
 			parameter, err = modules.Parameters.GetInContext(s, args.NAME, params, &modules.ServicesV3, args.Service)
 		} else {
 			parameter, err = modules.Parameters.Get(s, args.NAME, params)
@@ -97,9 +108,14 @@ func init() {
 	}
 
 	R(&ParametersCreateOptions{}, "parameter-create", "create a parameter", func(s *mcclient.ClientSession, args *ParametersCreateOptions) error {
+		value, err := jsonutils.ParseString(args.VALUE)
+		if err != nil {
+			return err
+		}
+
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.NAME), "name")
-		params.Add(jsonutils.NewString(args.VALUE), "value")
+		params.Add(value, "value")
 
 		if len(args.User) > 0 {
 			params.Add(jsonutils.NewString(args.User), "user_id")
@@ -123,13 +139,18 @@ func init() {
 	}
 
 	R(&ParametersUpdateOptions{}, "parameter-update", "update parameter", func(s *mcclient.ClientSession, args *ParametersUpdateOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.VALUE) > 0 {
-			params.Add(jsonutils.NewString(args.VALUE), "value")
-		}
-
 		var parameter jsonutils.JSONObject
 		var err error
+		value, err := jsonutils.ParseString(args.VALUE)
+		if err != nil {
+			return err
+		}
+
+		params := jsonutils.NewDict()
+		if len(args.VALUE) > 0 {
+			params.Add(value, "value")
+		}
+
 		if len(args.User) > 0 {
 			parameter, err = modules.Parameters.PutInContext(s, args.NAME, params, &modules.UsersV3, args.User)
 		} else if len(args.Service) > 0 {

cmd/climc/shell/policies.go

@@ -23,35 +23,28 @@ import (
 	"time"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
 
+	"yunion.io/x/onecloud/pkg/cloudcommon/consts"
 	"yunion.io/x/onecloud/pkg/cloudcommon/policy"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/auth"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+	"yunion.io/x/onecloud/pkg/util/rbacutils"
 )
 
 func init() {
 	type PolicyListOptions struct {
-		Limit  int64  `help:"Limit, default 0, i.e. no limit"`
-		Offset int64  `help:"Offset, default 0, i.e. no offset"`
-		Search string `help:"Search by name"`
-		Type   string `help:"filter by type"`
-		Format string `help:"policy format, default to yaml" default:"yaml" choices:"yaml|json"`
+		options.BaseListOptions
+		Type          string `help:"filter by type"`
+		Format        string `help:"policy format, default to yaml" default:"yaml" choices:"yaml|json"`
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 	}
 	R(&PolicyListOptions{}, "policy-list", "List all policies", func(s *mcclient.ClientSession, args *PolicyListOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.Format), "format")
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "type__icontains")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.Type) > 0 {
-			params.Add(jsonutils.NewString(args.Type), "type")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.Policies.List(s, params)
 		if err != nil {
@@ -62,6 +55,7 @@ func init() {
 	})
 
 	type PolicyCreateOptions struct {
+		Domain   string `help:"domain of the policy"`
 		TYPE     string `help:"type of the policy"`
 		FILE     string `help:"path to policy file"`
 		Enabled  bool   `help:"create policy enabled"`
@@ -76,6 +70,9 @@ func init() {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.TYPE), "type")
 		params.Add(jsonutils.NewString(string(policyBytes)), "policy")
+		if len(args.Domain) > 0 {
+			params.Add(jsonutils.NewString(args.Domain), "domain")
+		}
 		if args.Enabled {
 			params.Add(jsonutils.JSONTrue, "enabled")
 		} else if args.Disabled {
@@ -99,7 +96,7 @@ func init() {
 		Enabled  bool   `help:"update policy enabled"`
 		Disabled bool   `help:"update policy disabled"`
 	}
-	R(&PolicyPatchOptions{}, "policy-patch", "Patch policy", func(s *mcclient.ClientSession, args *PolicyPatchOptions) error {
+	updateFunc := func(s *mcclient.ClientSession, args *PolicyPatchOptions) error {
 		policyId, err := modules.Policies.GetId(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -127,6 +124,29 @@ func init() {
 
 		printObject(result)
 
+		return nil
+	}
+	R(&PolicyPatchOptions{}, "policy-patch", "Patch policy", updateFunc)
+	R(&PolicyPatchOptions{}, "policy-update", "Patch policy", updateFunc)
+
+	type PolicyPerformOptions struct {
+		ID string `help:"ID of policy to update"`
+	}
+	R(&PolicyPerformOptions{}, "policy-public", "Mark a policy public", func(s *mcclient.ClientSession, args *PolicyPerformOptions) error {
+		result, err := modules.Policies.PerformAction(s, args.ID, "public", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&PolicyPerformOptions{}, "policy-private", "Mark a policy private", func(s *mcclient.ClientSession, args *PolicyPerformOptions) error {
+		result, err := modules.Policies.PerformAction(s, args.ID, "private", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
 		return nil
 	})
 
@@ -222,10 +242,11 @@ func init() {
 	})
 
 	type PolicyAdminCapableOptions struct {
-		User       string   `help:"For user"`
-		UserDomain string   `help:"Domain for user"`
-		Project    string   `help:"Role assignments for project"`
-		Role       []string `help:"Roles"`
+		User          string   `help:"For user"`
+		UserDomain    string   `help:"Domain for user"`
+		Project       string   `help:"Role assignments for project"`
+		ProjectDomain string   `help:"Domain for project"`
+		Role          []string `help:"Roles"`
 	}
 	R(&PolicyAdminCapableOptions{}, "policy-admin-capable", "Check admin capable", func(s *mcclient.ClientSession, args *PolicyAdminCapableOptions) error {
 		auth.InitFromClientSession(s)
@@ -234,49 +255,64 @@ func init() {
 		var token mcclient.TokenCredential
 		if len(args.User) > 0 {
 			token = &mcclient.SSimpleToken{
-				Domain:  args.UserDomain,
-				User:    args.User,
-				Project: args.Project,
-				Roles:   strings.Join(args.Role, ","),
+				Domain:        args.UserDomain,
+				User:          args.User,
+				Project:       args.Project,
+				ProjectDomain: args.ProjectDomain,
+				Roles:         strings.Join(args.Role, ","),
 			}
 		} else {
 			token = s.GetToken()
 		}
 
-		capable := policy.PolicyManager.IsAdminCapable(token)
-		fmt.Printf("%v\n", capable)
+		fmt.Println("Token", token)
+
+		for _, scope := range []rbacutils.TRbacScope{
+			rbacutils.ScopeSystem,
+			rbacutils.ScopeDomain,
+			rbacutils.ScopeProject,
+			rbacutils.ScopeUser,
+			rbacutils.ScopeNone,
+		} {
+			fmt.Printf("%s: ", scope)
+			capable := policy.PolicyManager.IsScopeCapable(token, scope)
+			fmt.Println(capable)
+		}
 
 		return nil
 	})
 
 	type PolicyExplainOptions struct {
-		User       string   `help:"For user"`
-		UserDomain string   `help:"Domain for user"`
-		Project    string   `help:"Role assignments for project"`
-		Role       []string `help:"Roles"`
-		Request    []string `help:"explain request, in format of key:is_admin:service:resource:action:extra"`
-		Name       string   `help:"policy name"`
+		User          string   `help:"For user"`
+		UserDomain    string   `help:"Domain for user"`
+		Project       string   `help:"Role assignments for project"`
+		Role          []string `help:"Roles"`
+		Request       []string `help:"explain request, in format of key:scope:service:resource:action:extra"`
+		Name          string   `help:"policy name"`
+		Debug         bool     `help:"enable RBAC debug"`
+		ProjectDomain string   `help:"Domain name"`
+		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 {
+			consts.EnableRbacDebug()
+		}
 
 		req := jsonutils.NewDict()
 		for i := 0; i < len(args.Request); i += 1 {
 			parts := strings.Split(args.Request[i], ":")
 			if len(parts) < 3 {
-				return fmt.Errorf("invalid request, should be in the form of key:is_admin:service[:resource:action:extra]")
+				return fmt.Errorf("invalid request, should be in the form of key:[system|domain|project]:service[:resource:action:extra]")
 			}
 			key := parts[0]
-			data := make([]jsonutils.JSONObject, 1)
-			if parts[1] == "true" {
-				data[0] = jsonutils.JSONTrue
-			} else if parts[1] == "false" {
-				data[0] = jsonutils.JSONFalse
-			} else {
-				return fmt.Errorf("invalid request, is_admin should be true|false")
-			}
-			for i := 2; i < len(parts); i += 1 {
+			data := make([]jsonutils.JSONObject, 0)
+			for i := 1; i < len(parts); i += 1 {
 				data = append(data, jsonutils.NewString(parts[i]))
 			}
 			req.Add(jsonutils.NewArray(data...), key)
@@ -285,11 +321,54 @@ func init() {
 
 		var token mcclient.TokenCredential
 		if len(args.User) > 0 {
+			usrParams := jsonutils.NewDict()
+			if len(args.UserDomain) > 0 {
+				usrDom, err := modules.Domains.Get(s, args.UserDomain, nil)
+				if err != nil {
+					return fmt.Errorf("search user domain %s fail %s", args.UserDomain, err)
+				}
+				usrDomId, _ := usrDom.Get("id")
+				usrParams.Add(usrDomId, "domain_id")
+			}
+			usr, err := modules.UsersV3.Get(s, args.User, usrParams)
+			if err != nil {
+				return fmt.Errorf("search user %s fail %s", args.User, err)
+			}
+			usrId, _ := usr.GetString("id")
+			usrName, _ := usr.GetString("name")
+			usrDomId, _ := usr.GetString("domain_id")
+			usrDom, _ := usr.GetString("domain")
+
+			projParams := jsonutils.NewDict()
+			if len(args.ProjectDomain) > 0 {
+				projDom, err := modules.Domains.Get(s, args.ProjectDomain, nil)
+				if err != nil {
+					return fmt.Errorf("search project domain %s fail %s", args.ProjectDomain, err)
+				}
+				projDomId, _ := projDom.Get("id")
+				projParams.Add(projDomId, "domain_id")
+			}
+			proj, err := modules.Projects.Get(s, args.Project, projParams)
+			if err != nil {
+				return fmt.Errorf("search project %s fail %s", args.Project, err)
+			}
+			projId, _ := proj.GetString("id")
+			projName, _ := proj.GetString("name")
+			projDom, _ := proj.GetString("domain")
+			projDomId, _ := proj.GetString("domain_id")
 			token = &mcclient.SSimpleToken{
-				Domain:  args.UserDomain,
-				User:    args.User,
-				Project: args.Project,
-				Roles:   strings.Join(args.Role, ","),
+				Domain:          usrDom,
+				DomainId:        usrDomId,
+				User:            usrName,
+				UserId:          usrId,
+				Project:         projName,
+				ProjectId:       projId,
+				ProjectDomain:   projDom,
+				ProjectDomainId: projDomId,
+				Roles:           strings.Join(args.Role, ","),
+				Context: mcclient.SAuthContext{
+					Ip: args.Ip,
+				},
 			}
 		} else {
 			token = s.GetToken()
@@ -302,10 +381,18 @@ func init() {
 		printObject(result)
 
 		fmt.Println("userCred:", token)
-		m := policy.PolicyManager.MatchedPolicies(false, token)
-		fmt.Println("matched policies:", m)
-		m = policy.PolicyManager.MatchedPolicies(true, token)
-		fmt.Println("matched admin policies:", m)
+		for _, scope := range []rbacutils.TRbacScope{
+			rbacutils.ScopeSystem,
+			rbacutils.ScopeDomain,
+			rbacutils.ScopeProject,
+			rbacutils.ScopeUser,
+			rbacutils.ScopeNone,
+		} {
+			m := policy.PolicyManager.MatchedPolicies(scope, token)
+			fmt.Println("matched", scope, "policies:", m)
+		}
+
+		fmt.Println("all_policies", policy.PolicyManager.AllPolicies())
 		return nil
 	})
 }

cmd/climc/shell/projectresources.go

@@ -0,0 +1,36 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"fmt"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+)
+
+func init() {
+	type ProjectResourceOptions struct {
+		SERVICE string `help:"Service type"`
+	}
+	R(&ProjectResourceOptions{}, "project-resource-show", "query backend service for its project resource count", func(s *mcclient.ClientSession, args *ProjectResourceOptions) error {
+		body, err := modules.GetProjectResources(s, args.SERVICE)
+		if err != nil {
+			return err
+		}
+		fmt.Println(body.PrettyString())
+		return nil
+	})
+}

cmd/climc/shell/projects.go

@@ -17,34 +17,21 @@ package shell
 import (
 	"yunion.io/x/jsonutils"
 
+	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type ProjectListOptions struct {
-		Domain string `help:"Domain ID or Name"`
-		Search string `help:"Search project name"`
-		Limit  int64  `help:"Items per page" default:"20"`
-		Offset int64  `help:"Offset"`
+		options.BaseListOptions
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 	}
 	R(&ProjectListOptions{}, "project-list", "List projects", func(s *mcclient.ClientSession, args *ProjectListOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Domain) > 0 {
-			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
-			if err != nil {
-				return err
-			}
-			params.Add(jsonutils.NewString(domainId), "domain_id")
-		}
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "name__icontains")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.Projects.List(s, params)
 		if err != nil {
@@ -345,7 +332,7 @@ func init() {
 		return nil
 	})
 
-	R(&ProjectShowOptions{}, "project-shared-images", "Show shared images of a project", func(s *mcclient.ClientSession, args *ProjectShowOptions) error {
+	/*R(&ProjectShowOptions{}, "project-shared-images", "Show shared images of a project", func(s *mcclient.ClientSession, args *ProjectShowOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {
 			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
@@ -376,5 +363,72 @@ func init() {
 			return err
 		}
 		return nil
+	})*/
+
+	// Deprecated
+	type ProjectBatchJoinOptions struct {
+		Ids      []string `help:"user ids or group ids"`
+		Resource string   `help:"resource type" choices:"users|groups"`
+		Rid      string   `help:"role id"`
+		Pid      string   `help:"project id"`
+	}
+	R(&ProjectBatchJoinOptions{}, "project-batch-join", "Batch join users or groups into project with role", func(s *mcclient.ClientSession, args *ProjectBatchJoinOptions) error {
+		params := jsonutils.Marshal(args)
+		_, err := modules.Projects.DoProjectBatchJoin(s, params)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
+
+	type ProjectAddUserGroupOptions struct {
+		Project string   `help:"ID or name of project to add users/groups" positional:"true" optional:"false"`
+		User    []string `help:"ID of user to add"`
+		Group   []string `help:"ID of group to add"`
+		Role    []string `help:"ID of role to add"`
+	}
+	R(&ProjectAddUserGroupOptions{}, "project-add-user-group", "Batch add users/groups to project", func(s *mcclient.ClientSession, args *ProjectAddUserGroupOptions) error {
+		input := api.SProjectAddUserGroupInput{}
+		input.Users = args.User
+		input.Groups = args.Group
+		input.Roles = args.Role
+		err := input.Validate()
+		if err != nil {
+			return err
+		}
+		result, err := modules.Projects.PerformAction(s, args.Project, "join", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ProjectRemoveUserGroup struct {
+		Project string   `help:"ID or name of project to remove user/group" optional:"false" positional:"true"`
+		User    string   `help:"user to remove"`
+		Group   string   `help:"group to remove"`
+		Role    []string `help:"roles to remove"`
+	}
+	R(&ProjectRemoveUserGroup{}, "project-remove-user-group", "Remove users/groups from project", func(s *mcclient.ClientSession, args *ProjectRemoveUserGroup) error {
+		input := api.SProjectRemoveUserGroupInput{}
+		input.UserRoles = make([]api.SUserRole, len(args.Role))
+		input.GroupRoles = make([]api.SGroupRole, len(args.Role))
+		for i := range args.Role {
+			input.UserRoles[i].User = args.User
+			input.UserRoles[i].Role = args.Role[i]
+			input.GroupRoles[i].Group = args.Group
+			input.GroupRoles[i].Role = args.Role[i]
+		}
+		err := input.Validate()
+		if err != nil {
+			return err
+		}
+		result, err := modules.Projects.PerformAction(s, args.Project, "leave", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
 	})
 }

cmd/climc/shell/quotas.go

@@ -33,11 +33,13 @@ type QuotaBaseOptions struct {
 	IsolatedDevice int64 `help:"Isolated device count" json:"isolated_device,omitzero"`
 	Snapshot       int64 `help:"Snapshot count" json:"snapshot,omitzero"`
 	Image          int64 `help:"Template count" json:"image,omitzero"`
+	Secgroup       int64 `help:"Secgroup count" json:"secgroup,omitzero"`
 }
 
 func init() {
 	type QuotaOptions struct {
-		Tenant string `help:"Tenant name of ID"`
+		Tenant        string `help:"Tenant name or ID"`
+		ProjectDomain string `help:"Domain name or ID"`
 	}
 	R(&QuotaOptions{}, "quota", "Show quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
 		params := jsonutils.Marshal(args)
@@ -59,7 +61,10 @@ func init() {
 	})
 
 	type QuotaSetOptions struct {
-		Tenant string `help:"Tenant name or ID to set quota" json:"tenant,omitempty"`
+		Tenant        string `help:"Tenant name or ID to set quota" json:"tenant,omitempty"`
+		ProjectDomain string `help:"Domain name or ID to set quota" json:",omitempty"`
+		Action        string `help:"quota set action" choices:"add|reset|replace"`
+		Cascade       bool   `help:"cascade set quota so that auto increment domain quota if total project quota exceeds parent domain quota"`
 		QuotaBaseOptions
 	}
 	R(&QuotaSetOptions{}, "quota-set", "Set quota for tenant", func(s *mcclient.ClientSession, args *QuotaSetOptions) error {
@@ -72,7 +77,20 @@ func init() {
 		return nil
 	})
 
-	type QuotaCheckOptions struct {
+	type QuotaListOptions struct {
+		ProjectDomain string `help:"domain name or ID to query project quotas"`
+	}
+	R(&QuotaListOptions{}, "quota-list", "List quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
+		params := jsonutils.Marshal(args)
+		result, e := modules.Quotas.GetQuotaList(s, params)
+		if e != nil {
+			return e
+		}
+		printList(modules.JSON2ListResult(result), nil)
+		return nil
+	})
+
+	/*type QuotaCheckOptions struct {
 		TENANT string `help:"Tenant name or ID to check quota" json:"tenant,omitempty"`
 		QuotaBaseOptions
 	}
@@ -84,6 +102,6 @@ func init() {
 		}
 		printObject(result)
 		return nil
-	})
+	})*/
 
 }

cmd/climc/shell/reservedips.go

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

cmd/climc/shell/role_assignments.go

@@ -24,6 +24,8 @@ import (
 func init() {
 	type RoleAssignmentsOptions struct {
 		Effective     bool   `help:"Include role assignment of group members"`
+		System        bool   `help:"Include system user account"`
+		Policy        bool   `help:"Show matched policies"`
 		Domain        string `help:"Role assignments for domain"`
 		User          string `help:"For user"`
 		UserDomain    string `help:"Domain for user"`
@@ -33,6 +35,8 @@ func init() {
 		ProjectDomain string `help:"Domain for project"`
 		Role          string `help:"Role assignments for role"`
 		RoleDomain    string `help:"Domain for role"`
+		Limit         int64  `help:"maximal returned number of rows"`
+		Offset        int64  `help:"offset index of returned results"`
 	}
 	R(&RoleAssignmentsOptions{}, "role-assignments", "List all role assignments", func(s *mcclient.ClientSession, args *RoleAssignmentsOptions) error {
 		query := jsonutils.NewDict()
@@ -40,6 +44,12 @@ func init() {
 		if args.Effective {
 			query.Add(jsonutils.JSONNull, "effective")
 		}
+		if args.System {
+			query.Add(jsonutils.JSONNull, "include_system")
+		}
+		if args.Policy {
+			query.Add(jsonutils.JSONNull, "include_policies")
+		}
 		if len(args.Domain) > 0 {
 			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
 			if err != nil {
@@ -75,6 +85,12 @@ func init() {
 			}
 			query.Add(jsonutils.NewString(rid), "role", "id")
 		}
+		if args.Limit > 0 {
+			query.Add(jsonutils.NewInt(args.Limit), "limit")
+		}
+		if args.Offset > 0 {
+			query.Add(jsonutils.NewInt(args.Offset), "offset")
+		}
 		result, err := modules.RoleAssignments.List(s, query)
 		if err != nil {
 			return err

cmd/climc/shell/roles.go

@@ -19,38 +19,20 @@ import (
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type RoleListOptions struct {
-		Name   string `help:"Name filter"`
-		Domain string `help:"Domain filter"`
-		Limit  int64  `help:"Items per page" default:"20"`
-		Offset int64  `help:"Offset"`
-		Search string `help:"search text"`
+		options.BaseListOptions
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
 	}
 	R(&RoleListOptions{}, "role-list", "List keystone Roles", func(s *mcclient.ClientSession, args *RoleListOptions) error {
-		query := jsonutils.NewDict()
-		if len(args.Name) > 0 {
-			query.Add(jsonutils.NewString(args.Name), "name")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
-		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")
-		}
-		if args.Limit > 0 {
-			query.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			query.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.Search) > 0 {
-			query.Add(jsonutils.NewString(args.Search), "name__icontains")
-		}
-		result, err := modules.RolesV3.List(s, query)
+		result, err := modules.RolesV3.List(s, params)
 		if err != nil {
 			return err
 		}
@@ -158,4 +140,25 @@ func init() {
 		printObject(role)
 		return nil
 	})
+
+	type RolePerformOptions struct {
+		ID string `help:"ID of role to update"`
+	}
+	R(&RolePerformOptions{}, "role-public", "Mark a role public", func(s *mcclient.ClientSession, args *RolePerformOptions) error {
+		result, err := modules.RolesV3.PerformAction(s, args.ID, "public", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	R(&RolePerformOptions{}, "role-private", "Mark a role private", func(s *mcclient.ClientSession, args *RolePerformOptions) error {
+		result, err := modules.RolesV3.PerformAction(s, args.ID, "private", nil)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/schedulers.go

@@ -107,6 +107,19 @@ func init() {
 			return nil
 		})
 
+	type SchedulerCleanCacheOptions struct {
+		HostId    string `help:"ID of host" short-token:"h"`
+		SessionId string `help:"Session id" short-token:"s"`
+	}
+	R(&SchedulerCleanCacheOptions{}, "scheduler-clean-cache", "Clean scheduler hosts cache",
+		func(s *mcclient.ClientSession, args *SchedulerCleanCacheOptions) error {
+			err := modules.SchedManager.CleanCache(s, args.HostId, args.SessionId)
+			if err != nil {
+				return err
+			}
+			return nil
+		})
+
 	type SchedulerHistoryListOptions struct {
 		Limit  int  `default:"50" help:"Page limit"`
 		Offset int  `default:"0" help:"Page offset"`

cmd/climc/shell/servernetworks.go

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

cmd/climc/shell/servers.go

@@ -18,9 +18,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"net"
 	"os"
 	"path/filepath"
 
+	yaml "gopkg.in/yaml.v2"
+
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 
@@ -533,21 +536,13 @@ func init() {
 	})
 
 	type ServerChangeOwnerOptions struct {
-		ID      string `help:"Server to change owner"`
-		PROJECT string `help:"Project ID or change"`
-		RawId   bool   `help:"User raw ID, instead of name"`
+		ID      string `help:"Server to change owner" json:"-"`
+		PROJECT string `help:"Project ID or change" json:"tenant"`
 	}
 	R(&ServerChangeOwnerOptions{}, "server-change-owner", "Change owner porject of a server", func(s *mcclient.ClientSession, opts *ServerChangeOwnerOptions) error {
-		params := jsonutils.NewDict()
-		if opts.RawId {
-			projid, err := modules.Projects.GetId(s, opts.PROJECT, nil)
-			if err != nil {
-				return err
-			}
-			params.Add(jsonutils.NewString(projid), "tenant")
-			params.Add(jsonutils.JSONTrue, "raw_id")
-		} else {
-			params.Add(jsonutils.NewString(opts.PROJECT), "tenant")
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
 		}
 		srv, err := modules.Servers.PerformAction(s, opts.ID, "change-owner", params)
 		if err != nil {
@@ -844,34 +839,101 @@ func init() {
 	})
 
 	type ServersImportFromLibvirtOptions struct {
-		CONFIG_FILE string `help:"JSON file describing servers from libvirt, e.g. 
-			{'hosts': 
-				[
-					{
-						'servers': [
-							{
-								'mac_ip': {'mac1': 'ip1', ...}
-							},
-						],
-						'xml_file_path': '/etc/libvirt/qemu',
-						'host_ip': '192.168.1.100',
-					},
-				],
-			}
-		"`
+		CONFIG_FILE string `help:"File Path describing servers from libvirt"`
 	}
+
+	type Servers struct {
+		Mac string `yaml:"mac"`
+		Ip  string `yaml:"ip"`
+	}
+
+	type Hosts struct {
+		HostIp      string    `yaml:"host_ip"`
+		XmlFilePath string    `yaml:"xml_file_path"`
+		MonitorPath string    `yaml:"monitor_path"`
+		Servers     []Servers `yaml:"servers"`
+	}
+
+	type LibvirtImportOptions struct {
+		Hosts []Hosts `yaml:"hosts"`
+	}
+
 	R(&ServersImportFromLibvirtOptions{}, "servers-import-from-libvirt", "Import servers from libvrt", func(s *mcclient.ClientSession, args *ServersImportFromLibvirtOptions) error {
-		rawConfig, err := ioutil.ReadFile(args.CONFIG_FILE)
+		var (
+			rawConfig []byte
+			err       error
+		)
+
+		rawConfig, err = ioutil.ReadFile(args.CONFIG_FILE)
 		if err != nil {
-			return fmt.Errorf("Read file error: %s", err)
+			return fmt.Errorf("Read config file %s error: %s", args.CONFIG_FILE, err)
 		}
 
-		config := &compute.SLibvirtImportConfig{}
-		err = json.Unmarshal(rawConfig, config)
-		if err != nil {
-			return fmt.Errorf("Parse config error %s", err)
+		var (
+			params []jsonutils.JSONObject
+			config = &compute.SLibvirtImportConfig{}
+		)
+
+		// Try parse as json first
+		{
+			err = json.Unmarshal(rawConfig, config)
+			if err != nil {
+				goto YAML
+			}
+			for i := 0; i < len(config.Hosts); i++ {
+				if nIp := net.ParseIP(config.Hosts[i].HostIp); nIp == nil {
+					return fmt.Errorf("Parse host ip %s failed", config.Hosts[i].HostIp)
+				}
+				for _, server := range config.Hosts[i].Servers {
+					for mac, ip := range server.MacIp {
+						if _, err := net.ParseMAC(mac); err != nil {
+							return fmt.Errorf("Parse mac %s error %s", mac, err)
+						}
+						if nIp := net.ParseIP(ip); nIp == nil {
+							return fmt.Errorf("Parse ip %s failed", ip)
+						}
+					}
+				}
+			}
+
+			goto REQUEST
 		}
-		params, err := jsonutils.Marshal(config.Hosts).GetArray()
+
+	YAML: // Try Parse as yaml
+		{
+			yamlConfig := &LibvirtImportOptions{}
+			err = yaml.Unmarshal(rawConfig, yamlConfig)
+			if err != nil {
+				return err
+			}
+
+			config.Hosts = make([]compute.SLibvirtHostConfig, len(yamlConfig.Hosts))
+			for i := 0; i < len(yamlConfig.Hosts); i++ {
+				if nIp := net.ParseIP(yamlConfig.Hosts[i].HostIp); nIp == nil {
+					return fmt.Errorf("Parse host ip %s failed", yamlConfig.Hosts[i].HostIp)
+				}
+				config.Hosts[i].HostIp = yamlConfig.Hosts[i].HostIp
+				config.Hosts[i].XmlFilePath = yamlConfig.Hosts[i].XmlFilePath
+				config.Hosts[i].Servers = make([]compute.SLibvirtServerConfig, len(yamlConfig.Hosts[i].Servers))
+				for j := 0; j < len(yamlConfig.Hosts[i].Servers); j++ {
+					config.Hosts[i].Servers[j].MacIp = make(map[string]string)
+					mac := yamlConfig.Hosts[i].Servers[j].Mac
+					_, err := net.ParseMAC(mac)
+					if err != nil {
+						return fmt.Errorf("Parse mac address %s error %s", mac, err)
+					}
+					ip := yamlConfig.Hosts[i].Servers[j].Ip
+					nIp := net.ParseIP(ip)
+					if len(nIp) == 0 {
+						return fmt.Errorf("Parse ip address %s failed", ip)
+					}
+					config.Hosts[i].Servers[j].MacIp[mac] = ip
+				}
+			}
+		}
+
+	REQUEST:
+		params, err = jsonutils.Marshal(config.Hosts).GetArray()
 		if err != nil {
 			return err
 		}
@@ -915,4 +977,44 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	R(&options.ServerIdOptions{}, "server-remote-nics", "Show remote nics of a server", func(s *mcclient.ClientSession, opts *options.ServerIdOptions) error {
+		result, err := modules.Servers.GetSpecific(s, opts.ID, "remote-nics", nil)
+		if err != nil {
+			return err
+		}
+		listResult := modules.ListResult{}
+		listResult.Data, _ = result.GetArray()
+		printList(&listResult, nil)
+		return nil
+	})
+
+	type ServerSyncFixNicsOptions struct {
+		ID string   `help:"ID or name of VM" json:"-"`
+		IP []string `help:"IP address of each NIC" json:"ip"`
+	}
+	R(&ServerSyncFixNicsOptions{}, "server-sync-fix-nics", "Fix missing IP for each nics after syncing VNICS", func(s *mcclient.ClientSession, opts *ServerSyncFixNicsOptions) error {
+		params := jsonutils.Marshal(opts)
+		result, err := modules.Servers.PerformAction(s, opts.ID, "sync-fix-nics", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type ServerResizeDiskOptions struct {
+		Server string `help:"ID or name of VM" json:"-" optional:"false" positional:"true"`
+		Disk   string `help:"ID or name of disk to resize" json:"disk" optional:"false" positional:"true"`
+		Size   string `help:"new size of disk in MB" json:"size" optional:"false" positional:"true"`
+	}
+	R(&ServerResizeDiskOptions{}, "server-resize-disk", "Resize attached disk of a server", func(s *mcclient.ClientSession, args *ServerResizeDiskOptions) error {
+		params := jsonutils.Marshal(args)
+		result, err := modules.Servers.PerformAction(s, args.Server, "resize-disk", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/snapshot_policy.go

@@ -1,7 +1,22 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package 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"

cmd/climc/shell/snapshots.go

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

cmd/climc/shell/storages.go

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

cmd/climc/shell/usages.go

@@ -23,8 +23,14 @@ import (
 
 type GeneralUsageOptions struct {
 	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack"`
-	Provider []string `help:"Provider" choices:"VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack"`
-	Project  string
+	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack"`
+	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|DStack"`
+	Project  string   `help:"show usage of specified project"`
+
+	ProjectDomain string `help:"show usage of specified domain"`
+
+	CloudEnv string `help:"show usage of specified cloudenv" choices:"public|private|onpremise"`
+	Scope    string `help:"show usage of specified privilege scope" choices:"system|domain|project"`
 }
 
 func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
@@ -35,6 +41,12 @@ func fetchHostTypeOptions(args *GeneralUsageOptions) *jsonutils.JSONDict {
 	if len(args.Provider) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Provider), "provider")
 	}
+	if len(args.Brand) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Brand), "brand")
+	}
+	if len(args.CloudEnv) > 0 {
+		params.Add(jsonutils.NewString(args.CloudEnv), "cloud_env")
+	}
 	return params
 }
 
@@ -43,6 +55,11 @@ func init() {
 		params := fetchHostTypeOptions(args)
 		if args.Project != "" {
 			params.Add(jsonutils.NewString(args.Project), "project")
+		} else if args.ProjectDomain != "" {
+			params.Add(jsonutils.NewString(args.ProjectDomain), "project_domain")
+		}
+		if len(args.Scope) > 0 {
+			params.Add(jsonutils.NewString(args.Scope), "scope")
 		}
 		result, err := modules.Usages.GetGeneralUsage(s, params)
 		if err != nil {
@@ -130,11 +147,18 @@ func init() {
 
 	type ImageUsageOptions struct {
 		Project string `help:"check image usage of a project"`
+		Domain  string `help:"check image usage of a domain"`
+		Scope   string `help:"query scope" choices:"project|domain|system"`
 	}
 	R(&ImageUsageOptions{}, "image-usage", "Show general usage of images", func(s *mcclient.ClientSession, args *ImageUsageOptions) error {
 		params := jsonutils.NewDict()
 		if args.Project != "" {
 			params.Add(jsonutils.NewString(args.Project), "project")
+		} else if args.Domain != "" {
+			params.Add(jsonutils.NewString(args.Domain), "domain")
+		}
+		if args.Scope != "" {
+			params.Add(jsonutils.NewString(args.Scope), "scope")
 		}
 		result, err := modules.Images.GetUsage(s, params)
 		if err != nil {

cmd/climc/shell/users.go

@@ -17,54 +17,23 @@ package shell
 import (
 	"yunion.io/x/jsonutils"
 
+	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
 func init() {
 	type UserListOptions struct {
-		Admin            bool   `help:"admin mode"`
-		Domain           string `help:"Filter by domain"`
-		Name             string `help:"Filter by name"`
-		Limit            int64  `help:"Limit, default 0, i.e. no limit"`
-		Offset           int64  `help:"Offset, default 0, i.e. no offset"`
-		Search           string `help:"Search by name"`
-		DefaultProject   string `help:"Filter by default_project_id"`
-		NoDefaultProject bool   `help:"Filter users without valid default_project_id"`
+		options.BaseListOptions
+		Name          string `help:"Filter by name"`
+		OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
+		Role          string `help:"Filter by role"`
 	}
 	R(&UserListOptions{}, "user-list", "List users", func(s *mcclient.ClientSession, args *UserListOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Domain) > 0 {
-			domainId, err := modules.Domains.GetId(s, args.Domain, nil)
-			if err != nil {
-				return err
-			}
-			params.Add(jsonutils.NewString(domainId), "domain_id")
-			params.Add(jsonutils.JSONTrue, "admin")
-		}
-		if args.Admin {
-			params.Add(jsonutils.JSONTrue, "admin")
-		}
-		if len(args.Name) > 0 {
-			params.Add(jsonutils.NewString(args.Name), "name")
-		}
-		if len(args.Search) > 0 {
-			params.Add(jsonutils.NewString(args.Search), "name__icontains")
-		}
-		if args.Limit > 0 {
-			params.Add(jsonutils.NewInt(args.Limit), "limit")
-		}
-		if args.Offset > 0 {
-			params.Add(jsonutils.NewInt(args.Offset), "offset")
-		}
-		if len(args.DefaultProject) > 0 {
-			projId, err := modules.Projects.GetId(s, args.DefaultProject, nil)
-			if err != nil {
-				return err
-			}
-			params.Add(jsonutils.NewString(projId), "default_project_id")
-		} else if args.NoDefaultProject {
-			params.Add(jsonutils.NewString(""), "default_project_id__iempty")
+		params, err := options.ListStructToParams(args)
+		if err != nil {
+			return err
 		}
 		result, err := modules.UsersV3.List(s, params)
 		if err != nil {
@@ -77,6 +46,7 @@ func init() {
 	type UserDetailOptions struct {
 		ID     string `help:"ID of user"`
 		Domain string `help:"Domain"`
+		System bool   `help:"show system user"`
 	}
 	R(&UserDetailOptions{}, "user-show", "Show details of user", func(s *mcclient.ClientSession, args *UserDetailOptions) error {
 		query := jsonutils.NewDict()
@@ -87,6 +57,9 @@ func init() {
 			}
 			query.Add(jsonutils.NewString(domainId), "domain_id")
 		}
+		if args.System {
+			query.Add(jsonutils.JSONTrue, "system")
+		}
 		user, e := modules.UsersV3.Get(s, args.ID, query)
 		if e != nil {
 			return e
@@ -185,7 +158,10 @@ func init() {
 		Enabled     bool   `help:"Enabled"`
 		Disabled    bool   `help:"Disabled"`
 
-		DefaultProject string `help:"Default project"`
+		// DefaultProject string `help:"Default project"`
+		SystemAccount bool `help:"is a system account?"`
+		NoWebConsole  bool `help:"allow web console access"`
+		EnableMfa     bool `help:"enable TOTP mfa"`
 	}
 	R(&UserCreateOptions{}, "user-create", "Create a user", func(s *mcclient.ClientSession, args *UserCreateOptions) error {
 		params := jsonutils.NewDict()
@@ -218,13 +194,23 @@ func init() {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
 
-		if len(args.DefaultProject) > 0 {
+		if args.SystemAccount {
+			params.Add(jsonutils.JSONTrue, "is_system_account")
+		}
+		if args.NoWebConsole {
+			params.Add(jsonutils.JSONFalse, "allow_web_console")
+		}
+		if args.EnableMfa {
+			params.Add(jsonutils.JSONTrue, "enable_mfa")
+		}
+
+		/*if len(args.DefaultProject) > 0 {
 			projId, err := modules.Projects.GetId(s, args.DefaultProject, nil)
 			if err != nil {
 				return err
 			}
 			params.Add(jsonutils.NewString(projId), "default_project_id")
-		}
+		}*/
 
 		user, err := modules.UsersV3.Create(s, params)
 		if err != nil {
@@ -246,7 +232,16 @@ func init() {
 		Enabled     bool   `help:"Enabled"`
 		Disabled    bool   `help:"Disabled"`
 
-		DefaultProject string `help:"Default project"`
+		SystemAccount    bool `help:"Turn on is_system_account"`
+		NotSystemAccount bool `help:"Turn off is_system_account"`
+
+		AllowWebConsole    bool `help:"Turn on allow_web_console"`
+		DisallowWebConsole bool `help:"Turn off allow_web_console"`
+
+		EnableMfa  bool `help:"turn on enable_mfa"`
+		DisableMfa bool `help:"turn off enable_mfa"`
+
+		// DefaultProject string `help:"Default project"`
 		// Option []string `help:"User options"`
 	}
 	R(&UserUpdateOptions{}, "user-update", "Update a user", func(s *mcclient.ClientSession, args *UserUpdateOptions) error {
@@ -286,25 +281,40 @@ func init() {
 		} else if !args.Enabled && args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
-		if len(args.DefaultProject) > 0 {
-			projId, err := modules.Projects.GetId(s, args.DefaultProject, nil)
-			if err != nil {
-				return err
-			}
-			params.Add(jsonutils.NewString(projId), "default_project_id")
+		if args.SystemAccount {
+			params.Add(jsonutils.JSONTrue, "is_system_account")
+		} else if args.NotSystemAccount {
+			params.Add(jsonutils.JSONFalse, "is_system_account")
 		}
-		/*
-		   if len(args.Option) > 0 {
-		       uoptions := jsonutils.NewDict()
-		       for _, opt := range args.Option {
-		           pos := strings.IndexByte(opt, ':')
-		           key := opt[:pos]
-		           val := opt[pos+1:]
-		           uoptions.Add(jsonutils.NewString(val), key)
-		       }
-		       params.Add(uoptions, "_resource_options")
-		   }
-		*/
+		if args.AllowWebConsole {
+			params.Add(jsonutils.JSONTrue, "allow_web_console")
+		} else if args.DisallowWebConsole {
+			params.Add(jsonutils.JSONFalse, "allow_web_console")
+		}
+		if args.EnableMfa {
+			params.Add(jsonutils.JSONTrue, "enable_mfa")
+		} else if args.DisableMfa {
+			params.Add(jsonutils.JSONFalse, "enable_mfa")
+		}
+		// if len(args.DefaultProject) > 0 {
+		// 	projId, err := modules.Projects.GetId(s, args.DefaultProject, nil)
+		// 	if err != nil {
+		// 		return err
+		// 	}
+		// 	params.Add(jsonutils.NewString(projId), "default_project_id")
+		// }
+		//
+		//   if len(args.Option) > 0 {
+		//       uoptions := jsonutils.NewDict()
+		//       for _, opt := range args.Option {
+		//           pos := strings.IndexByte(opt, ':')
+		//           key := opt[:pos]
+		//           val := opt[pos+1:]
+		//           uoptions.Add(jsonutils.NewString(val), key)
+		//       }
+		//       params.Add(uoptions, "_resource_options")
+		//   }
+		//
 		user, err := modules.UsersV3.Patch(s, uid, params)
 		if err != nil {
 			return err
@@ -352,4 +362,41 @@ func init() {
 		return nil
 	})
 
+	type UserJoinProjectOptions struct {
+		User    string   `help:"User Id or name" optional:"false" positional:"true"`
+		Project []string `help:"Projects to join" nargs:"+"`
+		Role    []string `help:"User join project with roles" nargs:"+"`
+	}
+	R(&UserJoinProjectOptions{}, "user-join-project", "User join projects with roles", func(s *mcclient.ClientSession, args *UserJoinProjectOptions) error {
+		input := api.SJoinProjectsInput{}
+		input.Projects = args.Project
+		input.Roles = args.Role
+		result, err := modules.UsersV3.PerformAction(s, args.User, "join", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
+	type UserLeaveProjectsOptions struct {
+		User    string   `help:"user id or name" optional:"false" positional:"true"`
+		Project string   `help:"project id or name" optional:"false" positional:"true"`
+		Role    []string `help:"roles to remove" nargs:"+"`
+	}
+	R(&UserLeaveProjectsOptions{}, "user-leave-project", "Leave a user from projects", func(s *mcclient.ClientSession, args *UserLeaveProjectsOptions) error {
+		input := api.SLeaveProjectsInput{}
+		input.ProjectRoles = make([]api.SProjectRole, len(args.Role))
+		for i := range args.Role {
+			input.ProjectRoles[i].Project = args.Project
+			input.ProjectRoles[i].Role = args.Role[i]
+		}
+		result, err := modules.UsersV3.PerformAction(s, args.User, "leave", jsonutils.Marshal(input))
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 }

cmd/climc/shell/utils.go

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

cmd/climc/shell/zones.go

@@ -101,8 +101,16 @@ func init() {
 		return nil
 	})
 
-	R(&ZoneShowOptions{}, "zone-capability", "Show zone's capacibilities", func(s *mcclient.ClientSession, args *ZoneShowOptions) error {
-		result, err := modules.Zones.GetSpecific(s, args.ID, "capability", nil)
+	type ZoneCapabilityOptions struct {
+		ID     string `help:"Zone ID or Name" json:"-"`
+		Domain string `help:"domain Id or name"`
+	}
+	R(&ZoneCapabilityOptions{}, "zone-capability", "Show zone's capacibilities", func(s *mcclient.ClientSession, args *ZoneCapabilityOptions) error {
+		query, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Zones.GetSpecific(s, args.ID, "capability", query)
 		if err != nil {
 			return err
 		}

cmd/cryptool/main.go

@@ -21,9 +21,8 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/structarg"
 
-	"yunion.io/x/onecloud/pkg/util/shellutils"
-
 	_ "yunion.io/x/onecloud/cmd/cryptool/shell"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 type BaseOptions struct {

cmd/host-deployer/main.go

@@ -0,0 +1,22 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import "yunion.io/x/onecloud/pkg/hostman/hostdeployer/deployserver"
+
+func main() {
+	deployer := deployserver.NewDeployService()
+	deployer.StartService()
+}

cmd/host/main.go

@@ -15,6 +15,7 @@
 package main
 
 import (
+	"yunion.io/x/onecloud/pkg/cloudcommon/service"
 	"yunion.io/x/onecloud/pkg/hostman"
 	"yunion.io/x/onecloud/pkg/util/atexit"
 )
@@ -22,6 +23,9 @@ import (
 func main() {
 	defer atexit.Handle()
 
-	var srv = hostman.SHostService{}
+	var srv = &hostman.SHostService{}
+	srv.SServiceBase = &service.SServiceBase{
+		Service: srv,
+	}
 	srv.StartService()
 }

cmd/huaweicli/main.go

@@ -86,14 +86,9 @@ func newClient(options *BaseOptions) (*huawei.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
-	account := ""
-	if len(options.ProjectId) > 0 {
-		account = options.AccessKey + "/" + options.ProjectId
-	} else {
-		account = options.AccessKey
-	}
-
-	cli, err := huawei.NewHuaweiClient("", "", options.CloudEnv, account, options.Secret, options.Debug)
+	cli, err := huawei.NewHuaweiClient("", "", options.CloudEnv,
+		options.AccessKey, options.Secret, options.ProjectId,
+		options.Debug)
 	if err != nil {
 		return nil, err
 	}

cmd/ldapcli/shell/search.go

@@ -17,16 +17,29 @@ package shell
 import (
 	"fmt"
 	"strings"
+
+	"gopkg.in/ldap.v3"
+
+	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/util/ldaputils"
 	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
+func queryScope(scope string) int {
+	if scope == api.QueryScopeOne {
+		return ldap.ScopeSingleLevel
+	} else {
+		return ldap.ScopeWholeSubtree
+	}
+}
+
 func init() {
 	type LdapSearchOptions struct {
 		Base        string   `help:"base DN, e.g. OU=tech,DC=example,DC=com"`
 		Objectclass string   `help:"objectclass, e.g. organizationalPerson"`
 		Search      []string `help:"search conditions, in format of field:value"`
 		Field       []string `help:"retrieve field info"`
+		Scope       string   `help:"query scope" choices:"one|sub" default:"sub"`
 	}
 	shellutils.R(&LdapSearchOptions{}, "search", "search ldap", func(cli *ldaputils.SLDAPClient, args *LdapSearchOptions) error {
 		search := make(map[string]string)
@@ -37,7 +50,7 @@ func init() {
 			}
 			search[s[:colonPos]] = s[(colonPos + 1):]
 		}
-		entries, err := cli.Search(args.Base, args.Objectclass, search, args.Field)
+		entries, err := cli.Search(args.Base, args.Objectclass, search, "", args.Field, queryScope(args.Scope))
 		if err != nil {
 			return err
 		}
@@ -54,9 +67,10 @@ func init() {
 		ACCOUNT     string   `help:"account name to auth"`
 		PASSWORD    string   `help:"Password to auth"`
 		Field       []string `help:"retrieve field info"`
+		Scope       string   `help:"query scope" choices:"one|sub" default:"sub"`
 	}
 	shellutils.R(&LdapAuthOptions{}, "auth", "authenticate against ldap", func(cli *ldaputils.SLDAPClient, args *LdapAuthOptions) error {
-		entry, err := cli.Authenticate(args.Base, args.Objectclass, args.ATTR, args.ACCOUNT, args.PASSWORD, args.Field)
+		entry, err := cli.Authenticate(args.Base, args.Objectclass, args.ATTR, args.ACCOUNT, args.PASSWORD, "", args.Field, queryScope(args.Scope))
 		if err != nil {
 			return err
 		}

cmd/openstackcli/main.go

@@ -27,16 +27,17 @@ import (
 )
 
 type BaseOptions struct {
-	Debug        bool   `help:"debug mode"`
-	Help         bool   `help:"Show help"`
-	AuthURL      string `help:"Auth URL" default:"$OPENSTACK_AUTH_URL"`
-	Username     string `help:"Username" default:"$OPENSTACK_USERNAME"`
-	Password     string `help:"Password" default:"$OPENSTACK_PASSWORD"`
-	Project      string `help:"Project" default:"$OPENSTACK_PROJECT"`
-	EndpointType string `help:"Project" default:"$OPENSTACK_ENDPOINT_TYPE|internal"`
-	DomainName   string `help:"DomainName" default:"$OPENSTACK_DOMAIN_NAME"`
-	RegionID     string `help:"RegionId" default:"$OPENSTACK_REGION_ID"`
-	SUBCOMMAND   string `help:"openstackcli subcommand" subcommand:"true"`
+	Debug         bool   `help:"debug mode"`
+	Help          bool   `help:"Show help"`
+	AuthURL       string `help:"Auth URL" default:"$OPENSTACK_AUTH_URL"`
+	Username      string `help:"Username" default:"$OPENSTACK_USERNAME"`
+	Password      string `help:"Password" default:"$OPENSTACK_PASSWORD"`
+	Project       string `help:"Project" default:"$OPENSTACK_PROJECT"`
+	EndpointType  string `help:"Project" default:"$OPENSTACK_ENDPOINT_TYPE|internal"`
+	DomainName    string `help:"Domain of user" default:"$OPENSTACK_DOMAIN_NAME|Default"`
+	ProjectDomain string `help:"Domain of project" default:"$OPENSTACK_PROJECT_DOMAIN|Default"`
+	RegionID      string `help:"RegionId" default:"$OPENSTACK_REGION_ID"`
+	SUBCOMMAND    string `help:"openstackcli subcommand" subcommand:"true"`
 }
 
 func getSubcommandParser() (*structarg.ArgumentParser, error) {
@@ -92,7 +93,7 @@ func newClient(options *BaseOptions) (*openstack.SRegion, error) {
 		return nil, fmt.Errorf("Missing Password")
 	}
 
-	cli, err := openstack.NewOpenStackClient("", "", options.AuthURL, options.Username, options.Password, options.Project, options.EndpointType, options.DomainName, options.Debug)
+	cli, err := openstack.NewOpenStackClient("", "", options.AuthURL, options.Username, options.Password, options.Project, options.EndpointType, options.DomainName, options.ProjectDomain, options.Debug)
 	if err != nil {
 		return nil, err
 	}

cmd/qcloudcli/main.go

@@ -85,12 +85,11 @@ func newClient(options *BaseOptions) (*qcloud.SRegion, error) {
 		return nil, fmt.Errorf("Missing SecretID")
 	}
 
-	account := options.SecretID
-	if len(options.AppID) > 0 {
-		account = fmt.Sprintf("%s/%s", account, options.AppID)
-	}
-
-	if cli, err := qcloud.NewQcloudClient("", "", account, options.SecretKey, options.Debug); err != nil {
+	if cli, err := qcloud.NewQcloudClient("", "",
+		options.SecretID,
+		options.SecretKey,
+		options.AppID,
+		options.Debug); err != nil {
 		return nil, err
 	} else if region := cli.GetRegion(options.RegionId); region == nil {
 		return nil, fmt.Errorf("No such region %s", options.RegionId)

cmd/ucloudcli/main.go

@@ -17,12 +17,12 @@ package main
 import (
 	"fmt"
 	"os"
-	"yunion.io/x/onecloud/pkg/util/ucloud"
 
 	"yunion.io/x/log"
 	"yunion.io/x/structarg"
 
 	"yunion.io/x/onecloud/pkg/util/shellutils"
+	"yunion.io/x/onecloud/pkg/util/ucloud"
 	_ "yunion.io/x/onecloud/pkg/util/ucloud/shell"
 )
 
@@ -86,14 +86,11 @@ func newClient(options *BaseOptions) (*ucloud.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
-	account := ""
-	if len(options.ProjectId) > 0 {
-		account = options.AccessKey + "::" + options.ProjectId
-	} else {
-		account = options.AccessKey
-	}
-
-	cli, err := ucloud.NewUcloudClient("", "", account, options.Secret, options.Debug)
+	cli, err := ucloud.NewUcloudClient("", "",
+		options.AccessKey,
+		options.Secret,
+		options.ProjectId,
+		options.Debug)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -0,0 +1,140 @@
+module yunion.io/x/onecloud
+
+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/go-autorest v10.15.5+incompatible
+	github.com/DataDog/dd-trace-go v0.6.1 // indirect
+	github.com/DataDog/zstd v1.3.4 // indirect
+	github.com/Microsoft/azure-vhd-utils v0.0.0-20181115010904-44cbada2ece3
+	github.com/RoaringBitmap/roaring v0.4.16 // indirect
+	github.com/Shopify/sarama v1.20.0 // indirect
+	github.com/Shopify/toxiproxy v2.1.4+incompatible // indirect
+	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
+	github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20180112035716-b5829a0278c8
+	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20181116160301-c6838fdc33ed
+	github.com/anacrolix/dht v0.0.0-20181129074040-b09db78595aa // indirect
+	github.com/anacrolix/go-libutp v0.0.0-20180808010927-aebbeb60ea05 // indirect
+	github.com/anacrolix/log v0.0.0-20180808012509-286fcf906b48 // indirect
+	github.com/anacrolix/mmsg v0.0.0-20180808012353-5adb2c1127c0 // indirect
+	github.com/anacrolix/torrent v0.0.0-20181129073333-cc531b8c4a80
+	github.com/aokoli/goutils v1.0.1
+	github.com/apache/thrift v0.0.0-20180514124809-e59b73d3c2bf // indirect
+	github.com/aws/aws-sdk-go v1.15.73
+	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
+	github.com/bitly/go-simplejson v0.5.0
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
+	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/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/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
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/eapache/go-resiliency v1.1.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+	github.com/eapache/queue v1.1.0 // indirect
+	github.com/edsrzf/mmap-go v1.0.0 // indirect
+	github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710 // indirect
+	github.com/fatih/color v1.7.0
+	github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e
+	github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
+	github.com/fsnotify/fsnotify v1.4.7
+	github.com/ghodss/yaml v1.0.0
+	github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect
+	github.com/gin-gonic/gin v1.3.0
+	github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 // indirect
+	github.com/go-logfmt/logfmt v0.4.0 // indirect
+	github.com/go-ole/go-ole v1.2.2 // indirect
+	github.com/go-sql-driver/mysql v1.4.1
+	github.com/gofrs/uuid v3.2.0+incompatible // indirect
+	github.com/golang-plus/errors v1.0.0
+	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.2
+	github.com/google/gopacket v1.1.17
+	github.com/google/uuid v1.1.0 // indirect
+	github.com/googleapis/gnostic v0.2.0 // indirect
+	github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb // indirect
+	github.com/googollee/go-socket.io v0.0.0-20181214084611-0ad7206c347a
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/mux v1.6.2
+	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/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
+	github.com/imdario/mergo v0.3.6 // indirect
+	github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c
+	github.com/kr/pty v1.1.3
+	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
+	github.com/mdlayher/arp v0.0.0-20190313224443-98a83c8a2717
+	github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7
+	github.com/mdlayher/raw v0.0.0-20190606144222-a54781e5f38f
+	github.com/mholt/caddy v0.10.11
+	github.com/miekg/dns v1.1.1
+	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+	github.com/moul/http2curl v1.0.0
+	github.com/mozillazg/go-pinyin v0.15.0
+	github.com/nelsonken/cos-go-sdk-v5 v0.0.0-20180622024522-5247afdb7a80
+	github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
+	github.com/opentracing/opentracing-go v1.0.2 // indirect
+	github.com/openzipkin/zipkin-go-opentracing v0.3.4 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/pierrec/lz4 v0.0.0-20181005164709-635575b42742
+	github.com/pkg/errors v0.8.1
+	github.com/pkg/term v0.0.0-20181116001808-27bbf2edb814 // indirect
+	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
+	github.com/serialx/hashring v0.0.0-20180504054112-49a4782e9908
+	github.com/shirou/gopsutil v2.18.10+incompatible
+	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // 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/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
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738
+	go.uber.org/atomic v1.4.0 // indirect
+	golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4
+	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7
+	golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 // indirect
+	golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456
+	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
+	google.golang.org/appengine v1.3.0 // indirect
+	google.golang.org/genproto v0.0.0-20181218023534-67d6565462c5 // indirect
+	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
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/ldap.v3 v3.0.3
+	gopkg.in/yaml.v2 v2.2.2
+	k8s.io/api v0.0.0-20181004124137-fd83cbc87e76
+	k8s.io/apimachinery v0.0.0-20181215012845-4d029f033399
+	k8s.io/client-go v9.0.0+incompatible
+	k8s.io/klog v0.1.0 // indirect
+	k8s.io/kubernetes v1.12.3
+	yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051
+	yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d
+	yunion.io/x/pkg v0.0.0-20191111031517-2206ee61d93e
+	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

@@ -0,0 +1,549 @@
+bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+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/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=
+github.com/DataDog/dd-trace-go v0.6.1 h1:nsZ2lohbSw1CKtfNRu3wPh1jFirv6XSz8vqNpuIYWbM=
+github.com/DataDog/dd-trace-go v0.6.1/go.mod h1:SmQTTcC37XMyEm75HV0AWiZIYxDiaNhRi49zorIpW+o=
+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/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=
+github.com/Shopify/sarama v1.20.0 h1:wAMHhl1lGRlobeoV/xOKpbqD2OQsOvY4A/vIOGroIe8=
+github.com/Shopify/sarama v1.20.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
+github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20180112035716-b5829a0278c8 h1:mb7rn6WX8viizO36Nv6VVCBrgwaq01HPrZv1qq07/Yg=
+github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20180112035716-b5829a0278c8/go.mod h1:T9M45xf79ahXVelWoOBmH0y4aC1t5kXO5BxwyakgIGA=
+github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20181116160301-c6838fdc33ed h1:8Nj1ihALo/UVM2EnOVQ1EY/kwNKRwLx1GW/z3Y65czY=
+github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20181116160301-c6838fdc33ed/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
+github.com/anacrolix/dht v0.0.0-20180412060941-24cbf25b72a4/go.mod h1:hQfX2BrtuQsLQMYQwsypFAab/GvHg8qxwVi4OJdR1WI=
+github.com/anacrolix/dht v0.0.0-20181127122252-acaa69c368bb/go.mod h1:Z/mP+H70xwnUv957UXVkTrzYRhKs0mGjS0lyqS331g4=
+github.com/anacrolix/dht v0.0.0-20181129074040-b09db78595aa h1:5RyX9Tvqa9oewlJhFihkxe8biS0ojTlrNU3ryqm5g2s=
+github.com/anacrolix/dht v0.0.0-20181129074040-b09db78595aa/go.mod h1:Ayu4t+5TsHQ07/P8XzRJqVofv7lU4R1ZTT7KW5+SPFA=
+github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa h1:xCaATLKmn39QqLs3tUZYr6eKvezJV+FYvVOLTklxK6U=
+github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c=
+github.com/anacrolix/go-libutp v0.0.0-20180522111405-6baeb806518d/go.mod h1:beQSaSxwH2d9Eeu5ijrEnHei5Qhk+J6cDm1QkWFru4E=
+github.com/anacrolix/go-libutp v0.0.0-20180725071407-34b43d880940/go.mod h1:szRMvnqPPC0VKbIRVoImO5gjJj8OZCYdixSrDEo1TzM=
+github.com/anacrolix/go-libutp v0.0.0-20180808010927-aebbeb60ea05 h1:Zoniih3jyqtr3I0xFoMvw1USWpg+CbI/zOrcLudr0lc=
+github.com/anacrolix/go-libutp v0.0.0-20180808010927-aebbeb60ea05/go.mod h1:POY/GPlrFKRxnOKH1sGAB+NBWMoP+sI+hHJxgcgWbWw=
+github.com/anacrolix/log v0.0.0-20180412014343-2323884b361d/go.mod h1:sf/7c2aTldL6sRQj/4UKyjgVZBu2+M2z9wf7MmwPiew=
+github.com/anacrolix/log v0.0.0-20180808012509-286fcf906b48 h1:aHwCj9Q6sjQOq5sC8Bzylt7GCAvt+D5MPEpkD6TeXxU=
+github.com/anacrolix/log v0.0.0-20180808012509-286fcf906b48/go.mod h1:sf/7c2aTldL6sRQj/4UKyjgVZBu2+M2z9wf7MmwPiew=
+github.com/anacrolix/missinggo v0.0.0-20180522035225-b4a5853e62ff/go.mod h1:b0p+7cn+rWMIphK1gDH2hrDuwGOcbB6V4VXeSsEfHVk=
+github.com/anacrolix/missinggo v0.0.0-20180621131740-7fc7cfea16ea/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s=
+github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s=
+github.com/anacrolix/missinggo v0.0.0-20181127231911-72d14a94053a/go.mod h1:IN+9GUe7OxKMIs/XeXEbT/rMUolmJzmlZiXHS7FwD/Y=
+github.com/anacrolix/missinggo v0.0.0-20181129073415-3237bf955fed h1:pMzstxgUXooGmNxZnjFSsnjtFd7s81sNI7L2pzEuWWs=
+github.com/anacrolix/missinggo v0.0.0-20181129073415-3237bf955fed/go.mod h1:IN+9GUe7OxKMIs/XeXEbT/rMUolmJzmlZiXHS7FwD/Y=
+github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb/go.mod h1:x2/ErsYUmT77kezS63+wzZp8E3byYB0gzirM/WMBLfw=
+github.com/anacrolix/mmsg v0.0.0-20180808012353-5adb2c1127c0 h1:Fa1XqqLW62lQzEDlNA+QcdJbkfJcxQN0YC8983kj5tU=
+github.com/anacrolix/mmsg v0.0.0-20180808012353-5adb2c1127c0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc=
+github.com/anacrolix/sync v0.0.0-20171108081538-eee974e4f8c1/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w=
+github.com/anacrolix/sync v0.0.0-20180611022320-3c4cb11f5a01/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w=
+github.com/anacrolix/sync v0.0.0-20180725074606-fda11526ff08/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w=
+github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778 h1:XpCDEixzXOB8yaTW/4YBzKrJdMcFI0DzpPTYNv75wzk=
+github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778/go.mod h1:s735Etp3joe/voe2sdaXLcqDdJSay1O0OPnM0ystjqk=
+github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
+github.com/anacrolix/tagflag v0.0.0-20180605133421-f477c8c2f14c/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw=
+github.com/anacrolix/torrent v0.0.0-20180622074351-fefeef4ee9eb/go.mod h1:3vcFVxgOASslNXHdivT8spyMRBanMCenHRpe0u5vpBs=
+github.com/anacrolix/torrent v0.0.0-20181129073333-cc531b8c4a80 h1:LnqSEnVSkn8Z4Flz/s2AR78OcLQCqz356xmTMxJgPws=
+github.com/anacrolix/torrent v0.0.0-20181129073333-cc531b8c4a80/go.mod h1:AYCt8S7XNEn0Oq+bIZYUfma6/USBjugDp4nynaHQBTE=
+github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 h1:kpt6TQTVi6gognY+svubHfxxpq0DLU9AfTQyZVc3UOc=
+github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk=
+github.com/aokoli/goutils v1.0.1 h1:7fpzNGoJ3VA8qcrm++XEE1QUe0mIwNeLa02Nwq7RDkg=
+github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ=
+github.com/apache/thrift v0.0.0-20180514124809-e59b73d3c2bf h1:AmV4ypk1GFDRKjzX6eO47pRAoSO5FTjyVqRYhZmHhms=
+github.com/apache/thrift v0.0.0-20180514124809-e59b73d3c2bf/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
+github.com/aws/aws-sdk-go v1.15.73 h1:Xzo/nSFgDfRNHRkXc03nT9389YFFaxqsy9clPwAoff0=
+github.com/aws/aws-sdk-go v1.15.73/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
+github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
+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=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
+github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2 h1:1B/+1BcRhOMG1KH/YhNIU8OppSWk5d/NGyfRla88CuY=
+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/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/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=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4=
+github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
+github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY=
+github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
+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=
+github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
+github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
+github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
+github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/elgatito/upnp v0.0.0-20180711183757-2f244d205f9a h1:2Zw3pxDRTs4nX1WCLAEm27UN0hvjZSge7EaUUQexRZw=
+github.com/elgatito/upnp v0.0.0-20180711183757-2f244d205f9a/go.mod h1:afkYpY8JAIL4341N7Zj9xJ5yTovsg6BkWfBFlCzIoF4=
+github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710 h1:QdyRyGZWLEvJG5Kw3VcVJvhXJ5tZ1MkRgqpJOEZSySM=
+github.com/farsightsec/golang-framestream v0.0.0-20181102145529-8a0cb8ba8710/go.mod h1:eNde4IQyEiA5br02AouhEHCu3p3UzrCdFR4LuQHklMI=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e h1:P10tZmVD2XclAaT9l7OduMH1OLFzTa1wUuUqHZnEdI0=
+github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e/go.mod h1:2H9hjfbpSMHwY503FclkV/lZTBh2YlOmLLSda12uL8c=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 h1:AzN37oI0cOS+cougNAV9szl6CVoj2RYwzS3DpUQNtlY=
+github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-gonic/gin v1.3.0 h1:kCmZyPklC0gVdL728E6Aj20uYBJV93nj/TkwBTKhFbs=
+github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
+github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
+github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4=
+github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
+github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493 h1:OTanQnFt0bi5iLFSdbEVA/idR6Q2WhCm+deb7ir2CcM=
+github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.2 h1:QNWhweRd9D5Py2rRVboZ2L4SEoW/dyraWJCc8bgS8kE=
+github.com/go-ole/go-ole v1.2.2/go.mod h1:pnvuG7BrDMZ8ifMurTQmxwhQM/odqm9sSqNe5BUI7v4=
+github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gogo/protobuf v1.1.1/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=
+github.com/golang-plus/testing v1.0.0/go.mod h1:psANDlKPZ0ycedUzCS0Trf8h98sFyOyB51FlqyU+Ltc=
+github.com/golang-plus/uuid v1.0.0 h1:ga84hG89vda++AGpup4N/cbfbM3O4d3R5ON9/jcN6AY=
+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/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+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=
+github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+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/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/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/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
+github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
+github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb h1:n22Aukg/TjoypWc37dbKIpCsz0VMFPD36HQk1WKvg3A=
+github.com/googollee/go-engine.io v0.0.0-20180829091931-e2f255711dcb/go.mod h1:MBpz1MS3P4HtRcBpQU4HcjvWXZ9q+JWacMEh2/BFYbg=
+github.com/googollee/go-socket.io v0.0.0-20181214084611-0ad7206c347a h1:NMY2a78Z98wdhMHJTJxTc9BFfnGGc5ZWfgY9a23zeck=
+github.com/googollee/go-socket.io v0.0.0-20181214084611-0ad7206c347a/go.mod h1:ftBGBMhSYToR5oV4ImIPKvAIsNaTkLC+tTvoNafqxlQ=
+github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f h1:FDM3EtwZLyhW48YRiyqjivNlNZjAObv4xt4NnJaU+NQ=
+github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+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=
+github.com/gosuri/uiprogress v0.0.0-20170224063937-d0567a9d84a1/go.mod h1:C1RTYn4Sc7iEyf6j8ft5dyoZ4212h8G1ol9QQluh5+0=
+github.com/gosuri/uitable v0.0.0-20160404203958-36ee7e946282 h1:KFqmdzEPbU7Uck2tn50t+HQXZNVkxe8M9qRb/ZoSHaE=
+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.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.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=
+github.com/hako/durafmt v0.0.0-20180520121703-7b7ae1e72ead/go.mod h1:5Scbynm8dF1XAPwIwkGPqzkM/shndPm79Jd1003hTjE=
+github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo=
+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/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
+github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/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.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/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/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=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.3 h1:/Um6a/ZmD5tF7peoOJ5oN5KMQ0DrGVQSXLNwyckutPk=
+github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+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=
+github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-tty v0.0.0-20181127064339-e4f871175a2f h1:4P7Ul+TAnk92vTeVkXs6VLjmf1EhrYtDRa03PCYY6VM=
+github.com/mattn/go-tty v0.0.0-20181127064339-e4f871175a2f/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
+github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mdlayher/arp v0.0.0-20190313224443-98a83c8a2717 h1:lAsTIRVOYxE/LwrMmSAVfV/HDndBEvHaAEkjbwhqsJ4=
+github.com/mdlayher/arp v0.0.0-20190313224443-98a83c8a2717/go.mod h1:eOj1DDj3NAZ6yv+WafaKzY37MFZ58TdfIhQ+8nQbiis=
+github.com/mdlayher/ethernet v0.0.0-20190313224307-5b5fc417d966/go.mod h1:5s5p/sMJ6sNsFl6uCh85lkFGV8kLuIYJCRJLavVJwvg=
+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
+github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
+github.com/mdlayher/raw v0.0.0-20190313224157-43dbcdd7739d/go.mod h1:r1fbeITl2xL/zLbVnNHFyOzQJTgr/3fpf1lJX/cjzR8=
+github.com/mdlayher/raw v0.0.0-20190606142536-fef19f00fc18/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/mdlayher/raw v0.0.0-20190606144222-a54781e5f38f h1:Xjvm7UTnKTwrlhbs+8qA6I0v1iX77rY3QxftSgvOVRk=
+github.com/mdlayher/raw v0.0.0-20190606144222-a54781e5f38f/go.mod h1:7EpbotpCmVZcu+KCX4g9WaRNuu11uyhiW7+Le1dKawg=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
+github.com/mholt/caddy v0.10.11 h1:s8X+R8DuBbrrMuUTcWSxlDe567B0s5EDmiDBKSYsioY=
+github.com/mholt/caddy v0.10.11/go.mod h1:Wb1PlT4DAYSqOEd03MsqkdkXnTxA8v9pKjdpxbqM1kY=
+github.com/miekg/dns v1.1.1 h1:DVkblRdiScEnEr0LR9nTnEQqHYycjkXW9bOjd+2EL2o=
+github.com/miekg/dns v1.1.1/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+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=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
+github.com/mozillazg/go-pinyin v0.15.0 h1:sSwlnsogK/WMzcf0HnjgxyAI4GU6LFqwXnhr77q1Z80=
+github.com/mozillazg/go-pinyin v0.15.0/go.mod h1:bO+dztNW6O2lSJdYLha7LO3bujXzjjU3UvKb2IGANfg=
+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/nelsonken/cos-go-sdk-v5 v0.0.0-20180622024522-5247afdb7a80 h1:1tGm26e9ktdEIa7LHD7xf7oMUCE0V2wP4URkUAvEttA=
+github.com/nelsonken/cos-go-sdk-v5 v0.0.0-20180622024522-5247afdb7a80/go.mod h1:UZaoQ2hntRH4P8MwrKOxcVXvNgg1N4atxfa7NP+1wWg=
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88=
+github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
+github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 h1:lM6RxxfUMrYL/f8bWEUqdXrANWtrL7Nndbm9iFN0DlU=
+github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
+github.com/opentracing/opentracing-go v1.0.2 h1:3jA2P6O1F9UOrWVpwrIo17pu01KWvNWg4X946/Y5Zwg=
+github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/openzipkin/zipkin-go-opentracing v0.3.4 h1:x/pBv/5VJNWkcHF1G9xqhug8Iw7X1y1zOMzDmyuvP2g=
+github.com/openzipkin/zipkin-go-opentracing v0.3.4/go.mod h1:js2AbwmHW0YD9DwIw2JhQWmbfFi/UnWyYwdVhqbCDOE=
+github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=
+github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
+github.com/pierrec/lz4 v0.0.0-20181005164709-635575b42742 h1:wKfigKMTgvSzBLIVvB5QaBBQI0odU6n45/UKSphjLus=
+github.com/pierrec/lz4 v0.0.0-20181005164709-635575b42742/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
+github.com/pkg/term v0.0.0-20181116001808-27bbf2edb814 h1:qWlKm6sU/AyVAgBC1Pg1uuY/X/p4lNYG7t4v8/f4FJE=
+github.com/pkg/term v0.0.0-20181116001808-27bbf2edb814/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+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-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.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.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=
+github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8=
+github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/serialx/hashring v0.0.0-20180504054112-49a4782e9908 h1:RRpyb4kheanCQVyYfOhkZoD/cwClvn12RzHex2ZmHxw=
+github.com/serialx/hashring v0.0.0-20180504054112-49a4782e9908/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc=
+github.com/shirou/gopsutil v2.18.10+incompatible h1:cy84jW6EVRPa5g9HAHrlbxMSIjBhDSX0OFYyMYminYs=
+github.com/shirou/gopsutil v2.18.10+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
+github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/smartystreets/assertions v0.0.0-20180607162144-eb5b59917fa2 h1:hjkfjJKpNSPqJZJKSrHbQgBz+eEui8ivYlorRc9DR64=
+github.com/smartystreets/assertions v0.0.0-20180607162144-eb5b59917fa2/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a h1:JSvGDIbmil4Ui/dDdFBExb7/cmkNjyX5F97oglmvCDo=
+github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
+github.com/smartystreets/gunit v0.0.0-20180314194857-6f0d6275bdcd h1:p5kvxG4NHogJX1brTLtvUSGdW0/aBvIyqDSW7tmnsmQ=
+github.com/smartystreets/gunit v0.0.0-20180314194857-6f0d6275bdcd/go.mod h1:XUKj4gbqj2QvJk/OdLWzyZ3FYli0f+MdpngyryX0gcw=
+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/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=
+github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+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/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=
+github.com/vmware/govmomi v0.19.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
+github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
+github.com/willf/bitset v1.1.9 h1:GBtFynGY9ZWZmEC9sWuu41/7VBXPFCOAbCbqTflOg9c=
+github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
+github.com/willf/bloom v0.0.0-20170505221640-54e3b963ee16/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8=
+github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA=
+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 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.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=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
+golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/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=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190419010253-1f3472d942ba/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+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-20181203162652-d668ce993890 h1:uESlIz09WIHT2I+pasSXcpLYqYK8wHcdCetU3VuMBJE=
+golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/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=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190405154228-4b34438f7a67/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+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-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/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-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.3.0 h1:FBSsiFRMz3LBeXIomRnVzrQwSDj4ibvcRexLG0LZGQk=
+google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181218023534-67d6565462c5 h1:ZcmLUbATcwP+ZlsJ5pn5qeF9O3pC7U7mYpSnHH7RFFs=
+google.golang.org/genproto v0.0.0-20181218023534-67d6565462c5/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+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/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=
+gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
+gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/ldap.v3 v3.0.3 h1:YKRHW/2sIl05JsCtx/5ZuUueFuJyoj/6+DGXe3wp6ro=
+gopkg.in/ldap.v3 v3.0.3/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw=
+gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/urfave/cli.v1 v1.19.1/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
+gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+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-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=
+k8s.io/apimachinery v0.0.0-20181215012845-4d029f033399/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
+k8s.io/client-go v9.0.0+incompatible h1:2kqW3X2xQ9SbFvWZjGEHBLlWc1LG9JIJNXWkuqwdZ3A=
+k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
+k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk=
+k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/kubernetes v1.12.3 h1:5GPfYyyBylqcZUqL+ApYpYTm2IYjH56JUewYC0GbetU=
+k8s.io/kubernetes v1.12.3/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
+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/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-20191111031517-2206ee61d93e h1:Wa66RRG3+ZPxaWmIZD053S4iBpy0cPrq3imUkKVECR0=
+yunion.io/x/pkg v0.0.0-20191111031517-2206ee61d93e/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
+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

@@ -0,0 +1,311 @@
+// 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 models
+
+import (
+	"context"
+	"fmt"
+	"sync"
+	"time"
+
+	"github.com/pkg/errors"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
+	"yunion.io/x/sqlchemy"
+
+	"yunion.io/x/onecloud/pkg/cloudcommon/db"
+	"yunion.io/x/onecloud/pkg/httperrors"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/auth"
+	mcclient_models "yunion.io/x/onecloud/pkg/mcclient/models"
+	mcclient_modules "yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/ansible"
+)
+
+const (
+	AnsiblePlaybookStatusInit      = "init"
+	AnsiblePlaybookStatusRunning   = "running"
+	AnsiblePlaybookStatusSucceeded = "succeeded"
+	AnsiblePlaybookStatusFailed    = "failed"
+	AnsiblePlaybookStatusCanceled  = "canceled"
+	AnsiblePlaybookStatusUnknown   = "unknown"
+)
+
+// low priority
+//
+// - retry times and interval
+// - timeout,
+// - copied playbook has no added value
+
+type SAnsiblePlaybook struct {
+	db.SVirtualResourceBase
+
+	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
+	PlaybookMaxBytes = 64*1024 - 1
+)
+
+type SAnsiblePlaybookManager struct {
+	db.SVirtualResourceBaseManager
+
+	sessions    ansible.SessionManager
+	sessionsMux *sync.Mutex
+}
+
+var AnsiblePlaybookManager *SAnsiblePlaybookManager
+
+func init() {
+	AnsiblePlaybookManager = &SAnsiblePlaybookManager{
+		SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager(
+			SAnsiblePlaybook{},
+			"ansibleplaybooks_tbl",
+			"ansibleplaybook",
+			"ansibleplaybooks",
+		),
+		sessions:    ansible.SessionManager{},
+		sessionsMux: &sync.Mutex{},
+	}
+	AnsiblePlaybookManager.SetVirtualObject(AnsiblePlaybookManager)
+}
+
+func (man *SAnsiblePlaybookManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
+	pbV := NewAnsiblePlaybookValidator("playbook", userCred)
+	if err := pbV.Validate(data); err != nil {
+		return nil, err
+	}
+	data.Set("status", jsonutils.NewString(AnsiblePlaybookStatusInit))
+	return man.SVirtualResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, data)
+}
+
+func (apb *SAnsiblePlaybook) PostCreate(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data jsonutils.JSONObject) {
+	apb.SVirtualResourceBase.PostCreate(ctx, userCred, ownerId, query, data)
+	err := apb.runPlaybook(ctx, userCred)
+	if err != nil {
+		log.Errorf("postCreate: runPlaybook: %v", err)
+	}
+}
+
+func (man *SAnsiblePlaybookManager) InitializeData() error {
+	pbs := []SAnsiblePlaybook{}
+	q := AnsiblePlaybookManager.Query()
+	q = q.Filter(sqlchemy.Equals(q.Field("status"), AnsiblePlaybookStatusRunning))
+	if err := db.FetchModelObjects(AnsiblePlaybookManager, q, &pbs); err != nil {
+		return errors.WithMessage(err, "fetch running playbooks")
+	}
+	for i := 0; i < len(pbs); i++ {
+		pb := &pbs[i]
+		_, err := db.Update(pb, func() error {
+			pb.Status = AnsiblePlaybookStatusUnknown
+			return nil
+		})
+		if err != nil {
+			log.Errorf("set playbook %s(%s) to unknown state: %v", pb.Name, pb.Id, err)
+		}
+	}
+	return nil
+}
+
+func (apb *SAnsiblePlaybook) ValidateDeleteCondition(ctx context.Context) error {
+	if apb.Status == AnsiblePlaybookStatusRunning {
+		return httperrors.NewConflictError("playbook is in running state")
+	}
+	return nil
+}
+
+func (apb *SAnsiblePlaybook) ValidateUpdateCondition(ctx context.Context) error {
+	if apb.Status == AnsiblePlaybookStatusRunning {
+		return httperrors.NewConflictError("playbook is in running state")
+	}
+	return nil
+}
+
+func (apb *SAnsiblePlaybook) ValidateUpdateData(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data *jsonutils.JSONDict) (*jsonutils.JSONDict, error) {
+	pbV := NewAnsiblePlaybookValidator("playbook", userCred)
+	if err := pbV.Validate(data); err != nil {
+		return nil, err
+	}
+	apb.Playbook = pbV.Playbook // Update as a whole
+	data.Set("status", jsonutils.NewString(AnsiblePlaybookStatusInit))
+	return data, nil
+}
+
+func (apb *SAnsiblePlaybook) PostUpdate(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {
+	apb.SVirtualResourceBase.PostUpdate(ctx, userCred, query, data)
+	err := apb.runPlaybook(ctx, userCred)
+	if err != nil {
+		log.Errorf("postUpdate: runPlaybook: %v", err)
+	}
+}
+
+func (apb *SAnsiblePlaybook) AllowPerformRun(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
+	return apb.IsOwner(userCred) || db.IsAdminAllowPerform(userCred, apb, "run")
+}
+
+func (apb *SAnsiblePlaybook) PerformRun(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
+	err := apb.runPlaybook(ctx, userCred)
+	if err != nil {
+		return nil, httperrors.NewConflictError("%s", err.Error())
+	}
+	return nil, nil
+}
+
+func (apb *SAnsiblePlaybook) AllowPerformStop(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
+	return apb.IsOwner(userCred) || db.IsAdminAllowPerform(userCred, apb, "stop")
+}
+
+func (apb *SAnsiblePlaybook) PerformStop(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) (jsonutils.JSONObject, error) {
+	err := apb.stopPlaybook(ctx, userCred)
+	if err != nil {
+		return nil, httperrors.NewConflictError("%s", err.Error())
+	}
+	return nil, nil
+}
+
+func (apb *SAnsiblePlaybook) fetchPrivateKey(ctx context.Context, userCred mcclient.TokenCredential) (string, error) {
+	s := auth.GetSession(ctx, userCred, "", "")
+	jd := jsonutils.NewDict()
+	var jr jsonutils.JSONObject
+	if userCred.HasSystemAdminPrivilege() {
+		jd.Set("admin", jsonutils.JSONTrue)
+		r, err := mcclient_modules.Sshkeypairs.List(s, jd)
+		if err != nil {
+			return "", errors.WithMessage(err, "get admin ssh key")
+		}
+		jr = r.Data[0]
+	} else {
+		r, err := mcclient_modules.Sshkeypairs.GetById(s, userCred.GetProjectId(), jd)
+		if err != nil {
+			return "", errors.WithMessage(err, "get project ssh key")
+		}
+		jr = r
+	}
+	kp := &mcclient_models.SshKeypair{}
+	if err := jr.Unmarshal(kp); err != nil {
+		return "", errors.WithMessage(err, "unmarshal ssh key")
+	}
+	if kp.PrivateKey == "" {
+		return "", errors.New("empty ssh key")
+	}
+	return kp.PrivateKey, nil
+}
+
+func (apb *SAnsiblePlaybook) runPlaybook(ctx context.Context, userCred mcclient.TokenCredential) error {
+	man := AnsiblePlaybookManager
+	man.sessionsMux.Lock()
+	defer man.sessionsMux.Unlock()
+	if man.sessions.Has(apb.Id) {
+		return fmt.Errorf("playbook is already running")
+	}
+
+	// init private key
+	pb := apb.Playbook.Copy()
+	if k, err := apb.fetchPrivateKey(ctx, userCred); err != nil {
+		return err
+	} else {
+		pb.PrivateKey = []byte(k)
+	}
+	pb.OutputWriter(&ansiblePlaybookOutputRecorder{apb})
+
+	_, err := db.Update(apb, func() error {
+		apb.StartTime = time.Now()
+		apb.EndTime = time.Time{}
+		apb.Output = ""
+		apb.Status = AnsiblePlaybookStatusRunning
+		return nil
+	})
+	if err != nil {
+		log.Errorf("run playbook: update db failed before run: %v", err)
+	}
+
+	man.sessions.Add(apb.Id, pb)
+	go func() {
+		defer func() {
+			man.sessionsMux.Lock()
+			defer man.sessionsMux.Unlock()
+			man.sessions.Remove(apb.Id)
+		}()
+		runErr := man.sessions.Run(apb.Id)
+
+		_, err := db.Update(apb, func() error {
+			err := man.sessions.Err(apb.Id)
+			if err != nil {
+				apb.Status = AnsiblePlaybookStatusCanceled
+			} else if runErr != nil {
+				log.Warningf("playbook %s(%s) failed: %v", apb.Name, apb.Id, runErr)
+				apb.Status = AnsiblePlaybookStatusFailed
+			} else {
+				apb.Status = AnsiblePlaybookStatusSucceeded
+			}
+			apb.EndTime = time.Now()
+			return nil
+		})
+		if err != nil {
+			log.Errorf("updating ansible playbook failed: %v", err)
+		}
+	}()
+	return nil
+}
+
+func (apb *SAnsiblePlaybook) stopPlaybook(ctx context.Context, userCred mcclient.TokenCredential) error {
+	man := AnsiblePlaybookManager
+	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
+	man.sessions.Stop(apb.Id)
+	return nil
+}
+
+type ansiblePlaybookOutputRecorder struct {
+	apb *SAnsiblePlaybook
+}
+
+func (w *ansiblePlaybookOutputRecorder) Write(p []byte) (n int, err error) {
+	apb := w.apb
+	_, err = db.Update(apb, func() error {
+		cur := apb.Output
+		i := len(p) + len(cur) - OutputMaxBytes
+		if i > 0 {
+			// truncate to preserve the tail
+			apb.Output = cur[i:] + string(p)
+		} else {
+			apb.Output += string(p)
+		}
+		return nil
+	})
+	if err != nil {
+		log.Errorf("ansibleplaybook %s(%s): record output: %v", apb.Name, apb.Id, err)
+		return 0, err
+	}
+	return len(p), nil
+}

pkg/ansibleserver/models/ansibleplaybooks_validator.go

@@ -0,0 +1,136 @@
+// 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 models
+
+import (
+	"context"
+	"strings"
+
+	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/util/regutils"
+
+	"yunion.io/x/onecloud/pkg/cloudcommon/validators"
+	"yunion.io/x/onecloud/pkg/httperrors"
+	mcclient "yunion.io/x/onecloud/pkg/mcclient"
+	mcclient_auth "yunion.io/x/onecloud/pkg/mcclient/auth"
+	mcclient_models "yunion.io/x/onecloud/pkg/mcclient/models"
+	mcclient_modules "yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/ansible"
+)
+
+type ValidatorAnsiblePlaybook struct {
+	validators.Validator
+	Playbook *ansible.Playbook
+
+	userCred mcclient.TokenCredential
+}
+
+func NewAnsiblePlaybookValidator(key string, userCred mcclient.TokenCredential) *ValidatorAnsiblePlaybook {
+	v := &ValidatorAnsiblePlaybook{
+		Validator: validators.Validator{Key: key},
+		userCred:  userCred,
+	}
+	v.SetParent(v)
+	return v
+}
+
+func (v *ValidatorAnsiblePlaybook) Validate(data *jsonutils.JSONDict) error {
+	pb := ansible.NewPlaybook()
+	err := data.Unmarshal(pb, "playbook")
+	if err != nil {
+		return httperrors.NewBadRequestError("unmarshaling json: %v", err)
+	}
+	hosts := pb.Inventory.Hosts
+	for i := range hosts {
+		name := strings.TrimSpace(hosts[i].Name)
+		if len(name) == 0 {
+			return httperrors.NewBadRequestError("empty host name")
+		}
+		defaultUsername := ansible.PUBLIC_CLOUD_ANSIBLE_USER
+		switch {
+		case regutils.MatchIP4Addr(name):
+		case strings.HasPrefix(name, "host:"):
+			var err error
+			name = strings.TrimSpace(name[len("host:"):])
+			name, err = v.getHostAccessIp(name)
+			if err != nil {
+				return err
+			}
+			defaultUsername = "root"
+		case strings.HasPrefix(name, "server:"):
+			name = name[len("server:"):]
+			fallthrough
+		default:
+			var err error
+			name = strings.TrimSpace(name)
+			name, err = v.getServerIp(name)
+			if err != nil {
+				return err
+			}
+		}
+		hosts[i].Name = name
+		if username, _ := hosts[i].GetVar("ansible_user"); username == "" {
+			if defaultUsername != "" {
+				hosts[i].SetVar("ansible_user", defaultUsername)
+			}
+		}
+	}
+	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
+}
+
+func (v *ValidatorAnsiblePlaybook) getHostAccessIp(name string) (string, error) {
+	sess := mcclient_auth.GetSession(context.Background(), v.userCred, "", "")
+	hostJson, err := mcclient_modules.Hosts.Get(sess, name, nil)
+	if err != nil {
+		return "", httperrors.NewBadRequestError("cannot find host %s", name)
+	}
+	host := &mcclient_models.Host{}
+	if err := hostJson.Unmarshal(host); err != nil {
+		return "", httperrors.NewBadRequestError("unmarshal host %s: %v", name, err)
+	}
+	if host.AccessIp == "" {
+		return "", httperrors.NewBadRequestError("host %s has no access ip", name)
+	}
+	return host.AccessIp, nil
+}
+
+func (v *ValidatorAnsiblePlaybook) getServerIp(name string) (string, error) {
+	sess := mcclient_auth.GetSession(context.Background(), v.userCred, "", "")
+	serverJson, err := mcclient_modules.Servers.Get(sess, name, nil)
+	if err != nil {
+		return "", httperrors.NewBadRequestError("find server %s: %v", name, err)
+	}
+	server := &mcclient_models.Server{}
+	if err := serverJson.Unmarshal(server); err != nil {
+		return "", httperrors.NewBadRequestError("unmarshal server %s: %v", name, err)
+	}
+	serverNetworks, err := mcclient_models.ParseServerNetworkDetailedString(server.Networks)
+	if err != nil {
+		return "", httperrors.NewConflictError("parse networks of %s: %v", name, err)
+	}
+	ips := serverNetworks.GetPrivateIPs()
+	if len(ips) == 0 {
+		return "", httperrors.NewBadRequestError("server %s has no private ips", name)
+	}
+	name = ips[0].String()
+	return name, nil
+}

pkg/ansibleserver/models/doc.go

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package sshkeys // import "yunion.io/x/onecloud/pkg/cloudcommon/sshkeys"
+package models // import "yunion.io/x/onecloud/pkg/ansibleserver/models"

pkg/ansibleserver/models/initdb.go

@@ -0,0 +1,38 @@
+// 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 models
+
+import (
+	"yunion.io/x/log"
+
+	"yunion.io/x/onecloud/pkg/cloudcommon/db"
+)
+
+func InitDB() error {
+	for _, manager := range []db.IModelManager{
+		/*
+		 * Important!!!
+		 * initialization order matters, do not change the order
+		 */
+		AnsiblePlaybookManager,
+	} {
+		err := manager.InitializeData()
+		if err != nil {
+			log.Errorf("Manager %s initializeData fail %s", manager.Keyword(), err)
+			// return err skip error table
+		}
+	}
+	return nil
+}

pkg/ansibleserver/options/doc.go

@@ -0,0 +1,15 @@
+// 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 options // import "yunion.io/x/onecloud/pkg/ansibleserver/options"