Merge pull request #8224 from yousong/automated-cherry-pick-of-#8222-upstream-release-2.13

Automated cherry pick of #8222: webconsole: ssh: each argument on its own line

.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/pull_request_template.md

@@ -1,15 +1,9 @@
 **这个 PR 实现什么功能/修复什么问题**:
 
-<!--
-- [ ] 功能、bugfix描述
-- [ ] 冒烟测试
-- [ ] 单元测试编写
--->
-
 **是否需要 backport 到之前的 release 分支**:
-
 <!--
 如果不需要，填写 "NONE".
 如果需要，就以下面 item 的格式写 release 分支名，并提交对应的 cherry-pick PR:
-- release/3.1
+- release/2.8.0
+- release/2.6.0
 -->

.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 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 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 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 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 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

@@ -30,7 +30,6 @@ _output
 /relay
 /structargtest
 .idea
-.vscode
 GPATH
 GRTAGS
 GTAGS

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

@@ -10,7 +10,7 @@ BUILD_SCRIPT := $(ROOT_DIR)/build/build.sh
 ifeq ($(ONECLOUD_CI_BUILD),)
 	GIT_COMMIT := $(shell git rev-parse --short HEAD)
 	GIT_BRANCH := $(shell git name-rev --name-only HEAD)
-	GIT_VERSION := $(shell git describe --always --tags --abbrev=14 $(GIT_COMMIT)^{commit})
+	GIT_VERSION := $(shell git describe --tags --abbrev=14 $(GIT_COMMIT)^{commit})
 	GIT_TREE_STATE := $(shell s=`git status --porcelain 2>/dev/null`; if [ -z "$$s" ]; then echo "clean"; else echo "dirty"; fi)
 	BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
 else
@@ -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,11 +44,10 @@ 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 GOOS ?= linux
 export GO111MODULE:=on
 export CGO_CFLAGS = ${X_CGO_CFLAGS}
 export CGO_LDFLAGS = ${X_CGO_LDFLAGS}
@@ -76,7 +72,7 @@ install: prepare_dir
 
 
 gencopyright:
-	@bash scripts/gencopyright.sh pkg cmd
+	@sh scripts/gencopyright.sh pkg cmd
 
 test:
 	@go test $(GO_BUILD_FLAGS) $(shell go list ./... | egrep -v 'host-image|hostimage')
@@ -84,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)/$@
 
@@ -188,82 +181,48 @@ dep:
 	@$(MAKE) mod
 
 mod:
-	go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
+	go get $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p'))
 	go mod tidy
 	go mod vendor -v
 
 
-DOCKER_BUILD_IMAGE_VERSION?=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
 
@@ -274,13 +233,11 @@ 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
+	./scripts/codegen.py model-api
 
 gen-swagger-check:
 	which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
@@ -288,27 +245,8 @@ gen-swagger-check:
 	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
+	./scripts/codegen.py swagger-code
+	./scripts/codegen.py swagger-yaml
 
-swagger-serve-only:
-	$(ROOT_DIR)/scripts/codegen.py swagger-serve
-
-swagger-serve: gen-model-api gen-swagger swagger-serve-only
-
-swagger-site: gen-model-api gen-swagger
-	$(ROOT_DIR)/scripts/codegen.py swagger-site
-
-.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve swagger-site
-
-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
-
-%:
-	@:
+swagger-serve: gen-swagger
+	./scripts/codegen.py swagger-serve

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/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/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

@@ -1,11 +0,0 @@
-FROM alpine:3.11.6
-
-MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
-
-# openssh-client, for ansible ssh connection
-RUN set -x \
-	&& apk update \
-	&& apk add openssh-client \
-	&& apk add ansible \
-	&& apk add tzdata ca-certificates \
-	&& rm -rf /var/cache/apk/*

build/docker/Dockerfile.apigateway

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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.3
-
-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:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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 curl busybox-extras tcpdump strace 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:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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:v0.1
-
-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/root/opt/yunion/share/template/content/IMAGE_ACTIVED

@@ -1 +0,0 @@
-{{.os_type}} 镜像 {{.name}} 上传完成

build/notify/root/opt/yunion/share/template/content/VERIFY.email

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <title>Document</title>
-</head>
-<body>
-  <table style="width: 650px; margin-bottom: 20px;" border="0" cellpadding="0" cellspacing="0" align="center">
-  	<tr style="height: 50px; background: #333; overflow: hidden;">
-  		<td>
-  			<table style="margin-left: 20px;">
-  				<tr>
-  					<td>
-  						<img src="data:{{.login_logo_format}};base64,{{.login_logo}}" alt="" style="color: #fff; height: 32px; vertical-align: middle;">
-  					</td>
-  				</tr>
-  			</table>
-  		</td>
-  		<td>
-  			<table style="float: right;">
-  				<tr>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">产品</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">解决方案</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">服务</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">帮助与文档</a>
-  					</td>
-  					<td style="padding-left: 20px; padding-right: 20px;">
-  						<a href="" style="text-decoration: none; color: #20A0FF; font-size: 12px; display: none;">关于我们</a>
-  					</td>
-  				</tr>
-  			</table>
-  		</td>
-  	</tr>
-  	<tr>
-  		<td style="width: 100%;" colspan="2">
-  			<table style="padding: 20px 10px; width: 100%;">
-	  			<tr>
-	  				<td style="padding-bottom: 20px;">
-	  					亲爱的{{.name}}，您好：
-	  				</td>
-	  			</tr>
-	  			<tr>
-	  				<td style="padding-bottom: 10px;">请点击下面的链接，完成用户邮箱的激活：</td>
-	  			</tr>
-	  			<tr>
-	  				<td style="padding-bottom: 30px;"><a href="{{.link}}">{{.link}}</a></td>
-	  			</tr>
-	  		</table>
-  		</td>
-  	</tr>
-  	<tr style="width: 96%;">
-		<td colspan="2" style="border-top: 1px dashed #ccc; color: #333; font-size: 12px; padding-bottom: 10px; font-weight: 100;">*为了确保您的帐号安全，该链接仅48小时内访问有效，请勿直接回复此邮件。</td>
-	</tr>
-	<tr>
-		<td colspan="2" style="background: #333; text-align: right; padding-right: 20px; font-size: 12px; color: #fff; height: 50px;">版权所有 © {{.copyright}} 保留一切权利</td>
-	</tr>
-  </table>
-</body>
-</html>

build/notify/root/opt/yunion/share/template/title/IMAGE_ACTIVED

@@ -1 +0,0 @@
-镜像 {{.name}} 上传完成

build/notify/root/opt/yunion/share/template/title/VERIFY.email

@@ -1 +0,0 @@
-Yunion Verify

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

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

cmd/climc/shell/bill_tasks.go

@@ -1,42 +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 BillTasksCreateOptions struct {
-		options.BaseListOptions
-		CloudaccountId string `help:"cloudaccount Id" required:"true"`
-		StartDay       int    `help:"start day of billing cycle, example: 20060102"`
-		EndDay         int    `help:"end day of billing cycle, example: 20060102"`
-	}
-	R(&BillTasksCreateOptions{}, "bill-tasks-create", "create bill task",
-		func(s *mcclient.ClientSession, args *BillTasksCreateOptions) error {
-			params := jsonutils.Marshal(args)
-			result, err := modules.BillTasks.Create(s, params)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		})
-}

cmd/climc/shell/buckets.go

@@ -32,22 +32,12 @@ import (
 func init() {
 	type BucketListOptions struct {
 		options.BaseListOptions
-		DistinctField string `help:"query specified distinct field"`
 	}
 	R(&BucketListOptions{}, "bucket-list", "List all buckets", func(s *mcclient.ClientSession, args *BucketListOptions) error {
 		params, err := options.ListStructToParams(args)
 		if err != nil {
 			return err
 		}
-		if len(args.DistinctField) > 0 {
-			params.Add(jsonutils.NewString(args.DistinctField), "extra_field")
-			result, err := modules.Buckets.Get(s, "distinct-field", params)
-			if err != nil {
-				return err
-			}
-			fmt.Println(result)
-			return nil
-		}
 		result, err := modules.Buckets.List(s, params)
 		if err != nil {
 			return err
@@ -56,10 +46,10 @@ func init() {
 		return nil
 	})
 
-	type BucketIdOptions struct {
+	type BucketShowOptions struct {
 		ID string `help:"ID or name of bucket"`
 	}
-	R(&BucketIdOptions{}, "bucket-show", "Id details of bucket", func(s *mcclient.ClientSession, args *BucketIdOptions) error {
+	R(&BucketShowOptions{}, "bucket-show", "Show details of bucket", func(s *mcclient.ClientSession, args *BucketShowOptions) error {
 		result, err := modules.Buckets.Get(s, args.ID, nil)
 		if err != nil {
 			return err
@@ -68,15 +58,6 @@ func init() {
 		return nil
 	})
 
-	R(&BucketIdOptions{}, "bucket-syncstatus", "Sync bucket statust", func(s *mcclient.ClientSession, args *BucketIdOptions) error {
-		result, err := modules.Buckets.PerformAction(s, args.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type BucketUpdateOptions struct {
 		ID   string `help:"ID or name of bucket" json:"-"`
 		Name string `help:"new name of bucket" json:"name"`

cmd/climc/shell/cloudaccounts.go

@@ -52,10 +52,6 @@ func init() {
 
 	type CloudaccountListOptions struct {
 		options.BaseListOptions
-		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
-
-		DistinctField string `help:"distinct field"`
-		ProxySetting  string `help:"Proxy setting id or name"`
 	}
 	R(&CloudaccountListOptions{}, "cloud-account-list", "List cloud accounts", func(s *mcclient.ClientSession, args *CloudaccountListOptions) error {
 		var params *jsonutils.JSONDict
@@ -65,21 +61,6 @@ func init() {
 			if err != nil {
 				return err
 			}
-			if len(args.Capability) > 0 {
-				params.Add(jsonutils.NewStringArray(args.Capability), "capability")
-			}
-			if len(args.ProxySetting) > 0 {
-				params.Add(jsonutils.NewString(args.ProxySetting), "proxy_setting")
-			}
-		}
-		if len(args.DistinctField) > 0 {
-			params.Add(jsonutils.NewString(args.DistinctField), "extra_field")
-			result, err := modules.Cloudaccounts.Get(s, "distinct-field", params)
-			if err != nil {
-				return err
-			}
-			fmt.Println(result)
-			return nil
 		}
 		result, err := modules.Cloudaccounts.List(s, params)
 		if err != nil {
@@ -414,19 +395,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)
 
@@ -468,7 +436,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()
@@ -720,19 +688,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)
@@ -753,129 +708,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.SVMwareCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-vmware", "Update credential of a VMware cloud account", func(s *mcclient.ClientSession, args *options.SVMwareCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SAliyunCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-aliyun", "Update credential of an Aliyun cloud account", func(s *mcclient.ClientSession, args *options.SAliyunCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SAzureCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-azure", "Update credential of an Azure cloud account", func(s *mcclient.ClientSession, args *options.SAzureCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SQcloudCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-qcloud", "Update credential of a Qcloud cloud account", func(s *mcclient.ClientSession, args *options.SQcloudCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SAWSCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-aws", "Update credential of an AWS cloud account", func(s *mcclient.ClientSession, args *options.SAWSCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SOpenStackCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-openstack", "Update credential of an OpenStack cloud account", func(s *mcclient.ClientSession, args *options.SOpenStackCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SHuaweiCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-huawei", "Update credential of an Huawei cloud account", func(s *mcclient.ClientSession, args *options.SHuaweiCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SUcloudCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-ucloud", "Update credential of a Ucloud cloud account", func(s *mcclient.ClientSession, args *options.SUcloudCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SZStackCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-zstack", "Update credential of a ZStack cloud account", func(s *mcclient.ClientSession, args *options.SZStackCloudAccountUpdateCredentialOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SGoogleCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-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, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SS3CloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-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, "test-connectivity", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&options.SCtyunCloudAccountUpdateCredentialOptions{}, "cloud-account-test-connectivity-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, "test-connectivity", 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"`
@@ -939,14 +771,10 @@ func init() {
 	})
 
 	type CloudaccountPublicOptions struct {
-		ID            string   `help:"ID or name of cloud account" json:"-"`
-		Scope         string   `help:"public_sccope" choices:"domain|system" json:"scope"`
-		SharedDomains []string `help:"shared domains" json:"shared_domains"`
-		ShareMode     string   `help:"share_mode" choices:"account_domain|provider_domain|system"`
+		ID string `help:"ID or name of cloud account"`
 	}
 	R(&CloudaccountPublicOptions{}, "cloud-account-public", "Mark this cloud account public ", func(s *mcclient.ClientSession, args *CloudaccountPublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "public", params)
+		result, err := modules.Cloudaccounts.PerformAction(s, args.ID, "public", nil)
 		if err != nil {
 			return err
 		}
@@ -1006,47 +834,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type ClouaccountChangeOwnerOptions struct {
-		ID            string `help:"ID or name of cloudaccount" json:"-"`
-		ProjectDomain string `json:"project_domain" help:"target domain"`
-	}
-	R(&ClouaccountChangeOwnerOptions{}, "cloud-account-change-owner", "Change owner domain of cloudaccount", func(s *mcclient.ClientSession, args *ClouaccountChangeOwnerOptions) error {
-		if len(args.ProjectDomain) == 0 {
-			return fmt.Errorf("empty project_domain")
-		}
-		params := jsonutils.Marshal(args)
-		ret, err := modules.Cloudaccounts.PerformAction(s, args.ID, "change-owner", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	type ClouaccountChangeProjectOptions struct {
-		ID      string `help:"ID or name of cloudaccount" json:"-"`
-		PROJECT string `json:"project" help:"target domain"`
-	}
-	R(&ClouaccountChangeProjectOptions{}, "cloud-account-change-project", "Change domain/project of cloudaccount", func(s *mcclient.ClientSession, args *ClouaccountChangeProjectOptions) error {
-		if len(args.PROJECT) == 0 {
-			return fmt.Errorf("empty project")
-		}
-		params := jsonutils.Marshal(args)
-		ret, err := modules.Cloudaccounts.PerformAction(s, args.ID, "change-project", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	R(&CloudaccountShowOptions{}, "cloud-account-change-owner-candidate-domains", "Show candiate domains of a cloud account changing project", func(s *mcclient.ClientSession, args *CloudaccountShowOptions) error {
-		result, err := modules.Cloudaccounts.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/cloudnet/routes.go

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

cmd/climc/shell/cloudprovider_quota.go

@@ -1,60 +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 CloudproviderQuotaListOptions struct {
-		options.BaseListOptions
-		Cloudregion string `help:"ID or Name of Cloudregion"`
-		QuotaType   string `help:"Quota type"`
-		QuotaRange  string `help:"Quota range" choices:"cloudregion|cloudprovider"`
-	}
-
-	R(&CloudproviderQuotaListOptions{}, "cloud-provider-quota-list", "List cloudprovider quota", func(s *mcclient.ClientSession, args *CloudproviderQuotaListOptions) error {
-		params, err := args.Params()
-		if err != nil {
-			return err
-		}
-
-		if len(args.QuotaType) > 0 {
-			params.Add(jsonutils.NewString(args.QuotaType), "quota_type")
-		}
-
-		if len(args.QuotaRange) > 0 {
-			params.Add(jsonutils.NewString(args.QuotaRange), "quota_range")
-		}
-
-		if len(args.Cloudregion) > 0 {
-			params.Add(jsonutils.NewString(args.Cloudregion), "cloudregion")
-		}
-
-		result, err := modules.CloudproviderQuotas.List(s, params)
-		if err != nil {
-			return err
-		}
-
-		printList(result, modules.CloudproviderQuotas.GetColumns(s))
-		return nil
-	})
-
-}

cmd/climc/shell/cloudproviderregions.go

@@ -27,8 +27,6 @@ func init() {
 	type CloudproviderRegionListOptions struct {
 		options.BaseListOptions
 		Region string `help:"ID or Name of Host"`
-
-		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
 	}
 	R(&CloudproviderRegionListOptions{}, "cloud-provider-region-list", "List cloudprovider region synchronization status", func(s *mcclient.ClientSession, args *CloudproviderRegionListOptions) error {
 		var params *jsonutils.JSONDict

cmd/climc/shell/cloudproviders.go

@@ -31,10 +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"`
-		Cloudregion      string   `help:"filter cloudproviders by cloudregion"`
+		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
@@ -54,14 +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")
-			}
-
-			if len(args.Cloudregion) > 0 {
-				params.Add(jsonutils.NewString(args.Cloudregion), "cloudregion")
-			}
 		}
 		result, err := modules.Cloudproviders.List(s, params)
 		if err != nil {
@@ -250,13 +240,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	R(&CloudproviderShowOptions{}, "cloud-provider-change-owner-candidate-domains", "Show candiate domains of a cloud provider  changing owner", func(s *mcclient.ClientSession, args *CloudproviderShowOptions) error {
-		result, err := modules.Cloudproviders.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/cloudregions.go

@@ -15,8 +15,6 @@
 package shell
 
 import (
-	"fmt"
-
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
@@ -34,25 +32,12 @@ func init() {
 		Service   string `help:"List regions which service has available skus" choices:"dbinstances|servers"`
 
 		City string `help:"List regions in the specified city"`
-
-		Capability []string `help:"capability filter" choices:"project|compute|network|loadbalancer|objectstore|rds|cache|event"`
-
-		DistinctField string `help:"list the specified distinct field, e.g. city, region"`
 	}
 	R(&CloudregionListOptions{}, "cloud-region-list", "List cloud regions", func(s *mcclient.ClientSession, opts *CloudregionListOptions) error {
 		params, err := options.ListStructToParams(opts)
 		if err != nil {
 			return err
 		}
-		if len(opts.DistinctField) > 0 {
-			params.Add(jsonutils.NewString(opts.DistinctField), "extra_field")
-			result, err := modules.Cloudregions.Get(s, "distinct-field", params)
-			if err != nil {
-				return err
-			}
-			fmt.Println(result)
-			return nil
-		}
 		result, err := modules.Cloudregions.List(s, 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/dbinstance_backups.go

@@ -38,11 +38,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		if len(opts.ExportFile) > 0 {
-			exportList(result, opts.ExportFile, opts.ExportKeys, opts.ExportTexts, modules.DBInstanceBackups.GetColumns(s))
-		} else {
-			printList(result, modules.DBInstanceBackups.GetColumns(s))
-		}
+		printList(result, modules.DBInstanceBackups.GetColumns(s))
 		return nil
 	})
 
@@ -84,15 +80,6 @@ func init() {
 		return nil
 	})
 
-	R(&DBInstanceBackupIdOptions{}, "dbinstance-backup-syncstatus", "Sync DB instance backup status", func(s *mcclient.ClientSession, opts *DBInstanceBackupIdOptions) error {
-		result, err := modules.DBInstanceBackups.PerformAction(s, opts.ID, "syncstatus", 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 {

cmd/climc/shell/dbinstances.go

@@ -41,12 +41,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-
-		if len(opts.ExportFile) > 0 {
-			exportList(result, opts.ExportFile, opts.ExportKeys, opts.ExportTexts, modules.DBInstance.GetColumns(s))
-		} else {
-			printList(result, modules.DBInstance.GetColumns(s))
-		}
+		printList(result, modules.DBInstance.GetColumns(s))
 		return nil
 	})
 
@@ -263,24 +258,6 @@ func init() {
 		return nil
 	})
 
-	R(&DBInstanceIdOptions{}, "dbinstance-syncstatus", "Sync status for DB instance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	R(&DBInstanceIdOptions{}, "dbinstance-sync", "Sync conf from cloud dbinstance", func(s *mcclient.ClientSession, opts *DBInstanceIdOptions) error {
-		result, err := modules.DBInstance.PerformAction(s, opts.ID, "sync", 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 {

cmd/climc/shell/devtooltemplate.go

@@ -107,7 +107,7 @@ func init() {
 	R(
 		&options.DevtoolTemplateBindingOptions{},
 		"devtooltemplate-unbind",
-		"UnBinding devtool template to a host/vm",
+		"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))

cmd/climc/shell/disks.go

@@ -133,15 +133,6 @@ func init() {
 		return nil
 	})
 
-	R(&DiskDetailOptions{}, "disk-syncstatus", "Sync status for disk", func(s *mcclient.ClientSession, args *DiskDetailOptions) error {
-		ret, e := modules.Disks.PerformAction(s, args.ID, "syncstatus", nil)
-		if e != nil {
-			return e
-		}
-		printObject(ret)
-		return nil
-	})
-
 	type DiskUpdateOptions struct {
 		ID           string `help:"ID or name of disk"`
 		Name         string `help:"New name of disk"`
@@ -291,14 +282,4 @@ func init() {
 		printObject(srv)
 		return nil
 	})
-
-	R(&DiskDetailOptions{}, "disk-change-owner-candidate-domains", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *DiskDetailOptions) error {
-		result, err := modules.Disks.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 }

cmd/climc/shell/distinctfield.go

@@ -1,48 +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/modulebase"
-)
-
-func init() {
-	type DistinctFieldOption struct {
-		MODULE string `help:"module name"`
-		FIELD  string `help:"distinct field name to query"`
-	}
-	R(&DistinctFieldOption{}, "distinct-field", "Query values of a distinct field for a module", func(s *mcclient.ClientSession, args *DistinctFieldOption) error {
-		mod, err := modulebase.GetModule(s, args.MODULE)
-		if err != nil || mod == nil {
-			if err != nil {
-				return fmt.Errorf("module %s not found %s", args.MODULE, err)
-			}
-			return fmt.Errorf("No module %s found", args.MODULE)
-		}
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.NewString(args.FIELD), "extra_field")
-		result, err := mod.Get(s, "distinct-field", params)
-		if err != nil {
-			return err
-		}
-		fmt.Println(result)
-		return nil
-	})
-}

cmd/climc/shell/domains.go

@@ -83,8 +83,6 @@ func init() {
 		Desc     string `help:"Description"`
 		Enabled  bool   `help:"Set the domain enabled"`
 		Disabled bool   `help:"Set the domain disabled"`
-
-		Displayname string `help:"display name"`
 	}
 	R(&DomainCreateOptions{}, "domain-create", "Create a new domain", func(s *mcclient.ClientSession, args *DomainCreateOptions) error {
 		params := jsonutils.NewDict()
@@ -97,9 +95,6 @@ func init() {
 		} else if !args.Enabled && args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
-		if len(args.Displayname) > 0 {
-			params.Add(jsonutils.NewString(args.Displayname), "displayname")
-		}
 		result, err := modules.Domains.Create(s, params)
 		if err != nil {
 			return err
@@ -115,8 +110,6 @@ func init() {
 		Enabled  bool   `help:"Set the domain enabled"`
 		Disabled bool   `help:"Set the domain disabled"`
 		Driver   string `help:"Set the domain Driver"`
-
-		Displayname string `help:"display name"`
 	}
 	R(&DomainUpdateOptions{}, "domain-update", "Update a domain", func(s *mcclient.ClientSession, args *DomainUpdateOptions) error {
 		obj, err := modules.Domains.Get(s, args.ID, nil)
@@ -143,9 +136,6 @@ func init() {
 		} else if !args.Enabled && args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
-		if len(args.Displayname) > 0 {
-			params.Add(jsonutils.NewString(args.Displayname), "displayname")
-		}
 		result, err := modules.Domains.Patch(s, objId, params)
 		if err != nil {
 			return err

cmd/climc/shell/elasticcache.go

@@ -75,16 +75,6 @@ func init() {
 		return nil
 	})
 
-	R(&options.ElasticCacheIdOptions{}, "elastic-cache-syncstatus", "Sync elastisc cache instance status", func(s *mcclient.ClientSession, opts *options.ElasticCacheIdOptions) error {
-		result, err := modules.ElasticCache.PerformAction(s, opts.ID, "syncstatus", 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 {

cmd/climc/shell/elasticips.go

@@ -170,15 +170,6 @@ func init() {
 		return nil
 	})
 
-	R(&EipSingleOptions{}, "eip-syncstatus", "Synchronize status of an EIP", func(s *mcclient.ClientSession, args *EipSingleOptions) error {
-		result, err := modules.Elasticips.PerformAction(s, args.ID, "syncstatus", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type ServerCreateEipOptions struct {
 		ID         string `help:"server ID or name"`
 		BW         int    `help:"EIP bandwidth in Mbps"`

cmd/climc/shell/endpoints.go

@@ -64,15 +64,14 @@ func init() {
 	})
 
 	type EndpointCreateOptions struct {
-		SERVICE            string `help:"Service ID or Name"`
-		REGION             string `help:"Region"`
-		INTERFACE          string `help:"Interface types" choices:"internal|public|admin|console"`
-		URL                string `help:"URL"`
-		Zone               string `help:"Zone"`
-		Name               string `help:"Name"`
-		Enabled            bool   `help:"Enabled"`
-		Disabled           bool   `help:"Disabled"`
-		ServiceCertificate string `help:"Service certificate id or name"`
+		SERVICE   string `help:"Service ID or Name"`
+		REGION    string `help:"Region"`
+		INTERFACE string `help:"Interface types" choices:"internal|public|admin|console"`
+		URL       string `help:"URL"`
+		Zone      string `help:"Zone"`
+		Name      string `help:"Name"`
+		Enabled   bool   `help:"Enabled"`
+		Disabled  bool   `help:"Disabled"`
 	}
 	R(&EndpointCreateOptions{}, "endpoint-create", "Create endpoint", func(s *mcclient.ClientSession, args *EndpointCreateOptions) error {
 		params := jsonutils.NewDict()
@@ -96,9 +95,6 @@ func init() {
 		} else if !args.Enabled && args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
-		if len(args.ServiceCertificate) > 0 {
-			params.Add(jsonutils.NewString(args.ServiceCertificate), "service_certificate")
-		}
 		ep, err := modules.EndpointsV3.Create(s, params)
 		if err != nil {
 			return err
@@ -108,12 +104,11 @@ func init() {
 	})
 
 	type EndpointUpdateOptions struct {
-		ID                 string `help:"ID or name of endpoint"`
-		Url                string `help:"URL"`
-		Name               string `help:"Name"`
-		Enabled            bool   `help:"Enabled"`
-		Disabled           bool   `help:"Disabled"`
-		ServiceCertificate string `help:"Service certificate id or name"`
+		ID       string `help:"ID or name of endpoint"`
+		Url      string `help:"URL"`
+		Name     string `help:"Name"`
+		Enabled  bool   `help:"Enabled"`
+		Disabled bool   `help:"Disabled"`
 	}
 	R(&EndpointUpdateOptions{}, "endpoint-update", "Update a endpoint", func(s *mcclient.ClientSession, args *EndpointUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -128,9 +123,6 @@ func init() {
 		} else if !args.Enabled && args.Disabled {
 			params.Add(jsonutils.JSONFalse, "enabled")
 		}
-		if len(args.ServiceCertificate) > 0 {
-			params.Add(jsonutils.NewString(args.ServiceCertificate), "service_certificate")
-		}
 		ep, err := modules.EndpointsV3.Patch(s, args.ID, params)
 		if err != nil {
 			return err

cmd/climc/shell/events.go

@@ -34,8 +34,8 @@ type BaseEventListOptions struct {
 	OrderBy    string   `help:"order by specific field"`
 	Action     []string `help:"Log action"`
 
-	User    string `help:"filter by operator user"`
-	Project string `help:"filter by owner project"`
+	User    []string `help:"filter by operator user"`
+	Project []string `help:"filter by owner project"`
 
 	PagingMarker string `help:"marker for pagination"`
 }
@@ -99,10 +99,10 @@ func doEventList(man modulebase.ResourceManager, s *mcclient.ClientSession, args
 		params.Add(jsonutils.NewStringArray(args.Action), "action")
 	}
 	if len(args.User) > 0 {
-		params.Add(jsonutils.NewString(args.User), "user")
+		params.Add(jsonutils.NewStringArray(args.User), "user")
 	}
 	if len(args.Project) > 0 {
-		params.Add(jsonutils.NewString(args.Project), "project")
+		params.Add(jsonutils.NewStringArray(args.Project), "project")
 	}
 	if len(args.Scope) > 0 {
 		params.Add(jsonutils.NewString(args.Scope), "scope")
@@ -216,11 +216,6 @@ func init() {
 		return doIdentityEventList(s, &nargs)
 	})
 
-	R(&TypeEventListOptions{}, "idp-event", "Show operation event logs of keystone identity provider", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
-		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"identity_provider"}}
-		return doIdentityEventList(s, &nargs)
-	})
-
 	R(&TypeEventListOptions{}, "project-event", "Show operation event logs of keystone projects", func(s *mcclient.ClientSession, args *TypeEventListOptions) error {
 		nargs := EventListOptions{BaseEventListOptions: args.BaseEventListOptions, Id: args.ID, Type: []string{"project"}}
 		return doIdentityEventList(s, &nargs)

cmd/climc/shell/globalvpcs.go

@@ -15,8 +15,6 @@
 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"
@@ -50,32 +48,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type GlobalVpcPublicOptions struct {
-		ID            string   `help:"ID or name of global vpc" json:"-"`
-		Scope         string   `help:"sharing scope" choices:"system|domain"`
-		SharedDomains []string `help:"share to domains"`
-	}
-	R(&GlobalVpcPublicOptions{}, "global-vpc-public", "Make global vpc public", func(s *mcclient.ClientSession, args *GlobalVpcPublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.GlobalVpcs.PerformAction(s, args.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type GlobalVpcPrivateOptions struct {
-		ID string `help:"ID or name of global vpc" json:"-"`
-	}
-	R(&GlobalVpcPrivateOptions{}, "global-vpc-private", "Make global vpc private", func(s *mcclient.ClientSession, args *GlobalVpcPrivateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.GlobalVpcs.PerformAction(s, args.ID, "private", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/groups.go

@@ -224,29 +224,4 @@ func init() {
 			printObject(sp)
 			return nil
 		})
-
-	type GroupAddUsersOptions struct {
-		GROUP string   `help:"group Id or Name" json:"-"`
-		USER  []string `help:"list of user id or name" json:"user"`
-	}
-	R(&GroupAddUsersOptions{}, "group-add-users", "Add users into group",
-		func(s *mcclient.ClientSession, args *GroupAddUsersOptions) error {
-			params := jsonutils.Marshal(args)
-			result, err := modules.Groups.PerformAction(s, args.GROUP, "add-users", params)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		})
-	R(&GroupAddUsersOptions{}, "group-remove-users", "Add users into group",
-		func(s *mcclient.ClientSession, args *GroupAddUsersOptions) error {
-			params := jsonutils.Marshal(args)
-			result, err := modules.Groups.PerformAction(s, args.GROUP, "remove-users", params)
-			if err != nil {
-				return err
-			}
-			printObject(result)
-			return nil
-		})
 }

cmd/climc/shell/hosts.go

@@ -18,13 +18,11 @@ import (
 	"fmt"
 
 	"yunion.io/x/jsonutils"
-	"yunion.io/x/log"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/util/fileutils2"
-	"yunion.io/x/onecloud/pkg/util/ssh"
 )
 
 func init() {
@@ -203,36 +201,6 @@ func init() {
 		return nil
 	})
 
-	R(&HostListOptions{}, "host-node-count", "Get host node count", func(s *mcclient.ClientSession, opts *HostListOptions) error {
-		params, err := options.ListStructToParams(opts)
-		if err != nil {
-			return err
-		}
-
-		if opts.Empty {
-			params.Add(jsonutils.JSONTrue, "is_empty")
-		} else if opts.Occupied {
-			params.Add(jsonutils.JSONFalse, "is_empty")
-		}
-		if opts.Enabled {
-			params.Add(jsonutils.NewInt(1), "enabled")
-		} else if opts.Disabled {
-			params.Add(jsonutils.NewInt(0), "enabled")
-		}
-		if len(opts.Uuid) > 0 {
-			params.Add(jsonutils.NewString(opts.Uuid), "uuid")
-		}
-		if len(opts.Sn) > 0 {
-			params.Add(jsonutils.NewString(opts.Sn), "sn")
-		}
-		result, err := modules.Hosts.Get(s, "node-count", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 	type HostUpdateOptions struct {
 		ID                string  `help:"ID or Name of Host"`
 		Name              string  `help:"New name of the host"`
@@ -382,7 +350,7 @@ func init() {
 		return nil
 	})
 
-	R(&HostDetailOptions{}, "host-stop", "Power off host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+	R(&HostDetailOptions{}, "host-stop", "Power on host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
 		result, err := modules.Hosts.PerformAction(s, args.ID, "stop", nil)
 		if err != nil {
 			return err
@@ -696,123 +664,4 @@ func init() {
 		printObject(result)
 		return nil
 	})
-
-	type HostSSHLoginOptions struct {
-		ID   string `help:"ID or name of host"`
-		Port int    `help:"SSH service port" default:"22"`
-	}
-	R(&HostSSHLoginOptions{}, "host-ssh", "SSH login of a host", func(s *mcclient.ClientSession, args *HostSSHLoginOptions) error {
-		srvid, e := modules.Hosts.GetId(s, args.ID, nil)
-		if e != nil {
-			return e
-		}
-		i, e := modules.Hosts.GetLoginInfo(s, srvid, nil)
-		if e != nil {
-			return e
-		}
-		host, err := i.GetString("ip")
-		if err != nil {
-			return err
-		}
-		user, err := i.GetString("username")
-		if err != nil {
-			return err
-		}
-		passwd, err := i.GetString("password")
-		if err != nil {
-			return err
-		}
-		port := 22
-		if args.Port != 22 {
-			port = args.Port
-		}
-		sshCli, err := ssh.NewClient(host, port, user, passwd, "")
-		if err != nil {
-			return err
-		}
-		log.Infof("ssh %s:%d", host, port)
-		if err := sshCli.RunTerminal(); err != nil {
-			return err
-		}
-		return nil
-	})
-
-	type HostChangeOwnerOptions struct {
-		ID            string `help:"ID or name of host" json:"-"`
-		ProjectDomain string `json:"project_domain" help:"target domain"`
-	}
-	R(&HostChangeOwnerOptions{}, "host-change-owner", "Change owner domain of host", func(s *mcclient.ClientSession, args *HostChangeOwnerOptions) error {
-		if len(args.ProjectDomain) == 0 {
-			return fmt.Errorf("empty project_domain")
-		}
-		params := jsonutils.Marshal(args)
-		ret, err := modules.Hosts.PerformAction(s, args.ID, "change-owner", params)
-		if err != nil {
-			return err
-		}
-		printObject(ret)
-		return nil
-	})
-
-	type HostPublicOptions struct {
-		ID            string   `help:"ID or name of host" json:"-"`
-		Scope         string   `help:"sharing scope" choices:"system|domain"`
-		SharedDomains []string `help:"share to domains"`
-	}
-	R(&HostPublicOptions{}, "host-public", "Make a host public", func(s *mcclient.ClientSession, args *HostPublicOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Hosts.PerformAction(s, args.ID, "public", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type HostPrivateOptions struct {
-		ID string `help:"ID or name of host" json:"-"`
-	}
-	R(&HostPrivateOptions{}, "host-private", "Make a host private", func(s *mcclient.ClientSession, args *HostPrivateOptions) error {
-		params := jsonutils.Marshal(args)
-		result, err := modules.Hosts.PerformAction(s, args.ID, "private", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type HostChangeOwnerCandidateDomainsOptions struct {
-		ID string `help:"ID or name of host"`
-	}
-	R(&HostChangeOwnerCandidateDomainsOptions{}, "host-change-owner-candidate-domains", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *HostChangeOwnerCandidateDomainsOptions) error {
-		result, err := modules.Hosts.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
-	type HostAutoMigrateOnHostDownOptions struct {
-		ID      string `help:"ID or name of host"`
-		Enable  bool   `help:"enable auto migrate"`
-		Disable bool   `help:"disable auto migrate"`
-	}
-	R(&HostAutoMigrateOnHostDownOptions{}, "host-auto-migrate-on-host-down", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *HostAutoMigrateOnHostDownOptions) error {
-		params := jsonutils.NewDict()
-		if args.Disable {
-			params.Set("auto_migrate_on_host_down", jsonutils.NewString("disable"))
-		} else if args.Enable {
-			params.Set("auto_migrate_on_host_down", jsonutils.NewString("enable"))
-		} else {
-			return fmt.Errorf("missing input enable or disable")
-		}
-		result, err := modules.Hosts.PerformAction(s, args.ID, "auto-migrate-on-host-down", params)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
 }

cmd/climc/shell/identityproviders.go

@@ -23,7 +23,6 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	"yunion.io/x/onecloud/pkg/util/shellutils"
 )
 
 func init() {
@@ -295,36 +294,4 @@ func init() {
 		return nil
 	})
 
-	type IdentityProviderConfigEditOptions struct {
-		IDP string `help:"identity provider name or ID"`
-	}
-	R(&IdentityProviderConfigEditOptions{}, "idp-config-edit", "Edit config yaml of an identity provider", func(s *mcclient.ClientSession, args *IdentityProviderConfigEditOptions) error {
-		params := jsonutils.NewDict()
-		params.Add(jsonutils.JSONTrue, "sensitive")
-		conf, err := modules.IdentityProviders.GetSpecific(s, args.IDP, "config", params)
-		if err != nil {
-			return err
-		}
-		confJson, err := conf.Get("config")
-		if err != nil {
-			return err
-		}
-		content, err := shellutils.Edit(confJson.YAMLString())
-		if err != nil {
-			return err
-		}
-		yamlJson, err := jsonutils.ParseYAML(content)
-		if err != nil {
-			return err
-		}
-		config := jsonutils.NewDict()
-		config.Add(yamlJson, "config")
-		nconf, err := modules.IdentityProviders.PerformAction(s, args.IDP, "config", config)
-		if err != nil {
-			return err
-		}
-		fmt.Println(nconf.PrettyString())
-		return nil
-	})
-
 }

cmd/climc/shell/images.go

@@ -34,7 +34,6 @@ type ImageOptionalOptions struct {
 	Unprotected        bool     `help:"Allow image to be deleted"`
 	Standard           bool     `help:"Mark image as a standard image"`
 	Nonstandard        bool     `help:"Mark image as a non-standard image"`
-	Public             bool     `help:"make image public"`
 	MinDisk            int64    `help:"Disk size after expanded, in MB" metavar:"MIN_DISK_SIZE_MB"`
 	MinRam             int64    `help:"Minimal memory size required" metavar:"MIN_RAM_MB"`
 	VirtualSize        int64    `help:"Disk size after expanded, in MB"`
@@ -51,13 +50,14 @@ type ImageOptionalOptions struct {
 	OsLang             string   `help:"OS Language" choices:"zh_CN|en_US"`
 	Preference         int64    `help:"Disk preferences"`
 	Notes              string   `help:"Notes about the image"`
-	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container|openstack|ctyun"`
+	Hypervisor         []string `help:"Prefer hypervisor type" choices:"kvm|esxi|baremetal|container"`
 	DiskDriver         string   `help:"Perfer disk driver" choices:"virtio|scsi|pvscsi|ide|sata"`
 	NetDriver          string   `help:"Preferred network driver" choices:"virtio|e1000|vmxnet3"`
 }
 
 func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDict, args ImageOptionalOptions) error {
 	if len(args.Format) > 0 {
+		params.Add(jsonutils.NewString("bare"), "container-format")
 		params.Add(jsonutils.NewString(args.Format), "disk-format")
 	}
 	if args.Protected && !args.Unprotected {
@@ -70,9 +70,6 @@ func addImageOptionalOptions(s *mcclient.ClientSession, params *jsonutils.JSONDi
 	} else if !args.Standard && args.Nonstandard {
 		params.Add(jsonutils.JSONFalse, "is_standard")
 	}
-	if args.Public {
-		params.Add(jsonutils.JSONTrue, "is_public")
-	}
 	if args.MinDisk > 0 {
 		params.Add(jsonutils.NewString(fmt.Sprintf("%d", args.MinDisk)), "min_disk")
 	}
@@ -143,7 +140,6 @@ func init() {
 		Protected  string   `help:"filter images by protected" choices:"true|false"`
 		IsUefi     bool     `help:"list uefi image"`
 		Format     []string `help:"Disk formats"`
-		SubFormats []string `help:"Sub formats"`
 		Name       string   `help:"Name filter"`
 	}
 	R(&ImageListOptions{}, "image-list", "List images", func(s *mcclient.ClientSession, args *ImageListOptions) error {
@@ -174,14 +170,15 @@ func init() {
 			params.Add(jsonutils.NewString(args.Name), "name")
 		}
 		if len(args.Format) > 0 {
-			fs := jsonutils.NewArray()
-			for _, f := range args.Format {
-				fs.Add(jsonutils.NewString(f))
+			if len(args.Format) == 1 {
+				params.Add(jsonutils.NewString(args.Format[0]), "disk_format")
+			} else {
+				fs := jsonutils.NewArray()
+				for _, f := range args.Format {
+					fs.Add(jsonutils.NewString(f))
+				}
+				params.Add(fs, "disk_formats")
 			}
-			params.Add(fs, "disk_formats")
-		}
-		if len(args.SubFormats) > 0 {
-			params.Add(jsonutils.Marshal(args.SubFormats), "sub_formats")
 		}
 		result, err := modules.Images.List(s, params)
 		if err != nil {
@@ -247,6 +244,22 @@ func init() {
 		return nil
 	})
 
+	type ImageMembershipOptions struct {
+		IMAGE   string `help:"ID or name of image to share"`
+		PROJECT string `help:"ID or name of project to share image with"`
+	}
+	type ImageMembershipAddOptions struct {
+		ImageMembershipOptions
+		CanShare bool `help:"Indicating whether the project can share the image with others"`
+	}
+	R(&ImageMembershipAddOptions{}, "image-add-project", "Add a project to private image's membership list", func(s *mcclient.ClientSession, args *ImageMembershipAddOptions) error {
+		return modules.Images.AddMembership(s, args.IMAGE, args.PROJECT, args.CanShare)
+	})
+
+	R(&ImageMembershipOptions{}, "image-remove-project", "Remove a project from private image's membership list", func(s *mcclient.ClientSession, args *ImageMembershipOptions) error {
+		return modules.Images.RemoveMembership(s, args.IMAGE, args.PROJECT)
+	})
+
 	type ImageDetailOptions struct {
 		ID string `help:"Image ID or name"`
 	}
@@ -265,6 +278,19 @@ func init() {
 		return nil
 	})
 
+	R(&ImageDetailOptions{}, "image-list-project", "List image members", func(s *mcclient.ClientSession, args *ImageDetailOptions) error {
+		imgId, e := modules.Images.GetId(s, args.ID, nil)
+		if e != nil {
+			return e
+		}
+		result, e := modules.Images.ListMemberProjects(s, imgId)
+		if e != nil {
+			return e
+		}
+		printList(result, modules.Projects.GetColumns(s))
+		return nil
+	})
+
 	type ImageCancelDeleteOptions struct {
 		ID string `help:"Image id or name" metavar:"IMAGE"`
 	}
@@ -390,12 +416,14 @@ func init() {
 
 	type ImagePublicOptions struct {
 		ID             []string `help:"ID or name of image" json:"-"`
-		Scope          string   `help:"sharing scope" choices:"system|domain|project"`
-		SharedProjects []string `help:"Share to projects"`
-		SharedDomains  []string `help:"Share to domains"`
+		Scope          string   `help:"sharing scope" choices:"system|domain"`
+		ShareToProject []string `help:"Share to prject"`
 	}
 	R(&ImagePublicOptions{}, "image-public", "Make a image public", func(s *mcclient.ClientSession, args *ImagePublicOptions) error {
-		params := jsonutils.Marshal(args)
+		params, err := options.StructToParams(args)
+		if err != nil {
+			return err
+		}
 		if len(args.ID) == 0 {
 			return fmt.Errorf("No image ID provided")
 		} else if len(args.ID) == 1 {

cmd/climc/shell/itsm_histroic_process_instance.go

@@ -68,7 +68,7 @@ func init() {
 	type HistoricProcessInstanceStaticticsOptions struct {
 		ID string `help:"ID of user"`
 	}
-	R(&HistoricProcessInstanceStaticticsOptions{}, "historic-process-instance-statistics", "Show statistics for historic process instance", func(s *mcclient.ClientSession, args *HistoricProcessInstanceStaticticsOptions) error {
+	R(&HistoricProcessInstanceStaticticsOptions{}, "historic-process-instance-statistics", "Delete all contacts for the user", func(s *mcclient.ClientSession, args *HistoricProcessInstanceStaticticsOptions) error {
 		params := jsonutils.NewDict()
 		params.Add(jsonutils.NewString(args.ID), "user_id")
 

cmd/climc/shell/k8s/secret.go

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

cmd/climc/shell/keypairs.go

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

cmd/climc/shell/loadbalancerclusters.go

@@ -65,7 +65,7 @@ func init() {
 		printList(result, modules.LoadbalancerClusters.GetColumns(s))
 		return nil
 	})
-	R(&options.LoadbalancerClusterDeleteOptions{}, "lbcluster-delete", "Delete lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterDeleteOptions) error {
+	R(&options.LoadbalancerClusterDeleteOptions{}, "lbcluster-delete", "Show lbcluster", func(s *mcclient.ClientSession, opts *options.LoadbalancerClusterDeleteOptions) error {
 		lbagent, err := modules.LoadbalancerClusters.Delete(s, opts.ID, nil)
 		if err != nil {
 			return err

cmd/climc/shell/loadbalancers.go

@@ -99,13 +99,4 @@ func init() {
 		return nil
 	})
 
-	R(&options.LoadbalancerGetOptions{}, "lb-change-owner-candidate-domains", "Get change owner candidate domain list", func(s *mcclient.ClientSession, args *options.LoadbalancerGetOptions) error {
-		result, err := modules.Loadbalancers.GetSpecific(s, args.ID, "change-owner-candidate-domains", nil)
-		if err != nil {
-			return err
-		}
-		printObject(result)
-		return nil
-	})
-
 }

cmd/climc/shell/metadata.go

@@ -16,7 +16,6 @@ package shell
 
 import (
 	"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"
 )
@@ -44,12 +43,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		listResult := modulebase.ListResult{}
-		err = result.Unmarshal(&listResult)
-		if err != nil {
-			return err
-		}
-		printList(&listResult, []string{})
+		printObject(result)
 		return nil
 	})
 

cmd/climc/shell/monitor/alert.go

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

cmd/climc/shell/monitor/alertnotification.go

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