Merge pull request #6694 from ioito/automated-cherry-pick-of-#6692-upstream-release-3.1

Automated cherry pick of #6692: fix: 返回object默认acl

.circleci/Dockerfile

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

.circleci/config.yml

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

.github/workflows/docker.yml

@@ -29,16 +29,17 @@ jobs:
     - name: Build
       run: |
         sudo apt-get update
-        sudo apt-get install librados-dev librbd-dev
+        sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
         make cmd/apigateway cmd/climc cmd/keystone
         make cmd/logger cmd/region cmd/scheduler cmd/webconsole
         make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway
         make cmd/ansibleserver cmd/cloudnet cmd/notify
-        make cmd/host && ./scripts/bundle_libraries.sh _output/bin/bundles/host _output/bin/host && ./scripts/host_find_libraries.sh _output/bin/bundles/host
         make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
         make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
         make cmd/cloudevent cmd/devtool
         make cmd/*cli
+        make cmd/esxi-agent
+        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
 
     - name: Image baremetal-agent
       uses: elgohr/Publish-Docker-Github-Action@master
@@ -50,6 +51,26 @@ jobs:
         snapshot: true
         dockerfile: build/docker/Dockerfile.baremetal-agent
 
+    - name: Image esxi-agent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.esxi-agent
+
+    - name: Image vpcagent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/vpcagent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.vpcagent
+
     - name: Image climc
       uses: elgohr/Publish-Docker-Github-Action@master
       with:
@@ -180,7 +201,7 @@ jobs:
         snapshot: true
         dockerfile: build/docker/Dockerfile.host-deployer
 
-    - name: Image cloudevent 
+    - name: Image cloudevent
       uses: elgohr/Publish-Docker-Github-Action@master
       with:
         name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
@@ -199,3 +220,13 @@ jobs:
         registry: registry.cn-beijing.aliyuncs.com
         snapshot: true
         dockerfile: build/docker/Dockerfile.devtool
+
+    - name: Image region DNS
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/region-dns
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.region-dns

Makefile

@@ -83,6 +83,9 @@ test:
 vet:
 	go vet ./...
 
+cmd/esxi-agent: prepare_dir
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
 cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
@@ -189,43 +192,77 @@ mod:
 	go mod vendor -v
 
 
-DOCKER_BUILD_IMAGE_VERSION?=latest
+DOCKER_BUILD_IMAGE_VERSION?=1.0-1
 
-define dockerBuildCmd
+define dockerCentOSBuildCmd
+set -o xtrace
 set -o errexit
 set -o pipefail
-cd /home/build/onecloud
+cd /root/onecloud
 export GOFLAGS=-mod=vendor
 make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
 endef
 
-docker-build: export dockerBuildCmd:=$(call dockerBuildCmd,$(F))
-docker-build:
-	echo "$$dockerBuildCmd"
+docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
+docker-centos-build:
 	docker rm --force onecloud-ci-build &>/dev/null || true
 	docker run \
 		--name onecloud-ci-build \
 		--rm \
-		--volume $(CURDIR):/home/build/onecloud \
-		yunionio/onecloud-ci:$(DOCKER_BUILD_IMAGE_VERSION) \
-		/bin/bash -c "$$dockerBuildCmd"
+		--volume $(CURDIR):/root/onecloud \
+		--volume $(CURDIR)/_output/_cache:/root/.cache \
+		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:$(DOCKER_BUILD_IMAGE_VERSION) \
+		/bin/bash -c "$$dockerCentOSBuildCmd"
 	chown -R $$(id -u):$$(id -g) _output
 	ls -lh _output/bin
 
 # NOTE we need a way to stop and remove the container started by docker-build.
 # No --tty, --stop-signal won't work
-docker-build-stop:
-	docker stop --time 0 onecloud-ci-build || true
+docker-centos-build-stop:
+	docker-centos stop --time 0 onecloud-ci-build || true
 
-.PHONY: docker-build
-.PHONY: docker-build-stop
+.PHONY: docker-centos-build
+.PHONY: docker-centos-build-stop
+
+define dockerAlpineBuildCmd
+set -o xtrace
+set -o errexit
+set -o pipefail
+cd /root/go/src/yunion.io/x/onecloud
+export GOFLAGS=-mod=vendor
+make $(1)
+chown -R $(shell id -u):$(shell id -g) _output
+endef
+
+docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
+docker-alpine-build:
+	docker rm --force onecloud-docker-alpine-build &>/dev/null || true
+	docker run --rm \
+		--name onecloud-docker-alpine-build \
+		-v $(CURDIR):/root/go/src/yunion.io/x/onecloud \
+		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
+		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
+		registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-1 \
+		/bin/sh -c "$$dockerAlpineBuildCmd"
+	ls -lh _output/alpine-build/bin
+
+docker-alpine-build-stop:
+	docker stop --time 0 onecloud-docker-alpine-build || true
+
+.PHONY: docker-alpine-build
+.PHONY: docker-alpine-build-stop
 
 define helpText
 Build with docker
 
-	make docker-build F='-j4'
-	make docker-build F='-j4 cmd/region cmd/climc'
-	make docker-build-stop
+	make docker-centos-build F='-j4'
+	make docker-centos-build F='-j4 cmd/region cmd/climc'
+	make docker-centos-build-stop
+
+	make docker-alpine-build F='-j4'
+	make docker-alpine-build F='-j4 cmd/host cmd/host-deployer'
+	make docker-alpine-build-stop
 
 Tidy up go modules and vendor directory
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build/docker/Dockerfile.ansibleserver

@@ -1,15 +1,3 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache tzdata ansible ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:latest
 
 ADD ./_output/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

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

build/docker/Dockerfile.baremetal-agent

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:latest
+FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1
 
 MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
 

build/docker/Dockerfile.baremetal-base

@@ -27,3 +27,13 @@ COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
 COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+
+# add mkisofs with bundles libraries
+ADD ./mkisofs /bin/mkisofs
+ADD ./.mkisofs.bin /bin/.mkisofs.bin
+ADD ./bundles/mkisofs /bin/bundles/mkisofs
+# use GNU timeout command replace busybox timeout command
+RUN rm /usr/bin/timeout
+ADD ./timeout /bin/timeout
+ADD ./.timeout.bin /bin/.timeout.bin
+ADD ./bundles/timeout /bin/bundles/timeout

build/docker/Dockerfile.climc

@@ -1,16 +1,5 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308
 
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN apk add --no-cache bash bash-completion tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV PATH="/opt/yunion/bin:${PATH}"
-
-RUN mkdir -p /opt/yunion/bin
+ADD ./build/climc/root/opt /opt
 
 ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

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

build/docker/Dockerfile.esxi-agent

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

build/docker/Dockerfile.host

@@ -1,11 +1,9 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-base:v0.1.0
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 
 ENV TZ Asia/Shanghai
 
+RUN apk add librados librbd
 RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/host /opt/yunion/bin/host
-ADD ./_output/bin/.host.bin /opt/yunion/bin/.host.bin
-ADD ./_output/bin/bundles/host /opt/yunion/bin/bundles/host
+ADD ./_output/alpine-build/bin/host /opt/yunion/bin/host

build/docker/Dockerfile.host-deployer

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.0.2
 
 MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
 

build/docker/Dockerfile.monitor

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

build/docker/Dockerfile.region-dns

@@ -1,3 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:latest
+FROM alpine:3.11.3
 
-ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
+RUN mkdir -p /opt/yunion/bin
+ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.vpcagent

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

build/docker/Dockerfile.webconsole

@@ -1,14 +1,3 @@
-FROM yunion/kubectl:1.14.3
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:latest
 
 ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -0,0 +1,12 @@
+FROM yunion/kubectl:1.14.3
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+RUN mkdir -p /opt/yunion/bin
+
+RUN apk add --no-cache sshpass ipmitool openssh-client tzdata ca-certificates && \
+    rm -rf /var/cache/apk/*
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

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

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

build/esxi-agent/vars

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

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

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

build/host-image/vars

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

cmd/aliyuncli/main.go

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

cmd/awscli/main.go

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

cmd/azurecli/main.go

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

cmd/climc/climc.go

@@ -35,6 +35,7 @@ import (
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
 	"yunion.io/x/onecloud/pkg/mcclient"
 )
 

cmd/climc/shell/bucket_options.go

@@ -0,0 +1,46 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/mcclient/options"
+)
+
+func init() {
+	type BucketOptionsVerifyOptions struct {
+		options.BaseListOptions
+		CloudaccountId       string `help:"cloudaccount Id" required:"true"`
+		BillingReportBucket  string `help:"S3 bucket that stores account billing report"`
+		BillingFilePrefix    string `help:"prefix of billing file name"`
+		BillingBucketAccount string `help:"Id of cloudaccount that can access billing bucket"`
+		UsageReportBucket    string `help:"S3 bucket that stores account usage report"`
+		UsageFilePrefix      string `help:"prefix of usage file name"`
+		UsageBucketAccount   string `help:"Id of cloudaccount that can access usage bucket"`
+	}
+	R(&BucketOptionsVerifyOptions{}, "bucket-options-verify", "billing bucket connection test",
+		func(s *mcclient.ClientSession, args *BucketOptionsVerifyOptions) error {
+			params := jsonutils.Marshal(args)
+			result, err := modules.BucketOptions.PerformAction(s, args.CloudaccountId, "verify", params)
+			if err != nil {
+				return err
+			}
+			printObject(result)
+			return nil
+		})
+}

cmd/climc/shell/cloudaccounts.go

@@ -26,10 +26,33 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
+func parseGcpCredential(filename string) (jsonutils.JSONObject, error) {
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	authParams, err := jsonutils.Parse(data)
+	if err != nil {
+		return nil, err
+	}
+	ret := jsonutils.NewDict()
+	for _, k := range []string{
+		"client_email",
+		"project_id",
+		"private_key_id",
+		"private_key",
+	} {
+		v, _ := authParams.Get(k)
+		ret.Add(v, fmt.Sprintf("gcp_%s", k))
+	}
+	return ret, nil
+}
+
 func init() {
 
 	type CloudaccountListOptions struct {
 		options.BaseListOptions
+		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 	}
 	R(&CloudaccountListOptions{}, "cloud-account-list", "List cloud accounts", func(s *mcclient.ClientSession, args *CloudaccountListOptions) error {
 		var params *jsonutils.JSONDict
@@ -39,6 +62,9 @@ func init() {
 			if err != nil {
 				return err
 			}
+			if len(args.Capability) > 0 {
+				params.Add(jsonutils.NewStringArray(args.Capability), "capability")
+			}
 		}
 		result, err := modules.Cloudaccounts.List(s, params)
 		if err != nil {
@@ -88,6 +114,19 @@ func init() {
 	R(&options.SAliyunCloudAccountCreateOptions{}, "cloud-account-create-aliyun", "Create an Aliyun cloud account", func(s *mcclient.ClientSession, args *options.SAliyunCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args)
 		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Aliyun"), "provider")
+		options := jsonutils.NewDict()
+		if len(args.OptionsBillingReportBucket) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingReportBucket), "billing_report_bucket")
+		}
+		if len(args.OptionsBillingBucketAccount) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingBucketAccount), "billing_bucket_account")
+		}
+		if len(args.OptionsBillingFilePrefix) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingFilePrefix), "billing_file_prefix")
+		}
+		if options.Size() > 0 {
+			params.(*jsonutils.JSONDict).Add(options, "options")
+		}
 		result, err := modules.Cloudaccounts.Create(s, params)
 		if err != nil {
 			return err
@@ -121,11 +160,7 @@ func init() {
 	R(&options.SGoogleCloudAccountCreateOptions{}, "cloud-account-create-google", "Create a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args)
 		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Google"), "provider")
-		data, err := ioutil.ReadFile(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		authParams, err := jsonutils.Parse(data)
+		authParams, err := parseGcpCredential(args.GoogleJsonFile)
 		if err != nil {
 			return err
 		}
@@ -147,6 +182,12 @@ func init() {
 		if len(args.OptionsBillingReportBucket) > 0 {
 			options.Add(jsonutils.NewString(args.OptionsBillingReportBucket), "billing_report_bucket")
 		}
+		if len(args.OptionsBillingBucketAccount) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingBucketAccount), "billing_bucket_account")
+		}
+		if len(args.OptionsBillingFilePrefix) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingFilePrefix), "billing_file_prefix")
+		}
 		if options.Size() > 0 {
 			params.Add(options, "options")
 		}
@@ -280,6 +321,34 @@ func init() {
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}
+
+		options := jsonutils.NewDict()
+		if len(args.OptionsBillingReportBucket) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingReportBucket), "billing_report_bucket")
+		}
+		if len(args.OptionsBillingBucketAccount) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingBucketAccount), "billing_bucket_account")
+		}
+		if len(args.OptionsBillingFilePrefix) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingFilePrefix), "billing_file_prefix")
+		}
+		if options.Size() > 0 {
+			params.Add(options, "options")
+		}
+		removeOptions := make([]string, 0)
+		if args.RemoveOptionsBillingReportBucket {
+			removeOptions = append(removeOptions, "billing_report_bucket")
+		}
+		if args.RemoveOptionsBillingBucketAccount {
+			removeOptions = append(removeOptions, "billing_bucket_account")
+		}
+		if args.RemoveOptionsBillingFilePrefix {
+			removeOptions = append(removeOptions, "billing_file_prefix")
+		}
+		if len(removeOptions) > 0 {
+			params.Add(jsonutils.NewStringArray(removeOptions), "remove_options")
+		}
+
 		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
 		if err != nil {
 			return err
@@ -330,6 +399,19 @@ func init() {
 		return nil
 	})
 
+	R(&options.SGoogleCloudAccountUpdateOptions{}, "cloud-account-update-google", "update a google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountUpdateOptions) error {
+		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
+		if params.Size() == 0 {
+			return InvalidUpdateError()
+		}
+		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	R(&options.SAWSCloudAccountUpdateOptions{}, "cloud-account-update-aws", "update an AWS cloud account", func(s *mcclient.ClientSession, args *options.SAWSCloudAccountUpdateOptions) error {
 		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
 
@@ -337,6 +419,12 @@ func init() {
 		if len(args.OptionsBillingReportBucket) > 0 {
 			options.Add(jsonutils.NewString(args.OptionsBillingReportBucket), "billing_report_bucket")
 		}
+		if len(args.OptionsBillingBucketAccount) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingBucketAccount), "billing_bucket_account")
+		}
+		if len(args.OptionsBillingFilePrefix) > 0 {
+			options.Add(jsonutils.NewString(args.OptionsBillingFilePrefix), "billing_file_prefix")
+		}
 		if options.Size() > 0 {
 			params.Add(options, "options")
 		}
@@ -344,6 +432,12 @@ func init() {
 		if args.RemoveOptionsBillingReportBucket {
 			removeOptions = append(removeOptions, "billing_report_bucket")
 		}
+		if args.RemoveOptionsBillingBucketAccount {
+			removeOptions = append(removeOptions, "billing_bucket_account")
+		}
+		if args.RemoveOptionsBillingFilePrefix {
+			removeOptions = append(removeOptions, "billing_file_prefix")
+		}
 		if len(removeOptions) > 0 {
 			params.Add(jsonutils.NewStringArray(removeOptions), "remove_options")
 		}
@@ -359,7 +453,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.SOpenStackCloudAccountUpdateOptions{}, "cloud-account-update-openstack", "update an AWS cloud account", func(s *mcclient.ClientSession, args *options.SOpenStackCloudAccountUpdateOptions) error {
+	R(&options.SOpenStackCloudAccountUpdateOptions{}, "cloud-account-update-openstack", "update an OpenStack cloud account", func(s *mcclient.ClientSession, args *options.SOpenStackCloudAccountUpdateOptions) error {
 		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
 		if params.Size() == 0 {
 			return InvalidUpdateError()
@@ -611,6 +705,19 @@ func init() {
 		return nil
 	})
 
+	R(&options.SGoogleCloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-google", "Update credential of a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountUpdateCredentialOptions) error {
+		params, err := parseGcpCredential(args.GoogleJsonFile)
+		if err != nil {
+			return err
+		}
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
+
 	R(&options.SS3CloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-s3", "Update credential of a generic S3 cloud account", func(s *mcclient.ClientSession, args *options.SS3CloudAccountUpdateCredentialOptions) error {
 		params := jsonutils.Marshal(args)
 		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
@@ -727,4 +834,34 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type CloudaccountSyncSkusOptions struct {
+		ID       string `help:"ID or Name of cloud account"`
+		RESOURCE string `help:"Resource of skus" choices:"serversku|elasticcachesku|dbinstance_sku"`
+		Force    bool   `help:"Force sync no matter what"`
+		Provider string `help:"provider to sync"`
+		Region   string `help:"region to sync"`
+	}
+	R(&CloudaccountSyncSkusOptions{}, "cloud-account-sync-skus", "Sync skus of a cloud account", func(s *mcclient.ClientSession, args *CloudaccountSyncSkusOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("resource", jsonutils.NewString(args.RESOURCE))
+		if args.Force {
+			params.Add(jsonutils.JSONTrue, "force")
+		}
+
+		if len(args.Provider) > 0 {
+			params.Add(jsonutils.NewString(args.Provider), "cloudprovider")
+		}
+
+		if len(args.Region) > 0 {
+			params.Add(jsonutils.NewString(args.Region), "cloudregion")
+		}
+
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "sync-skus", params)
+		if err != nil {
+			return err
+		}
+		printObject(result)
+		return nil
+	})
 }

cmd/climc/shell/cloudevents.go

@@ -24,6 +24,9 @@ func init() {
 
 	type CloudeventListOptions struct {
 		options.BaseListOptions
+
+		Since string `help:"since time"`
+		Until string `hlep:"until time"`
 	}
 	R(&CloudeventListOptions{}, "cloud-event-list", "List cloud events", func(s *mcclient.ClientSession, opts *CloudeventListOptions) error {
 		params, err := options.ListStructToParams(opts)

cmd/climc/shell/cloudnet/routes.go

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

cmd/climc/shell/cloudproviders.go

@@ -31,8 +31,9 @@ func init() {
 
 		Usable bool `help:"Vpc & Network usable"`
 
-		HasObjectStorage bool `help:"filter cloudproviders that has object storage"`
-		NoObjectStorage  bool `help:"filter cloudproviders that has no object storage"`
+		HasObjectStorage bool     `help:"filter cloudproviders that has object storage"`
+		NoObjectStorage  bool     `help:"filter cloudproviders that has no object storage"`
+		Capability       []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 	}
 	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
 		var params *jsonutils.JSONDict
@@ -52,6 +53,10 @@ func init() {
 			} else if args.NoObjectStorage {
 				params.Add(jsonutils.JSONFalse, "has_object_storage")
 			}
+
+			if len(args.Capability) > 0 {
+				params.Add(jsonutils.NewStringArray(args.Capability), "capability")
+			}
 		}
 		result, err := modules.Cloudproviders.List(s, params)
 		if err != nil {

cmd/climc/shell/cloudregions.go

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

cmd/climc/shell/contacts.go

@@ -29,11 +29,11 @@ func init() {
 	 * 操作用户的通信地址（如果用户的通信地址不存在则进行添加；如果已存在则进行修改；如果设置空则进行删除。）
 	 */
 	type ContactsUpdateOptions struct {
-		UID            string `help:"The user you wanna add contact to (Keystone User ID)"`
-		CONTACTTYPE    string `help:"The contact type email|mobile" choices:"email|mobile|dingtalk"`
-		CONTACT        string `help:"The contacts details mobile number or email address or dingtalk's userid, if set it the empty str means delete"`
-		Status         string `help:"Enabled or disabled contact status" choices:"enable|disable"`
-		UpdateDingtalk bool   `help:"if update dingtalk"`
+		UID         string   `help:"The user you wanna add contact to (Keystone User ID)"`
+		CONTACTTYPE string   `help:"The contact type email|mobile" choices:"email|mobile|dingtalk"`
+		CONTACT     string   `help:"The contacts details mobile number or email address or dingtalk's userid, if set it the empty str means delete"`
+		Status      string   `help:"Enabled or disabled contact status" choices:"enable|disable"`
+		Pull        []string `help:"pull some subcontacts(e.g., dingtalk, feishu, etc) related to mobile"`
 	}
 	R(&ContactsUpdateOptions{}, "contact-update", "Create, delete or update contact for user", func(s *mcclient.ClientSession, args *ContactsUpdateOptions) error {
 		arr := jsonutils.NewArray()
@@ -52,12 +52,14 @@ func init() {
 
 		params := jsonutils.NewDict()
 		params.Add(arr, "contacts")
-		if args.UpdateDingtalk {
-			params.Add(jsonutils.JSONTrue, "update_dingtalk")
+
+		pulls := jsonutils.NewArray()
+		for _, pull := range args.Pull {
+			pulls.Add(jsonutils.NewString(pull))
 		}
+		params.Add(pulls, "pull")
 
 		contact, err := modules.Contacts.CustomizedPerformAction(s, args.UID, "update-contact", params)
-
 		if err != nil {
 			return err
 		}
@@ -66,6 +68,22 @@ func init() {
 		return nil
 	})
 
+	type ContactsPullOptions struct {
+		UID         string `help:"The user you wanna pull contact"`
+		CONTACTTYPE string `help:"The contact type"`
+	}
+	R(&ContactsPullOptions{}, "contact-pull", "Pull contact", func(s *mcclient.ClientSession, args *ContactsPullOptions) error {
+		params := jsonutils.NewDict()
+		params.Set("contacts", jsonutils.NewArray())
+		params.Set("pull", jsonutils.NewArray(jsonutils.NewString(args.CONTACTTYPE)))
+		contact, err := modules.Contacts.CustomizedPerformAction(s, args.UID, "update-contact", params)
+		if err != nil {
+			return err
+		}
+		printObject(contact)
+		return nil
+	})
+
 	type ContactsDeleteOptions struct {
 		UID         string `help:"The user you wanna add contact to (Keystone User ID)"`
 		CONTACTTYPE string `help:"The contact type email|mobile|dingtalk" choices:"email|mobile|dingtalk"`

cmd/climc/shell/copyright.go

@@ -15,7 +15,14 @@
 package shell
 
 import (
+	"bufio"
+	"bytes"
+	"encoding/base64"
 	"fmt"
+	"io/ioutil"
+	"mime/multipart"
+	"net/http"
+	"path/filepath"
 
 	"yunion.io/x/jsonutils"
 
@@ -56,4 +63,78 @@ func init() {
 		printObject(r)
 		return nil
 	})
+
+	type EnterpriseUpdateOptions struct {
+		Name      string `help:"Enterprise name"`
+		Copyright string `help:"The Email"`
+		Logo      string `help:"logo file path"`
+		LoginLogo string `help:"login page logo file path"`
+		Favicon   string `help:"favicon path"`
+	}
+
+	R(&EnterpriseUpdateOptions{}, "infos-update", "update enterprise info", func(s *mcclient.ClientSession, args *EnterpriseUpdateOptions) error {
+		var b bytes.Buffer
+		w := multipart.NewWriter(&b)
+		if len(args.Name) > 0 {
+			w.WriteField("name", args.Name)
+		}
+
+		if len(args.Copyright) > 0 {
+			w.WriteField("copyright", args.Copyright)
+		}
+
+		writeFile := func(filedName, filePath string) error {
+			if len(filePath) == 0 {
+				return nil
+			}
+
+			c, err := ioutil.ReadFile(filePath)
+			if err != nil {
+				return err
+			}
+
+			var v string
+			c64 := base64.StdEncoding.EncodeToString(c)
+			ext := filepath.Ext(filePath)
+			switch ext {
+			case ".png":
+				v = fmt.Sprintf("data:image/png;base64,%s", c64)
+			case ".jpg":
+				v = fmt.Sprintf("data:image/jpg;base64,%s", c64)
+			default:
+				return fmt.Errorf("only support png/jpg image")
+			}
+
+			err = w.WriteField(filedName, v)
+			if err != nil {
+				return err
+			}
+
+			return nil
+		}
+
+		if err := writeFile("logo", args.Logo); err != nil {
+			return err
+		}
+
+		if err := writeFile("login_logo", args.LoginLogo); err != nil {
+			return err
+		}
+
+		if err := writeFile("favicon", args.Favicon); err != nil {
+			return err
+		}
+
+		header := make(http.Header)
+		header.Set("content-type", fmt.Sprintf("multipart/form-data; boundary=%s", w.Boundary()))
+		w.Close()
+
+		ret, err := modules.Info.Update(s, header, bufio.NewReader(&b))
+		if err != nil {
+			return err
+		}
+
+		printObject(ret)
+		return nil
+	})
 }

cmd/climc/shell/groups.go

@@ -79,7 +79,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		users, err := modules.Groups.GetUsers(s, grpId)
+		users, err := modules.Groups.GetUsers(s, grpId, nil)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/hosts.go

@@ -18,11 +18,13 @@ import (
 	"fmt"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/log"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
+	"yunion.io/x/onecloud/pkg/util/ssh"
 )
 
 func init() {
@@ -38,7 +40,7 @@ func init() {
 		Occupied  bool   `help:"show occupid host" json:"-"`
 		Enabled   bool   `help:"Show enabled host only" json:"-"`
 		Disabled  bool   `help:"Show disabled host only" json:"-"`
-		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei|ucloud"`
+		HostType  string `help:"Host type filter" choices:"baremetal|hypervisor|esxi|kubelet|hyperv|aliyun|azure|qcloud|aws|huawei|ucloud|google|ctyun"`
 		AnyMac    string `help:"Mac matches one of the host's interface"`
 
 		IsBaremetal *bool `help:"filter host list by is_baremetal=true|false"`
@@ -55,6 +57,8 @@ func init() {
 
 		CdromBoot *bool `help:"filter hosts list by cdrom_boot=true|false"`
 
+		Sn string `help:"find host by sn"`
+
 		options.BaseListOptions
 	}
 	R(&HostListOptions{}, "host-list", "List hosts", func(s *mcclient.ClientSession, opts *HostListOptions) error {
@@ -76,6 +80,9 @@ func init() {
 		if len(opts.Uuid) > 0 {
 			params.Add(jsonutils.NewString(opts.Uuid), "uuid")
 		}
+		if len(opts.Sn) > 0 {
+			params.Add(jsonutils.NewString(opts.Sn), "sn")
+		}
 		result, err := modules.Hosts.List(s, params)
 		if err != nil {
 			return err
@@ -659,4 +666,44 @@ func init() {
 		printObject(result)
 		return nil
 	})
+
+	type HostSSHLoginOptions struct {
+		ID   string `help:"ID or name of host"`
+		Port int    `help:"SSH service port" default:"22"`
+	}
+	R(&HostSSHLoginOptions{}, "host-ssh", "SSH login of a host", func(s *mcclient.ClientSession, args *HostSSHLoginOptions) error {
+		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
+		if e != nil {
+			return e
+		}
+		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
+		if e != nil {
+			return e
+		}
+		host, err := i.GetString("ip")
+		if err != nil {
+			return err
+		}
+		user, err := i.GetString("username")
+		if err != nil {
+			return err
+		}
+		passwd, err := i.GetString("password")
+		if err != nil {
+			return err
+		}
+		port := 22
+		if args.Port != 22 {
+			port = args.Port
+		}
+		sshCli, err := ssh.NewClient(host, port, user, passwd, "")
+		if err != nil {
+			return err
+		}
+		log.Infof("ssh %s:%d", host, port)
+		if err := sshCli.RunTerminal(); err != nil {
+			return err
+		}
+		return nil
+	})
 }

cmd/climc/shell/images.go

@@ -50,7 +50,7 @@ type ImageOptionalOptions struct {
 	OsLang             string   `help:"OS Language" choices:"zh_CN|en_US"`
 	Preference         int64    `help:"Disk preferences"`
 	Notes              string   `help:"Notes about the image"`
-	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container|openstack"`
+	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container|openstack|ctyun"`
 	DiskDriver         string   `help:"Perfer disk driver" choices:"virtio|scsi|pvscsi|ide|sata"`
 	NetDriver          string   `help:"Preferred network driver" choices:"virtio|e1000|vmxnet3"`
 }

cmd/climc/shell/k8s/clusters.go

@@ -205,4 +205,70 @@ func initKubeCluster() {
 		printObject(ret)
 		return nil
 	})
+
+	R(&o.IdentOptions{}, cmdN("components-status"), "Get cluster component status", func(s *mcclient.ClientSession, args *o.IdentOptions) error {
+		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "components-status", nil)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterComponentTypeOptions{}, cmdN("component-setting"), "Get cluster component setting", func(s *mcclient.ClientSession, args *o.ClusterComponentTypeOptions) error {
+		q := jsonutils.NewDict()
+		q.Add(jsonutils.NewString(args.TYPE), "type")
+		ret, err := k8s.KubeClusters.GetSpecific(s, args.ID, "component-setting", q)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterEnableComponentCephCSIOpt{}, cmdN("component-enable-ceph-csi"), "Enable cluster component", func(s *mcclient.ClientSession, args *o.ClusterEnableComponentCephCSIOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "enable-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterDisableComponent{}, cmdN("component-disable"), "Enable cluster component", func(s *mcclient.ClientSession, args *o.ClusterDisableComponent) error {
+		params := args.Params()
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "disable-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterDisableComponent{}, cmdN("component-delete"), "Delete cluster component", func(s *mcclient.ClientSession, args *o.ClusterDisableComponent) error {
+		params := args.Params()
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "delete-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+
+	R(&o.ClusterUpdateComponentCephCSIOpt{}, cmdN("component-update-ceph-csi"), "Update cluster component", func(s *mcclient.ClientSession, args *o.ClusterUpdateComponentCephCSIOpt) error {
+		params, err := args.Params()
+		if err != nil {
+			return err
+		}
+		ret, err := k8s.KubeClusters.PerformAction(s, args.ID, "update-component", params)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
 }

cmd/climc/shell/k8s/event.go

@@ -0,0 +1,9 @@
+package k8s
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+)
+
+func initEvent() {
+	initK8sNamespaceResource("event", k8s.Events)
+}

cmd/climc/shell/k8s/k8s.go

@@ -16,6 +16,11 @@ package k8s
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+	"os/exec"
+
+	"github.com/ghodss/yaml"
 
 	"yunion.io/x/jsonutils"
 
@@ -57,7 +62,7 @@ func init() {
 	initPVC()
 	initJob()
 	initCronJob()
-
+	initEvent()
 	initRbac()
 
 	initApp()
@@ -217,6 +222,71 @@ func NewK8sNsResourceGetCmd(cmdN CmdNameFactory, manager modulebase.Manager) *Cm
 	)
 }
 
+func NewK8sNsResourceGetRawCmd(cmdN CmdNameFactory, manager k8s.IClusterResourceManager) *Cmd {
+	return NewCommand(
+		&o.NamespaceResourceGetOptions{},
+		cmdN.Do("show-raw"),
+		fmt.Sprintf("Show k8s %s raw data", cmdN.Kind),
+		func(s *mcclient.ClientSession, args *o.NamespaceResourceGetOptions) error {
+			ret, err := manager.GetRaw(s, args.NAME, args.Params())
+			if err != nil {
+				return err
+			}
+			printObjectYAML(ret)
+			return nil
+		},
+	)
+}
+
+func NewK8sResourceEditRawCmd(cmdN CmdNameFactory, manager k8s.IClusterResourceManager) *Cmd {
+	return NewCommand(
+		&o.NamespaceResourceGetOptions{},
+		cmdN.Do("edit-raw"),
+		fmt.Sprintf("Edit and update k8s %s raw data", cmdN.Kind),
+		func(s *mcclient.ClientSession, args *o.NamespaceResourceGetOptions) error {
+			rawData, err := manager.GetRaw(s, args.NAME, args.Params())
+			if err != nil {
+				return err
+			}
+			yamlBytes := rawData.YAMLString()
+			tempfile, err := ioutil.TempFile("", fmt.Sprintf("k8s-%s-%s*.yaml", cmdN.Kind, args.NAME))
+			if err != nil {
+				return err
+			}
+			defer os.Remove(tempfile.Name())
+			if _, err := tempfile.Write([]byte(yamlBytes)); err != nil {
+				return err
+			}
+			if err := tempfile.Close(); err != nil {
+				return err
+			}
+
+			cmd := exec.Command("vim", tempfile.Name())
+			cmd.Stdin = os.Stdin
+			cmd.Stdout = os.Stdout
+			if err := cmd.Run(); err != nil {
+				return err
+			}
+			content, err := ioutil.ReadFile(tempfile.Name())
+			if err != nil {
+				return err
+			}
+			jsonBytes, err := yaml.YAMLToJSON(content)
+			if err != nil {
+				return err
+			}
+			body, err := jsonutils.Parse(jsonBytes)
+			if err != nil {
+				return err
+			}
+			if _, err := manager.UpdateRaw(s, args.NAME, args.Params(), body.(*jsonutils.JSONDict)); err != nil {
+				return err
+			}
+			return nil
+		},
+	)
+}
+
 func NewK8sResourceDeleteCmd(cmdN CmdNameFactory, manager modulebase.Manager) *Cmd {
 	return NewCommand(
 		&o.ResourceDeleteOptions{},
@@ -244,11 +314,13 @@ func NewK8sNsResourceDeleteCmd(cmdN CmdNameFactory, manager modulebase.Manager)
 	return deleteCmd
 }
 
-func initK8sNamespaceResource(kind string, manager modulebase.Manager) *ShellCommands {
+func initK8sNamespaceResource(kind string, manager k8s.IClusterResourceManager) *ShellCommands {
 	cmdN := NewCmdNameFactory(kind)
 	return NewShellCommands(cmdN.Do).AddR(
 		NewK8sNsResourceListCmd(cmdN, manager),
 		NewK8sNsResourceGetCmd(cmdN, manager),
 		NewK8sNsResourceDeleteCmd(cmdN, manager),
+		NewK8sNsResourceGetRawCmd(cmdN, manager),
+		NewK8sResourceEditRawCmd(cmdN, manager),
 	)
 }

cmd/climc/shell/k8s/secret.go

@@ -40,22 +40,40 @@ func initSecret() {
 		})
 	secretCmd.AddR(listCmd)
 
-	registryCmd := initK8sNamespaceResource("registrysecret", k8s.RegistrySecrets)
-	createCmd := NewCommand(
+	registryCmd := NewCmdNameFactory("secret-registry")
+	registryCreateCmd := NewCommand(
 		&o.RegistrySecretCreateOptions{},
-		registryCmd.CommandNameFactory("create"),
-		"Create docker registry secret resource",
+		registryCmd.Do("create"),
+		"Create docker registry secret secret",
 		func(s *mcclient.ClientSession, args *o.RegistrySecretCreateOptions) error {
 			params, err := args.Params()
 			if err != nil {
 				return err
 			}
-			ret, err := k8s.RegistrySecrets.Create(s, params)
+			ret, err := k8s.Secrets.Create(s, params)
 			if err != nil {
 				return err
 			}
 			printObject(ret)
 			return nil
 		})
-	registryCmd.AddR(createCmd)
+
+	cephCSICmd := NewCmdNameFactory("secret-ceph-csi")
+	cephCSICreateCmd := NewCommand(
+		&o.CephCSISecretCreateOptions{},
+		cephCSICmd.Do("create"),
+		"Create ceph csi user secret",
+		func(s *mcclient.ClientSession, args *o.CephCSISecretCreateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := k8s.Secrets.Create(s, params)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+	secretCmd.AddR(cephCSICreateCmd, registryCreateCmd)
 }

cmd/climc/shell/k8s/storageclass.go

@@ -15,9 +15,70 @@
 package k8s
 
 import (
+	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/k8s"
+	o "yunion.io/x/onecloud/pkg/mcclient/options/k8s"
 )
 
 func initStorageClass() {
-	initK8sClusterResource("storageclass", k8s.Storageclass)
+	cmdN := NewCmdNameFactory("storageclass")
+	scCmd := initK8sClusterResource("storageclass", k8s.Storageclass)
+
+	setDefaultCmd := NewCommand(
+		&o.ClusterResourceBaseOptions{},
+		cmdN.Do("set-default"),
+		"Set storageclass as default",
+		func(s *mcclient.ClientSession, args *o.ClusterResourceBaseOptions) error {
+			ret, err := k8s.Storageclass.PerformAction(s, args.NAME, "set-default", args.Params())
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		},
+	)
+
+	scCmd.AddR(setDefaultCmd)
+
+	addStorageClassCephCSI(scCmd)
+}
+
+func addStorageClassCephCSI(cmd *ShellCommands) {
+	rbdN := NewCmdNameFactory("storageclass-ceph-csi-rbd")
+	rbdCreateCmd := NewCommand(
+		&o.StorageClassCephCSIRBDCreateOptions{},
+		rbdN.Do("create"),
+		"Create ceph csi rbd",
+		func(s *mcclient.ClientSession, args *o.StorageClassCephCSIRBDCreateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := k8s.Storageclass.Create(s, params)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		},
+	)
+	testConnCmd := NewCommand(
+		&o.StorageClassCephCSIRBDTestOptions{},
+		rbdN.Do("connection-test"),
+		"Test storageclass connection",
+		func(s *mcclient.ClientSession, args *o.StorageClassCephCSIRBDTestOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := k8s.Storageclass.PerformClassAction(s, "connection-test", params)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		},
+	)
+
+	cmd.AddR(rbdCreateCmd, testConnCmd)
 }

cmd/climc/shell/keypairs.go

@@ -51,9 +51,10 @@ func init() {
 	})
 
 	type KeypairCreate struct {
-		NAME   string `help:"Name of keypair to be created"`
-		Scheme string `help:"Scheme of keypair, default is RSA" choices:"RSA|DSA" default:"RSA"`
-		Desc   string `help:"Short description of keypair"`
+		NAME      string `help:"Name of keypair to be created"`
+		Scheme    string `help:"Scheme of keypair, default is RSA" choices:"RSA" default:"RSA"`
+		PublicKey string `help:"Publickey of keypair"`
+		Desc      string `help:"Short description of keypair"`
 	}
 
 	R(&KeypairCreate{}, "keypair-create", "Create a new keypair", func(s *mcclient.ClientSession, args *KeypairCreate) error {
@@ -63,6 +64,10 @@ func init() {
 			params.Add(jsonutils.NewString(args.Scheme), "scheme")
 		}
 
+		if len(args.PublicKey) > 0 {
+			params.Add(jsonutils.NewString(args.PublicKey), "public_key")
+		}
+
 		if len(args.Desc) > 0 {
 			params.Add(jsonutils.NewString(args.Desc), "description")
 		}

cmd/climc/shell/monitor/alert.go

@@ -0,0 +1,116 @@
+// 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 monitor
+
+import (
+	"fmt"
+
+	monitorapi "yunion.io/x/onecloud/pkg/apis/monitor"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func init() {
+	aN := cmdN("alert")
+	R(&options.AlertListOptions{}, aN("list"), "List all alerts",
+		func(s *mcclient.ClientSession, args *options.AlertListOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Alerts.List(s, params)
+			if err != nil {
+				return err
+			}
+			printList(ret, monitor.Alerts.GetColumns(s))
+			return nil
+		})
+
+	R(&options.AlertCreateOptions{}, aN("create"), "Create alert rule",
+		func(s *mcclient.ClientSession, args *options.AlertCreateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Alerts.DoCreate(s, params)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.AlertShowOptions{}, aN("show"), "Show details of a alert rule",
+		func(s *mcclient.ClientSession, args *options.AlertShowOptions) error {
+			ret, err := monitor.Alerts.Get(s, args.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.AlertUpdateOptions{}, aN("update"), "Update a alert rule",
+		func(s *mcclient.ClientSession, args *options.AlertUpdateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Alerts.Update(s, args.ID, params.JSON(params))
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.AlertDeleteOptions{}, aN("delete"), "Delete alerts",
+		func(s *mcclient.ClientSession, args *options.AlertDeleteOptions) error {
+			ret := monitor.Alerts.BatchDelete(s, args.ID, nil)
+			printBatchResults(ret, monitor.Alerts.GetColumns(s))
+			return nil
+		})
+
+	R(&options.AlertTestRunOptions{}, aN("test-run"), "Test run alert",
+		func(s *mcclient.ClientSession, args *options.AlertTestRunOptions) error {
+			data := new(monitorapi.AlertTestRunInput)
+			if args.Debug {
+				data.IsDebug = true
+			}
+			ret, err := monitor.Alerts.DoTestRun(s, args.ID, data)
+			if err != nil {
+				return err
+			}
+			fmt.Println(ret.JSON(ret).YAMLString())
+			return nil
+		})
+
+	R(&options.AlertPauseOptions{}, aN("pause"), "Pause or unpause alert",
+		func(s *mcclient.ClientSession, args *options.AlertPauseOptions) error {
+			data := new(monitorapi.AlertPauseInput)
+			if args.UnPause {
+				data.Paused = false
+			} else {
+				data.Paused = true
+			}
+			ret, err := monitor.Alerts.PerformAction(s, args.ID, "pause", data.JSON(data))
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+}

cmd/climc/shell/monitor/alertnotification.go

@@ -0,0 +1,60 @@
+package monitor
+
+import (
+	monitorapi "yunion.io/x/onecloud/pkg/apis/monitor"
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func init() {
+	initAlertNotification()
+}
+
+func initAlertNotification() {
+	aN := cmdN("alert-notification")
+	R(&options.AlertNotificationListOptions{}, aN("list"), "List alert notification pairs",
+		func(s *mcclient.ClientSession, args *options.AlertNotificationListOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			var result *modulebase.ListResult
+			if len(args.Alert) > 0 {
+				result, err = monitor.Alertnotification.ListDescendent(s, args.Alert, params)
+			} else if len(args.Notification) > 0 {
+				result, err = monitor.Alertnotification.ListDescendent2(s, args.Notification, params)
+			} else {
+				result, err = monitor.Alertnotification.List(s, params)
+			}
+			if err != nil {
+				return err
+			}
+			printList(result, monitor.Alertnotification.GetColumns(s))
+			return nil
+		})
+
+	R(&options.AlertNotificationAttachOptions{}, aN("attach"), "Attach a notification to a alert",
+		func(s *mcclient.ClientSession, args *options.AlertNotificationAttachOptions) error {
+			input := &monitorapi.AlertnotificationCreateInput{
+				UsedBy: args.UsedBy,
+			}
+			ret, err := monitor.Alertnotification.Attach(s, args.ALERT, args.NOTIFICATION, input.JSON(input))
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.AlertNotificationAttachOptions{}, aN("detach"), "Detach a notification to a alert",
+		func(s *mcclient.ClientSession, args *options.AlertNotificationAttachOptions) error {
+			ret, err := monitor.Alertnotification.Detach(s, args.ALERT, args.NOTIFICATION, nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+}

cmd/climc/shell/monitor/common.go

@@ -0,0 +1,27 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package monitor
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+)

cmd/climc/shell/monitor/monitor.go

@@ -0,0 +1,56 @@
+// 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 monitor
+
+import (
+	"fmt"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func cmdN(suffix string) func(action string) string {
+	return func(action string) string {
+		return fmt.Sprintf("monitor-%s-%s", suffix, action)
+	}
+}
+
+func init() {
+	dsN := cmdN("datasource")
+	R(&options.DataSourceListOptions{}, dsN("list"), "List all monitor data source",
+		func(s *mcclient.ClientSession, args *options.DataSourceListOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.DataSources.List(s, params)
+			if err != nil {
+				return err
+			}
+			printList(ret, monitor.DataSources.GetColumns(s))
+			return nil
+		})
+
+	R(&options.DataSourceDeleteOptions{}, dsN("delete"), "Delete monitor data source",
+		func(s *mcclient.ClientSession, args *options.DataSourceDeleteOptions) error {
+			ret, err := monitor.DataSources.Delete(s, args.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+}

cmd/climc/shell/monitor/notification.go

@@ -0,0 +1,99 @@
+// 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 monitor
+
+import (
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/monitor"
+	options "yunion.io/x/onecloud/pkg/mcclient/options/monitor"
+)
+
+func init() {
+	nN := cmdN("notification")
+	R(&options.NotificationListOptions{}, nN("list"), "List all alert notification",
+		func(s *mcclient.ClientSession, args *options.NotificationListOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Notifications.List(s, params)
+			if err != nil {
+				return err
+			}
+			printList(ret, monitor.Notifications.GetColumns(s))
+			return nil
+		})
+
+	R(&options.NotificationDingDingCreateOptions{}, nN("create-dingding"),
+		"Create dingding alert notification",
+		func(s *mcclient.ClientSession, args *options.NotificationDingDingCreateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Notifications.Create(s, params.JSON(params))
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.NotificationFeishuCreateOptions{}, nN("create-feishu"),
+		"Create feishu alert notification",
+		func(s *mcclient.ClientSession, args *options.NotificationFeishuCreateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Notifications.Create(s, params.JSON(params))
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.NotificationShowOptions{}, nN("show"), "Show alert notification",
+		func(s *mcclient.ClientSession, args *options.NotificationShowOptions) error {
+			ret, err := monitor.Notifications.Get(s, args.ID, nil)
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.NotificationUpdateOptions{}, nN("update"), "Update alert notification",
+		func(s *mcclient.ClientSession, args *options.NotificationUpdateOptions) error {
+			params, err := args.Params()
+			if err != nil {
+				return err
+			}
+			ret, err := monitor.Notifications.Update(s, args.ID, params.JSON(params))
+			if err != nil {
+				return err
+			}
+			printObject(ret)
+			return nil
+		})
+
+	R(&options.NotificationDeleteOptions{}, nN("delete"), "Show delete notification",
+		func(s *mcclient.ClientSession, args *options.NotificationDeleteOptions) error {
+			ret := monitor.Notifications.BatchDelete(s, args.ID, nil)
+			printBatchResults(ret, monitor.Notifications.GetColumns(s))
+			return nil
+		})
+}

cmd/climc/shell/networks.go

@@ -346,77 +346,6 @@ func init() {
 		return nil
 	})
 
-	type NetworkAddDnsUpdateTargetOptions struct {
-		ID     string `help:"Network ID or name"`
-		DNS    string `help:"DNS server address" metavar:"DNS_SERVER"`
-		KEY    string `help:"DNS update key name" metavar:"DNS_UPDATE_KEY"`
-		SECRET string `help:"DNS update key secret" metavar:"DNS_UPDATE_SECRET"`
-	}
-	R(&NetworkAddDnsUpdateTargetOptions{}, "network-add-dns-update-target", "Add a dns update target to a network", func(s *mcclient.ClientSession, args *NetworkAddDnsUpdateTargetOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.DNS), "server")
-		params.Add(jsonutils.NewString(args.KEY), "key")
-		params.Add(jsonutils.NewString(args.SECRET), "secret")
-		result, err := modules.Networks.PerformAction(s, args.ID, "add-dns-update-target", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type NetworkRemoveDnsUpdateTargetOptions struct {
-		ID  string `help:"Network ID or name"`
-		DNS string `help:"DNS server address" metavar:"DNS_SERVER"`
-		KEY string `help:"DNS update key name" metavar:"DNS_UPDATE_KEY"`
-	}
-	R(&NetworkRemoveDnsUpdateTargetOptions{}, "network-remove-dns-update-target", "Remove a dns update target from a network", func(s *mcclient.ClientSession, args *NetworkRemoveDnsUpdateTargetOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.DNS), "server")
-		params.Add(jsonutils.NewString(args.KEY), "key")
-		result, err := modules.Networks.PerformAction(s, args.ID, "remove-dns-update-target", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type NetworkSetDnsUpdateKeyOptions struct {
-		ID     string `help:"ID of virtual network to update"`
-		KEY    string `help:"Key name of secret" metavar:"KEYNAME"`
-		SECRET string `help:"Key secret"`
-		SERVER string `help:"Alternate DNS update server"`
-	}
-	R(&NetworkSetDnsUpdateKeyOptions{}, "network-set-dns-update-key", "Set DNS update key info for a virtual network", func(s *mcclient.ClientSession, args *NetworkSetDnsUpdateKeyOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.KEY), "dns_update_key_name")
-		params.Add(jsonutils.NewString(args.SECRET), "dns_update_key_secret")
-		params.Add(jsonutils.NewString(args.SERVER), "dns_update_server")
-		result, err := modules.Networks.PerformAction(s, args.ID, "metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type NetworkRemoveDnsUpdateKeyOptions struct {
-		ID string `help:"ID of virtual network"`
-	}
-	R(&NetworkRemoveDnsUpdateKeyOptions{}, "network-remove-dns-update-key", "Set DNS update key info for a virtual network", func(s *mcclient.ClientSession, args *NetworkRemoveDnsUpdateKeyOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONNull, "dns_update_key_name")
-		params.Add(jsonutils.JSONNull, "dns_update_key_secret")
-		params.Add(jsonutils.JSONNull, "dns_update_server")
-		result, err := modules.Networks.PerformAction(s, args.ID, "metadata", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type NetworkAddressOptions struct {
 		NETWORK string `help:"id or name of network to query"`
 	}

cmd/climc/shell/nodealert.go

@@ -59,18 +59,18 @@ func init() {
 	 * 修改指定的报警规则
 	 */
 	type NodealertUpdateOptions struct {
-		ID         string  `help:"ID of the alert rule" required:"true" positional:"true"`
-		Type       string  `help:"Alert rule type" choices:"guest|host"`
-		Metric     string  `help:"Metric name, include measurement and field, such as vm_cpu.usage_active"`
-		NodeName   string  `help:"Name of the guest or host"`
-		NodeID     string  `help:"ID of the guest or host"`
-		Period     string  `help:"Specify the query time period for the data"`
-		Window     string  `help:"Specify the query interval for the data"`
-		Threshold  float64 `help:"Threshold value of the metric"`
-		Comparator string  `help:"Comparison operator for join expressions" choices:">|<|>=|<=|=|!="`
-		Recipients string  `help:"Comma separated recipient ID"`
-		Level      string  `help:"Alert level" choices:"normal|important|fatal"`
-		Channel    string  `help:"Ways to send an alarm" choices:"email|mobile"`
+		ID         string   `help:"ID of the alert rule" required:"true" positional:"true"`
+		Type       string   `help:"Alert rule type" choices:"guest|host"`
+		Metric     string   `help:"Metric name, include measurement and field, such as vm_cpu.usage_active"`
+		NodeName   string   `help:"Name of the guest or host"`
+		NodeID     string   `help:"ID of the guest or host"`
+		Period     string   `help:"Specify the query time period for the data"`
+		Window     string   `help:"Specify the query interval for the data"`
+		Threshold  *float64 `help:"Threshold value of the metric"`
+		Comparator string   `help:"Comparison operator for join expressions" choices:">|<|>=|<=|=|!="`
+		Recipients string   `help:"Comma separated recipient ID"`
+		Level      string   `help:"Alert level" choices:"normal|important|fatal"`
+		Channel    string   `help:"Ways to send an alarm" choices:"email|mobile"`
 	}
 	R(&NodealertUpdateOptions{}, "nodealert-update", "Update the node alert rule", func(s *mcclient.ClientSession, args *NodealertUpdateOptions) error {
 		params, err := options.StructToParams(args)
@@ -92,14 +92,11 @@ func init() {
 	 * 删除指定ID的报警规则
 	 */
 	type NodealertDeleteOptions struct {
-		ID string `help:"ID of node alert" required:"true" positional:"true"`
+		ID []string `help:"ID of node alert" required:"true" positional:"true"`
 	}
 	R(&NodealertDeleteOptions{}, "nodealert-delete", "Delete a node alert", func(s *mcclient.ClientSession, args *NodealertDeleteOptions) error {
-		alarm, err := modules.NodeAlert.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(alarm)
+		ret := modules.NodeAlert.BatchDelete(s, args.ID, nil)
+		printBatchResults(ret, modules.NodeAlert.GetColumns(s))
 		return nil
 	})
 

cmd/climc/shell/notification.go

@@ -29,7 +29,7 @@ func init() {
 	 */
 
 	type NotificationCreateOptions struct {
-		CONTACTTYPE string `help:"User's contacts type" choices:"email|mobile|dingtalk|webconsole"`
+		CONTACTTYPE string `help:"User's contacts type"`
 		TOPIC       string `help:"Title or topic of the notification"`
 		PRIORITY    string `help:"Priority of the notification" choices:"normal|important|fatal"`
 		MSG         string `help:"The content of the notification"`
@@ -41,7 +41,7 @@ func init() {
 		NotificationCreateOptions
 	}
 
-	R(&NotificationCreateSingleOptions{}, "notify", "Send a notification to someones", func(s *mcclient.ClientSession,
+	R(&NotificationCreateSingleOptions{}, "notify", "Send a notification to someone", func(s *mcclient.ClientSession,
 		args *NotificationCreateSingleOptions) error {
 
 		msg := notify.SNotifyMessage{}

cmd/climc/shell/notify.go

@@ -34,7 +34,24 @@ func init() {
 		}
 		body := jsonutils.NewDict()
 		body.Add(tmp, args.CONTACTTYPE)
-		modules.Configs.Create(s, body)
+		ret, err := modules.Configs.Create(s, body)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
+		return nil
+	})
+	R(&ConfigCreate2Options{}, "notify-config-validate", "config validate", func(s *mcclient.ClientSession,
+		args *ConfigCreate2Options) error {
+		tmp := jsonutils.NewDict()
+		for i := 0; i+1 < len(args.CONFIGS); i += 2 {
+			tmp.Add(jsonutils.NewString(args.CONFIGS[i+1]), args.CONFIGS[i])
+		}
+		ret, err := modules.Configs.PerformAction(s, args.CONTACTTYPE, "validate", tmp)
+		if err != nil {
+			return err
+		}
+		printObject(ret)
 		return nil
 	})
 

cmd/climc/shell/policies.go

@@ -134,7 +134,7 @@ func init() {
 		return nil
 	}
 	R(&PolicyPatchOptions{}, "policy-patch", "Patch policy", updateFunc)
-	R(&PolicyPatchOptions{}, "policy-update", "Patch policy", updateFunc)
+	R(&PolicyPatchOptions{}, "policy-update", "Update policy", updateFunc)
 
 	type PolicyPerformOptions struct {
 		ID string `help:"ID of policy to update"`
@@ -375,7 +375,7 @@ func init() {
 			rbacutils.ScopeUser,
 			rbacutils.ScopeNone,
 		} {
-			m := policy.PolicyManager.MatchedPolicies(scope, token)
+			m := policy.PolicyManager.MatchedPolicyNames(scope, token)
 			fmt.Println("matched", scope, "policies:", m)
 		}
 

cmd/climc/shell/proxysettings.go

@@ -0,0 +1,81 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package 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.ProxySettingCreateOptions{}, "proxysetting-create", "Create proxysetting", func(s *mcclient.ClientSession, opts *options.ProxySettingCreateOptions) error {
+		params, err := options.StructToParams(opts)
+		if err != nil {
+			return err
+		}
+		proxysetting, err := modules.ProxySettings.Create(s, params)
+		if err != nil {
+			return err
+		}
+		printObject(proxysetting)
+		return nil
+	})
+	R(&options.ProxySettingGetOptions{}, "proxysetting-show", "Show proxysetting", func(s *mcclient.ClientSession, opts *options.ProxySettingGetOptions) error {
+		proxysetting, err := modules.ProxySettings.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(proxysetting)
+		return nil
+	})
+	R(&options.ProxySettingListOptions{}, "proxysetting-list", "List proxysettings", func(s *mcclient.ClientSession, opts *options.ProxySettingListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+		result, err := modules.ProxySettings.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.ProxySettings.GetColumns(s))
+		return nil
+	})
+	R(&options.ProxySettingUpdateOptions{}, "proxysetting-update", "Update proxysetting", func(s *mcclient.ClientSession, opts *options.ProxySettingUpdateOptions) error {
+		params, err := options.StructToParams(opts)
+		proxysetting, err := modules.ProxySettings.Update(s, opts.ID, params)
+		if err != nil {
+			return err
+		}
+		printObject(proxysetting)
+		return nil
+	})
+	R(&options.ProxySettingDeleteOptions{}, "proxysetting-delete", "Delete proxysetting", func(s *mcclient.ClientSession, opts *options.ProxySettingDeleteOptions) error {
+		proxysetting, err := modules.ProxySettings.Delete(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(proxysetting)
+		return nil
+	})
+	R(&options.ProxySettingTestOptions{}, "proxysetting-test", "Test proxysetting", func(s *mcclient.ClientSession, opts *options.ProxySettingTestOptions) error {
+		proxysetting, err := modules.ProxySettings.PerformAction(s, opts.ID, "test", nil)
+		if err != nil {
+			return err
+		}
+		printObject(proxysetting)
+		return nil
+	})
+}

cmd/climc/shell/quotas.go

@@ -24,7 +24,7 @@ import (
 )
 
 type ComputeQuotaKeys struct {
-	RegionQuotaKeys
+	ZoneQuotaKeys
 
 	Hypervisor string `help:"hypervisor" choices:"kvm|baremetal"`
 }
@@ -53,8 +53,8 @@ type RegionQuotaOptions struct {
 
 	Port  int64 `help:"Internal NIC count" json:"port,omitzero"`
 	Eport int64 `help:"External NIC count" json:"eport,omitzero"`
-	Bw    int64 `help:"Internal bandwidth in Mbps" json:"bw,omitzero"`
-	Ebw   int64 `help:"External bandwidth in Mbps" json:"ebw,omitzero"`
+	// Bw    int64 `help:"Internal bandwidth in Mbps" json:"bw,omitzero"`
+	// Ebw   int64 `help:"External bandwidth in Mbps" json:"ebw,omitzero"`
 
 	Eip int64 `help:"Elastic IP count" json:"eip,omitzero"`
 
@@ -110,6 +110,7 @@ func init() {
 		Project string `help:"Tenant name or ID" json:"tenant"`
 		Domain  string `help:"Domain name or ID" json:"domain"`
 		Refresh bool   `help:"refresh" json:"refresh,omitfalse"`
+		Primary bool   `help:"get primary quota ONLY" json:"primary,omitfalse"`
 	}
 	R(&QuotaOptions{}, "quota", "Show quota for current user or tenant", func(s *mcclient.ClientSession, args *QuotaOptions) error {
 		params := jsonutils.Marshal(args)
@@ -239,6 +240,8 @@ func init() {
 
 	type QuotaListOptions struct {
 		ProjectDomain string `help:"domain name or ID to query project quotas"`
+		Refresh       bool   `help:"refresh" json:"refresh,omitfalse"`
+		Primary       bool   `help:"list primary quota ONLY" json:"primary,omitfalse"`
 	}
 	R(&QuotaListOptions{}, "quota-list", "List quota of domains or projects of a domain", func(s *mcclient.ClientSession, args *QuotaListOptions) error {
 		params := jsonutils.Marshal(args)

cmd/climc/shell/reservedips.go

@@ -28,6 +28,7 @@ func init() {
 		NOTES    string   `help:"Why reserve this IP"`
 		IPS      []string `help:"IPs to reserve"`
 		Duration string   `help:"reservation duration, e.g. 1I, 1H, 2M"`
+		Status   string   `help:"ip status"`
 	}
 	R(&NetworkReserveIPOptions{}, "network-reserve-ip", "Reserve an IP address from pool", func(s *mcclient.ClientSession, args *NetworkReserveIPOptions) error {
 		params := jsonutils.NewDict()
@@ -36,6 +37,9 @@ func init() {
 		if len(args.Duration) > 0 {
 			params.Add(jsonutils.NewString(args.Duration), "duration")
 		}
+		if len(args.Status) > 0 {
+			params.Add(jsonutils.NewString(args.Status), "status")
+		}
 		net, err := modules.Networks.PerformAction(s, args.NETWORK, "reserve-ip", params)
 		if err != nil {
 			return err

cmd/climc/shell/servernetworks.go

@@ -21,6 +21,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/util/regutils"
 
+	"yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudcommon/cmdline"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
@@ -150,12 +151,19 @@ func init() {
 	})
 
 	type ServerAttachNetworkOptions struct {
-		SERVER  string `help:"ID or Name of server"`
-		NETDESC string `help:"Network description"`
+		SERVER  string   `help:"ID or Name of server"`
+		NETDESC []string `help:"Network description"`
 	}
 	R(&ServerAttachNetworkOptions{}, "server-attach-network", "Attach a server to a virtual network", func(s *mcclient.ClientSession, args *ServerAttachNetworkOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.NETDESC), "net_desc")
+		input := compute.AttachNetworkInput{[]*compute.NetworkConfig{}}
+		for i := 0; i < len(args.NETDESC); i++ {
+			conf, err := cmdline.ParseNetworkConfig(args.NETDESC[i], -1)
+			if err != nil {
+				return err
+			}
+			input.Nets = append(input.Nets, conf)
+		}
+		params := jsonutils.Marshal(input)
 		srv, err := modules.Servers.PerformAction(s, args.SERVER, "attachnetwork", params)
 		if err != nil {
 			return err

cmd/climc/shell/servers.go

@@ -34,6 +34,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
+	"yunion.io/x/onecloud/pkg/util/ssh"
 )
 
 func init() {
@@ -178,6 +179,19 @@ func init() {
 		},
 	)
 
+	R(&options.ServerCreateOptions{}, "server-check-create-data", "Check create server data", func(s *mcclient.ClientSession, opts *options.ServerCreateOptions) error {
+		params, err := opts.Params()
+		if err != nil {
+			return err
+		}
+		server, err := modules.Servers.PerformClassAction(s, "check-create-data", params.JSON(params))
+		if err != nil {
+			return err
+		}
+		printObject(server)
+		return nil
+	})
+
 	R(&options.ServerCreateOptions{}, "server-create", "Create a server", func(s *mcclient.ClientSession, opts *options.ServerCreateOptions) error {
 		params, err := opts.Params()
 		if err != nil {
@@ -974,6 +988,7 @@ func init() {
 				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))
+				config.Hosts[i].MonitorPath = yamlConfig.Hosts[i].MonitorPath
 				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
@@ -996,11 +1011,11 @@ func init() {
 		if err != nil {
 			return err
 		}
-		for i := 0; i < len(params); i++ {
-			val := jsonutils.NewDict()
-			val.Set(modules.Servers.KeywordPlural, params[i])
-			params[i] = val
-		}
+		//for i := 0; i < len(params); i++ {
+		//	val := jsonutils.NewDict()
+		//	val.Set(modules.Servers.KeywordPlural, params[i])
+		//	params[i] = val
+		//}
 
 		results := modules.Servers.BatchPerformClassAction(s, "import-from-libvirt", params)
 		printBatchResults(results, modules.Servers.GetColumns(s))
@@ -1218,4 +1233,77 @@ func init() {
 		}
 		return nil
 	})
+
+	R(&options.ServerSSHLoginOptions{}, "server-ssh", "Use SSH login a server", func(s *mcclient.ClientSession, opts *options.ServerSSHLoginOptions) error {
+		srv, err := modules.Servers.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+
+		srvid, err := srv.GetString("id")
+		if err != nil {
+			return err
+		}
+
+		address := make([]string, 0)
+		nics, err := srv.GetArray("nics")
+		if err != nil {
+			return err
+		}
+		for _, nic := range nics {
+			if addr, err := nic.GetString("ip_addr"); err == nil {
+				address = append(address, addr)
+			}
+		}
+		if len(address) == 0 {
+			return fmt.Errorf("Not found ip address from server %s", opts.ID)
+		}
+
+		params := jsonutils.NewDict()
+		if len(opts.Key) > 0 {
+			privateKey, e := ioutil.ReadFile(opts.Key)
+			if e != nil {
+				return e
+			}
+			params.Add(jsonutils.NewString(string(privateKey)), "private_key")
+		}
+
+		i, e := modules.Servers.GetLoginInfo(s, srvid, params)
+		if e != nil {
+			return e
+		}
+		passwd, err := i.GetString("password")
+		if err != nil {
+			return err
+		}
+		if opts.Password != "" {
+			passwd = opts.Password
+		}
+		user, err := i.GetString("username")
+		if err != nil {
+			return err
+		}
+		if opts.User != "" {
+			user = opts.User
+		}
+
+		host := address[0]
+		if opts.Host != "" {
+			host = opts.Host
+		}
+		port := 22
+		if opts.Port != 22 {
+			port = opts.Port
+		}
+
+		sshCli, err := ssh.NewClient(host, port, user, passwd, "")
+		if err != nil {
+			return err
+		}
+		log.Infof("ssh %s:%d", host, port)
+		if err := sshCli.RunTerminal(); err != nil {
+			return err
+		}
+		return nil
+	})
 }

cmd/climc/shell/usages.go

@@ -22,9 +22,9 @@ 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:"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"`
+	HostType []string `help:"Host types" choices:"hypervisor|baremetal|esxi|xen|kubelet|hyperv|aliyun|azure|aws|huawei|qcloud|openstack|ucloud|zstack|google|ctyun"`
+	Provider []string `help:"Provider" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|Google|Ctyun"`
+	Brand    []string `help:"Brands" choices:"OneCloud|VMware|Aliyun|Azure|Aws|Qcloud|Huawei|OpenStack|Ucloud|ZStack|DStack|Google|Ctyun"`
 	Project  string   `help:"show usage of specified project"`
 
 	ProjectDomain string `help:"show usage of specified domain"`

cmd/climc/shell/webconsole.go

@@ -15,6 +15,7 @@
 package shell
 
 import (
+	"encoding/base64"
 	"fmt"
 	"net/url"
 
@@ -45,6 +46,9 @@ func init() {
 		if err != nil {
 			return err
 		}
+		if decodeStr, err := base64.StdEncoding.DecodeString(connParams); err == nil {
+			connParams = string(decodeStr)
+		}
 		var query url.Values
 		connUrl, err := url.ParseRequestURI(connParams)
 		if err == nil {
@@ -64,7 +68,9 @@ func init() {
 			return nil
 		}
 
-		u.RawQuery = connParams
+		newQuery := url.Values(make(map[string][]string))
+		newQuery.Set("data", base64.StdEncoding.EncodeToString([]byte(connParams)))
+		u.RawQuery = newQuery.Encode()
 		fmt.Println(u.String())
 		return nil
 	}

cmd/ctyuncli/main.go

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

cmd/esxi-agent/main.go

@@ -12,18 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package apis
+package main
 
-type ModelBaseDetails struct {
-	CanDelete        bool   `json:"can_delete"`
-	DeleteFailReason string `json:"delete_fail_reason"`
-	CanUpdate        bool   `json:"can_update"`
-	UpdateFailReason string `json:"update_fail_reason"`
-}
+import (
+	"yunion.io/x/onecloud/pkg/esxi/service"
+	"yunion.io/x/onecloud/pkg/util/atexit"
+)
 
-type ModelBaseShortDescDetail struct {
-	ResName string `json:"res_name"`
-}
+func main() {
+	defer atexit.Handle()
 
-type ModelBaseListInput struct {
+	service.New().StartService()
 }

cmd/esxicli/main.go

@@ -88,7 +88,14 @@ func newClient(options *BaseOptions) (*esxi.SESXiClient, error) {
 		return nil, fmt.Errorf("Missing password")
 	}
 
-	return esxi.NewESXiClient2("", "", options.Host, options.Port, options.Account, options.Password, false)
+	return esxi.NewESXiClient2(
+		esxi.NewESXiClientConfig(
+			options.Host,
+			options.Port,
+			options.Account,
+			options.Password,
+		),
+	)
 }
 
 func main() {

cmd/googlecli/main.go

@@ -94,7 +94,14 @@ func newClient(options *BaseOptions) (*google.SRegion, error) {
 		return nil, fmt.Errorf("Missing ProjectID")
 	}
 
-	cli, err := google.NewGoogleClient("", "", options.ProjectID, options.ClientEmail, options.PrivateKeyID, options.PrivateKey, options.Debug)
+	cli, err := google.NewGoogleClient(
+		google.NewGoogleClientConfig(
+			options.ProjectID,
+			options.ClientEmail,
+			options.PrivateKeyID,
+			options.PrivateKey,
+		).Debug(options.Debug),
+	)
 	if err != nil {
 		return nil, err
 	}

cmd/huaweicli/main.go

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

cmd/monitor/main.go

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

cmd/openstackcli/main.go

@@ -93,7 +93,18 @@ 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.ProjectDomain, options.Debug)
+	cli, err := openstack.NewOpenStackClient(
+		openstack.NewOpenstackClientConfig(
+			options.AuthURL,
+			options.Username,
+			options.Password,
+			options.Project,
+			options.ProjectDomain,
+		).
+			EndpointType(options.EndpointType).
+			DomainName(options.DomainName).
+			Debug(options.Debug),
+	)
 	if err != nil {
 		return nil, err
 	}

cmd/qcloudcli/main.go

@@ -85,11 +85,12 @@ func newClient(options *BaseOptions) (*qcloud.SRegion, error) {
 		return nil, fmt.Errorf("Missing SecretID")
 	}
 
-	if cli, err := qcloud.NewQcloudClient("", "",
-		options.SecretID,
-		options.SecretKey,
-		options.AppID,
-		options.Debug); err != nil {
+	if cli, err := qcloud.NewQcloudClient(
+		qcloud.NewQcloudClientConfig(
+			options.SecretID,
+			options.SecretKey,
+		).AppId(options.AppID).Debug(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/s3cli/main.go

@@ -94,11 +94,23 @@ func newClient(options *BaseOptions) (cloudprovider.ICloudRegion, error) {
 	}
 
 	if options.Backend == api.CLOUD_PROVIDER_CEPH {
-		return ceph.NewCephRados("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
+		return ceph.NewCephRados(
+			objectstore.NewObjectStoreClientConfig(
+				options.AccessUrl, options.AccessKey, options.Secret,
+			).Debug(options.Debug),
+		)
 	} else if options.Backend == api.CLOUD_PROVIDER_XSKY {
-		return xsky.NewXskyClient("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
+		return xsky.NewXskyClient(
+			objectstore.NewObjectStoreClientConfig(
+				options.AccessUrl, options.AccessKey, options.Secret,
+			).Debug(options.Debug),
+		)
 	}
-	return objectstore.NewObjectStoreClient("", "", options.AccessUrl, options.AccessKey, options.Secret, options.Debug)
+	return objectstore.NewObjectStoreClient(
+		objectstore.NewObjectStoreClientConfig(
+			options.AccessUrl, options.AccessKey, options.Secret,
+		).Debug(options.Debug),
+	)
 }
 
 func main() {

cmd/ucloudcli/main.go

@@ -86,11 +86,12 @@ func newClient(options *BaseOptions) (*ucloud.SRegion, error) {
 		return nil, fmt.Errorf("Missing secret")
 	}
 
-	cli, err := ucloud.NewUcloudClient("", "",
-		options.AccessKey,
-		options.Secret,
-		options.ProjectId,
-		options.Debug)
+	cli, err := ucloud.NewUcloudClient(
+		ucloud.NewUcloudClientConfig(
+			options.AccessKey,
+			options.Secret,
+		).ProjectId(options.ProjectId).Debug(options.Debug),
+	)
 	if err != nil {
 		return nil, err
 	}

cmd/vpcagent/main.go

@@ -0,0 +1,71 @@
+// 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 (
+	"context"
+	"os"
+	"os/signal"
+	"sync"
+	"syscall"
+
+	"yunion.io/x/log"
+
+	app_common "yunion.io/x/onecloud/pkg/cloudcommon/app"
+	common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
+	"yunion.io/x/onecloud/pkg/util/atexit"
+	"yunion.io/x/onecloud/pkg/vpcagent/options"
+	_ "yunion.io/x/onecloud/pkg/vpcagent/ovn"
+	"yunion.io/x/onecloud/pkg/vpcagent/worker"
+)
+
+func main() {
+	defer atexit.Handle()
+
+	opts := &options.Options{}
+	commonOpts := &opts.CommonOptions
+	{
+		common_options.ParseOptions(opts, os.Args, "vpcagent.conf", "vpcagent")
+		app_common.InitAuth(commonOpts, func() {
+			log.Infof("auth finished ok")
+		})
+	}
+	if err := opts.ValidateThenInit(); err != nil {
+		log.Fatalf("opts validate: %s", err)
+	}
+
+	w := worker.NewWorker(opts)
+	if w == nil {
+		log.Fatalf("new worker failed")
+	}
+
+	{
+		wg := &sync.WaitGroup{}
+		ctx, cancelFunc := context.WithCancel(context.Background())
+		ctx = context.WithValue(ctx, "wg", wg)
+		wg.Add(1)
+		go w.Start(ctx)
+
+		go func() {
+			sigChan := make(chan os.Signal)
+			signal.Notify(sigChan, syscall.SIGINT)
+			signal.Notify(sigChan, syscall.SIGTERM)
+			sig := <-sigChan
+			log.Infof("signal received: %s", sig)
+			cancelFunc()
+		}()
+		wg.Wait()
+	}
+}

cmd/zstackcli/main.go

@@ -89,7 +89,13 @@ func newClient(options *BaseOptions) (*zstack.SRegion, error) {
 		return nil, fmt.Errorf("Missing Password")
 	}
 
-	cli, err := zstack.NewZStackClient("", "", options.AuthURL, options.Username, options.Password, options.Debug)
+	cli, err := zstack.NewZStackClient(
+		zstack.NewZstackClientConfig(
+			options.AuthURL,
+			options.Username,
+			options.Password,
+		).Debug(options.Debug),
+	)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -5,7 +5,8 @@ go 1.12
 require (
 	github.com/360EntSecGroup-Skylar/excelize v1.4.0
 	github.com/Azure/azure-sdk-for-go v36.1.0+incompatible
-	github.com/Azure/go-autorest v10.15.5+incompatible
+	github.com/Azure/go-autorest/autorest v0.9.3
+	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
 	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
@@ -22,28 +23,24 @@ require (
 	github.com/aokoli/goutils v1.0.1
 	github.com/aws/aws-sdk-go v1.21.4
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
+	github.com/benbjohnson/clock v1.0.0
 	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/denisenkom/go-mssqldb v0.0.0-20190806190131-db2462fef53b // 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/edsrzf/mmap-go v1.0.0 // indirect
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // 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/gin-gonic/gin v1.5.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
@@ -56,14 +53,12 @@ require (
 	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/mux v1.6.2
+	github.com/gorilla/mux v1.7.0
 	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
@@ -72,7 +67,7 @@ require (
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.0.1 // indirect
 	github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c
-	github.com/kr/pty v1.1.3
+	github.com/kr/pty v1.1.5
 	github.com/lib/pq v1.2.0 // indirect
 	github.com/libvirt/libvirt-go-xml v5.2.0+incompatible
 	github.com/mattn/go-runewidth v0.0.4 // indirect
@@ -82,7 +77,7 @@ require (
 	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/miekg/dns v1.1.4
 	github.com/minio/minio-go v6.0.14+incompatible
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/moul/http2curl v1.0.0
@@ -90,55 +85,81 @@ require (
 	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 v2.0.5+incompatible
 	github.com/pkg/errors v0.8.1
 	github.com/pkg/term v0.0.0-20181116001808-27bbf2edb814 // indirect
 	github.com/pquerna/otp v1.2.0
-	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/skip2/go-qrcode v0.0.0-20190110000554-dc11ecdae0a9
+	github.com/smartystreets/goconvey v1.6.4
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
 	github.com/stretchr/testify v1.4.0
-	github.com/tencentcloud/tencentcloud-sdk-go v0.0.0-20181108132626-805d01dd0e2e
+	github.com/tencentcloud/tencentcloud-sdk-go v3.0.135+incompatible
 	github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20191108095731-8ca4b370cde4
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
 	github.com/tredoe/osutil v0.0.0-20161130133508-7d3ee1afa71c
-	github.com/ugorji/go v0.0.0-20161130061742-9c7f9b7a2bc3 // indirect
+	github.com/vishvananda/netlink v1.0.0
+	github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df // indirect
 	github.com/vmihailenco/msgpack v4.0.4+incompatible
-	github.com/vmware/govmomi v0.19.0
+	github.com/vmware/govmomi v0.20.1
 	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-20191002192127-34f69633bfdc
-	golang.org/x/net v0.0.0-20191007182048-72f939374954
-	golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/sys v0.0.0-20191008105621-543471e840be
+	golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
+	golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553
+	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
+	golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20191008142428-8d021180e987
+	google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873
 	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/ini.v1 v1.44.0 // 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
+	gopkg.in/yaml.v2 v2.2.8
+	k8s.io/api v0.17.3
+	k8s.io/apimachinery v0.17.3
 	k8s.io/client-go v9.0.0+incompatible
-	k8s.io/klog v0.1.0 // indirect
-	k8s.io/kubernetes v1.12.3
-	yunion.io/x/executor v0.0.0-20191202093616-92e2e6119257
-	yunion.io/x/jsonutils v0.0.0-20191220095028-7fef3b75f64d
-	yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d
-	yunion.io/x/pkg v0.0.0-20191221094533-5097f12f41ac
+	k8s.io/cluster-bootstrap v0.17.3
+	k8s.io/kubernetes v1.16.0
+	yunion.io/x/executor v0.0.0-20200227030256-a18417815e74
+	yunion.io/x/jsonutils v0.0.0-20200415132054-2bf8a5e94501
+	yunion.io/x/log v0.0.0-20200313080802-57a4ce5966b3
+	yunion.io/x/pkg v0.0.0-20200516092703-0a53bc9270aa
 	yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
-	yunion.io/x/sqlchemy v0.0.0-20191226074733-6eb73845bfb7
-	yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3
+	yunion.io/x/sqlchemy v0.0.0-20200312002602-1177cd8fbc57
+	yunion.io/x/structarg v0.0.0-20200423163001-168d0687be7e
 )
 
-replace github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859
+replace (
+	github.com/ceph/go-ceph v0.0.0-20181217221554-e32f9f0f2e94 => github.com/yunionio/go-ceph v0.0.0-20190912101231-6f05a06b3859
+
+	k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
+	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
+	k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
+	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
+	k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
+	k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
+	k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
+)

pkg/apigateway/handler/auth.go

@@ -29,6 +29,7 @@ import (
 	"yunion.io/x/onecloud/pkg/apigateway/constants"
 	"yunion.io/x/onecloud/pkg/apigateway/options"
 	policytool "yunion.io/x/onecloud/pkg/apigateway/policy"
+	"yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/appctx"
 	"yunion.io/x/onecloud/pkg/appsrv"
 	"yunion.io/x/onecloud/pkg/cloudcommon/policy"
@@ -569,6 +570,7 @@ func (this *projectRoles) add(roleId, roleName string) {
 
 func (this *projectRoles) getToken(scope rbacutils.TRbacScope, user, userId, domain, domainId string, ip string) mcclient.TokenCredential {
 	return &mcclient.SSimpleToken{
+		Token:           "faketoken",
 		Domain:          domain,
 		DomainId:        domainId,
 		User:            user,
@@ -608,12 +610,12 @@ func (this *projectRoles) json(user, userId, domain, domainId string, ip string)
 	}
 	obj.Add(roles, "roles")
 	for _, scope := range []rbacutils.TRbacScope{
-		rbacutils.ScopeSystem,
-		rbacutils.ScopeDomain,
 		rbacutils.ScopeProject,
+		rbacutils.ScopeDomain,
+		rbacutils.ScopeSystem,
 	} {
 		token := this.getToken(scope, user, userId, domain, domainId, ip)
-		matches := policy.PolicyManager.MatchedPolicies(scope, token)
+		matches := policy.PolicyManager.MatchedPolicyNames(scope, token)
 		obj.Add(jsonutils.NewStringArray(matches), fmt.Sprintf("%s_policies", scope))
 		if len(matches) > 0 {
 			obj.Add(jsonutils.JSONTrue, fmt.Sprintf("%s_capable", scope))
@@ -646,8 +648,11 @@ func getUserAuthCookie(ctx context.Context, s *mcclient.ClientSession, token mcc
 }
 
 func getLBAgentInfo(s *mcclient.ClientSession, token mcclient.TokenCredential) (*jsonutils.JSONDict, error) {
-
-	lbagents, err := modules.LoadbalancerAgents.List(s, nil)
+	params := jsonutils.NewDict()
+	params.Add(jsonutils.NewString("hb_last_seen.isnotempty()"), "filter.0")
+	params.Add(jsonutils.NewInt(1), "limit")
+	params.Add(jsonutils.JSONFalse, "details")
+	lbagents, err := modules.LoadbalancerAgents.List(s, params)
 	if err != nil {
 		return nil, errors.Wrapf(err, "user %s get lbagent", token.GetUserName())
 	}
@@ -665,6 +670,7 @@ func getLBAgentInfo(s *mcclient.ClientSession, token mcclient.TokenCredential) (
 }
 
 func getUserInfo(ctx context.Context, s *mcclient.ClientSession, token mcclient.TokenCredential, req *http.Request) (*jsonutils.JSONDict, error) {
+	log.Infof("getUserInfo modules.UsersV3.Get")
 	usr, err := modules.UsersV3.Get(s, token.GetUserId(), nil)
 	if err != nil {
 		log.Errorf("modules.UsersV3.Get fail %s", err)
@@ -693,6 +699,7 @@ func getUserInfo(ctx context.Context, s *mcclient.ClientSession, token mcclient.
 	data.Add(jsonutils.NewString(token.GetProjectDomain()), "projectDomain")
 	data.Add(jsonutils.NewString(token.GetProjectDomainId()), "projectDomainId")
 
+	log.Infof("getUserInfo modules.RoleAssignments.List")
 	query := jsonutils.NewDict()
 	query.Add(jsonutils.JSONNull, "effective")
 	query.Add(jsonutils.JSONNull, "include_names")
@@ -735,7 +742,7 @@ func getUserInfo(ctx context.Context, s *mcclient.ClientSession, token mcclient.
 		rbacutils.ScopeDomain,
 		rbacutils.ScopeProject,
 	} {
-		p := policy.PolicyManager.MatchedPolicies(scope, token)
+		p := policy.PolicyManager.MatchedPolicyNames(scope, token)
 		data.Add(jsonutils.NewStringArray(p), fmt.Sprintf("%s_policies", scope))
 		if scope == rbacutils.ScopeSystem {
 			data.Add(jsonutils.NewStringArray(p), "admin_policies")
@@ -772,6 +779,7 @@ func getUserInfo(ctx context.Context, s *mcclient.ClientSession, token mcclient.
 		log.Errorf("fail to find services????: %#v %s", adminToken, curReg)
 	}
 
+	log.Infof("getUserInfo getLBAgentInfo")
 	lb, err := getLBAgentInfo(s, adminToken)
 	if err != nil {
 		log.Errorf("getLBAgentInfo fail %s", err)
@@ -788,13 +796,23 @@ func getUserInfo(ctx context.Context, s *mcclient.ClientSession, token mcclient.
 		}
 	}
 
+	log.Infof("getUserInfo modules.Hosts.Get")
 	s2 := auth.GetSession(ctx, token, FetchRegion(req), "v2")
-	cap, err := modules.Capabilities.List(s2, nil)
+	params := jsonutils.NewDict()
+	params.Add(jsonutils.NewString("host_type"), "field")
+	params.Add(jsonutils.NewString("system"), "scope")
+	params.Add(jsonutils.JSONTrue, "usable")
+	params.Add(jsonutils.JSONTrue, "show_emulated")
+	cap, err := modules.Hosts.Get(s2, "distinct-field", params)
 	if err != nil {
-		log.Errorf("modules.Capabilities.List fail %s", err)
+		log.Errorf("modules.Servers.Get distinct-field fail %s", err)
 	} else {
-		hypervisors, _ := cap.Data[0].Get("hypervisors")
-		data.Add(hypervisors, "hypervisors")
+		hostTypes, _ := jsonutils.GetStringArray(cap, "host_type")
+		hypervisors := make([]string, len(hostTypes))
+		for i, hostType := range hostTypes {
+			hypervisors[i] = compute.HOSTTYPE_HYPERVISOR[hostType]
+		}
+		data.Add(jsonutils.NewStringArray(hypervisors), "hypervisors")
 	}
 
 	data.Add(menus, "menus")

pkg/apigateway/handler/init.go

@@ -0,0 +1,19 @@
+// 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 handler
+
+import (
+	_ "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
+)

pkg/apigateway/handler/misc.go

@@ -285,6 +285,12 @@ func (mh *MiscHandler) DoBatchUserRegister(ctx context.Context, w http.ResponseW
 		domain := row[2]
 		allowWebConsole := strings.ToLower(row[3])
 
+		// 忽略空白行
+		rowStr := strings.Join(row, "")
+		if len(strings.TrimSpace(rowStr)) == 0 {
+			continue
+		}
+
 		if len(name) == 0 {
 			e := httperrors.NewClientError("row %d name is empty", rowIdx)
 			httperrors.JsonClientError(w, e)

pkg/apigateway/handler/resource.go

@@ -187,7 +187,7 @@ func (f *ResourceHandlers) listHandler(ctx context.Context, w http.ResponseWrite
 	}
 }
 
-func (f *ResourceHandlers) doList(session *mcclient.ClientSession, module modulebase.BaseManagerInterface, query jsonutils.JSONObject, w http.ResponseWriter, r *http.Request) {
+func (f *ResourceHandlers) doList(session *mcclient.ClientSession, module modulebase.IBaseManager, query jsonutils.JSONObject, w http.ResponseWriter, r *http.Request) {
 	var exportKeys []string
 	var exportTexts []string
 	exportFormat, _ := query.GetString("export")
@@ -606,28 +606,45 @@ func (f *ResourceHandlers) patchJointHandler(ctx context.Context, w http.Respons
 	}
 }
 
-// batch update Joint
+// * batch update Joint
+// * put specific
+// /<resname>/<resid>/<resname2>
+// /<resname>/<resid>/<spec>
 func (f *ResourceHandlers) batchUpdateJointHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) {
-	req := newRequest(ctx, w, r).WithMod1().WithMod2()
+	req := newRequest(ctx, w, r).WithMod1()
 	if err := req.Error(); err != nil {
 		httperrors.GeneralServerError(w, err)
 		return
 	}
 	session := req.Session()
 	module := req.Mod1()
-	module2 := req.Mod2()
 	body := req.Body()
 	query := req.Query()
 
-	idlist := fetchIdList(query, w)
-	if idlist == nil {
+	if idlist, _ := query.GetArray("id"); len(idlist) == 0 {
+		// do put specific
+		spec := req.ResName2()
+		obj, e := module.PutSpecific(session, req.ResID(), spec, query, body)
+		if e != nil {
+			httperrors.GeneralServerError(w, e)
+		} else {
+			appsrv.SendJSON(w, obj)
+		}
 		return
 	}
+
+	req = req.WithMod2()
+	if err := req.Error(); err != nil {
+		httperrors.GeneralServerError(w, err)
+		return
+	}
+	module2 := req.Mod2()
 	jmod, e := modulebase.GetJointModule2(session, module, module2)
 	if e != nil { // update joint
 		httperrors.GeneralServerError(w, e)
 		return
 	}
+	idlist := fetchIdList(query, w)
 	ret := jmod.BatchUpdate(session, req.ResID(), idlist, query, body)
 	w.WriteHeader(207)
 	appsrv.SendJSON(w, modulebase.SubmitResults2JSON(ret))

pkg/apigateway/handler/rpc.go

@@ -117,21 +117,24 @@ func rpcHandler(ctx context.Context, w http.ResponseWriter, req *http.Request) {
 		v, ok := retobj.Interface().(jsonutils.JSONObject)
 		if ok {
 			appsrv.SendJSON(w, v)
+			return
 		}
 
 		v2, ok := retobj.Interface().([]modulebase.SubmitResult)
 		if ok {
 			w.WriteHeader(207)
 			appsrv.SendJSON(w, modulebase.SubmitResults2JSON(v2))
-		} else {
-			httperrors.BadGatewayError(w, "recv invalid data")
+			return
 		}
+
+		httperrors.BadGatewayError(w, "recv invalid data")
 	} else {
 		v, ok := reterr.Interface().(*httputils.JSONClientError)
 		if ok {
 			httperrors.JsonClientError(w, v)
-		} else {
-			httperrors.BadGatewayError(w, fmt.Sprintf("%s", reterr.Interface()))
+			return
 		}
+
+		httperrors.BadGatewayError(w, fmt.Sprintf("%s", reterr.Interface()))
 	}
 }

pkg/apigateway/options/options.go

@@ -29,7 +29,7 @@ type GatewayOptions struct {
 
 	SqlitePath string `help:"sqlite db path" default:"/etc/yunion/data/yunionapi.db"`
 
-	common_options.CommonOptions
+	common_options.CommonOptions `"request_worker_count->default":"32"`
 }
 
 var (
@@ -40,9 +40,10 @@ func OnOptionsChange(oldO, newO interface{}) bool {
 	oldOpts := oldO.(*GatewayOptions)
 	newOpts := newO.(*GatewayOptions)
 
+	changed := false
 	if common_options.OnCommonOptionsChange(&oldOpts.CommonOptions, &newOpts.CommonOptions) {
-		return true
+		changed = true
 	}
 
-	return false
+	return changed
 }

pkg/apis/cloudcommon/proxy/doc.go

@@ -0,0 +1 @@
+package proxy // import "yunion.io/x/onecloud/pkg/apis/cloudcommon/proxy"

pkg/apis/cloudcommon/proxy/proxy.go

@@ -0,0 +1,55 @@
+package proxy
+
+import (
+	"yunion.io/x/jsonutils"
+
+	"yunion.io/x/onecloud/pkg/apis"
+)
+
+const (
+	ProxySettingId_DIRECT = "DIRECT"
+)
+
+type ProxySettingCreateInput struct {
+	apis.StandaloneResourceCreateInput
+
+	ProxySetting
+}
+
+type ProxySettingUpdateInput struct {
+	// 资源名称
+	Name string `json:"name"`
+	// 资源描述
+	Description string `json:"description"`
+
+	ProxySetting
+}
+
+// String implements ISerializable interface
+func (ps *SProxySetting) String() string {
+	return jsonutils.Marshal(ps).String()
+}
+
+// IsZero implements ISerializable interface
+func (ps *SProxySetting) IsZero() bool {
+	if ps.HTTPProxy == "" &&
+		ps.HTTPSProxy == "" &&
+		ps.NoProxy == "" {
+		return true
+	}
+	return false
+}
+
+type ProxySettingResourceInput struct {
+	// 代理配置
+	ProxySetting string `json:"proxy_setting"`
+
+	// swagger:ignore
+	// Deprecated
+	ProxySettingId string `json:"proxy_setting_id" "yunion:deprecated-by":"proxy_setting"`
+}
+
+type ProxySettingTestInput struct {
+	HttpProxy  string
+	HttpsProxy string
+}

pkg/apis/cloudcommon/proxy/setting.go

@@ -0,0 +1,111 @@
+package proxy
+
+import (
+	"fmt"
+	"net"
+	"net/url"
+	"strings"
+
+	"yunion.io/x/pkg/errors"
+)
+
+type ProxySetting struct {
+	HttpProxy  string
+	HttpsProxy string
+	NoProxy    string
+}
+
+func (v *ProxySetting) Sanitize() error {
+	v.HttpProxy = strings.TrimSpace(v.HttpProxy)
+	if u, err := parseProxy(v.HttpProxy); err != nil {
+		return errors.Wrap(err, "invalid https_proxy url")
+	} else if u != nil {
+		v.HttpProxy = u.String()
+	}
+
+	v.HttpsProxy = strings.TrimSpace(v.HttpsProxy)
+	if u, err := parseProxy(v.HttpsProxy); err != nil {
+		return errors.Wrap(err, "invalid http_proxy url")
+	} else if u != nil {
+		v.HttpsProxy = u.String()
+	}
+
+	if noProxy, err := parseNoProxy(v.NoProxy); err == nil {
+		v.NoProxy = strings.Join(noProxy, ",")
+	} else {
+		return errors.Wrap(err, "invalid no_proxy")
+	}
+	return nil
+}
+
+func parseProxy(proxy string) (*url.URL, error) {
+	if proxy == "" {
+		return nil, nil
+	}
+
+	proxyURL, err := url.Parse(proxy)
+	if err != nil ||
+		(proxyURL.Scheme != "http" &&
+			proxyURL.Scheme != "https" &&
+			proxyURL.Scheme != "socks5") {
+		// proxy was bogus. Try prepending "http://" to it and
+		// see if that parses correctly. If not, we fall
+		// through and complain about the original one.
+		if proxyURL, err := url.Parse("http://" + proxy); err == nil {
+			return proxyURL, nil
+		}
+	}
+	if err != nil {
+		return nil, errors.Wrapf(err, "invalid proxy address %q", proxy)
+	}
+	return proxyURL, nil
+}
+
+func parseNoProxy(noProxy string) ([]string, error) {
+	var r []string
+	for _, p := range strings.Split(noProxy, ",") {
+		p = strings.ToLower(strings.TrimSpace(p))
+		if len(p) == 0 {
+			continue
+		}
+
+		if p == "*" {
+			r = append(r, p)
+			// let it go
+			//return r, nil
+		}
+
+		// IPv4/CIDR, IPv6/CIDR
+		if _, _, err := net.ParseCIDR(p); err == nil {
+			r = append(r, p)
+			continue
+		}
+
+		// IPv4:port, [IPv6]:port
+		phost, _, err := net.SplitHostPort(p)
+		if err == nil {
+			if len(phost) == 0 {
+				// There is no host part, likely the entry is malformed; ignore.
+				return nil, fmt.Errorf("host part must not be empty: %s", p)
+			}
+			if phost[0] == '[' && phost[len(phost)-1] == ']' {
+				phost = phost[1 : len(phost)-1]
+			}
+		} else {
+			phost = p
+		}
+		// IPv4, IPv6
+		if pip := net.ParseIP(phost); pip != nil {
+			r = append(r, p)
+			continue
+		}
+
+		if len(phost) == 0 {
+			// There is no host part, likely the entry is malformed; ignore.
+			continue
+		}
+
+		r = append(r, p)
+	}
+	return r, nil
+}

pkg/apis/cloudcommon/proxy/zz_generated.model.go

@@ -0,0 +1,27 @@
+// 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.
+
+// Code generated by model-api-gen. DO NOT EDIT.
+
+package proxy
+
+import (
+	"yunion.io/x/onecloud/pkg/apis"
+)
+
+// SProxySetting is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db/proxy.SProxySetting.
+type SProxySetting struct {
+	apis.SStandaloneResourceBase
+	HTTPProxy  string `json:"http_proxy"`
+	HTTPSProxy string `json:"https_proxy"`
+	NoProxy    string `json:"no_proxy"`
+}