fix(baremetal): try clear jbod devices before create (#14179)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>

.circleci/config.yml

@@ -3,11 +3,22 @@
 # Check https://circleci.com/docs/2.0/language-go/ for more details
 version: 2
 jobs:
-  test:
+  check:
+    docker:
+      - image: yunionio/centos-build:1.1-4
+        environment:
+          ONECLOUD_CI_BUILD: "1"
+    working_directory: /root/go/src/yunion.io/x/onecloud
+    steps:
+      - checkout
+      - run:
+          command: |
+            make -j3 check
+  build:
     requires:
       - check
     docker:
-      - image: yunion/centos-build:go-1.18.3-0
+      - image: yunionio/centos-build:1.1-4
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -16,21 +27,58 @@ jobs:
     ####   /go/src/github.com/circleci/go-tool
     ####   /go/src/bitbucket.org/circleci/go-tool
     working_directory: /root/go/src/yunion.io/x/onecloud
-    resource_class: large
-    parallelism: 1
+    parallelism: 4
     steps:
       - checkout
+      - restore_cache:
+          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /root/.cache/go-build
       - run:
           command: |
-            make -j3 check
-            make test
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make $targets
+            make -j2 $targets
             ls -lh _output/bin/
+      - save_cache:
+          key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /root/.cache/go-build
+      - store_artifacts:
+          path: _output/
+
+  test:
+    requires:
+      - check
+    docker:
+      - image: yunionio/centos-build:1.1-4
+        environment:
+          ONECLOUD_CI_BUILD: "1"
+    working_directory: /root/go/src/yunion.io/x/onecloud
+    parallelism: 4
+    steps:
+      - checkout
+      - restore_cache:
+          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /root/.cache/go-build
+      - run:
+          name: unit_test
+          command: |
+            ./scripts/coverage.sh --codecov
+      - save_cache:
+          key: onecloud-test-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
+          paths:
+            - /root/.cache/go-build
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - test
+      - check
+      - build:
+          requires:
+            - check
+      - test:
+          requires:
+            - check

.github/workflows/docker.yml

@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.16
+    - name: Set up Go 1.14
       uses: actions/setup-go@v1
       with:
-        go-version: 1.16
+        go-version: 1.14
       id: go
 
     - name: Check out code into the Go module directory

.gitignore

@@ -41,5 +41,3 @@ pkg/generated
 
 # gotext extracted
 out.gotext.json
-
-pkg/notify/sender/email_test.go

Makefile

@@ -49,7 +49,7 @@ 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 -lgnutls -lnettle -L ${LIBQEMUIO_PATH}/src
+		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
 export GOOS ?= linux
@@ -86,8 +86,8 @@ test:
 vet:
 	go vet ./...
 
-# cmd/esxi-agent: prepare_dir
-# 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+cmd/esxi-agent: prepare_dir
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
 cmd/fetcherfs: prepare_dir
 	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
@@ -241,25 +241,10 @@ y18n-check:
 
 .PHONY: y18n-check
 
-define hostdeployer-grpc-gen
-	set -o errexit; \
-	set -o pipefail; \
-	protoc -I pkg/hostman/hostdeployer/apis \
-		--go_out=pkg/hostman/hostdeployer/apis \
-		--go_opt=paths=source_relative \
-		--go-grpc_out=pkg/hostman/hostdeployer/apis \
-		--go-grpc_opt=paths=source_relative \
-		pkg/hostman/hostdeployer/apis/deploy.proto
-
-endef
-
-hostdeployer-grpc-gen:
-	$(hostdeployer-grpc-gen)
-
 check: fmt-check
 check: gendocgo-check
 check: goimports-check
-#check: vet-check
+check: vet-check
 #check: y18n-check
 .PHONY: check
 
@@ -282,12 +267,9 @@ dep:
 	@echo "$$depDeprecated"
 	@$(MAKE) mod
 
-RELEASE_BRANCH:=release/3.10
-GOPROXY ?= direct
-
 mod:
-	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d yunion.io/x/cloudmux@$(RELEASE_BRANCH)
-	GOPROXY=$(GOPROXY) GONOSUMDB=yunion.io/x go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v '/cloudmux$$'))
+	go get -d $(patsubst %,%@master,$(shell GO111MODULE=on go mod edit -print  | sed -n -e 's|.*\(yunion.io/x/[a-z].*\) v.*|\1|p' | grep -v sqlchemy))
+	go get -d yunion.io/x/sqlchemy@v1.0.2
 	go mod tidy
 	go mod vendor -v
 
@@ -349,7 +331,7 @@ image:
 .PHONY: image
 
 image-telegraf-raid-plugin:
-	VERSION=release-1.6.4 ARCH=all make image telegraf-raid-plugin
+	VERSION=release-1.6.3 ARCH=all make image telegraf-raid-plugin
 
 %:
 	@:

Makefile.common.mk

@@ -4,12 +4,12 @@ __inc_Makefile_common_mk:=1
 ifeq ($(ModName),)
   $(error ModName must be set, e.g. yunion.io/x/onecloud)
 endif
-
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:3.16.0-go-1.18.2-0
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:go-1.18.3-0
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-5
+DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-5
+
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))
 
@@ -17,7 +17,6 @@ define dockerCentOSBuildCmd
 set -o xtrace
 set -o errexit
 set -o pipefail
-git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
 cd /root/go/src/yunion.io/x/$(ModBaseName)
 env \
 	$(call EnvIf,GOARCH) \
@@ -27,14 +26,12 @@ env \
 chown -R $(shell id -u):$(shell id -g) _output
 endef
 
-tmpName=$(ModBaseName)-$(shell date +"%Y%m%d.%H%M%S%3N")
-
 docker-centos-build: export dockerCentOSBuildCmd:=$(call dockerCentOSBuildCmd,$(F))
 docker-centos-build:
-	docker rm --force docker-centos-build-$(tmpName) &>/dev/null || true
+	docker rm --force docker-centos-build-$(ModBaseName) &>/dev/null || true
 	docker run \
 		--rm \
-		--name docker-centos-build-$(tmpName) \
+		--name docker-centos-build-$(ModBaseName) \
 		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
 		-v $(CURDIR)/_output/centos-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
 		-v $(CURDIR)/_output/centos-build/_cache:/root/.cache \
@@ -45,7 +42,7 @@ docker-centos-build:
 # 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 stop --time 0 docker-centos-build-$(tmpName) || true
+	docker stop --time 0 docker-centos-build-$(ModBaseName) || true
 
 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop
@@ -55,9 +52,7 @@ define dockerAlpineBuildCmd
 set -o xtrace
 set -o errexit
 set -o pipefail
-git config --global --add safe.directory /root/go/src/yunion.io/x/$(ModBaseName)
 cd /root/go/src/yunion.io/x/$(ModBaseName)
-git config --global --add safe.directory /root/go/src/yunion.io/x/onecloud
 env \
 	$(call EnvIf,GOARCH) \
 	$(call EnvIf,GOOS) \
@@ -68,10 +63,10 @@ endef
 
 docker-alpine-build: export dockerAlpineBuildCmd:=$(call dockerAlpineBuildCmd,$(F))
 docker-alpine-build:
-	docker rm --force docker-alpine-build-$(tmpName) &>/dev/null || true
+	docker rm --force docker-alpine-build-$(ModBaseName) &>/dev/null || true
 	docker run \
 		--rm \
-		--name docker-alpine-build-$(tmpName) \
+		--name docker-alpine-build-$(ModBaseName) \
 		-v $(CURDIR):/root/go/src/yunion.io/x/$(ModBaseName) \
 		-v $(CURDIR)/_output/alpine-build:/root/go/src/yunion.io/x/$(ModBaseName)/_output \
 		-v $(CURDIR)/_output/alpine-build/_cache:/root/.cache \
@@ -80,7 +75,7 @@ docker-alpine-build:
 	ls -lh _output/alpine-build/bin
 
 docker-alpine-build-stop:
-	docker stop --time 0 docker-alpine-build-$(tmpName) || true
+	docker stop --time 0 docker-alpine-build-$(ModBaseName) || true
 
 .PHONY: docker-alpine-build
 .PHONY: docker-alpine-build-stop

README-CN.md

@@ -21,184 +21,16 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 ## 功能
 
-### 概览 & UI 展示
-
-<details>
-  <summary>管理多云资源的功能，可以管理大多数的主流云，包括私有云，例如OpenStack，以及公有云，例如AWS，Azure，GCP，阿里云，华为云和腾讯云等</summary>
-  <ul>
-    <li>
-      <p>云帐号纳管</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
-    </li>
-    <li>
-      <p>云帐号列表</p>
-      <img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
-    </li>
-    <li>
-      <p>公有云虚拟机列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  一个可以管理海量KVM虚拟机的轻量级私有云
-  </summary>
-  <ul>
-    <li>
-      <p>虚拟机列表</p>
-      <img src="https://i.imgur.com/DbkRUoo.png">
-    </li>
-    <li>
-      <p>虚拟机创建页面</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
-    </li>
-    <li>
-      <p>虚拟机可通过 VNC 或者 SSH 登录</p>
-      <img src="https://i.imgur.com/m0rkeQ3.png">
-    </li>
-    <li>
-      <p>宿主机列表</p>
-      <img src="https://imgur.com/i509t5a.png">
-    </li>
-    <li>
-      <p>镜像模板列表</p>
-      <img src="https://imgur.com/UVFLGi2.png">
-    </li>
-    <li>
-      <p>VPC列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>二层网络列表（经典网络）</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
-    </li>
-    <li>
-      <p>IP子网列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
-    </li> 
-    <li>
-      <p>弹性公网IP列表（VPC网络）</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>LB列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  一个能进行物理机全生命周期管理的裸机云
-  </summary>
-  <ul>
-    <li>
-      <p>物理机列表</p>
-      <img src="https://i.imgur.com/Jz8b5nC.png">
-    </li>
-    <li>
-      <p>物理机纳管</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
-    </li>
-    <li>
-      <p>安装操作系统</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
-    </li>
-    <li>支持 ARM64 的物理机服务器</li>
-  </ul>
-</details>
-
-<details>
-  <summary>一套完整的多租户认证和访问控制体系</summary>
-  <ul>
-    <li>
-      <p>支持本地sql、LDAP 等认证源</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
-    </li>
-    <li>
-      <p>多租户系统，包括域，项目，组，用户，角色和权限等</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  实现了VMware vSphere虚拟化集群的自助服务和自动化
-  </summary>
-  <ul>
-    <li>
-      <p>添加VMware云账号</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
-    </li>
-    <li>
-      <p>VMware云账号列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
-    </li>
-    <li>
-      <p>自动创建二层网络</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
-    </li>
-    <li>
-      <p>自动创建IP子网</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
-    </li>
-    <li>
-      <p>新建VMware虚拟机</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
-    </li>
-  </ul>
-</details>
-
-
-<details>
-  <summary>
-  允许以统一的联邦身份访问各个云平台的原生控制台的SSO
-  </summary>
-  <ul>
-    <li>
-      <p>为云账号开启免密登录（以阿里云为例）</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
-    </li>
-    <li>
-      <p>将Cloudpods平台用户添加为免密登录用户</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
-    </li>
-    <li>
-      <p>多云统一登录入口</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
-    </li>
-    <li>
-      <p>多云统一登录-免密登录用户列表</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
-    </li>
-    <li>
-      <p>Cloudpods平台用户免密登录阿里云</p>
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
-  </summary>
-</details>
-
-<details>
-  <summary>
-  自动将镜像转换为不同云平台需要的格式的多云镜像服务
-  </summary>
-</details>
+Cloudpods提供了如下的功能：
 
+* 管理多云资源的功能，可以管理大多数的主流云，包括私有云，例如OpenStack，以及公有云，例如AWS，Azure，GCP，阿里云，华为云和腾讯云等
+* 允许以统一的联邦身份访问各个云平台的原生控制台的SSO
+* 一个可以管理海量KVM虚拟机的轻量级私有云
+* 一个能进行物理机全生命周期管理的裸机云
+* 实现了VMware vSphere虚拟化集群的自助服务和自动化
+* 一套功能丰富、统一一致的RESTAPI和模型访问以上的云资源和功能
+* 一套完整的多租户认证和访问控制体系
+* 自动将镜像转换为不同云平台需要的格式的多云镜像服务
 
 ### 支持的云平台
 
@@ -210,17 +42,15 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
   * 华为云
   * 腾讯云
   * UCloud
-  * 天翼云
-  * 移动云
+  * 中国电信云
+  * 中国移动云
   * 京东云
 * 私有云:
   * OpenStack
   * ZStack
-  * Alibaba Cloud Aspara (阿里飞天)
-  * Huawei HCSO (华为HCSO)
-  * Nutanix
+  * AlibabaCloud Aspara (阿里飞天)
 * 本地基础设施资源:
-  * 基于 KVM 实现的轻量级私有云
+  * KVM
   * VMWare vSphere vCenter/ESXi
   * Baremetals (IPMI, Redfish API)
   * Object storages (Minio, Ceph, XSky)
@@ -237,13 +67,50 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 * DNS: DNS zones, DNS records
 * VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
-## 安装部署
+## 快速开始
 
-- [All in One 安装](https://www.cloudpods.org/zh/docs/quickstart/allinone/)：在 CentOS 7 或 Debian 10 等发行版里搭建全功能 Cloudpods 服务，可以快速体验**内置私有云**和**多云管理**的功能。
-- [Kubernetes Helm 安装](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：在已有 Kubernetes 集群上通过 Helm 部署一套 Cloudpods CMP 服务，可以体验**多云管理**的功能。
-- [Docker Compose 安装](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：通过 Docker Compose 部署 Cloudpods CMP 服务，可以迅速体验**多云管理**的功能。
-- [高可用安装](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：在生产环境中使用高可用的方式部署 Cloudpods 服务，包括**内置私有云**和**多云管理**的功能。
+我们可以通过以下简单三步将Cloudpods安装在一台至少8GiB内存和100GB硬盘的Linux主机上（目前CentOS 7和Debian 10经过充分测试）
 
+(下面假设该主机的IP为 *10.168.26.216*)
+
+### 1. 准备SSH免密登录
+
+```bash
+# Generate the local ssh keypair
+# (SKIP this stekp if you already have ~/.ssh/id_rsa.pub locally)
+$ ssh-keygen
+# Copy the generated ~/.ssh/id_rsa.pub public key to the machine to be deployed
+$ ssh-copy-id -i ~/.ssh/id_rsa.pub root@10.168.26.216
+# Try to login to the machine to be deployed without password,
+# should be able to get the hostname of the deployed machine
+# without entering the login password
+$ ssh root@10.168.26.216 "hostname"
+```
+
+### 2. 安装git和相关工具
+
+#### CentOS 7安装git和epel源
+```bash
+yum install -y git epel-release
+```
+
+#### Debian 10安装git
+```bash
+apt install -y git
+```
+
+### 3. 安装Cloudpods
+
+通过以下命令开始安装Cloudpods：
+
+```bash
+# Git clone the ocboot installation tool locally
+$ git clone https://github.com/yunionio/ocboot && cd ./ocboot && ./run.py 10.168.26.216
+```
+
+大概10-30分钟后，安装完成。访问 https://10.168.26.216 登入Cloudpods的Web控制台。初始的账号为 *admin* ，密码为 *admin@123*
+
+请参考文档 [快速开始](https://www.cloudpods.org/zh/docs/quickstart/) 获得更详细的安装指导。
 
 ## 文档
 
@@ -259,7 +126,7 @@ Cloudpods是一个开源的Golang实现的云原生的融合多云/混合云的
 
 您可以通过如下方式联系我们：
 
-* [服务订阅](https://www.yunion.cn/subscription/index.html)
+* Reddit: [r/Cloudpods](https://www.reddit.com/r/Cloudpods/)
 
 * 哔哩哔哩: [Cloudpods](https://space.bilibili.com/623431553/)
 

README.md

@@ -23,186 +23,14 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 
 ## Features
 
-### Summary & UI
-
-<details>
-  <summary>
-  Multi-cloud management that is able to manage a wide range of cloud providers, including private cloud, such as OpenStack, and public clouds, such as AWS, Azure, Google Cloud, Alibaba Cloud, Tencent Cloud, Huawei Cloud, etc.
-  </summary>
-  <ul>
-    <li>
-      <p>Cloud account create form</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudselect.png" alt="multi cloud management">
-    </li>
-    <li>
-      <p>Cloud accounts list</p>
-      <img src="https://i.imgur.com/Q0LipfI.png" alt="cloud account list">
-    </li>
-    <li>
-      <p>Multi public cloud VM list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/publicvmlist.png">
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  A light-weight private cloud that manages KVM hypervisor in scale
-  </summary>
-  <ul>
-    <li>
-      <p>VM instances list</p>
-      <img src="https://i.imgur.com/DbkRUoo.png">
-    </li>
-    <li>
-      <p>Create VM instance form</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createkvmvm2.png">
-    </li>
-    <li>
-      <p>VNC and SSH login page</p>
-      <img src="https://i.imgur.com/m0rkeQ3.png">
-    </li>
-    <li>
-      <p>Host list</p>
-      <img src="https://imgur.com/i509t5a.png">
-    </li>
-    <li>
-      <p>Image template list</p>
-      <img src="https://imgur.com/UVFLGi2.png">
-    </li>
-    <li>
-      <p>VPC list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>Wire list (Classic Network)</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/wirelist.png">
-    </li>
-    <li>
-      <p>IPsubnet list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/ipsubnetlist.png">
-    </li> 
-    <li>
-      <p>Eip list (VPC Network)</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vpclist.png">
-    </li>
-    <li>
-      <p>LB list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/lblist.png">
-    </li>   
-  </ul>
-</details>
-
-<details>
-  <summary>
-  A BareMetal cloud that automates the full life-cycle management of baremetal physical machines
-  </summary>
-  <ul>
-    <li>
-      <p>BareMetal list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/physicalmachinelist.png">
-    </li>
-    <li>
-      <p>Baremetal Management</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addphysicalmachine.png">
-    </li>
-    <li>
-      <p>Create OS on BareMetal</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createbaremetal.png">
-    </li>
-    <li>ARM64 baremetal supported</li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  A complete multi-tenancy RBAC-enabled IAM (identity and access management) system
-  </summary>
-  <ul>
-    <li>
-      <p>sql, LDAP supported</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/idplist.png">
-    </li>
-    <li>
-      <p>Multi-tenancy system, include domain, project, group, user, role, policy</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/domainlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/projectlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/grouplist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/userlist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/rolelist.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/policylist.png">
-  </ul>
-</details>
-
-<details>
-  <summary>
-  VMware vSphere management that enables self-service and automation
-  </summary>
-  <ul>
-    <li>
-      <p>Add VMware account</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmware.png">
-    </li>
-    <li>
-      <p>VMware account list</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarelist.png">
-    </li>
-    <li>
-      <p>Automatic creation of wire</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwarewirelist.png">
-    </li>
-    <li>
-      <p>Automatic creation of ipsubnet</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/vmwareipsubnetlist.png">
-    </li>
-    <li>
-      <p>Create a VMware VM instance</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm1.png">
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/createvmwarevm2.png">
-    </li>
-  </ul>
-</details>
-
-
-<details>
-  <summary>
-  Cloud SSO that allows accessing native webconsole of cloud providers with unified federated identities
-  </summary>
-  <ul>
-    <li>
-      <p>Enable the SSO login function of the cloud account (aliyun as an example)</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/enablecloudsso.png">
-    </li>
-    <li>
-      <p>create saml users</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/addsamluser.png">
-    </li>
-    <li>
-      <p>Cloud SSO entry</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudssoentry.png">
-    </li>
-    <li>
-      <p>Cloud SSO - SSO login user</p>
-      <img src="https://www.cloudpods.org/zh/docs/introduce/ui/images/cloudsamluser.png">
-    </li>
-    <li>
-      <p>Sign in to the public cloud platform with SSO</p>
-    </li>
-  </ul>
-</details>
-
-<details>
-  <summary>
-  One set of feature-rich APIs to access a wide range of resources from cloud providers above with consistent models and APIs
-  </summary>
-</details>
-
-<details>
-  <summary>
-  Multi-cloud image management system that automates image conversion between different cloud providers
-  </summary>
-</details>
+* Multi-cloud management that is able to manage a wide range of cloud providers, including private cloud, such as OpenStack, and public clouds, such as AWS, Azure, Google Cloud, Alibaba Cloud, Tencent Cloud, Huawei Cloud, etc.
+* Cloud SSO that allows accessing native webconsole of cloud providers with unified federated identities
+* A light-weight private cloud that manages KVM hypervisor in scale
+* A BareMetal cloud that automates the full life-cycle management of baremetal physical machines
+* VMware vSphere management that enables self-service and automation
+* One set of feature-rich APIs to access a wide range of resources from cloud providers above with consistent models and APIs
+* A complete multi-tenancy RBAC-enabled IAM (identity and access management) system
+* Multi-cloud image management system that automates image conversion between different cloud providers
 
 ### Supported cloud providers
 
@@ -220,11 +48,9 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 * Private Clouds:
   * OpenStack
   * ZStack
-  * Alibaba Cloud Aspara
-  * Huawei HCSO
-  * Nutanix
+  * AlibabaCloud Aspara
 * On-premise resources:
-  * Lightweight private cloud built on KVM
+  * KVM
   * VMWare vSphere vCenter/ESXi
   * Baremetals (IPMI, Redfish API)
   * Object storages (Minio, Ceph, XSky)
@@ -241,12 +67,53 @@ Cloudpods is a cloud-native open source unified multi/hybrid-cloud platform deve
 * DNS: DNS zones, DNS records
 * VPC: VPCs, VPC peering, inter-VPC network, NAT gateway, DNAT/SNAT rules, route tables, route entries
 
-## Getting started
+## Quick start
 
-- [All in One Installation](https://www.cloudpods.org/zh/docs/quickstart/allinone/)：Building a full-featured Cloudpods service on linux distributions such as CentOS 7 or Debian 10 allows for a quick experience of the **built-in private cloud** and **multi-cloud management** features.
-- [Kubernetes Helm Installation](https://www.cloudpods.org/zh/docs/quickstart/k8s/)：Deploying the Cloudpods CMP service on an existing Kubernetes cluster using Helm and experience the **multi-cloud management** feature.
-- [Docker Compose Installation](https://www.cloudpods.org/zh/docs/quickstart/docker-compose/)：Deploying the Cloudpods CMP service using Docker Compose and quickly experience the **multi-cloud management** feature.
-- [High availability installation](https://www.cloudpods.org/zh/docs/setup/ha-ce/)：Deploying Cloudpods services in a highly available manner for production environments, including **built-in private cloud** and **multi-cloud management** features.
+You may install Cloudpods in a Linux box (currently CentOS 7 and Debian 10 are fully tested) with at least 8GiB RAM and 100GB storage by following three steps.
+
+(Assuming that you install Cloudpods on a Linux box with IP *10.168.26.216*):
+
+
+### 1. Prepare passwordless SSH login
+
+```bash
+# Generate a local ssh keypair
+# (SKIP this step if you already have ~/.ssh/id_rsa.pub locally)
+$ ssh-keygen
+
+# Copy the generated ~/.ssh/id_rsa.pub public key to the machine to be deployed
+$ ssh-copy-id -i ~/.ssh/id_rsa.pub root@10.168.26.216
+
+# Try to login to the machine to be deployed without password,
+# should be able to get the hostname of the deployed machine
+# without entering the login password
+$ ssh root@10.168.26.216 "hostname"
+```
+
+### 2. Install git and relevant tools
+
+#### For CentOS 7
+```bash
+yum install -y git epel-release
+```
+
+#### For Debian 10
+```bash
+apt install -y git
+```
+
+### 3. Install Cloudpods
+
+Run the following commands to start installing Cloudpods.
+
+```bash
+# Git clone the ocboot installation tool locally
+$ git clone https://github.com/yunionio/ocboot && cd ./ocboot && ./run.py 10.168.26.216
+```
+
+It takes 10-30 minutes to finish the installation. You may visit the webconsole of Cloudpods at https://10.168.26.216. The initial login account is *admin* and password is *admin@123*.
+
+For more detailed instructions, please refers to [quick start](https://www.cloudpods.org/en/docs/quickstart/).
 
 
 ## Documentations
@@ -264,7 +131,7 @@ Please check this [issue](https://github.com/yunionio/cloudpods/issues/11427) fo
 
 You may contact us by:
 
-* [Subscription](https://www.yunion.cn/subscription/index.html)
+* Reddit: [r/Cloudpods](https://www.reddit.com/r/Cloudpods/)
 
 * Bilibili: [Cloudpods](https://space.bilibili.com/623431553/)
 

build/build.sh

@@ -44,12 +44,7 @@ echo "Build root ${BUILDROOT}"
 if [ -z "$VERSION" ]; then
 	TAG=$(git describe --abbrev=0 --tags || echo testing)
 	VERSION=${TAG/\//-}
-	if [[ "$VERSION" =~ ^v0. ]]; then
-		VERSION=${VERSION/v0./}
-	elif [[ "$VERSION" =~ ^v ]]; then
-		VERSION=${VERSION/v/}
-	fi
-	VERSION=${VERSION//-/.}
+	VERSION=${VERSION/v/}
 fi
 RELEASE=`date +"%y%m%d%H"`
 

build/build_deb.sh

@@ -48,9 +48,7 @@ mkdir -p $BUILDROOT/DEBIAN
 mkdir -p $BUILDROOT/$BIN_PATH
 
 cp -rf $BIN $BUILDROOT/$BIN_PATH
-if [ -d $ROOT/root ]; then
-    cp -rf $ROOT/root/* $BUILDROOT/
-fi
+cp -rf $ROOT/root/* $BUILDROOT/
 
 
 echo "Build root ${BUILDROOT}"

build/docker/Dockerfile.ansibleserver

@@ -1,7 +1,7 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.1.1
+FROM registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver-base:v1.0.5-2
 
 # install playbook and telegraf install pkg
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/playbook /opt/yunion/playbook
-COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.4.0 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/playbook /opt/yunion/playbook
+COPY --from=registry.cn-beijing.aliyuncs.com/yunionio/file-repo:v0.3.4 /opt/yunion/ansible-install-pkg /opt/yunion/ansible-install-pkg
 
 ADD ./_output/alpine-build/bin/ansibleserver /opt/yunion/bin/ansibleserver

build/docker/Dockerfile.ansibleserver-base

@@ -4,8 +4,6 @@ MAINTAINER "Yousong Zhou <zhouyousong@yunionyun.com>"
 
 ENV TZ UTC
 
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
-
 # openssh-client, for ansible ssh connection
 # git, ca-certificates, for fetching ansible roles
 RUN set -x \
@@ -13,8 +11,5 @@ RUN set -x \
 	&& apk add openssh-client \
 	&& apk add sshpass \
 	&& apk add ansible \
-    && apk add py3-pip \
 	&& apk add tzdata git ca-certificates \
 	&& rm -rf /var/cache/apk/*
-
-RUN pip3 install pywinrm

build/docker/Dockerfile.apimap

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

build/docker/Dockerfile.baremetal-agent

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

build/docker/Dockerfile.baremetal-base

@@ -1,36 +1,10 @@
-#FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
-#RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
+FROM --platform=linux/amd64 registry.cn-beijing.aliyuncs.com/yunionio/centos-build:1.1-4 as build
+RUN yum install -y https://iso.yunion.cn/vm-images/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
 #RUN yum install -y http://192.168.23.50:8083/baremetal-pxerom-1.1.0-21092209.x86_64.rpm
-FROM registry.cn-beijing.aliyuncs.com/yunionio/yunionos:v0.1.8-20230221.2 as yunionos
-
-FROM centos:8 as grub-stage
-
-RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
-RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
-RUN dnf install -y grub2*
-
-# make grub_booti386 firmware
-RUN grub2-mkimage -d /usr/lib/grub/i386-pc/ -O i386-pc-pxe -o /root/grub_booti386 -p '/grub' pxe tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal biosdisk
-# make grub_bootx64 firmware
-RUN grub2-mkimage -d /usr/lib/grub/x86_64-efi/ -O x86_64-efi -o /root/grub_bootx64.efi -p '/grub' efinet tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal efi_gop
-# make grub_arm64 firmware
-RUN grub2-mkimage -d /usr/lib/grub/arm64-efi/ -O arm64-efi -o /root/grub_arm64.efi -p '/grub' efinet tftp boot linux ext2 xfs ntfs fat part_msdos part_gpt normal efi_gop
-
-RUN mkdir -p /tftp/grub
-
-RUN cp /root/grub_booti386 /tftp
-RUN cp -rf /usr/lib/grub/i386-pc /tftp/grub
-
-RUN cp /root/grub_bootx64.efi /tftp
-RUN cp -rf /usr/lib/grub/x86_64-efi /tftp/grub
-
-RUN cp /root/grub_arm64.efi /tftp
-RUN cp -rf /usr/lib/grub/arm64-efi /tftp/grub
-
 
 FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3-3.13.5
 
-MAINTAINER "Zexi Li <zexi.li@icloud.com>"
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
 
 RUN mkdir -p /opt/yunion/bin
 
@@ -44,45 +18,17 @@ RUN mkdir -p /opt/cloud/yunion/baremetal
 RUN wget -O /opt/cloud/yunion/baremetal/pci.ids http://pci-ids.ucw.cz/v2.2/pci.ids
 
 # download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
-#COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
-#COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
-#COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
-#COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
-
-# copy grub file
-COPY --from=grub-stage /tftp/grub_booti386 /opt/cloud/yunion/baremetal
-COPY --from=grub-stage /tftp/grub_bootx64.efi /opt/cloud/yunion/baremetal
-COPY --from=grub-stage /tftp/grub_arm64.efi /opt/cloud/yunion/baremetal
-COPY --from=grub-stage /tftp/grub /opt/cloud/yunion/baremetal/grub
-
-# copy boot files from yunionos
-COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/aarch64/kernel /opt/cloud/yunion/baremetal/kernel_aarch64
-COPY --from=yunionos /yunionos/aarch64/initramfs /opt/cloud/yunion/baremetal/initramfs_aarch64
-
-# TODO: syslinux firmwares should removed in future
-COPY --from=yunionos /yunionos/x86_64/isolinux.bin /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/bootia32.efi /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/bootx64.efi /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/chain.c32 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/initramfs /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/kernel /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/ldlinux.c32 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/ldlinux.e32 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/ldlinux.e64 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/libcom32.c32 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/libutil.c32 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/lpxelinux.0 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/menu.c32 /opt/cloud/yunion/baremetal
-COPY --from=yunionos /yunionos/x86_64/pxelinux.0 /opt/cloud/yunion/baremetal
+COPY --from=build /opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
+COPY --from=build /opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
+COPY --from=build /opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
+COPY --from=build ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal

build/docker/Dockerfile.esxi-agent

@@ -1,3 +1,5 @@
 FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
 
+COPY ./build/esxi-agent/root/opt/ /opt/
+
 ADD ./_output/alpine-build/bin/esxi-agent /opt/yunion/bin/esxi-agent

build/docker/Dockerfile.file-repo

@@ -11,12 +11,10 @@ RUN set -x \
 
 # install default playbook and install pkg
 Run mkdir -p /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_arm64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~be742cbf-0_amd64.deb -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_amd64.zip -P /opt/yunion/ansible-install-pkg
-Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~be742cbf_windows_i386.zip -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.aarch64.rpm -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf-1.19.2-yn~fe11a96b-0.x86_64.rpm -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_amd64.deb -P /opt/yunion/ansible-install-pkg
+Run wget https://yunioniso.oss-cn-beijing.aliyuncs.com/rpms/telegraf/telegraf_1.19.2-yn~fe11a96b-0_arm64.deb -P /opt/yunion/ansible-install-pkg
 
 Run mkdir -p /opt/yunion/playbook
 Run mkdir /opt/yunion/playbook/monitor-agent

build/docker/Dockerfile.host

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

build/docker/Dockerfile.host-deployer

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

build/docker/Dockerfile.host-health

@@ -1,3 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/onecloud-base:v0.3.5-1
-
-ADD ./_output/alpine-build/bin/host-health /opt/yunion/bin/host-health

build/docker/Dockerfile.lbagent

@@ -1,8 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/lbagent-base:v0.0.4
-
-MAINTAINER "Yousong Zhou <zhouyousong@yunion.cn>"
-
-ENV TZ UTC
-
-RUN mkdir -p /opt/yunion/bin
-ADD ./_output/alpine-build/bin/lbagent /opt/yunion/bin/lbagent

build/docker/Dockerfile.lbagent-base

@@ -1,35 +0,0 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/openvswitch:2.12.4-2
-
-MAINTAINER "Jian QIU <qiujian@yunion.cn>"
-
-ENV TZ UTC
-
-ENV GOPATH=/root/go
-
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
-
-RUN set -x \
-    && apk update \
-    && apk upgrade \
-    && apk add --no-cache bash haproxy keepalived iptables \
-    && apk add --no-cache --virtual .build-deps \
-        build-base \
-        make \
-       	go \
-        git \
-        gcc \
-        libc-dev \
-        libgcc \
-        linux-headers
-
-RUN set -x \
-    && mkdir -p $GOPATH/src/github.com/yyyar $GOPATH/bin \
-    && cd $GOPATH/src/github.com/yyyar \
-    && git clone --depth 1 https://github.com/yyyar/gobetween.git \
-    && cd gobetween \
-    && make deps \
-    && make build \
-    && cp bin/gobetween /bin/gobetween \
-    && rm -fr $GOPATH \
-    && apk del .build-deps \
-    && rm -rf /var/cache/apk/*

build/docker/Dockerfile.onecloud-base-3-15-4

@@ -1,13 +0,0 @@
-FROM alpine:3.15.4
-
-MAINTAINER "Zexi Li <lizexi@yunionyun.com>"
-
-ENV TZ UTC
-
-RUN mkdir -p /opt/yunion/bin
-
-RUN sed -i 's!https://dl-cdn.alpinelinux.org/!https://mirrors.ustc.edu.cn/!g' /etc/apk/repositories
-
-RUN apk update && \
-    apk add --no-cache tzdata curl busybox-extras tcpdump strace ca-certificates && \
-    rm -rf /var/cache/apk/*

build/docker/Dockerfile.scheduledtask

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

build/docker/Makefile

@@ -8,14 +8,11 @@ debian10-base:
 		-t registry.cn-beijing.aliyuncs.com/yunionio/debian10-base:1.0 -f ./Dockerfile.debian-base .
 
 ONECLOUD_BASE_VERSION = v0.3-3.13.5
-ONECLOUD_BASE_VERSION_3-15-4 = v3.15.4-0
 
 onecloud-base:
 	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION) -f ./Dockerfile.onecloud-base .
-onecloud-base-3-15-4:
-	$(DOCKER_BUILDX)/onecloud-base:$(ONECLOUD_BASE_VERSION_3-15-4) -f ./Dockerfile.onecloud-base-3-15-4 .
 
-ANSIBLESERVER_BASE = v1.1.1
+ANSIBLESERVER_BASE = v1.0.5-2
 
 ansibleserver-base:
 	$(DOCKER_BUILDX)/ansibleserver-base:$(ANSIBLESERVER_BASE) -f ./Dockerfile.ansibleserver-base .
@@ -30,7 +27,7 @@ WEBCONSOLE_BASE_VERSION = v0.2-1
 webconsole-base:
 	$(DOCKER_BUILDX)/webconsole-base:$(WEBCONSOLE_BASE_VERSION) -f ./Dockerfile.webconsole-base .
 
-BAREMETAL_BASE_VERSION = v0.3.9-20230221.2
+BAREMETAL_BASE_VERSION = v0.3.3-2
 
 baremetal-base:
 	$(DOCKER_BUILDX)/baremetal-base:$(BAREMETAL_BASE_VERSION) -f ./Dockerfile.baremetal-base .
@@ -48,19 +45,3 @@ FILE_REPO_VERSION = v0.3.3
 
 file-repo:
 	$(DOCKER_BUILDX)/file-repo:$(FILE_REPO_VERSION) -f ./Dockerfile.file-repo .
-
-HOST_IMAGE_VERSION ?= v1.0.2
-HOST_IMAGE_NAME = $(REGISTRY)/host-image:$(HOST_IMAGE_VERSION)
-host-image:
-	docker pull $(HOST_IMAGE_NAME)-amd64 --platform amd64
-	docker pull $(HOST_IMAGE_NAME)-arm64 --platform arm64
-	docker manifest create $(HOST_IMAGE_NAME) \
-		$(HOST_IMAGE_NAME)-amd64 \
-		$(HOST_IMAGE_NAME)-arm64
-	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-amd64 --arch amd64
-	docker manifest annotate $(HOST_IMAGE_NAME) $(HOST_IMAGE_NAME)-arm64 --arch arm64
-	docker manifest push $(HOST_IMAGE_NAME)
-
-LBAGENT_BASE_VERSION = v0.0.3
-lbagent-base:
-	$(DOCKER_BUILDX)/lbagent-base:$(LBAGENT_BASE_VERSION) -f ./Dockerfile.lbagent-base .

build/docker/multi-arch/Dockerfile.host

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:3.16.0-go-1.18.2-0 as build
+FROM registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-5 as build
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 RUN mkdir -p /root/go/src/yunion.io/x/onecloud

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

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

build/memclean/vars

@@ -1 +0,0 @@
-DESCRIPTION="Memclean Utility"

build/notify/root/opt/yunion/share/local-templates/content@cn/ACTION_LOG_EXCEED_COUNT.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details.action -}}
-当前日志 ID: {{ $d.id }}

build/notify/root/opt/yunion/share/local-templates/content@cn/CHECKSUM_TEST_FAILED.tmpl

@@ -1,16 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if eq .resource_type "db_table_record" }}
-表{{ $d.table_name }}记录{{ $d.name }}被修改，完整性校验失败。期望校验和({{ $d.expected_checksum }}) != 计算校验和({{ $d.calculated_checksum }})。
-{{- end -}}
-{{- if eq .resource_type "cloudpods_component" }}
-{{ $d.details }}
-{{- end -}}
-{{- if eq .resource_type "snapshot" }}
-快照{{ $d.name }}的内存快照完整性校验失败
-{{- end -}}
-{{- if eq .resource_type "image" }}
-镜像{{ $d.name }}完整性校验失败
-{{- end -}}
-{{- if eq .resource_type "vm_integrity" }}
-主机{{ $d.name }}完整性校验失败
-{{- end -}}

build/notify/root/opt/yunion/share/local-templates/content@cn/MYSQL_OUT_OF_SYNC.tmpl

@@ -1,18 +0,0 @@
-{{- $d := .resource_details -}}
-数据库 {{$d.ip}} 的主从同步不一致，请及时检查。
-
-{{ range $status := $d.status }}
-数据库 {{$status.ip}} 状态:
-{{- if not $status.operator_error }}
-  - Slave_IO_Running: {{$status.slave_io_running}}
-  - Slave_SQL_Running: {{$status.slave_sql_running}}
-  {{- if $status.last_error }}
-  - Last_Error: {{$status.last_error}}
-  {{- end -}}
-  {{- if $status.last_io_error }}
-  - Last_IO_Error: {{$status.last_io_error}}
-  {{- end }}
-{{else}}
-  - Operator_Error: {{$status.operator_error}}
-{{- end}}
-{{end}}

build/notify/root/opt/yunion/share/local-templates/content@cn/NET_OUT_OF_SYNC.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.service_name }}服务的网络拓扑信息同步不一致，请及时检查。	

build/notify/root/opt/yunion/share/local-templates/content@cn/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。

build/notify/root/opt/yunion/share/local-templates/content@cn/SERVER_PANICKED_FAILED.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的虚拟机{{ $d.name }}崩溃了

build/notify/root/opt/yunion/share/local-templates/content@cn/SERVICE_ABNORMAL.tmpl

@@ -1,8 +0,0 @@
-{{- $d := .resource_details -}}
-服务: {{ $d.service_name }} 异常。
-方法: {{ $d.method }}
-路径: {{ $d.path }} 
-{{- if $d.body }}
-请求: {{ $d.body -}}
-{{ end }}
-错误: {{ $d.error }}

build/notify/root/opt/yunion/share/local-templates/content@cn/SYNC_ACCOUNT_STATUS.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-云账号{{ $d.name }}状态异常，请及时检查。

build/notify/root/opt/yunion/share/local-templates/content@cn/USER_LOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-账号{{ $d.name }}由于异常登录已被锁定，请核实情况，如果需要为用户解锁，请到用户列表启用该用户。

build/notify/root/opt/yunion/share/local-templates/content@cn/WORK_BLOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-服务{{ d.service_name}} worker阻塞半小时，请及时检查。

build/notify/root/opt/yunion/share/local-templates/content@en/ACTION_LOG_EXCEED_COUNT.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details.action -}}
-Current log ID: {{ $d.id }}

build/notify/root/opt/yunion/share/local-templates/content@en/CHECKSUM_TEST_FAILED.tmpl

@@ -1,14 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if eq .resource_type "db_table_record" }}
-The record {{ $d.name }} in table {{ $d.table_name }} of the database {{ $d.db_name }} has been modified because the checksum test failed. Expected_checksum({{ $d.expected_checksum }}) != Calculated_checksum({{ $d.calculated_checksum }}).
-{{- end -}}
-{{- if eq .resource_type "cloudpods_component" }}
-{{ $d.details }}
-{{- end -}}
-{{- if eq .resource_type "snapshot" }}
-The checksum of the memory snapshot of the snapshot {{ $d.name }} test failed.
-{{- end -}}
-{{- if eq .resource_type "image" }}
-The checksum of the image {{ $d.name }} test failed.
-{{- end -}}
-

build/notify/root/opt/yunion/share/local-templates/content@en/MYSQL_OUT_OF_SYNC.tmpl

@@ -1,18 +0,0 @@
-{{- $d := .resource_details -}}
-The primary and secondary synchronization of the database ({{ $d.ip }}) is inconsistent, please check in time.
-
-{{ range $status := $d.status }}
-Database {{$status.ip}} status:
-{{- if not $status.operator_error }}
-  - Slave_IO_Running: {{$status.slave_io_running}}
-  - Slave_SQL_Running: {{$status.slave_sql_running}}
-  {{- if $status.last_error }}
-  - Last_Error: {{$status.last_error}}
-  {{- end -}}
-  {{- if $status.last_io_error }}
-  - Last_IO_Error: {{$status.last_io_error}}
-  {{- end }}
-{{else}}
-  - Operator_Error: {{$status.operator_error}}
-{{- end}}
-{{end}}

build/notify/root/opt/yunion/share/local-templates/content@en/NET_OUT_OF_SYNC.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.service_name }}: The network topology information of the service is inconsistent, please check in time.

build/notify/root/opt/yunion/share/local-templates/content@en/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.account }}:Your password is valid and will expire soon. Please log in to the platform in time to update your password.

build/notify/root/opt/yunion/share/local-templates/content@en/SERVER_PANICKED_FAILED.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The server {{ $d.name }} in project {{ $d.project }} panicked.

build/notify/root/opt/yunion/share/local-templates/content@en/SERVICE_ABNORMAL.tmpl

@@ -1,8 +0,0 @@
-{{- $d := .resource_details -}}
-Service: {{ $d.service_name }} abnormal
-Method: {{ $d.method }}
-Path: {{ $d.path }} 
-{{- if $d.body }}
-Body: {{ $d.body -}}
-{{ end }}
-Error: {{ $d.error }}

build/notify/root/opt/yunion/share/local-templates/content@en/SYNC_ACCOUNT_STATUS.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The account {{ $d.name }} status is abnormal. Please check in time.

build/notify/root/opt/yunion/share/local-templates/content@en/USER_LOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The account {{ $d.name }} has been locked due to abnormal login. Please verify the situation. If you need to unlock the user, please go to the user list to enable the user.

build/notify/root/opt/yunion/share/local-templates/content@en/WORK_BLOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The service: {{ d.service_name}} worker has been block 30 minutes.Please verify the service in time.

build/notify/root/opt/yunion/share/local-templates/title@cn/ACTION_LOG_EXCEED_COUNT.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-操作日志超出设置数量{{ $d.exceed_count }}条，当前{{ $d.current_count }}条

build/notify/root/opt/yunion/share/local-templates/title@cn/CHECKSUM_TEST_FAILED.tmpl

@@ -1,6 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if eq .resource_type "cloudpods_component" }}
-{{ $d.title }}
-{{- else -}}
-{{ .resource_type_display }}完整性校验失败
-{{- end -}}

build/notify/root/opt/yunion/share/local-templates/title@cn/MYSQL_OUT_OF_SYNC.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-数据库 {{$d.ip}} 的主从同步不一致，请及时检查。

build/notify/root/opt/yunion/share/local-templates/title@cn/NET_OUT_OF_SYNC.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.service_name }}服务的网络拓扑信息同步不一致，请及时检查。	

build/notify/root/opt/yunion/share/local-templates/title@cn/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.account }}:您的密码有效期将过，请及时登录平台更新密码。

build/notify/root/opt/yunion/share/local-templates/title@cn/SERVER_PANICKED_FAILED.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-您在{{ $d.project }}项目的虚拟机{{ $d.name }}崩溃了

build/notify/root/opt/yunion/share/local-templates/title@cn/SERVICE_ABNORMAL.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-服务{{ $d.service_name }}异常

build/notify/root/opt/yunion/share/local-templates/title@cn/SYNC_ACCOUNT_STATUS.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-云账号{{ $d.name}}状态异常，请及时检查。

build/notify/root/opt/yunion/share/local-templates/title@cn/USER_LOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-账号{{ $d.name }}已被锁定

build/notify/root/opt/yunion/share/local-templates/title@cn/WORK_BLOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-服务{{ d.service_name}} worker阻塞半小时，请及时检查。

build/notify/root/opt/yunion/share/local-templates/title@en/ACTION_LOG_EXCEED_COUNT.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Action logs excced expected count {{ $d.exceed_count }}, current count is {{ $d.current_count }}

build/notify/root/opt/yunion/share/local-templates/title@en/CHECKSUM_TEST_FAILED.tmpl

@@ -1,6 +0,0 @@
-{{- $d := .resource_details -}}
-{{- if eq .resource_type "cloudpods_component" }}
-{{ $d.title }}
-{{- else -}}
-The checksum of {{ .resource_type_display }} test failed
-{{- end -}}

build/notify/root/opt/yunion/share/local-templates/title@en/MYSQL_OUT_OF_SYNC.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The primary and secondary synchronization of the database ({{ $d.ip }}) is inconsistent, please check in time.

build/notify/root/opt/yunion/share/local-templates/title@en/NET_OUT_OF_SYNC.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.service_name }}: The network topology information of the service is inconsistent, please check in time.

build/notify/root/opt/yunion/share/local-templates/title@en/PASSWORD_EXPIRE_SOON.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-{{ $d.account }}:Your password is valid and will expire soon. Please log in to the platform in time to update your password.

build/notify/root/opt/yunion/share/local-templates/title@en/SERVER_PANICKED_FAILED.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The server {{ $d.name }}  in project {{ $d.project }}panicked.

build/notify/root/opt/yunion/share/local-templates/title@en/SERVICE_ABNORMAL.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Server {{ $d.service_name }} abnormal

build/notify/root/opt/yunion/share/local-templates/title@en/USER_LOCK copy.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The account {{ $d.name }} has been locked due to abnormal login. Please verify the situation. If you need to unlock the user, please go to the user list to enable the user.

build/notify/root/opt/yunion/share/local-templates/title@en/USER_LOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-Account {{ $d.name }} has been locked

build/notify/root/opt/yunion/share/local-templates/title@en/WORK_BLOCK.tmpl

@@ -1,2 +0,0 @@
-{{- $d := .resource_details -}}
-The service: {{ d.service_name}} worker has been block 30 minutes.Please verify the service in time.

cmd/aliyuncli/main.go

@@ -0,0 +1,164 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"golang.org/x/net/http/httpproxy"
+
+	"yunion.io/x/structarg"
+
+	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/multicloud/aliyun"
+	_ "yunion.io/x/onecloud/pkg/multicloud/aliyun/shell"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+)
+
+type BaseOptions struct {
+	Debug      bool   `help:"debug mode"`
+	Help       bool   `help:"Show help"`
+	CloudEnv   string `help:"Cloud environment" default:"$ALIYUN_CLOUD_ENV" choices:"InternationalCloud|FinanceCloud" metavar:"ALIYUN_CLOUD_ENV"`
+	AccessKey  string `help:"Access key" default:"$ALIYUN_ACCESS_KEY" metavar:"ALIYUN_ACCESS_KEY"`
+	Secret     string `help:"Secret" default:"$ALIYUN_SECRET" metavar:"ALIYUN_SECRET"`
+	RegionId   string `help:"RegionId" default:"$ALIYUN_REGION" metavar:"ALIYUN_REGION"`
+	SUBCOMMAND string `help:"aliyuncli subcommand" subcommand:"true"`
+}
+
+func getSubcommandParser() (*structarg.ArgumentParser, error) {
+	parse, e := structarg.NewArgumentParser(&BaseOptions{},
+		"aliyuncli",
+		"Command-line interface to aliyun API.",
+		`See "aliyuncli help COMMAND" for help on a specific command.`)
+
+	if e != nil {
+		return nil, e
+	}
+
+	subcmd := parse.GetSubcommand()
+	if subcmd == nil {
+		return nil, fmt.Errorf("No subcommand argument.")
+	}
+	type HelpOptions struct {
+		SUBCOMMAND string `help:"sub-command name"`
+	}
+	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
+		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
+		if e != nil {
+			return e
+		} else {
+			fmt.Print(helpstr)
+			return nil
+		}
+	})
+	for _, v := range shellutils.CommandTable {
+		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
+		if e != nil {
+			return nil, e
+		}
+	}
+	return parse, nil
+}
+
+func showErrorAndExit(e error) {
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
+	os.Exit(1)
+}
+
+func newClient(options *BaseOptions) (*aliyun.SRegion, error) {
+	if len(options.AccessKey) == 0 {
+		return nil, fmt.Errorf("Missing accessKey")
+	}
+
+	if len(options.Secret) == 0 {
+		return nil, fmt.Errorf("Missing secret")
+	}
+
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
+	cli, err := aliyun.NewAliyunClient(
+		aliyun.NewAliyunClientConfig(
+			options.CloudEnv,
+			options.AccessKey,
+			options.Secret,
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	region := cli.GetRegion(options.RegionId)
+	if region == nil {
+		return nil, fmt.Errorf("No such region %s", options.RegionId)
+	}
+
+	return region, nil
+}
+
+func main() {
+	parser, e := getSubcommandParser()
+	if e != nil {
+		showErrorAndExit(e)
+	}
+	e = parser.ParseArgs(os.Args[1:], false)
+	options := parser.Options().(*BaseOptions)
+
+	if options.Help {
+		fmt.Print(parser.HelpString())
+	} else {
+		subcmd := parser.GetSubcommand()
+		subparser := subcmd.GetSubParser()
+		if e != nil {
+			if subparser != nil {
+				fmt.Print(subparser.Usage())
+			} else {
+				fmt.Print(parser.Usage())
+			}
+			showErrorAndExit(e)
+		} else {
+			suboptions := subparser.Options()
+			if options.SUBCOMMAND == "help" {
+				e = subcmd.Invoke(suboptions)
+			} else {
+				var region *aliyun.SRegion
+				region, e = newClient(options)
+				if e != nil {
+					showErrorAndExit(e)
+				}
+				e = subcmd.Invoke(region, suboptions)
+			}
+			if e != nil {
+				showErrorAndExit(e)
+			}
+		}
+	}
+}

cmd/apimap/main.go

@@ -1,21 +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 main
-
-import "yunion.io/x/onecloud/pkg/apimap/service"
-
-func main() {
-	service.StartService()
-}

cmd/apsaracli/main.go

@@ -0,0 +1,165 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"golang.org/x/net/http/httpproxy"
+
+	"yunion.io/x/structarg"
+
+	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/multicloud/apsara"
+	_ "yunion.io/x/onecloud/pkg/multicloud/apsara/shell"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+)
+
+type BaseOptions struct {
+	Debug                          bool   `help:"debug mode"`
+	Help                           bool   `help:"Show help"`
+	AccessKey                      string `help:"Access key" default:"$APSARA_ACCESS_KEY" metavar:"APSARA_ACCESS_KEY"`
+	Secret                         string `help:"Secret" default:"$APSARA_SECRET" metavar:"APSARA_SECRET"`
+	cloudprovider.SApsaraEndpoints `help:"Endpoints for Apsara"`
+	Endpoint                       string `help:"Apsara endpoint" default:"$APSARA_ENDPOINT" metavar:"APSARA_ENDPOINT"`
+	RegionId                       string `help:"RegionId" default:"$APSARA_REGION" metavar:"APSARA_REGION"`
+	SUBCOMMAND                     string `help:"apsaracli subcommand" subcommand:"true"`
+}
+
+func getSubcommandParser() (*structarg.ArgumentParser, error) {
+	parse, e := structarg.NewArgumentParser(&BaseOptions{},
+		"apsaracli",
+		"Command-line interface to apsara API.",
+		`See "apsaracli help COMMAND" for help on a specific command.`)
+
+	if e != nil {
+		return nil, e
+	}
+
+	subcmd := parse.GetSubcommand()
+	if subcmd == nil {
+		return nil, fmt.Errorf("No subcommand argument.")
+	}
+	type HelpOptions struct {
+		SUBCOMMAND string `help:"sub-command name"`
+	}
+	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
+		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
+		if e != nil {
+			return e
+		} else {
+			fmt.Print(helpstr)
+			return nil
+		}
+	})
+	for _, v := range shellutils.CommandTable {
+		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
+		if e != nil {
+			return nil, e
+		}
+	}
+	return parse, nil
+}
+
+func showErrorAndExit(e error) {
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
+	os.Exit(1)
+}
+
+func newClient(options *BaseOptions) (*apsara.SRegion, error) {
+	if len(options.AccessKey) == 0 {
+		return nil, fmt.Errorf("Missing accessKey")
+	}
+
+	if len(options.Secret) == 0 {
+		return nil, fmt.Errorf("Missing secret")
+	}
+
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
+	cli, err := apsara.NewApsaraClient(
+		apsara.NewApsaraClientConfig(
+			options.AccessKey,
+			options.Secret,
+			options.Endpoint,
+			options.SApsaraEndpoints,
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	region := cli.GetRegion(options.RegionId)
+	if region == nil {
+		return nil, fmt.Errorf("No such region %s", options.RegionId)
+	}
+
+	return region, nil
+}
+
+func main() {
+	parser, e := getSubcommandParser()
+	if e != nil {
+		showErrorAndExit(e)
+	}
+	e = parser.ParseArgs(os.Args[1:], false)
+	options := parser.Options().(*BaseOptions)
+
+	if options.Help {
+		fmt.Print(parser.HelpString())
+		return
+	}
+	subcmd := parser.GetSubcommand()
+	subparser := subcmd.GetSubParser()
+	if e != nil {
+		if subparser != nil {
+			fmt.Print(subparser.Usage())
+		} else {
+			fmt.Print(parser.Usage())
+		}
+		showErrorAndExit(e)
+	}
+	suboptions := subparser.Options()
+	if options.SUBCOMMAND == "help" {
+		e = subcmd.Invoke(suboptions)
+	} else {
+		var region *apsara.SRegion
+		region, e = newClient(options)
+		if e != nil {
+			showErrorAndExit(e)
+		}
+		e = subcmd.Invoke(region, suboptions)
+	}
+	if e != nil {
+		showErrorAndExit(e)
+	}
+}

cmd/awscli/main.go

@@ -0,0 +1,167 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"golang.org/x/net/http/httpproxy"
+
+	"yunion.io/x/pkg/errors"
+	"yunion.io/x/structarg"
+
+	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/multicloud/aws"
+	_ "yunion.io/x/onecloud/pkg/multicloud/aws/shell"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+)
+
+type BaseOptions struct {
+	Help       bool   `help:"Show help"`
+	Debug      bool   `help:"debug mode"`
+	AccessUrl  string `help:"Access key" default:"$AWS_ACCESS_URL" choices:"ChinaCloud|InternationalCloud" metavar:"AWS_ACCESS_URL"`
+	AccessKey  string `help:"Access key" default:"$AWS_ACCESS_KEY" metavar:"AWS_ACCESS_KEY"`
+	Secret     string `help:"Secret" default:"$AWS_SECRET" metavar:"AWS_SECRET"`
+	RegionId   string `help:"RegionId" default:"$AWS_REGION" metavar:"AWS_REGION"`
+	AccountId  string `help:"Subaccount ID" default:"$AWS_ACCOUNT_ID" metavar:"AWS_ACCOUNT_ID"`
+	SUBCOMMAND string `help:"awscli subcommand" subcommand:"true"`
+}
+
+func getSubcommandParser() (*structarg.ArgumentParser, error) {
+	parse, e := structarg.NewArgumentParser(&BaseOptions{},
+		"awscli",
+		"Command-line interface to aws API.",
+		`See "awscli help COMMAND" for help on a specific command.`)
+
+	if e != nil {
+		return nil, e
+	}
+
+	subcmd := parse.GetSubcommand()
+	if subcmd == nil {
+		return nil, fmt.Errorf("No subcommand argument.")
+	}
+	type HelpOptions struct {
+		SUBCOMMAND string `help:"sub-command name"`
+	}
+	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
+		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
+		if e != nil {
+			return e
+		} else {
+			fmt.Print(helpstr)
+			return nil
+		}
+	})
+	for _, v := range shellutils.CommandTable {
+		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
+		if e != nil {
+			return nil, e
+		}
+	}
+	return parse, nil
+}
+
+func showErrorAndExit(e error) {
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
+	os.Exit(1)
+}
+
+func newClient(options *BaseOptions) (*aws.SRegion, error) {
+	if len(options.AccessKey) == 0 {
+		return nil, fmt.Errorf("Missing accessKey")
+	}
+
+	if len(options.Secret) == 0 {
+		return nil, fmt.Errorf("Missing secret")
+	}
+
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
+	cli, err := aws.NewAwsClient(
+		aws.NewAwsClientConfig(
+			options.AccessUrl,
+			options.AccessKey,
+			options.Secret,
+			options.AccountId,
+		).Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	region, err := cli.GetRegion(options.RegionId)
+	if err != nil {
+		return nil, errors.Wrapf(err, "GetRegion(%s)", options.RegionId)
+	}
+
+	return region, nil
+}
+
+func main() {
+	parser, e := getSubcommandParser()
+	if e != nil {
+		showErrorAndExit(e)
+	}
+	e = parser.ParseArgs(os.Args[1:], false)
+	options := parser.Options().(*BaseOptions)
+
+	if options.Help {
+		fmt.Print(parser.HelpString())
+	} else {
+		subcmd := parser.GetSubcommand()
+		subparser := subcmd.GetSubParser()
+		if e != nil {
+			if subparser != nil {
+				fmt.Print(subparser.Usage())
+			} else {
+				fmt.Print(parser.Usage())
+			}
+			showErrorAndExit(e)
+		} else {
+			suboptions := subparser.Options()
+			if options.SUBCOMMAND == "help" {
+				e = subcmd.Invoke(suboptions)
+			} else {
+				var region *aws.SRegion
+				region, e = newClient(options)
+				if e != nil {
+					showErrorAndExit(e)
+				}
+				e = subcmd.Invoke(region, suboptions)
+			}
+			if e != nil {
+				showErrorAndExit(e)
+			}
+		}
+	}
+}

cmd/azurecli/main.go

@@ -0,0 +1,185 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"net/url"
+	"os"
+
+	"golang.org/x/net/http/httpproxy"
+
+	"yunion.io/x/structarg"
+
+	"yunion.io/x/onecloud/pkg/cloudprovider"
+	"yunion.io/x/onecloud/pkg/multicloud/azure"
+	_ "yunion.io/x/onecloud/pkg/multicloud/azure/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+	"yunion.io/x/onecloud/pkg/util/shellutils"
+)
+
+type BaseOptions struct {
+	Help           bool   `help:"Show help"`
+	Debug          bool   `help:"debug mode"`
+	DirectoryID    string `help:"Azure account Directory ID/Tenant ID" default:"$AZURE_DIRECTORY_ID" metavar:"AZURE_DIRECTORY_ID"`
+	SubscriptionID string `help:"Azure account subscription ID" default:"$AZURE_SUBSCRIPTION_ID" metavar:"AZURE_SUBSCRIPTION_ID"`
+	ApplicationID  string `help:"Azure application ID" default:"$AZURE_APPLICATION_ID" metavar:"AZURE_APPLICATION_ID"`
+	ApplicationKey string `help:"Azure application key" default:"$AZURE_APPLICATION_KEY" metavar:"AZURE_APPLICATION_KEY"`
+	RegionId       string `help:"RegionId" default:"$AZURE_REGION_ID" metavar:"AZURE_REGION_ID"`
+	CloudEnv       string `help:"Cloud Environment" default:"$AZURE_CLOUD_ENV" choices:"AzureGermanCloud|AzureChinaCloud|AzureUSGovernmentCloud|AzurePublicCloud" metavar:"AZURE_CLOUD_ENV"`
+	SUBCOMMAND     string `help:"azurecli subcommand" subcommand:"true"`
+}
+
+func getSubcommandParser() (*structarg.ArgumentParser, error) {
+	parse, e := structarg.NewArgumentParser(&BaseOptions{},
+		"azurecli",
+		"Command-line interface to azure API.",
+		`See "azurecli help COMMAND" for help on a specific command.`)
+
+	if e != nil {
+		return nil, e
+	}
+
+	subcmd := parse.GetSubcommand()
+	if subcmd == nil {
+		return nil, fmt.Errorf("No subcommand argument.")
+	}
+	type HelpOptions struct {
+		SUBCOMMAND string `help:"sub-command name"`
+	}
+	shellutils.R(&HelpOptions{}, "help", "Show help of a subcommand", func(args *HelpOptions) error {
+		helpstr, e := subcmd.SubHelpString(args.SUBCOMMAND)
+		if e != nil {
+			return e
+		} else {
+			fmt.Print(helpstr)
+			return nil
+		}
+	})
+	for _, v := range shellutils.CommandTable {
+		_, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
+		if e != nil {
+			return nil, e
+		}
+	}
+	return parse, nil
+}
+
+func showErrorAndExit(e error) {
+	fmt.Fprintf(os.Stderr, "%s", e)
+	fmt.Fprintln(os.Stderr)
+	os.Exit(1)
+}
+
+func newClient(options *BaseOptions) (*azure.SRegion, error) {
+	if len(options.DirectoryID) == 0 {
+		return nil, fmt.Errorf("Missing Directory ID")
+	}
+
+	if len(options.SubscriptionID) == 0 {
+		return nil, fmt.Errorf("Missing subscription ID")
+	}
+
+	if len(options.ApplicationID) == 0 {
+		return nil, fmt.Errorf("Missing Application ID")
+	}
+
+	if len(options.ApplicationKey) == 0 {
+		return nil, fmt.Errorf("Missing Application Key")
+	}
+
+	if len(options.CloudEnv) == 0 {
+		return nil, fmt.Errorf("Missing Cloud Environment")
+	}
+
+	cfg := &httpproxy.Config{
+		HTTPProxy:  os.Getenv("HTTP_PROXY"),
+		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
+		NoProxy:    os.Getenv("NO_PROXY"),
+	}
+	cfgProxyFunc := cfg.ProxyFunc()
+	proxyFunc := func(req *http.Request) (*url.URL, error) {
+		return cfgProxyFunc(req.URL)
+	}
+
+	cli, err := azure.NewAzureClient(
+		azure.NewAzureClientConfig(
+			options.CloudEnv,
+			options.DirectoryID,
+			options.ApplicationID,
+			options.ApplicationKey,
+		).
+			SubscriptionId(options.SubscriptionID).
+			Debug(options.Debug).
+			CloudproviderConfig(
+				cloudprovider.ProviderConfig{
+					ProxyFunc: proxyFunc,
+				},
+			),
+	)
+
+	if err != nil {
+		return nil, err
+	}
+	region := cli.GetRegion(options.RegionId)
+	if region == nil {
+		fmt.Println("Please chooce which region you are going to use:")
+		regions := cli.GetRegions()
+		printutils.PrintInterfaceList(regions, 0, 0, 0, nil)
+		return nil, fmt.Errorf("No such region %s", options.RegionId)
+	}
+
+	return region, nil
+}
+
+func main() {
+	parser, e := getSubcommandParser()
+	if e != nil {
+		showErrorAndExit(e)
+	}
+	e = parser.ParseArgs(os.Args[1:], false)
+	options := parser.Options().(*BaseOptions)
+
+	if options.Help {
+		fmt.Print(parser.HelpString())
+	} else {
+		subcmd := parser.GetSubcommand()
+		subparser := subcmd.GetSubParser()
+		if e != nil {
+			if subparser != nil {
+				fmt.Print(subparser.Usage())
+			} else {
+				fmt.Print(parser.Usage())
+			}
+			showErrorAndExit(e)
+		} else {
+			suboptions := subparser.Options()
+			if options.SUBCOMMAND == "help" {
+				e = subcmd.Invoke(suboptions)
+			} else {
+				var region *azure.SRegion
+				region, e = newClient(options)
+				if e != nil {
+					showErrorAndExit(e)
+				}
+				e = subcmd.Invoke(region, suboptions)
+			}
+			if e != nil {
+				showErrorAndExit(e)
+			}
+		}
+	}
+}

cmd/climc/entry/climc.go

@@ -19,21 +19,14 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"net/http"
-	"net/url"
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
 	"time"
 
 	"github.com/c-bata/go-prompt"
-	"github.com/cheggaaa/pb/v3"
-	"golang.org/x/net/http/httpproxy"
 
 	"yunion.io/x/log"
-	"yunion.io/x/pkg/errors"
-	"yunion.io/x/pkg/util/httputils"
 	"yunion.io/x/pkg/util/version"
 	"yunion.io/x/structarg"
 
@@ -43,6 +36,7 @@ import (
 )
 
 type BaseOptions struct {
+	Help     bool `help:"Show help" short-token:"h"`
 	Debug    bool `help:"Show debug information"`
 	Version  bool `help:"Show version"`
 	Timeout  int  `default:"600" help:"Number of seconds to wait for a response"`
@@ -71,12 +65,9 @@ type BaseOptions struct {
 	OsRegionName   string `default:"$OS_REGION_NAME" help:"Defaults to env[OS_REGION_NAME]"`
 	OsZoneName     string `default:"$OS_ZONE_NAME" help:"Defaults to env[OS_ZONE_NAME]"`
 	OsEndpointType string `default:"$OS_ENDPOINT_TYPE|internalURL" help:"Defaults to env[OS_ENDPOINT_TYPE] or internalURL" choices:"publicURL|internalURL|adminURL"`
-	// ApiVersion     string `default:"$API_VERSION" help:"override default modules service api version"`
-	OutputFormat string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|yaml|flatten-table|flatten-kv" help:"output format"`
-
-	ParallelRun int `help:"run in parallel to stess test the performance of server"`
-
-	SUBCOMMAND string `help:"climc subcommand" subcommand:"true"`
+	ApiVersion     string `default:"$API_VERSION" help:"override default modules service api version"`
+	OutputFormat   string `default:"$CLIMC_OUTPUT_FORMAT|table" choices:"table|kv|json|flatten-table|flatten-kv" help:"output format"`
+	SUBCOMMAND     string `help:"climc subcommand" subcommand:"true"`
 }
 
 func getSubcommandsParser() (*structarg.ArgumentParser, error) {
@@ -84,7 +75,7 @@ func getSubcommandsParser() (*structarg.ArgumentParser, error) {
 		prog = "climc"
 		desc = `Command-line interface to the API server.`
 	)
-	parse, e := structarg.NewArgumentParserWithHelp(&BaseOptions{},
+	parse, e := structarg.NewArgumentParser(&BaseOptions{},
 		prog,
 		desc,
 		`See "climc help COMMAND" for help on a specific command.`)
@@ -95,10 +86,22 @@ func getSubcommandsParser() (*structarg.ArgumentParser, error) {
 	if subcmd == nil {
 		return nil, fmt.Errorf("No subcommand argument")
 	}
+	type HelpOptions struct {
+		SUBCOMMAND string `help:"Sub-command name"`
+	}
+	shell.R(&HelpOptions{}, "help", "Show help information of any subcommand", func(suboptions *HelpOptions) error {
+		helpstr, e := subcmd.SubHelpString(suboptions.SUBCOMMAND)
+		if e != nil {
+			return e
+		} else {
+			fmt.Print(helpstr)
+			return nil
+		}
+	})
 
 	promptRootCmd := promputils.InitRootCmd(prog, desc, parse.GetOptArgs(), parse.GetPosArgs())
 	for _, v := range shell.CommandTable {
-		_par, e := subcmd.AddSubParserWithHelp(v.Options, v.Command, v.Desc, v.Callback)
+		_par, e := subcmd.AddSubParser(v.Options, v.Command, v.Desc, v.Callback)
 
 		if e != nil {
 			return nil, e
@@ -155,18 +158,6 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 		options.CertFile,
 		options.KeyFile)
 
-	cfg := &httpproxy.Config{
-		HTTPProxy:  os.Getenv("HTTP_PROXY"),
-		HTTPSProxy: os.Getenv("HTTPS_PROXY"),
-		NoProxy:    os.Getenv("NO_PROXY"),
-	}
-
-	cfgProxyFunc := cfg.ProxyFunc()
-	proxyFunc := func(req *http.Request) (*url.URL, error) {
-		return cfgProxyFunc(req.URL)
-	}
-	httputils.SetClientProxyFunc(client.GetClient(), proxyFunc)
-
 	var cacheToken mcclient.TokenCredential
 	authUrlAlter := strings.Replace(options.OsAuthURL, "/", "", -1)
 	authUrlAlter = strings.Replace(authUrlAlter, ":", "", -1)
@@ -228,13 +219,16 @@ func newClientSession(options *BaseOptions) (*mcclient.ClientSession, error) {
 		}
 	}
 
+	if options.ApiVersion != "" {
+		mcclient.DisableApiVersionByModule()
+	}
 	session := client.NewSession(
 		context.Background(),
 		options.OsRegionName,
 		options.OsZoneName,
 		options.OsEndpointType,
 		cacheToken,
-	)
+		options.ApiVersion)
 	return session, nil
 }
 
@@ -259,56 +253,16 @@ func executeSubcommand(
 	subparser *structarg.ArgumentParser,
 	options *BaseOptions,
 	sessionFactory func() *mcclient.ClientSession,
-	parallel int,
 ) {
+	var e error
 	suboptions := subparser.Options()
-	if subparser.IsHelpSet() {
-		helpStr, err := subcmd.SubHelpString(options.SUBCOMMAND)
-		if err != nil {
-			showErrorAndExit(err)
-			return
-		}
-		fmt.Println(helpStr)
-		return
-	}
-	if parallel <= 1 {
-		sess := sessionFactory()
-		err := subcmd.Invoke(sess, suboptions)
-		if err != nil {
-			showErrorAndExit(err)
-			return
-		}
+	if options.SUBCOMMAND == "help" {
+		e = subcmd.Invoke(suboptions)
 	} else {
-		fmt.Println("Authenticating...")
-		bar := pb.StartNew(parallel)
-		sess := make([]*mcclient.ClientSession, parallel)
-		for i := 0; i < parallel; i++ {
-			sess[i] = sessionFactory()
-			bar.Increment()
-		}
-		bar.Finish()
-		fmt.Println("Tokens are ready, start to request ...")
-		start := time.Now()
-		var wg sync.WaitGroup
-		var errs []error
-		for i := 0; i < parallel; i++ {
-			wg.Add(1)
-			s := sess[i]
-			go func() {
-				defer wg.Done()
-				err := subcmd.Invoke(s, suboptions)
-				if err != nil {
-					errs = append(errs, err)
-				}
-			}()
-		}
-		wg.Wait()
-		if len(errs) > 0 {
-			showErrorAndExit(errors.NewAggregate(errs))
-			return
-		}
-		diff := time.Now().Sub(start)
-		fmt.Printf("cost: %f seconds %f qps\n", diff.Seconds(), float64(parallel)/diff.Seconds())
+		e = subcmd.Invoke(sessionFactory(), suboptions)
+	}
+	if e != nil {
+		showErrorAndExit(e)
 	}
 }
 
@@ -316,7 +270,6 @@ func ClimcMain() {
 	parser, e := getSubcommandsParser()
 	if e != nil {
 		showErrorAndExit(e)
-		return
 	}
 	e = parser.ParseArgs(os.Args[1:], false)
 	options := parser.Options().(*BaseOptions)
@@ -329,7 +282,7 @@ func ClimcMain() {
 		return
 	}
 
-	if parser.IsHelpSet() {
+	if options.Help {
 		fmt.Print(parser.HelpString())
 		return
 	}
@@ -344,7 +297,6 @@ func ClimcMain() {
 		session, err := newClientSession(options)
 		if err != nil {
 			showErrorAndExit(err)
-			return nil
 		}
 		return session
 	}
@@ -364,9 +316,8 @@ func ClimcMain() {
 			fmt.Print(parser.Usage())
 		}
 		showErrorAndExit(e)
-		return
 	}
 
 	// execute subcommand in non-interactive mode
-	executeSubcommand(subcmd, subparser, options, ensureSessionFactory, options.ParallelRun)
+	executeSubcommand(subcmd, subparser, options, ensureSessionFactory)
 }

cmd/climc/main.go

@@ -18,7 +18,6 @@ import (
 	"yunion.io/x/onecloud/cmd/climc/entry"
 	_ "yunion.io/x/onecloud/cmd/climc/shell"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/apimap"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudid"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
@@ -29,15 +28,14 @@ import (
 	_ "yunion.io/x/onecloud/cmd/climc/shell/events"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/identity"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/image"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/itsm"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/logger"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/misc"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/notify"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/quota"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/scheduledtask"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/scheduler"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/webconsole"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/notifyv2"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/servicetree"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/suggestion"
 	_ "yunion.io/x/onecloud/cmd/climc/shell/yunionconf"
 )
 

cmd/climc/promputils/executor.go

@@ -75,10 +75,6 @@ func Executor(s string) {
 	} else {
 		session.GetClient().SetDebug(false)
 	}
-	if subparser.IsHelpSet() {
-		fmt.Print(subparser.HelpString())
-		return
-	}
 	if e != nil {
 		if subparser != nil {
 			fmt.Print(subparser.Usage())
@@ -88,7 +84,11 @@ func Executor(s string) {
 		fmt.Println(e)
 	} else {
 		suboptions := subparser.Options()
-		e = subcmd.Invoke(session, suboptions)
+		if args[0] == "help" {
+			e = subcmd.Invoke(suboptions)
+		} else {
+			e = subcmd.Invoke(session, suboptions)
+		}
 		if e != nil {
 			fmt.Println(e)
 		}

cmd/climc/shell/ansible/ansible.go

@@ -21,7 +21,7 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	compute "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 )
 
 type AnsibleHostsOptions struct {
@@ -60,7 +60,7 @@ func doList(s *mcclient.ClientSession, args *AnsibleHostsOptions) error {
 		params.Add(jsonutils.NewInt(int64(limit)), "limit")
 		params.Add(jsonutils.NewInt(int64(hosts.Size())), "offset")
 		params.Add(jsonutils.JSONTrue, "details")
-		retList, err := compute.Servers.List(s, params)
+		retList, err := modules.Servers.List(s, params)
 		if err != nil {
 			return err
 		}
@@ -100,7 +100,7 @@ func doList(s *mcclient.ClientSession, args *AnsibleHostsOptions) error {
 }
 
 func doHost(s *mcclient.ClientSession, host string, args *AnsibleHostsOptions) error {
-	srv, err := compute.Servers.Get(s, host, nil)
+	srv, err := modules.Servers.Get(s, host, nil)
 	if err != nil {
 		return err
 	}

cmd/climc/shell/ansible/ansibleplaybook_reference.go

@@ -16,7 +16,7 @@ package ansible
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/ansible"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	options "yunion.io/x/onecloud/pkg/mcclient/options/ansible"
 )
 

cmd/climc/shell/ansible/ansibleplaybooks.go

@@ -18,7 +18,7 @@ import (
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/ansible"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 

cmd/climc/shell/ansible/ansibleplaybooks_v2.go

@@ -16,7 +16,7 @@ package ansible
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/ansible"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 

cmd/climc/shell/ansible/common.go

@@ -15,9 +15,8 @@
 package ansible
 
 import (
-	"yunion.io/x/pkg/util/printutils"
-
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 var (

cmd/climc/shell/apimap/apimap.go

@@ -1,36 +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 apimap
-
-import (
-	"fmt"
-
-	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules/apimap"
-)
-
-func init() {
-	type GetOptions struct{}
-	shell.R(new(GetOptions), "apimap-vpcagent", "Show net map for vpcagent", func(s *mcclient.ClientSession, _ *GetOptions) error {
-		ret, err := apimap.APIMap.GetVPCAgentTopo(s)
-		if err != nil {
-			return err
-		}
-		fmt.Print(ret.YAMLString())
-		return nil
-	})
-
-}

cmd/climc/shell/cloudevent/cloudevents.go

@@ -15,10 +15,12 @@
 package cloudevent
 
 import (
+	"fmt"
+
 	"yunion.io/x/jsonutils"
 
 	"yunion.io/x/onecloud/pkg/mcclient"
-	"yunion.io/x/onecloud/pkg/mcclient/modules/cloudevent"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
@@ -35,11 +37,11 @@ func init() {
 		if err != nil {
 			return err
 		}
-		result, err := cloudevent.Cloudevents.List(s, params)
+		result, err := modules.Cloudevents.List(s, params)
 		if err != nil {
 			return err
 		}
-		printList(result, cloudevent.Cloudevents.GetColumns(s))
+		printList(result, modules.Cloudevents.GetColumns(s))
 		return nil
 	})
 
@@ -47,23 +49,22 @@ func init() {
 	}
 
 	R(&CloudeventSplitTableOptions{}, "cloud-event-splitable", "Show obsolete cloud event logs", func(s *mcclient.ClientSession, opts *CloudeventSplitTableOptions) error {
-		resp, err := cloudevent.Cloudevents.Get(s, "splitable", nil)
+		resp, err := modules.Cloudevents.Get(s, "splitable", nil)
 		if err != nil {
 			return err
 		}
-		printObject(resp)
+		fmt.Println(resp)
 		return nil
 	})
 
 	type CloudeventLogsPurgeOptions struct {
-		Tables []string
 	}
 	R(&CloudeventLogsPurgeOptions{}, "cloud-event-purge-splitable", "Purge obsolete cloud event logs", func(s *mcclient.ClientSession, opts *CloudeventLogsPurgeOptions) error {
-		resp, err := cloudevent.Cloudevents.PerformClassAction(s, "purge-splitable", jsonutils.Marshal(opts))
+		resp, err := modules.Cloudevents.PerformClassAction(s, "purge-splitable", jsonutils.Marshal(opts))
 		if err != nil {
 			return err
 		}
-		printObject(resp)
+		fmt.Println(resp)
 		return nil
 	})
 }

cmd/climc/shell/cloudevent/common.go

@@ -15,13 +15,11 @@
 package cloudevent
 
 import (
-	"yunion.io/x/pkg/util/printutils"
-
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 var (
-	R           = shell.R
-	printList   = printutils.PrintJSONList
-	printObject = printutils.PrintJSONObject
+	R         = shell.R
+	printList = printutils.PrintJSONList
 )

cmd/climc/shell/cloudid/cloudgroup.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudgroupcache.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudgrouppolicies.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudgroupusers.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudpolicy.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudpolicycache.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudrole.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/clouduserpolicies.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/cloudusers.go

@@ -15,11 +15,8 @@
 package cloudid
 
 import (
-	"yunion.io/x/jsonutils"
-
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 
@@ -38,10 +35,4 @@ func init() {
 	cmd.Perform("reset-password", &cloudid.ClouduserResetPasswordOptions{})
 	cmd.Perform("cloud-user-join-group", &cloudid.ClouduserGroupOptions{})
 	cmd.Perform("cloud-user-leave-group", &cloudid.ClouduserGroupOptions{})
-	cmd.GetWithCustomShow("access-keys", func(result jsonutils.JSONObject) {
-		ret := modulebase.JSON2ListResult(result)
-		shell.PrintList(ret, nil)
-	}, &cloudid.ClouduserListAccessKeyInput{})
-	cmd.Perform("delete-access-key", &cloudid.ClouduserDeleteAccessKeyInput{})
-	cmd.Perform("create-access-key", &cloudid.ClouduserCreateAccessKeyInput{})
 }

cmd/climc/shell/cloudid/common.go

@@ -15,9 +15,8 @@
 package cloudid
 
 import (
-	"yunion.io/x/pkg/util/printutils"
-
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 var (

cmd/climc/shell/cloudid/samlprovider.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudid/samluser.go

@@ -16,7 +16,7 @@ package cloudid
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/cloudid"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/cloudid"
 )
 

cmd/climc/shell/cloudnet/common.go

@@ -15,9 +15,8 @@
 package cloudnet
 
 import (
-	"yunion.io/x/pkg/util/printutils"
-
 	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
 var (

cmd/climc/shell/compute/access_group_caches.go

@@ -16,7 +16,7 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )
 

cmd/climc/shell/compute/access_group_rules.go

@@ -16,7 +16,7 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )

cmd/climc/shell/compute/access_groups.go

@@ -16,7 +16,7 @@ package compute
 
 import (
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	modules "yunion.io/x/onecloud/pkg/mcclient/modules/compute"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/mcclient/options/compute"
 )