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

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

.circleci/Dockerfile

@@ -0,0 +1,39 @@
+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
+USER build
+ENV HOME /home/build
+WORKDIR /home/build
+USER build
+
+ENV GOPATH="/home/build/go"
+ENV PATH="${GOPATH}/bin:${PATH}"
+
+RUN true \
+	&& mkdir -p "$GOPATH" \
+	&& d="$GOPATH/src/golang.org/x/tools" \
+	&& mkdir -p "$d" \
+	&& git clone --branch yun --depth 8 https://github.com/yousong/tools "$d" \
+	&& cd "$d" \
+	&& go install ./cmd/goimports \
+	&& true

.circleci/config.yml

@@ -5,10 +5,10 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/onecloud-ci:v1.0.3
         environment:
           ONECLOUD_CI_BUILD: "1"
-    working_directory: /root/go/onecloud
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
     steps:
       - checkout
       - run:
@@ -18,7 +18,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/onecloud-ci:v1.0.2
         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: /root/go/onecloud
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
     parallelism: 4
     steps:
       - checkout
       - restore_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
           paths:
-            - /root/.cache/go-build
+            - /home/build/.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:
-            - /root/.cache/go-build
+            - /home/build/.cache/go-build
       - store_artifacts:
           path: _output/
 
@@ -51,16 +51,16 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.0-1
+      - image: yunionio/onecloud-ci:v1.0.2
         environment:
           GO111MODULE: "on"
-    working_directory: /root/go/onecloud
+    working_directory: /home/build/go/src/yunion.io/x/onecloud
     steps:
       - checkout
       - restore_cache:
           key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
           paths:
-            - /root/.cache/go-build
+            - /home/build/.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:
-            - /root/.cache/go-build
+            - /home/build/.cache/go-build
 
 workflows:
   version: 2

.dockerignore

@@ -1,4 +0,0 @@
-/.git
-/vendor
-/cmd
-/pkg

.drone.yml

@@ -2,131 +2,49 @@
 kind: pipeline
 name: build
 
-clone:
-  depth: 1
-
 workspace:
-  base: /home/build/go
+  base: /go
   path: src/yunion.io/x/onecloud
 
 steps:
 - name: build
-  image: yunion/onecloud-ci:latest
+  image: d3lx/golang:yunion
   commands:
-  - CGO_ENABLED=0 make -j 4 cmd/apigateway cmd/baremetal-agent cmd/climc cmd/keystone
-  - CGO_ENABLED=0 make -j 4 cmd/logger cmd/region cmd/scheduler cmd/webconsole
-  - CGO_ENABLED=0 make -j 4 cmd/yunionconf cmd/glance cmd/torrent
+  - make
+  when:
+    event:
+    - pull_request
+    - tag
 
-- name: image-baremetal-agent
+trigger:
+  event:
+  - pull_request
+  - tag
+
+---
+kind: pipeline
+name: release
+
+steps:
+- name: release-img
   image: plugins/docker
   settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
+    repo: registry.cn-beijing.aliyuncs.com/yunionio/onecloud
     registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.baremetal-agent
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-climc
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/climc
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.climc
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-keystone
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.keystone
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-logger
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/logger
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.logger
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-region
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/region
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.region
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-scheduler
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.scheduler
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-yunionconf
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/yunionconf
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.yunionconf
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-apigateway
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.apigateway
-    tags: "${DRONE_TAG}"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: image-glance
-  image: plugins/docker
-  settings:
-    repo: registry.cn-beijing.aliyuncs.com/yunionio/glance
-    registry: registry.cn-beijing.aliyuncs.com
-    dockerfile: build/docker/Dockerfile.glance
-    tags: "${DRONE_TAG}"
+    tags: "{DRONE_TAG}"
     username:
       from_secret: docker_username
     password:
       from_secret: docker_password
+  when:
+    event:
+    - tag
 
 trigger:
   event:
   - tag
   status:
   - success
+
+depends_on:
+- build

.github/workflows/docker.yml

@@ -1,232 +0,0 @@
-name: Docker image
-
-on:
-  push:
-    branches:
-    - master
-    - releases/*
-    #paths:
-    #- 'cmd/*'
-    #- 'pkg/*'
-    #- 'vendor/*'
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.12
-      uses: actions/setup-go@v1
-      with:
-        go-version: 1.12
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v1
-
-    - name: Build
-      run: |
-        sudo apt-get update
-        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-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
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        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:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/climc
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.climc
-
-    - name: Image keystone
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.keystone
-
-    - name: Image logger
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/logger
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.logger
-
-    - name: Image region
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/region
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.region
-
-    - name: Image scheduler
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.scheduler
-
-    - name: Image apigateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.apigateway
-
-    - name: Image s3gateway
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.s3gateway
-
-    - name: Image ansibleserver
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.ansibleserver
-
-    - name: Image cloudnet
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudnet
-
-    - name: Image glance
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/glance
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.glance
-
-    - name: Image notify
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/notify
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.notify
-
-    - name: Image host
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host
-
-    - name: Image host-deployer
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.host-deployer
-
-    - name: Image cloudevent
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        registry: registry.cn-beijing.aliyuncs.com
-        snapshot: true
-        dockerfile: build/docker/Dockerfile.cloudevent
-
-    - name: Image devtool
-      uses: elgohr/Publish-Docker-Github-Action@master
-      with:
-        name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-        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

.gitignore

@@ -33,4 +33,3 @@ _output
 GPATH
 GRTAGS
 GTAGS
-pkg/generated

CONTRIBUTING.md

@@ -1,3 +0,0 @@
-# 开发贡献参考
-
-详情见文档 [开发贡献](https://docs.yunion.io/docs/contribute/)

Dockerfile

@@ -0,0 +1,20 @@
+FROM alpine:3.8
+
+MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
+
+ENV TZ Asia/Shanghai
+
+# Fix binary file not found, see:
+# https://stackoverflow.com/questions/34729748/installed-go-binary-not-found-in-path-on-alpine-linux-docker
+RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
+
+RUN mkdir -p /opt/yunion/bin
+
+ADD ./_output/bin/climc /opt/yunion/bin/climc
+ADD ./_output/bin/cloudir /opt/yunion/bin/cloudir
+ADD ./_output/bin/glance /opt/yunion/bin/glance
+ADD ./_output/bin/region /opt/yunion/bin/region
+ADD ./_output/bin/region-dns /opt/yunion/bin/region-dns
+ADD ./_output/bin/scheduler /opt/yunion/bin/scheduler
+ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole
+ADD ./_output/bin/yunionconf /opt/yunion/bin/yunionconf

Makefile

@@ -32,11 +32,8 @@ LDFLAGS := "-w \
 
 
 #####################################################
-ifneq ($(DLV),)
-	GO_BUILD_FLAGS += -gcflags "all=-N -l"
-	LDFLAGS = ""
-endif
-GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
+
+GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
 GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test
@@ -47,8 +44,8 @@ CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
 ifdef LIBQEMUIO_PATH
-		X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
-		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
+	X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+	X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
 export GO111MODULE:=on
@@ -83,9 +80,6 @@ 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)/$@
 
@@ -192,77 +186,43 @@ mod:
 	go mod vendor -v
 
 
-DOCKER_BUILD_IMAGE_VERSION?=1.0-1
+DOCKER_BUILD_IMAGE_VERSION?=latest
 
-define dockerCentOSBuildCmd
-set -o xtrace
+define dockerBuildCmd
 set -o errexit
 set -o pipefail
-cd /root/onecloud
+cd /home/build/onecloud
 export GOFLAGS=-mod=vendor
 make $(1)
-chown -R $(shell id -u):$(shell id -g) _output
 endef
 
-docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
-docker-centos-build:
+docker-build: export dockerBuildCmd:=$(call dockerBuildCmd,$(F))
+docker-build:
+	echo "$$dockerBuildCmd"
 	docker rm --force onecloud-ci-build &>/dev/null || true
 	docker run \
 		--name onecloud-ci-build \
 		--rm \
-		--volume $(CURDIR):/root/onecloud \
-		--volume $(CURDIR)/_output/_cache:/root/.cache \
-		registry.cn-beijing.aliyuncs.com/yunionio/centos-build:$(DOCKER_BUILD_IMAGE_VERSION) \
-		/bin/bash -c "$$dockerCentOSBuildCmd"
+		--volume $(CURDIR):/home/build/onecloud \
+		yunionio/onecloud-ci:$(DOCKER_BUILD_IMAGE_VERSION) \
+		/bin/bash -c "$$dockerBuildCmd"
 	chown -R $$(id -u):$$(id -g) _output
 	ls -lh _output/bin
 
 # NOTE we need a way to stop and remove the container started by docker-build.
 # No --tty, --stop-signal won't work
-docker-centos-build-stop:
-	docker-centos stop --time 0 onecloud-ci-build || true
+docker-build-stop:
+	docker stop --time 0 onecloud-ci-build || true
 
-.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
+.PHONY: docker-build
+.PHONY: docker-build-stop
 
 define helpText
 Build with docker
 
-	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
+	make docker-build F='-j4'
+	make docker-build F='-j4 cmd/region cmd/climc'
+	make docker-build-stop
 
 Tidy up go modules and vendor directory
 
@@ -272,37 +232,3 @@ endef
 help: export helpText:=$(helpText)
 help:
 	@echo "$$helpText"
-
-.PHONY: help
-
-gen-model-api-check:
-	which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen)
-
-gen-model-api: gen-model-api-check
-	$(ROOT_DIR)/scripts/codegen.py model-api
-
-gen-swagger-check:
-	which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
-	which swagger-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-gen)
-	which swagger-serve || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-serve)
-
-gen-swagger: gen-swagger-check
-	$(ROOT_DIR)/scripts/codegen.py swagger-code
-	$(ROOT_DIR)/scripts/codegen.py swagger-yaml
-
-swagger-serve: gen-swagger
-	$(ROOT_DIR)/scripts/codegen.py swagger-serve
-
-.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve
-
-REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
-VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
-                git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
-
-image:
-	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
-
-.PHONY: image
-
-%:
-	@:

OWNERS

@@ -1,13 +1,11 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 reviewers:
+  - swordqiu
+  - yousong
+  - wanyaoqi
   - Zexi
   - ioito
-  - swordqiu
   - tb365
-  - wanyaoqi
-  - yousong
-  - zhaoxiangchun
-  - zhasm
 approvers:
   - swordqiu
   - yousong

README-CN.md

@@ -1,54 +0,0 @@
-# Yunion OneCloud (云联融合云）
-
-[![CircleCI](https://circleci.com/gh/yunionio/onecloud.svg?style=svg)](https://circleci.com/gh/yunionio/onecloud) 
-[![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
-
-## 什么是云联融合云?
-
-云联融合云（Yunion OneCloud）是一个开源的多云平台。融合云构建在用户分布于多云基础设施之上，通过技术手段将分布于多云的异构IT资源统一管理，将多底层多云的差异向用户屏蔽，并通过网络和调度实现资源的融合与打通，在多云之上进行抽象，向用户呈现统一的使用界面和API接口，让用户就像使用一个云平台一样使用分布于多云的资源，实现一个统一的“云上之云”的云平台。
-
-鉴于企业IT基础设施的两个趋势：1. 企业使用多云基础设施，并且公有云是最主要的基础设施提供者；2. 企业应用将逐步云原生化，企业IT基础设施需要为Kubernetes优化。融合云为此架构而设计。一方面抽象管理底层的多云基础设施，另一方面为多云Kubernetes提供运行环境。融合云为企业未来的的IT基础设施架构而设计。
-
-云联融合云具备以下功能特性:
-
-- 多云资源统一管理
-
-  统一API、镜像、调度、账号体系、监控和计费等操作，能够全面管理 On premises、 私有云、公有云资源。
-
-- 内置私有云
-
-  OneCloud内置完备的私有云实现，提供对用户本地IDC的虚拟机、物理机和负载均衡等资源管理。
-
-- 为多云Kubernetes提供运行环境
-
-  OneCloud自身为运行在Kubernetes的云原生应用，并且能在多云环境部署运行Kubernetes集群。
-
-欢迎安装部署云联融合云，期待大家的反馈！
-
-
-## 部署
-
-请参考文档 [安装部署](https://docs.yunion.io/docs/setup/) 搭建 OneCloud 集群。
-
-
-## 文档
-
-- [文档中心](https://docs.yunion.io/)
-
-- [Swagger API文档](https://docs.yunion.cn/api/)
-
-
-## 架构
-
-![architecture](./docs/architecture.png)
-
-
-## 贡献
-
-我们非常欢迎和感谢开发者向项目做贡献，流程细节请查看 [CONTRIBUTING.md](./CONTRIBUTING.md) 。
-
-
-## License
-
-OneCloud 使用 Apache license 2.0. 详情请看 [LICENSE](./LICENSE) 。

README.md

@@ -4,52 +4,7 @@
 [![Build Status](https://travis-ci.com/yunionio/onecloud.svg?branch=master)](https://travis-ci.org/yunionio/onecloud) 
 [![Go Report Card](https://goreportcard.com/badge/github.com/yunionio/onecloud)](https://goreportcard.com/report/github.com/yunionio/onecloud) 
 
-### [README in Chinese](./README-CN.md)
+# 文档
 
-## What is Yunion OneCloud?
-
-Yunion OneCloud is an open source unified-IaaS cloud platform.
-
-As its name sugguests, 'Yun' means 'cloud' in Chinese and 'Yunion OneCloud' means to unify many distinct clouds into the one that behaves like an integral cloud platform.
-
-As trends show, the enterprise IT infrastructure in the future would be unavoidably heterogeneous and the public clouds should be the major infrastructure providers for many enterprises. Further, the infrastructure would most likely be prepared for the cloud-native applications running on Kubernetes. Yunion OneCloud is built to provide the cloud architecture for this scenario such that it is the middle layer between the underlying cloud infrustructures and the overlay kubernetes clusters across many clouds.
-
-Many may consider Yunion OneCloud as a multi-cloud management platform (MCMP). Rather, we would view it as an IaaS platform as it does not only manage the resources and services from many clouds, but also hides the differences of underlying technologies and exposes one set of APIs that allow programatically interacting with the compute/storage/networking resources across many clouds.
-
-Yunion OneCloud is working on abstracting APIs for the following resources:
-
-* Compute, including virtual machines, images, etc.
-* Storage, including disks, snapshots, object storages, etc.
-* Networking, including load balancers, VPC, virtual networks, NAT gateways, security groups, etc.
-* Accouting and billing, etc.
-* ...
-
-over the following many cloud providers:
-
-* On-premise IT resources, including kvm VM, baremetal, VMware vsphere/ESXi, etc.
-* Private clouds, including OpenStack, etc.
-* Public clouds, including Aliyun, AWS, Azure, Tencent Cloud, Huawei Cloud, etc.
-
-You are welcome to install and try Yunion OneCloud. Looking forward to your feedback.
-
-## Installation
-
-Please refers to [install & deployment](https://docs.yunion.io/docs/setup/) (currently in Chinese Only).
-
-## Documentations
-
-- [Yunion OneCloud Documents](https://docs.yunion.io/)
-
-- [Swagger API](https://docs.yunion.cn/api/)
-
-## Architecture
-
-![architecture](./docs/architecture.png)
-
-## Contribution
-
-You are welcome to contribute to the project. Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for guidelines.
-
-## License
-
-Apache License 2.0. See [LICENSE](./LICENSE) 。
+- 文档中心，https://docs.yunion.cn/
+- API文档，https://docs.yunion.cn/api/

build/baremetal-agent/vars

@@ -1,6 +1 @@
-DESCRIPTION="Baremetal Agent Command Line Utility"
-
-REQUIRES=(
-    ipmitool
-    mkisofs
-)
+DESCRIPTION="Baremetal Agent Command Line Utility"

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

@@ -1,42 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
-#/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

@@ -1,80 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
-#!/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

@@ -1,96 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
-#/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

@@ -1,34 +0,0 @@
-#!/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

@@ -1,28 +0,0 @@
-#!/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

@@ -1,55 +0,0 @@
-#/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/cloudevent/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloudevent"

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

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

build/cloudnet/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion Cloudnet"

build/devtool/vars

@@ -1 +0,0 @@
-DESCRIPTION="Yunion DevTools Server"

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

@@ -1,13 +0,0 @@
-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.apigateway

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

build/docker/Dockerfile.baremetal-agent

@@ -1,9 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/baremetal-base:v0.0.1
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/baremetal-agent /opt/yunion/bin/baremetal-agent
-ADD ./_output/bin/.baremetal-agent.bin /opt/yunion/bin/.baremetal-agent.bin
-ADD ./_output/bin/bundles/baremetal-agent /opt/yunion/bin/bundles/baremetal-agent

build/docker/Dockerfile.baremetal-base

@@ -1,39 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN apk update && \
-    apk add --no-cache ipmitool ethtool tzdata ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-RUN mkdir -p /opt/cloud/yunion/baremetal
-
-# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
-COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
-COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
-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,5 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308
-
-ADD ./build/climc/root/opt /opt
-
-ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

@@ -1,16 +0,0 @@
-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.cloudevent

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

build/docker/Dockerfile.cloudnet

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

build/docker/Dockerfile.devtool

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

build/docker/Dockerfile.esxi-agent

@@ -1,4 +0,0 @@
-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.glance

@@ -1,6 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/glance-base:latest
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/bin/glance /opt/yunion/bin/glance

build/docker/Dockerfile.glance-base

@@ -1,18 +0,0 @@
-FROM frolvlad/alpine-glibc:glibc-2.28
-
-MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
-
-RUN apk update && \
-    apk add --no-cache tzdata ca-certificates qemu-img && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-
-ENV TZ Asia/Shanghai
-
-# add executable file torrent
-# make cmd/torrent && ./scripts/bundle-libraries.sh _output/bin/bundles/torrent _output/bin/torrent
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/bin/torrent /opt/yunion/bin/torrent
-ADD ./_output/bin/.torrent.bin /opt/yunion/bin/.torrent.bin
-ADD ./_output/bin/bundles/torrent /opt/yunion/bin/bundles/torrent

build/docker/Dockerfile.host

@@ -1,9 +0,0 @@
-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/alpine-build/bin/host /opt/yunion/bin/host

build/docker/Dockerfile.host-deployer

@@ -1,11 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:v0.0.2
-
-MAINTAINER "Yaoqi Wan wanyaoqi@yunionyun.com"
-
-ENV TZ Asia/Shanghai
-
-RUN mkdir -p /opt/yunion/bin
-
-ADD ./_output/bin/host-deployer /opt/yunion/bin/host-deployer
-ADD ./_output/bin/.host-deployer.bin /opt/yunion/bin/.host-deployer.bin
-ADD ./_output/bin/bundles/host-deployer /opt/yunion/bin/bundles/host-deployer

build/docker/Dockerfile.keystone

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

build/docker/Dockerfile.logger

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

build/docker/Dockerfile.monitor

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

build/docker/Dockerfile.notify

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

build/docker/Dockerfile.onecloud-base

@@ -1,13 +0,0 @@
-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 ca-certificates && \
-    rm -rf /var/cache/apk/*
-
-RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime

build/docker/Dockerfile.region

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

build/docker/Dockerfile.region-dns

@@ -1,4 +0,0 @@
-FROM alpine:3.11.3
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/region-dns /opt/yunion/bin/region-dns

build/docker/Dockerfile.s3gateway

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

build/docker/Dockerfile.scheduler

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

build/docker/Dockerfile.vpcagent

@@ -1,6 +0,0 @@
-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,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/webconsole-base:latest
-
-ADD ./_output/bin/webconsole /opt/yunion/bin/webconsole

build/docker/Dockerfile.webconsole-base

@@ -1,12 +0,0 @@
-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/docker/Dockerfile.yunionconf

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

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

@@ -1,65 +0,0 @@
-<?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

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

build/executor-server/root/usr/lib/systemd/system/yunion-executor.service

@@ -1,18 +0,0 @@
-[Unit]
-Description=Yunion Command Executor
-Documentation=https://docs.yunion.cn
-
-[Service]
-Type=simple
-User=root
-Group=root
-ExecStart=/opt/yunion/bin/executor-server
-WorkingDirectory=/opt/yunion/bin
-KillMode=process
-Restart=always
-RestartSec=30
-LimitNOFILE=500000
-LimitNPROC=500000
-
-[Install]
-WantedBy=multi-user.target

build/executor-server/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Executor Server Command Line Utility"
-SERVICE="yes"

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

@@ -1,19 +0,0 @@
-[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

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

build/notify/vars

@@ -1,2 +0,0 @@
-DESCRIPTION="Yunion Cloud noitfy Service"
-

cmd/aliyuncli/main.go

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

cmd/awscli/main.go

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

cmd/azurecli/main.go

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

cmd/climc/climc.go

@@ -32,10 +32,8 @@ import (
 
 	"yunion.io/x/onecloud/cmd/climc/promputils"
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
 	"yunion.io/x/onecloud/pkg/mcclient"
 )
 

cmd/climc/shell/ansibleplaybooks.go

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

cmd/climc/shell/ansibleplaybooks_v2.go

@@ -1,52 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type AnsiblePlaybookV2IdOptions struct {
-		ID string `help:"name/id of the playbook"`
-	}
-
-	type AnsiblePlaybookV2ListOptions struct {
-		options.BaseListOptions
-	}
-
-	R(&AnsiblePlaybookV2IdOptions{}, "ansibleplaybookv2-show", "Show ansible playbook", func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2IdOptions) error {
-		apb, err := modules.AnsiblePlaybooksV2.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(apb)
-		return nil
-	})
-	R(&AnsiblePlaybookV2ListOptions{}, "ansibleplaybookv2-list", "List ansible playbooks", func(s *mcclient.ClientSession, opts *AnsiblePlaybookV2ListOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		apbs, err := modules.AnsiblePlaybooksV2.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(apbs, modules.AnsiblePlaybooksV2.GetColumns(s))
-		return nil
-	})
-}

cmd/climc/shell/associated_bills.go

@@ -1,44 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type AssociatedBillListOptions struct {
-		options.BaseListOptions
-		StartDay int `help:"time range of the associated bills, example: 20060102" required:"true"`
-		EndDay   int `help:"time range of the associated bills, example: 20060102" required:"true"`
-
-		ResourceId string `help:"resource id"`
-	}
-	R(&AssociatedBillListOptions{}, "associated-bill-list", "List associated bills",
-		func(s *mcclient.ClientSession, args *AssociatedBillListOptions) error {
-			params, err := options.ListStructToParams(args)
-			if err != nil {
-				return err
-			}
-			result, err := modules.AssociatedBills.List(s, params)
-			if err != nil {
-				return err
-			}
-			printList(result, modules.AssociatedBills.GetColumns(s))
-			return nil
-		})
-}

cmd/climc/shell/baremetalagents.go

@@ -47,15 +47,6 @@ func init() {
 	type BaremetalAgentOpsOperations struct {
 		ID string `help:"ID or name of agent"`
 	}
-	R(&BaremetalAgentOpsOperations{}, "agent-show", "Show details of an agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
-		result, err := modules.Baremetalagents.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	R(&BaremetalAgentOpsOperations{}, "agent-enable", "Enable agent", func(s *mcclient.ClientSession, args *BaremetalAgentOpsOperations) error {
 		result, err := modules.Baremetalagents.PerformAction(s, args.ID, "enable", nil)
 		if err != nil {

cmd/climc/shell/baremetalevents.go

@@ -1,73 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-)
-
-func init() {
-	type BaremetalEventListOptions struct {
-		HostId       string `help:"filter by hostId"`
-		HostName     string `help:"filter by hostname"`
-		IpmiIp       string `help:"filter by ipmi_ip"`
-		Type         string `help:"filter by type" choices:"system|manager"`
-		PagingMarker string `help:"marker for pagination"`
-		Limit        int    `help:"page limit, default 20" default:"20"`
-		Severity     string `help:"filter by severity"`
-		Since        string `help:"Show logs since specific date" metavar:"DATETIME"`
-		Until        string `help:"Show logs until specific date" metavar:"DATETIME"`
-	}
-	R(&BaremetalEventListOptions{}, "baremetal-event-list", "List baremetal events", func(s *mcclient.ClientSession, args *BaremetalEventListOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.BaremetalEvents.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.BaremetalEvents.GetColumns(s))
-		return nil
-	})
-
-	type BaremetalEventCreateOptions struct {
-		HOST     string `json:"-" help:"Host Id"`
-		Type     string `json:"type" help:"event type" choices:"system|manager"`
-		EventId  string `json:"event_id" help:"original event Id"`
-		MESSAGE  string `json:"message" help:"content of event"`
-		Severity string `json:"severity" help:"Severity of event"`
-		CREATED  string `json:"created" help:"when event was created"`
-	}
-	R(&BaremetalEventCreateOptions{}, "baremetal-event-create", "Create baremetal event", func(s *mcclient.ClientSession, args *BaremetalEventCreateOptions) error {
-		host, err := modules.Hosts.Get(s, args.HOST, nil)
-		if err != nil {
-			return err
-		}
-		hostId, _ := host.Get("id")
-		hostName, _ := host.Get("name")
-		ipmiIp, _ := host.Get("ipmi_ip")
-		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
-		params.Add(hostId, "host_id")
-		params.Add(hostName, "host_name")
-		params.Add(ipmiIp, "ipmi_ip")
-		result, err := modules.BaremetalEvents.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-}

cmd/climc/shell/baremetalnetworks.go

@@ -18,7 +18,6 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -42,7 +41,7 @@ func init() {
 		if len(args.Network) > 0 {
 			params.Add(jsonutils.NewString(args.Network), "network_id")
 		}
-		var result *modulebase.ListResult
+		var result *modules.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Baremetalnetworks.ListDescendent(s, args.Host, params)

cmd/climc/shell/baremetalstorages.go

@@ -18,7 +18,6 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -38,7 +37,7 @@ func init() {
 
 			}
 		}
-		var result *modulebase.ListResult
+		var result *modules.ListResult
 		var err error
 		if len(args.Host) > 0 {
 			result, err = modules.Baremetalstorages.ListDescendent(s, args.Host, params)

cmd/climc/shell/bucket_options.go

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

@@ -21,12 +21,9 @@ import (
 
 	"yunion.io/x/jsonutils"
 
-	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	objectshell "yunion.io/x/onecloud/pkg/multicloud/objectstore"
 )
 
 func init() {
@@ -107,11 +104,9 @@ func init() {
 	})
 
 	type BucketListObjectsOptions struct {
-		ID           string `help:"ID or name of bucket" json:"-"`
-		Prefix       string `help:"List objects with prefix"`
-		Recursive    bool   `help:"List objects recursively"`
-		Limit        int    `help:"maximal items per request"`
-		PagingMarker string `help:"paging marker"`
+		ID        string `help:"ID or name of bucket" json:"-"`
+		Prefix    string `help:"List objects with prefix"`
+		Recursive bool   `help:"List objects recursively"`
 	}
 	R(&BucketListObjectsOptions{}, "bucket-object-list", "List objects in a bucket", func(s *mcclient.ClientSession, args *BucketListObjectsOptions) error {
 		params, err := options.StructToParams(args)
@@ -123,11 +118,8 @@ func init() {
 			return err
 		}
 
-		listResult := modulebase.ListResult{}
-		err = result.Unmarshal(&listResult)
-		if err != nil {
-			return err
-		}
+		arrays, _ := result.GetArray("objects")
+		listResult := modules.ListResult{Data: arrays}
 		printList(&listResult, []string{})
 		return nil
 	})
@@ -166,10 +158,9 @@ func init() {
 		Path string `help:"Path to file to upload" required:"true"`
 
 		ContentLength int64  `help:"Content lenght (bytes)" default:"-1"`
+		ContentType   string `help:"Content type"`
 		StorageClass  string `help:"storage CLass"`
 		Acl           string `help:"object acl." choices:"private|public-read|public-read-write"`
-
-		objectshell.ObjectHeaderOptions
 	}
 	R(&BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *BucketUploadObjectsOptions) error {
 		var body io.Reader
@@ -195,9 +186,7 @@ func init() {
 			return fmt.Errorf("required content-length")
 		}
 
-		meta := args.ObjectHeaderOptions.Options2Header()
-
-		err := modules.Buckets.Upload(s, args.ID, args.KEY, body, args.ContentLength, args.StorageClass, args.Acl, meta)
+		err := modules.Buckets.Upload(s, args.ID, args.KEY, body, args.ContentLength, args.ContentType, args.StorageClass, args.Acl)
 		if err != nil {
 			return err
 		}
@@ -300,27 +289,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type BucketSetMetadataOptions struct {
-		ID string `help:"ID or name of bucket" json:"-"`
-
-		Key []string `help:"Optional object key" json:"key"`
-
-		objectshell.ObjectHeaderOptions
-	}
-	R(&BucketSetMetadataOptions{}, "bucket-set-metadata", "Set metadata of object", func(s *mcclient.ClientSession, args *BucketSetMetadataOptions) error {
-		input := api.BucketMetadataInput{}
-		input.Key = args.Key
-		input.Metadata = args.ObjectHeaderOptions.Options2Header()
-		err := input.Validate()
-		if err != nil {
-			return err
-		}
-		result, err := modules.Buckets.PerformAction(s, args.ID, "metadata", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/cloudaccounts.go

@@ -16,43 +16,18 @@ package shell
 
 import (
 	"fmt"
-	"io/ioutil"
 
 	"yunion.io/x/jsonutils"
 
-	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
-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
@@ -62,9 +37,6 @@ 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 {
@@ -114,19 +86,6 @@ 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
@@ -157,37 +116,12 @@ func init() {
 		return nil
 	})
 
-	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")
-		authParams, err := parseGcpCredential(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		err = jsonutils.Update(params, authParams)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cloudaccounts.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	R(&options.SAWSCloudAccountCreateOptions{}, "cloud-account-create-aws", "Create an AWS cloud account", func(s *mcclient.ClientSession, args *options.SAWSCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
 		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")
 		}
@@ -277,17 +211,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SCtyunCloudAccountCreateOptions{}, "cloud-account-create-ctyun", "Create a Ctyun cloud account", func(s *mcclient.ClientSession, args *options.SCtyunCloudAccountCreateOptions) error {
-		params := jsonutils.Marshal(args)
-		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Ctyun"), "provider")
-		result, err := modules.Cloudaccounts.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudaccountUpdateOptions struct {
 		ID        string `help:"ID or Name of cloud account"`
 		Name      string `help:"New name to update"`
@@ -321,34 +244,6 @@ 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
@@ -399,19 +294,6 @@ 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)
 
@@ -419,12 +301,6 @@ 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")
 		}
@@ -432,12 +308,6 @@ 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")
 		}
@@ -453,7 +323,7 @@ func init() {
 		return nil
 	})
 
-	R(&options.SOpenStackCloudAccountUpdateOptions{}, "cloud-account-update-openstack", "update an OpenStack cloud account", func(s *mcclient.ClientSession, args *options.SOpenStackCloudAccountUpdateOptions) error {
+	R(&options.SOpenStackCloudAccountUpdateOptions{}, "cloud-account-update-openstack", "update an AWS cloud account", func(s *mcclient.ClientSession, args *options.SOpenStackCloudAccountUpdateOptions) error {
 		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
 		if params.Size() == 0 {
 			return InvalidUpdateError()
@@ -518,19 +388,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SCtyunCloudAccountUpdateOptions{}, "cloud-account-update-ctyun", "update a Ctyun cloud account", func(s *mcclient.ClientSession, args *options.SCtyunCloudAccountUpdateOptions) error {
-		params := jsonutils.Marshal(args).(*jsonutils.JSONDict)
-		if params.Size() == 0 {
-			return InvalidUpdateError()
-		}
-		result, err := modules.Cloudaccounts.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudaccountShowOptions struct {
 		ID string `help:"ID or Name of cloud account"`
 	}
@@ -705,19 +562,6 @@ 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)
@@ -728,16 +572,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SCtyunCloudAccountUpdateCredentialOptions{}, "cloud-account-update-credential-ctyun", "Update credential of an Ctyun cloud account", func(s *mcclient.ClientSession, args *options.SCtyunCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "update-credential", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type CloudaccountSyncOptions struct {
 		ID       string   `help:"ID or Name of cloud account"`
 		Force    bool     `help:"Force sync no matter what"`
@@ -819,49 +653,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type CloudaccountShareModeOptions struct {
-		ID   string `help:"ID or name of cloud account"`
-		MODE string `help:"cloud account share mode" choices:"account_domain|system|provider_domain"`
-	}
-	R(&CloudaccountShareModeOptions{}, "cloud-account-share-mode", "Set share_mode of a cloud account", func(s *mcclient.ClientSession, args *CloudaccountShareModeOptions) error {
-		input := api.CloudaccountShareModeInput{}
-		input.ShareMode = args.MODE
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "share-mode", jsonutils.Marshal(input))
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	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

@@ -1,43 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-
-	type 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)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Cloudevents.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Cloudevents.GetColumns(s))
-		return nil
-	})
-}

cmd/climc/shell/cloudnet/common.go

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

cmd/climc/shell/cloudnet/meshnetworks.go

@@ -1,82 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cloudnet
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
-	base_options "yunion.io/x/onecloud/pkg/mcclient/options"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudnet"
-)
-
-func init() {
-	R(&options.MeshNetworkCreateOptions{}, "meshnetwork-create", "Create mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkCreateOptions) error {
-		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		mn, err := modules.MeshNetworks.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(mn)
-		return nil
-	})
-	R(&options.MeshNetworkGetOptions{}, "meshnetwork-show", "Show mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkGetOptions) error {
-		mn, err := modules.MeshNetworks.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(mn)
-		return nil
-	})
-	R(&options.MeshNetworkListOptions{}, "meshnetwork-list", "List mesh networks", func(s *mcclient.ClientSession, opts *options.MeshNetworkListOptions) error {
-		params, err := base_options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.MeshNetworks.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.MeshNetworks.GetColumns(s))
-		return nil
-	})
-	R(&options.MeshNetworkUpdateOptions{}, "meshnetwork-update", "Update mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkUpdateOptions) error {
-		params, err := base_options.StructToParams(opts)
-		mn, err := modules.MeshNetworks.Update(s, opts.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(mn)
-		return nil
-	})
-	R(&options.MeshNetworkDeleteOptions{}, "meshnetwork-delete", "Delete mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkDeleteOptions) error {
-		mn, err := modules.MeshNetworks.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(mn)
-		return nil
-	})
-	R(&options.MeshNetworkActionRealizeOptions{}, "meshnetwork-realize", "Realize mesh network", func(s *mcclient.ClientSession, opts *options.MeshNetworkActionRealizeOptions) error {
-		mn, err := modules.MeshNetworks.PerformAction(s, opts.ID, "realize", nil)
-		if err != nil {
-			return err
-		}
-		printObject(mn)
-		return nil
-	})
-}

cmd/climc/shell/cloudnet/routers.go

@@ -1,134 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cloudnet
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudnet"
-	base_options "yunion.io/x/onecloud/pkg/mcclient/options"
-	options "yunion.io/x/onecloud/pkg/mcclient/options/cloudnet"
-)
-
-func init() {
-	R(&options.RouterCreateOptions{}, "router-create", "Create router", func(s *mcclient.ClientSession, opts *options.RouterCreateOptions) error {
-		params, err := opts.Params()
-		if err != nil {
-			return err
-		}
-		router, err := modules.Routers.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterGetOptions{}, "router-show", "Show router", func(s *mcclient.ClientSession, opts *options.RouterGetOptions) error {
-		router, err := modules.Routers.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterListOptions{}, "router-list", "List routers", func(s *mcclient.ClientSession, opts *options.RouterListOptions) error {
-		params, err := base_options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.Routers.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.Routers.GetColumns(s))
-		return nil
-	})
-	R(&options.RouterUpdateOptions{}, "router-update", "Update router", func(s *mcclient.ClientSession, opts *options.RouterUpdateOptions) error {
-		params, err := base_options.StructToParams(opts)
-		router, err := modules.Routers.Update(s, opts.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterDeleteOptions{}, "router-delete", "Delete router", func(s *mcclient.ClientSession, opts *options.RouterDeleteOptions) error {
-		router, err := modules.Routers.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterActionJoinMeshNetworkOptions{}, "router-join-meshnetwork", "Router join meshnetwork", func(s *mcclient.ClientSession, opts *options.RouterActionJoinMeshNetworkOptions) error {
-		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		router, err := modules.Routers.PerformAction(s, opts.ID, "join-mesh-network", params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterActionLeaveMeshNetworkOptions{}, "router-leave-meshnetwork", "Router leave meshnetwork", func(s *mcclient.ClientSession, opts *options.RouterActionLeaveMeshNetworkOptions) error {
-		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		router, err := modules.Routers.PerformAction(s, opts.ID, "leave-mesh-network", params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterActionRegisterIfnameOptions{}, "router-register-ifname", "Router register new ifname", func(s *mcclient.ClientSession, opts *options.RouterActionRegisterIfnameOptions) error {
-		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		router, err := modules.Routers.PerformAction(s, opts.ID, "register-ifname", params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterActionUnregisterIfnameOptions{}, "router-unregister-ifname", "Router unregister ifname", func(s *mcclient.ClientSession, opts *options.RouterActionUnregisterIfnameOptions) error {
-		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		router, err := modules.Routers.PerformAction(s, opts.ID, "unregister-ifname", params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-	R(&options.RouterActionRealizeOptions{}, "router-realize", "Router realize", func(s *mcclient.ClientSession, opts *options.RouterActionRealizeOptions) error {
-		params, err := base_options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		router, err := modules.Routers.PerformAction(s, opts.ID, "realize", params)
-		if err != nil {
-			return err
-		}
-		printObject(router)
-		return nil
-	})
-}

cmd/climc/shell/cloudnet/routes.go

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

cmd/climc/shell/cloudnet/rules.go

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

cmd/climc/shell/cloudproviderregions.go

@@ -18,7 +18,6 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -38,7 +37,7 @@ func init() {
 
 			}
 		}
-		var result *modulebase.ListResult
+		var result *modules.ListResult
 		var err error
 		if len(args.Manager) > 0 {
 			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager, params)

cmd/climc/shell/cloudproviders.go

@@ -31,9 +31,8 @@ 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"`
-		Capability       []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
+		HasObjectStorage bool `help:"filter cloudproviders that has object storage"`
+		NoObjectStorage  bool `help:"filter cloudproviders that has no object storage"`
 	}
 	R(&CloudproviderListOptions{}, "cloud-provider-list", "List cloud providers", func(s *mcclient.ClientSession, args *CloudproviderListOptions) error {
 		var params *jsonutils.JSONDict
@@ -53,10 +52,6 @@ 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

@@ -18,7 +18,6 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -27,9 +26,8 @@ func init() {
 	type CloudregionListOptions struct {
 		options.BaseListOptions
 
-		Usable    *bool  `help:"List regions where networks are usable"`
-		UsableVpc *bool  `help:"List regions where VPC are usable"`
-		Service   string `help:"List regions which service has available skus" choices:"dbinstances|servers"`
+		Usable    *bool `help:"List regions where networks are usable"`
+		UsableVpc *bool `help:"List regions where VPC are usable"`
 
 		City string `help:"List regions in the specified city"`
 	}
@@ -49,7 +47,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|Google|Ctyun"`
+		Provider string `help:"List objects from the provider" choices:"VMware|Aliyun|Qcloud|Azure|Aws|Huawei|Openstack|Ucloud|ZStack"`
 		City     string `help:"List regions in the specified city"`
 
 		PublicCloud  *bool `help:"List objects belonging to public cloud" json:"public_cloud"`
@@ -70,7 +68,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := modules.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err
@@ -88,7 +86,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
+		listResult := modules.ListResult{}
 		listResult.Data, err = results.GetArray()
 		if err != nil {
 			return err

cmd/climc/shell/contacts.go

@@ -18,7 +18,6 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -29,11 +28,10 @@ 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"`
-		Pull        []string `help:"pull some subcontacts(e.g., dingtalk, feishu, etc) related to mobile"`
+		UID         string `help:"The user you wanna add contact to (Keystone User ID)"`
+		CONTACTTYPE string `help:"The contact type" choices:"email|mobile"`
+		CONTACT     string `help:"The contacts details mobile number or email address, if set it the empty str means delete"`
+		Status      string `help:"Enabled or disabled contact status" choices:"enable|disable"`
 	}
 	R(&ContactsUpdateOptions{}, "contact-update", "Create, delete or update contact for user", func(s *mcclient.ClientSession, args *ContactsUpdateOptions) error {
 		arr := jsonutils.NewArray()
@@ -42,9 +40,9 @@ func init() {
 		tmpObj.Add(jsonutils.NewString(args.CONTACT), "contact")
 		if len(args.Status) > 0 {
 			if args.Status == "disable" {
-				tmpObj.Add(jsonutils.NewInt(0), "enabled")
+				tmpObj.Add(jsonutils.JSONFalse, "enabled")
 			} else {
-				tmpObj.Add(jsonutils.NewInt(1), "enabled")
+				tmpObj.Add(jsonutils.JSONTrue, "enabled")
 			}
 		}
 
@@ -53,13 +51,8 @@ func init() {
 		params := jsonutils.NewDict()
 		params.Add(arr, "contacts")
 
-		pulls := jsonutils.NewArray()
-		for _, pull := range args.Pull {
-			pulls.Add(jsonutils.NewString(pull))
-		}
-		params.Add(pulls, "pull")
+		contact, err := modules.Contacts.PerformAction(s, args.UID, "update-contact", params)
 
-		contact, err := modules.Contacts.CustomizedPerformAction(s, args.UID, "update-contact", params)
 		if err != nil {
 			return err
 		}
@@ -68,25 +61,9 @@ 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"`
+		CONTACTTYPE string `help:"The contact type" choices:"email|mobile"`
 	}
 	R(&ContactsDeleteOptions{}, "contact-delete", "Delete contact for user", func(s *mcclient.ClientSession, args *ContactsDeleteOptions) error {
 		arr := jsonutils.NewArray()
@@ -96,7 +73,7 @@ func init() {
 		arr.Add(tmpObj)
 		params := jsonutils.NewDict()
 		params.Add(arr, "contacts")
-		contact, err := modules.Contacts.CustomizedPerformAction(s, args.UID, "update-contact", params)
+		contact, err := modules.Contacts.PerformAction(s, args.UID, "update-contact", params)
 		if err != nil {
 			return err
 		}
@@ -120,7 +97,6 @@ func init() {
 
 			}
 		}
-		params.Add(jsonutils.JSONTrue, "details")
 
 		result, err := modules.Contacts.List(s, params)
 		if err != nil {
@@ -149,16 +125,14 @@ func init() {
 			}
 		}
 
-		params.Add(jsonutils.JSONTrue, "details")
-
-		result, err := modules.Contacts.CustomizedGet(s, args.UID, params)
+		result, err := modules.Contacts.Get(s, args.UID, params)
 		if err != nil {
 			return err
 		}
 
 		contactsStr, err := result.GetString("details")
 		if err != nil {
-			return nil
+			return err
 		}
 
 		contactsJson, err := jsonutils.ParseString(contactsStr)
@@ -171,7 +145,7 @@ func init() {
 			return err
 		}
 
-		printList(&modulebase.ListResult{Data: contacts}, nil)
+		printList(&modules.ListResult{Data: contacts}, nil)
 		return nil
 	})
 
@@ -184,10 +158,19 @@ func init() {
 		CONTACT      string `help:"The contacts details mobile number or email address"`
 	}
 	R(&ContactsVerifyOptions{}, "contact-verify-trigger", "Trigger contact verify", func(s *mcclient.ClientSession, args *ContactsVerifyOptions) error {
-		tmpDict := jsonutils.NewDict()
-		tmpDict.Add(jsonutils.NewString(args.CONTACT_TYPE), "contact_type")
-		tmpDict.Add(jsonutils.NewString(args.CONTACT), "contact")
-		_, err := modules.Contacts.CustomizedPerformAction(s, args.UID, "verify", tmpDict)
+		params := jsonutils.NewDict()
+		params.Add(jsonutils.NewString(args.CONTACT_TYPE), "contact_type")
+		params.Add(jsonutils.NewString(args.CONTACT), "contact")
+		/*
+		   if len(args.Email) > 0 {
+		       params.Add(jsonutils.NewString(args.Email), "email")
+		   }
+		   if len(args.Mobile) > 0 {
+		       params.Add(jsonutils.NewString(args.Mobile), "mobile")
+		   }
+		*/
+
+		_, err := modules.Contacts.PerformAction(s, args.UID, "verify", params)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/copyright.go

@@ -15,14 +15,7 @@
 package shell
 
 import (
-	"bufio"
-	"bytes"
-	"encoding/base64"
 	"fmt"
-	"io/ioutil"
-	"mime/multipart"
-	"net/http"
-	"path/filepath"
 
 	"yunion.io/x/jsonutils"
 
@@ -63,78 +56,4 @@ 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/credentials.go

@@ -21,7 +21,6 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
@@ -205,7 +204,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		result := modulebase.ListResult{}
+		result := modules.ListResult{}
 		result.Data = make([]jsonutils.JSONObject, len(secrets))
 		for i := range secrets {
 			result.Data[i] = jsonutils.Marshal(secrets[i])

cmd/climc/shell/dbinstance_accounts.go

@@ -1,64 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type DBInstanceAccountListOptions struct {
-		options.BaseListOptions
-		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
-	}
-	R(&DBInstanceAccountListOptions{}, "dbinstance-account-list", "List DB instance accounts", func(s *mcclient.ClientSession, opts *DBInstanceAccountListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.DBInstanceAccounts.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.DBInstanceAccounts.GetColumns(s))
-		return nil
-	})
-
-	type DBInstanceAccountIdOptions struct {
-		ID string `help:"ID or Name of DBInstanceaccount"`
-	}
-
-	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-show", "Show DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
-		account, err := modules.DBInstanceAccounts.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(account)
-		return nil
-	})
-
-	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-delete", "Delete DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
-		account, err := modules.DBInstanceAccounts.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(account)
-		return nil
-	})
-
-}

cmd/climc/shell/dbinstance_backups.go

@@ -1,91 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type DBInstanceBackupListOptions struct {
-		options.BaseListOptions
-		DBInstance  string `help:"ID or Name of DBInstance" json:"dbinstance"`
-		Cloudregion string `help:"ID or Name of cloudregion"`
-	}
-	R(&DBInstanceBackupListOptions{}, "dbinstance-backup-list", "List DB instance backups", func(s *mcclient.ClientSession, opts *DBInstanceBackupListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.DBInstanceBackups.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.DBInstanceBackups.GetColumns(s))
-		return nil
-	})
-
-	type DBInstanceBackupCreateOptions struct {
-		INSTANCE    string `help:"ID or Name of DBInstance" json:"dbinstance"`
-		NAME        string
-		Databases   []string
-		Description string
-	}
-
-	R(&DBInstanceBackupCreateOptions{}, "dbinstance-backup-create", "Create DB instance backup", func(s *mcclient.ClientSession, opts *DBInstanceBackupCreateOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(opts.INSTANCE), "dbinstance")
-		params.Add(jsonutils.NewString(opts.NAME), "name")
-		params.Add(jsonutils.NewString(opts.Description), "description")
-		databases := jsonutils.NewArray()
-		for _, database := range opts.Databases {
-			databases.Add(jsonutils.NewString(database))
-		}
-		params.Add(databases, "databases")
-		result, err := modules.DBInstanceBackups.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceBackupIdOptions struct {
-		ID string
-	}
-
-	R(&DBInstanceBackupIdOptions{}, "dbinstance-backup-show", "Show DB instance backup", func(s *mcclient.ClientSession, opts *DBInstanceBackupIdOptions) error {
-		result, err := modules.DBInstanceBackups.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceBackupIdOptions{}, "dbinstance-backup-delete", "Delete DB instance backup", func(s *mcclient.ClientSession, opts *DBInstanceBackupIdOptions) error {
-		result, err := modules.DBInstanceBackups.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-}

cmd/climc/shell/dbinstance_databases.go

@@ -1,74 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type DBInstanceDatabaseListOptions struct {
-		options.BaseListOptions
-		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
-	}
-	R(&DBInstanceDatabaseListOptions{}, "dbinstance-database-list", "List DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.DBInstanceDatabases.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.DBInstanceDatabases.GetColumns(s))
-		return nil
-	})
-
-	type DBInstanceDatabaseCreateOptions struct {
-		NAME         string
-		DBINSTANCE   string `help:"ID or Name of DBInstance" json:"dbinstance"`
-		CharacterSet string `help:"CharacterSet for database"`
-	}
-
-	R(&DBInstanceDatabaseCreateOptions{}, "dbinstance-database-create", "Create DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseCreateOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.DBInstanceDatabases.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceDatabaseIdOptions struct {
-		ID string
-	}
-
-	R(&DBInstanceDatabaseIdOptions{}, "dbinstance-database-delete", "Delete DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseIdOptions) error {
-		result, err := modules.DBInstanceDatabases.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-}

cmd/climc/shell/dbinstance_skus.go

@@ -1,58 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	type DBInstanceSkuListOption struct {
-		options.BaseListOptions
-		Engine        string
-		EngineVersion string
-		Category      string
-		StorageType   string
-		Cloudregion   string
-	}
-	R(&DBInstanceSkuListOption{}, "dbinstance-sku-list", "List dbinstance skus", func(s *mcclient.ClientSession, args *DBInstanceSkuListOption) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		result, err := modules.DBInstanceSkus.List(s, params)
-		if err != nil {
-			return err
-		}
-		printList(result, modules.DBInstanceSkus.GetColumns(s))
-		return nil
-	})
-
-	type DBInstanceSkuIdOption struct {
-		ID string `help:"DBInstance Id or name"`
-	}
-
-	R(&DBInstanceSkuIdOption{}, "dbinstance-sku-show", "Show dbinstance sku details", func(s *mcclient.ClientSession, args *DBInstanceSkuIdOption) error {
-		result, err := modules.DBInstanceSkus.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-}

cmd/climc/shell/dbinstances.go

@@ -15,13 +15,7 @@
 package shell
 
 import (
-	"fmt"
-	"strings"
-
-	"yunion.io/x/jsonutils"
-
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
@@ -45,228 +39,6 @@ func init() {
 		return nil
 	})
 
-	type DBInstanceCreateOptions struct {
-		NAME          string `help:"DBInstance Name"`
-		InstanceType  string `help:"InstanceType for DBInstance"`
-		VcpuCount     int    `help:"Core of cpu for DBInstance"`
-		VmemSizeMb    int    `help:"Memory size of DBInstance"`
-		Port          int    `help:"Port of DBInstance"`
-		Category      string `help:"Category of DBInstance"`
-		Network       string `help:"Network of DBInstance"`
-		Address       string `help:"Address of DBInstance"`
-		Engine        string `help:"Engine of DBInstance"`
-		EngineVersion string `help:"EngineVersion of DBInstance Engine"`
-		StorageType   string `help:"StorageTyep of DBInstance"`
-		Secgroup      string `help:"Secgroup name or Id for DBInstance"`
-		Zone          string `help:"ZoneId or name for DBInstance"`
-		DiskSizeGB    int    `help:"Storage size for DBInstance"`
-		Duration      string `help:"Duration for DBInstance"`
-		AllowDelete   *bool  `help:"not lock dbinstance" `
-	}
-
-	R(&DBInstanceCreateOptions{}, "dbinstance-create", "Create DB instance", func(s *mcclient.ClientSession, opts *DBInstanceCreateOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		if opts.AllowDelete != nil && *opts.AllowDelete {
-			params.Add(jsonutils.JSONFalse, "disable_delete")
-		}
-		result, err := modules.DBInstance.Create(s, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceRenewOptions struct {
-		ID       string `help:"ID or name of server to renew"`
-		DURATION string `help:"Duration of renew, ADMIN only command"`
-	}
-	R(&DBInstanceRenewOptions{}, "dbinstance-renew", "Renew a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceRenewOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.DURATION), "duration")
-		result, err := modules.DBInstance.PerformAction(s, args.ID, "renew", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceUpdateOptions struct {
-		ID          string `help:"ID or name of server to renew"`
-		Name        string
-		Description string
-		Delete      string `help:"Lock or not lock dbinstance" choices:"enable|disable"`
-	}
-	R(&DBInstanceUpdateOptions{}, "dbinstance-update", "Update a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceUpdateOptions) error {
-		params, err := options.StructToParams(args)
-		if err != nil {
-			return err
-		}
-		if len(args.Delete) > 0 {
-			if args.Delete == "disable" {
-				params.Add(jsonutils.JSONTrue, "disable_delete")
-			} else {
-				params.Add(jsonutils.JSONFalse, "disable_delete")
-			}
-		}
-		result, err := modules.DBInstance.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceChangeConfigOptions struct {
-		ID           string `help:"ID or name of server to renew"`
-		DiskSizeGb   int64  `help:"Change DBInstance storage size"`
-		VcpuCount    int64  `help:"Change DBInstance vcpu count"`
-		VmemSizeMb   int64  `help:"Change DBInstance vmem size mb"`
-		InstanceType string `help:"Change DBInstance instanceType"`
-		Category     string `help:"Change DBInstance category"`
-	}
-	R(&DBInstanceChangeConfigOptions{}, "dbinstance-change-config", "ChangeConfig a dbinstance", func(s *mcclient.ClientSession, args *DBInstanceChangeConfigOptions) error {
-		params := jsonutils.NewDict()
-		if len(args.Category) > 0 {
-			params.Add(jsonutils.NewString(args.Category), "category")
-		}
-		if len(args.InstanceType) > 0 {
-			params.Add(jsonutils.NewString(args.InstanceType), "instance_type")
-		}
-		if args.DiskSizeGb > 0 {
-			params.Add(jsonutils.NewInt(args.DiskSizeGb), "disk_size_gb")
-		}
-		if args.VcpuCount > 0 {
-			params.Add(jsonutils.NewInt(args.VcpuCount), "vcpu_count")
-		}
-		if args.VmemSizeMb > 0 {
-			params.Add(jsonutils.NewInt(args.VmemSizeMb), "vmeme_size_mb")
-		}
-		result, err := modules.DBInstance.PerformAction(s, args.ID, "change-config", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceIdOptions struct {
-		ID string `help:"ID of dbinstance"`
-	}
-
-	R(&DBInstanceIdOptions{}, "dbinstance-open-public-connection", "Open DB instance public connection", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONTrue, "open")
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "public-connection", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceIdOptions{}, "dbinstance-close-public-connection", "Close DB instance public connection", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONFalse, "open")
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "public-connection", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceRecoveryOptions struct {
-		ID        string
-		BACKUP    string
-		Databases []string
-	}
-
-	R(&DBInstanceRecoveryOptions{}, "dbinstance-recovery", "Recovery DB instance database from backup", func(s *mcclient.ClientSession, opts *DBInstanceRecoveryOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("dbinstancebackup", jsonutils.NewString(opts.BACKUP))
-		dbs := jsonutils.NewDict()
-		for _, database := range opts.Databases {
-			if len(database) > 0 {
-				dbInfo := strings.Split(database, ":")
-				if len(dbInfo) == 1 {
-					dbs.Add(jsonutils.NewString(dbInfo[0]), dbInfo[0])
-				} else if len(dbInfo) == 2 {
-					dbs.Add(jsonutils.NewString(dbInfo[1]), dbInfo[0])
-				} else {
-					return fmt.Errorf("Invalid dbinfo: %s", database)
-				}
-			}
-		}
-		if dbs.Length() > 0 {
-			params.Add(dbs, "databases")
-		}
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "recovery", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceIdOptions{}, "dbinstance-show", "Show DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		result, err := modules.DBInstance.Get(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceIdOptions{}, "dbinstance-reboot", "Reboot DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "reboot", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DBInstanceDeleteOptions struct {
-		ID         string `help:"DBInstance Id or name"`
-		KeepBackup bool   `help:"Keep dbinstance manual backup after delete dbinstance"`
-	}
-
-	R(&DBInstanceDeleteOptions{}, "dbinstance-delete", "Delete DB instance", func(s *mcclient.ClientSession, opts *DBInstanceDeleteOptions) error {
-		params := jsonutils.NewDict()
-		if opts.KeepBackup {
-			params.Add(jsonutils.JSONTrue, "keep_backup")
-		}
-		result, err := modules.DBInstance.Delete(s, opts.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceIdOptions{}, "dbinstance-purge", "Purge DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "purge", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceIdOptions{}, "dbinstance-sync-status", "Sync status for DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "sync-status", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type DBInstanceNetworkListOptions struct {
 		options.BaseListOptions
 		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
@@ -278,7 +50,7 @@ func init() {
 			return err
 		}
 
-		var result *modulebase.ListResult
+		var result *modules.ListResult
 		if len(opts.DBInstance) > 0 {
 			result, err = modules.DBInstanceNetworks.ListDescendent(s, opts.DBInstance, params)
 		} else if len(opts.Network) > 0 {
@@ -312,6 +84,74 @@ func init() {
 		return nil
 	})
 
+	type DBInstanceDatabaseListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceDatabaseListOptions{}, "dbinstance-database-list", "List DB instance databases", func(s *mcclient.ClientSession, opts *DBInstanceDatabaseListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceDatabases.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceDatabases.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceBackupListOptions struct {
+		options.BaseListOptions
+		DBInstance  string `help:"ID or Name of DBInstance" json:"dbinstance"`
+		Cloudregion string `help:"ID or Name of cloudregion"`
+	}
+	R(&DBInstanceBackupListOptions{}, "dbinstance-backup-list", "List DB instance backups", func(s *mcclient.ClientSession, opts *DBInstanceBackupListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceBackups.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceBackups.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceAccountListOptions struct {
+		options.BaseListOptions
+		DBInstance string `help:"ID or Name of DBInstance" json:"dbinstance"`
+	}
+	R(&DBInstanceAccountListOptions{}, "dbinstance-account-list", "List DB instance accounts", func(s *mcclient.ClientSession, opts *DBInstanceAccountListOptions) error {
+		params, err := options.ListStructToParams(opts)
+		if err != nil {
+			return err
+		}
+
+		result, err := modules.DBInstanceAccounts.List(s, params)
+		if err != nil {
+			return err
+		}
+		printList(result, modules.DBInstanceAccounts.GetColumns(s))
+		return nil
+	})
+
+	type DBInstanceAccountIdOptions struct {
+		ID string `help:"ID or Name of DBInstanceaccount"`
+	}
+
+	R(&DBInstanceAccountIdOptions{}, "dbinstance-account-show", "Show DB instance account", func(s *mcclient.ClientSession, opts *DBInstanceAccountIdOptions) error {
+		account, err := modules.DBInstanceAccounts.Get(s, opts.ID, nil)
+		if err != nil {
+			return err
+		}
+		printObject(account)
+		return nil
+	})
+
 	type DBInstancePrivilegeListOptions struct {
 		options.BaseListOptions
 		DBInstanceaccount  string `help:"ID or Name of DBInstanceaccount" json:"dbinstanceaccount"`
@@ -331,21 +171,4 @@ func init() {
 		return nil
 	})
 
-	type DBInstanceChangeOwnerOptions struct {
-		ID      string `help:"DBInstance to change owner" json:"-"`
-		PROJECT string `help:"Project ID or change" json:"tenant"`
-	}
-	R(&DBInstanceChangeOwnerOptions{}, "dbinstance-change-owner", "Change owner porject of a dbinstance", func(s *mcclient.ClientSession, opts *DBInstanceChangeOwnerOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "change-owner", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 }

cmd/climc/shell/devtoolcronjob.go

@@ -1,222 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func paramValidator(param jsonutils.JSONObject) (bool, error) {
-	// TODO 移到 server 端
-	log.Infof("paramValidator: param: %+v", param)
-	interval, err := param.Int("interval")
-	if err != nil {
-		return true, nil
-	}
-	day, err := param.Int("day")
-	if err != nil {
-		return true, nil
-	}
-	if interval == 0 && day == 0 {
-		return false, fmt.Errorf("interval and day can not be 0 at the same time")
-	}
-	return true, nil
-}
-
-func init() {
-	type CronjobListOptions struct {
-		options.BaseListOptions
-		Name string `help:"cloud region ID or Name" json:"-"`
-	}
-
-	R(&CronjobListOptions{}, "devtoolcronjob-list", "List Devtool Cronjobs", func(s *mcclient.ClientSession, args *CronjobListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		var result *modulebase.ListResult
-		result, err = modules.DevToolCronjobs.List(s, params)
-		printList(result, modules.DevToolCronjobs.GetColumns(s))
-		return nil
-	})
-
-	type CronjobCreateOptions struct {
-		NAME     string `help:"Ansible Playbook ID or Name" json:"-"`
-		Day      int    `help:"Cronjob runs at given day" default:"0"`
-		Hour     int    `help:"Cronjob runs at given hour" default:"0"`
-		Min      int    `help:"Cronjob runs at given min" default:"0"`
-		Sec      int    `help:"Cronjob runs at given sec" default:"0"`
-		Interval int64  `help:"Cronjob runs at given interval" default:"0"`
-		Start    bool   `help:"start job when created" default:"false"`
-		Enabled  bool   `help:"Set job status enabled" default:"false"`
-	}
-	R(
-		&CronjobCreateOptions{},
-		"devtoolcronjob-create",
-		"Create a cronjob repo component",
-		func(s *mcclient.ClientSession, args *CronjobCreateOptions) error {
-			result, err := modules.AnsiblePlaybooks.Get(s, args.NAME, nil)
-			if err != nil {
-				return err
-			}
-			ansiblePlaybookName, err := result.GetString("name")
-			if err != nil {
-				return err
-			}
-
-			ansiblePlaybookID, err := result.GetString("id")
-			if err != nil {
-				return err
-			}
-
-			params := jsonutils.NewDict()
-			params.Add(jsonutils.NewString(ansiblePlaybookName), "name")
-
-			params.Add(jsonutils.NewString(ansiblePlaybookID), "ansible_playbook_id")
-
-			if args.Start {
-				params.Add(jsonutils.JSONTrue, "start")
-
-			}
-			if args.Enabled {
-				params.Add(jsonutils.JSONTrue, "enabled")
-			} else if args.Interval > 0 {
-				params.Add(jsonutils.NewInt(int64(args.Interval)), "interval")
-			} else {
-				params.Add(jsonutils.NewInt(int64(0)), "interval")
-				params.Add(jsonutils.NewInt(int64(args.Day)), "day")
-				params.Add(jsonutils.NewInt(int64(args.Hour)), "hour")
-				params.Add(jsonutils.NewInt(int64(args.Min)), "min")
-				params.Add(jsonutils.NewInt(int64(args.Sec)), "sec")
-			}
-			ok, err := paramValidator(params)
-			if err != nil || !ok {
-				log.Infof("paramValidator error %s", err)
-				return err
-			}
-			cronjob, err := modules.DevToolCronjobs.Create(s, params)
-			if err != nil {
-				log.Errorf("modules.DevToolCronjobs.Create error %s", err)
-				return err
-			}
-			printObject(cronjob)
-			return nil
-		},
-	)
-
-	type DevToolCronjobShowOptions struct {
-		ID string `help:"ID or Name of the DevToolCronjob to show"`
-	}
-	R(&DevToolCronjobShowOptions{}, "devtoolcronjob-show", "Show cronjob details", func(s *mcclient.ClientSession, args *DevToolCronjobShowOptions) error {
-		result, err := modules.DevToolCronjobs.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type DevToolCronjobUpdateOptions struct {
-		ID       string `help:"ID or Name of DevToolCronjob to update"`
-		Day      int    `help:"Cronjob runs at given day" json:"-" default:"-1"`
-		Hour     int    `help:"Cronjob runs at given hour" json:"-" default:"-1"`
-		Min      int    `help:"Cronjob runs at given min" default:"-1"`
-		Sec      int    `help:"Cronjob runs at given sec" default:"-1"`
-		Interval int    `help:"Cronjob runs at given interval" default:"-1"`
-		Start    bool   `help:"start job when created"`
-		Stop     bool   `help:"start job when created"`
-		Enable   bool   `help:"Set job status enabled"`
-		Disable  bool   `help:"Set job status enabled"`
-	}
-	R(&DevToolCronjobUpdateOptions{}, "devtoolcronjob-update", "Update DevToolCronjob", func(s *mcclient.ClientSession, args *DevToolCronjobUpdateOptions) error {
-		result, err := modules.DevToolCronjobs.Get(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-
-		params := jsonutils.NewDict()
-		interval, _ := result.Int("interval")
-		day, _ := result.Int("day")
-		params.Add(jsonutils.NewString(args.ID), "id")
-		params.Add(jsonutils.NewInt(int64(interval)), "interval")
-		params.Add(jsonutils.NewInt(int64(day)), "day")
-
-		log.Infof("DevToolCronjobUpdateOptions args: %+v", args)
-		if args.Interval >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Interval)), "interval")
-			if args.Interval > 0 {
-				params.Add(jsonutils.NewInt(0), "day")
-			}
-		} else if args.Day >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Day)), "day")
-			if args.Day > 0 {
-				params.Add(jsonutils.NewInt(0), "interval")
-			}
-		}
-		if args.Hour >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Hour)), "hour")
-		}
-		if args.Min >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Min)), "min")
-		}
-		if args.Sec >= 0 {
-			params.Add(jsonutils.NewInt(int64(args.Sec)), "sec")
-		}
-
-		ok, err := paramValidator(params)
-		if err != nil || !ok {
-			return err
-		}
-
-		if args.Start && args.Stop {
-			return fmt.Errorf("can not set job start and stop at the same time")
-		} else if args.Start {
-			params.Add(jsonutils.JSONTrue, "start")
-		} else if args.Stop {
-			params.Add(jsonutils.JSONFalse, "start")
-		}
-		if args.Enable && args.Disable {
-			return fmt.Errorf("can not set job enabled and disabled at the same time")
-		} else if args.Enable {
-			params.Add(jsonutils.JSONTrue, "enabled")
-		} else if args.Disable {
-			params.Add(jsonutils.JSONFalse, "enabled")
-		}
-
-		result, err = modules.DevToolCronjobs.Update(s, args.ID, params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DevToolCronjobShowOptions{}, "devtoolcronjob-delete", "Delete DevToolCronjob", func(s *mcclient.ClientSession, args *DevToolCronjobShowOptions) error {
-		result, err := modules.DevToolCronjobs.Delete(s, args.ID, nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-}

cmd/climc/shell/devtooltemplate.go

@@ -1,154 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-
-	printAnsiblePlaybookObject := func(obj jsonutils.JSONObject) {
-		dict := obj.(*jsonutils.JSONDict)
-		pbJson, err := dict.Get("playbook")
-		if err != nil {
-			printObject(obj)
-			return
-		}
-		pbStr := pbJson.YAMLString()
-		dict.Set("playbook", jsonutils.NewString(pbStr))
-		printObject(obj)
-	}
-
-	type TemplateListOptions struct {
-		options.BaseListOptions
-		Name string `help:"cloud region ID or Name" json:"-"`
-	}
-
-	R(&TemplateListOptions{}, "devtooltemplate-list", "List Devtool Templates", func(s *mcclient.ClientSession, args *TemplateListOptions) error {
-		params, err := options.ListStructToParams(args)
-		if err != nil {
-			return err
-		}
-		var result *modulebase.ListResult
-		result, err = modules.DevToolTemplates.List(s, params)
-		printList(result, modules.DevToolTemplates.GetColumns(s))
-		return nil
-	})
-
-	R(
-		&options.DevtoolTemplateCreateOptions{},
-		"devtooltemplate-create",
-		"Create a template repo component",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateCreateOptions) error {
-
-			params, err := opts.Params()
-			if err != nil {
-				return err
-			}
-			log.Infof("devtool playbook create opts: %+v", params)
-			apb, err := modules.DevToolTemplates.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateIdOptions{},
-		"devtooltemplate-show",
-		"Show devtool template",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateIdOptions) error {
-			apb, err := modules.DevToolTemplates.Get(s, opts.ID, nil)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateBindingOptions{},
-		"devtooltemplate-bind",
-		"Binding devtool template to a host/vm",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateBindingOptions) error {
-			params := jsonutils.NewDict()
-			params.Set("server_id", jsonutils.NewString(opts.ServerID))
-			apb, err := modules.DevToolTemplates.PerformAction(s, opts.ID, "bind", params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateBindingOptions{},
-		"devtooltemplate-unbind",
-		"Binding devtool template to a host/vm",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateBindingOptions) error {
-			params := jsonutils.NewDict()
-			params.Set("server_id", jsonutils.NewString(opts.ServerID))
-			apb, err := modules.DevToolTemplates.PerformAction(s, opts.ID, "unbind", params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateIdOptions{},
-		"devtooltemplate-delete",
-		"Delete devtool template",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateIdOptions) error {
-			apb, err := modules.DevToolTemplates.Delete(s, opts.ID, nil)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-
-	R(
-		&options.DevtoolTemplateUpdateOptions{},
-		"devtooltemplate-update",
-		"Update ansible playbook",
-		func(s *mcclient.ClientSession, opts *options.DevtoolTemplateUpdateOptions) error {
-			params, err := opts.Params()
-			if err != nil {
-				return err
-			}
-			apb, err := modules.DevToolTemplates.Update(s, opts.ID, params)
-			if err != nil {
-				return err
-			}
-			printAnsiblePlaybookObject(apb)
-			return nil
-		},
-	)
-}

cmd/climc/shell/disks.go

@@ -81,7 +81,6 @@ func init() {
 	type DiskDeleteOptions struct {
 		ID                    []string `help:"ID of disks to delete" metavar:"DISK"`
 		OverridePendingDelete bool     `help:"Delete disk directly instead of pending delete" short-token:"f"`
-		DeleteSnapshots       bool     `help:"Delete disk snapshots before delete disk"`
 	}
 
 	R(&DiskDeleteOptions{}, "disk-delete", "Delete a disk", func(s *mcclient.ClientSession, args *DiskDeleteOptions) error {
@@ -89,9 +88,6 @@ func init() {
 		if args.OverridePendingDelete {
 			params.Add(jsonutils.JSONTrue, "override_pending_delete")
 		}
-		if args.DeleteSnapshots {
-			params.Add(jsonutils.JSONTrue, "delete_snapshots")
-		}
 		ret := modules.Disks.BatchDeleteWithParam(s, args.ID, params, nil)
 		printBatchResults(ret, modules.Disks.GetColumns(s))
 		return nil

cmd/climc/shell/elasticcache.go

@@ -1,386 +0,0 @@
-// Copyright 2019 Yunion
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shell
-
-import (
-	"fmt"
-
-	"yunion.io/x/jsonutils"
-
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules"
-	"yunion.io/x/onecloud/pkg/mcclient/options"
-)
-
-func init() {
-	R(&options.BaseListOptions{}, "elastic-cache-list", "List elastisc cache instance", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCache.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
-
-	R(&options.ElasticCacheCreateOptions{}, "elastic-cache-create", "Create elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheCreateOptions) error {
-		params, err := options.StructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCache.Create(s, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-restart", "Restart elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "restart", nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-flush-instance", "Flush elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "flush-instance", nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-delete", "Delete elastisc cache instance", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCache.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	type ElasticCacheChangeSpecOptions struct {
-		options.ElasticCacheIdOptions
-		Sku string `help:"elastic cache sku id"`
-	}
-
-	R(&ElasticCacheChangeSpecOptions{}, "elastic-cache-change-spec", "Change elastisc cache instance specification", func(s *mcclient.ClientSession, opts *ElasticCacheChangeSpecOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("sku", jsonutils.NewString(opts.Sku))
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "change-spec", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	type ElasticCacheMainteananceTimeOptions struct {
-		options.ElasticCacheIdOptions
-		START_TIME string `help:"elastic cache sku maintenance start time,format: HH:mm"`
-		END_TIME   string `help:"elastic cache sku maintenance end time, format: HH:mm"`
-	}
-
-	R(&ElasticCacheMainteananceTimeOptions{}, "elastic-cache-set-maintenance-time", "set elastisc cache instance maintenance time", func(s *mcclient.ClientSession, opts *ElasticCacheMainteananceTimeOptions) error {
-		params := jsonutils.NewDict()
-		start := fmt.Sprintf("%sZ", opts.START_TIME)
-		end := fmt.Sprintf("%sZ", opts.END_TIME)
-		params.Set("maintain_start_time", jsonutils.NewString(start))
-		params.Set("maintain_end_time", jsonutils.NewString(end))
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "set-maintain-time", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-allocate-public-connect", "Allocate elastisc cache instance public access connection", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "allocate-public-connection", nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-enable-auth", "Enable elastisc cache instance auth", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("auth_mode", jsonutils.NewString("on"))
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "update-auth-mode", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-disable-auth", "Disable elastisc cache instance auth", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("auth_mode", jsonutils.NewString("off"))
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "update-auth-mode", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	type ElasticCacheAccountResetPasswordOptions struct {
-		options.ElasticCacheIdOptions
-		PASSWORD string `help:"elastic cache account password."`
-	}
-
-	R(&ElasticCacheAccountResetPasswordOptions{}, "elastic-cache-account-reset-password", "Reset elastisc cache instance account password", func(s *mcclient.ClientSession, opts *ElasticCacheAccountResetPasswordOptions) error {
-		params := jsonutils.NewDict()
-		params.Set("password", jsonutils.NewString(opts.PASSWORD))
-		result, err := modules.ElasticCacheAccount.PerformAction(s, opts.ID, "reset-password", params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	type ElasticCacheBaseListOptions struct {
-		options.BaseListOptions
-		ElasticcacheId string `help:"elastic cache id"`
-	}
-
-	R(&ElasticCacheBaseListOptions{}, "elastic-cache-account-list", "List elastisc cache account", func(s *mcclient.ClientSession, opts *ElasticCacheBaseListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheAccount.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
-
-	R(&options.ElasticCacheAccountCreateOptions{}, "elastic-cache-account-create", "Create elastisc cache account", func(s *mcclient.ClientSession, opts *options.ElasticCacheAccountCreateOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheAccount.Create(s, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-account-delete", "Delete elastisc cache account", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCacheAccount.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheBackupCreateOptions{}, "elastic-cache-backup-create", "Create elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheBackupCreateOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheBackup.Create(s, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.BaseListOptions{}, "elastic-cache-backup-list", "List elastisc cache backup", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheBackup.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-backup-delete", "Delete elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCacheBackup.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-backup-restore", "Restore elastisc cache backup", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCacheBackup.PerformAction(s, opts.ID, "restore-instance", nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheAclCreateOptions{}, "elastic-cache-acl-create", "Create elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheAclCreateOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheAcl.Create(s, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-acl-delete", "Delete elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCacheAcl.Delete(s, opts.ID, nil)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.BaseListOptions{}, "elastic-cache-acl-list", "List elastisc cache acl", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheAcl.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
-
-	R(&options.ElasticCacheAclUpdateOptions{}, "elastic-cache-acl-update", "Update elastisc cache acl", func(s *mcclient.ClientSession, opts *options.ElasticCacheAclUpdateOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		params.Remove("id")
-		result, err := modules.ElasticCacheAcl.Update(s, opts.Id, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	R(&options.BaseListOptions{}, "elastic-cache-parameter-list", "List elastisc cache parameters", func(s *mcclient.ClientSession, opts *options.BaseListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticCacheParameter.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
-
-	R(&options.ElasticCacheParameterUpdateOptions{}, "elastic-cache-parameter-update", "Update elastisc cache parameter", func(s *mcclient.ClientSession, opts *options.ElasticCacheParameterUpdateOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		params.Remove("id")
-		result, err := modules.ElasticCacheParameter.Update(s, opts.Id, params)
-		if err != nil {
-			return err
-		}
-
-		printObject(result)
-		return nil
-	})
-
-	type ElasticCacheSkusListOptions struct {
-		options.BaseListOptions
-		Cloudregion   string  `help:"region Id or name"`
-		Usable        bool    `help:"Filter usable sku"`
-		Zone          string  `help:"zone Id or name"`
-		City          *string `help:"city name,eg. BeiJing"`
-		LocalCategory *string `help:"local category,eg. single"`
-		EngineVersion *string `help:"engine version,eg. 3.0"`
-		Cpu           *int    `help:"Cpu core count" json:"cpu_core_count"`
-		Mem           *int    `help:"Memory size in MB" json:"memory_size_mb"`
-		Name          string  `help:"Name of Sku"`
-	}
-
-	R(&ElasticCacheSkusListOptions{}, "elastic-cache-sku-list", "List elastisc cache sku", func(s *mcclient.ClientSession, opts *ElasticCacheSkusListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		result, err := modules.ElasticcacheSkus.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, nil)
-		return nil
-	})
-}