Merge pull request #7040 from swordqiu/automated-cherry-pick-of-#7036-upstream-release-3.0

Automated cherry pick of #7036: fix: cloud account sync may block

.circleci/Dockerfile

@@ -21,7 +21,6 @@ ENV GOROOT="/opt/go"
 ENV PATH="/opt/go/bin:${PATH}"
 
 RUN useradd -c "OneCloud Builder" --create-home --home-dir /home/build --shell /bin/bash build
-USER build
 ENV HOME /home/build
 WORKDIR /home/build
 USER build

.dockerignore

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

.drone.yml

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

.github/workflows/docker.yml

@@ -0,0 +1,212 @@
+name: Docker image
+
+on:
+  push:
+    branches:
+    - master
+    - releases/*
+    #paths:
+    #- 'cmd/*'
+    #- 'pkg/*'
+    #- 'vendor/*'
+
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go 1.12
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.12
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Build
+      run: |
+        sudo apt-get update
+        sudo apt-get install librados-dev librbd-dev
+        make cmd/apigateway cmd/climc cmd/keystone
+        make cmd/logger cmd/region cmd/scheduler cmd/webconsole
+        make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway
+        make cmd/ansibleserver cmd/cloudnet cmd/notify
+        make cmd/host && ./scripts/bundle_libraries.sh _output/bin/bundles/host _output/bin/host && ./scripts/host_find_libraries.sh _output/bin/bundles/host
+        make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
+        make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
+        make cmd/cloudevent cmd/devtool
+        make cmd/*cli
+        make cmd/esxi-agent
+
+    - name: Image baremetal-agent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/baremetal-agent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.baremetal-agent
+
+    - name: Image esxi-agent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/esxi-agent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.esxi-agent
+
+    - name: Image climc
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/climc
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.climc
+
+    - name: Image keystone
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/keystone
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.keystone
+
+    - name: Image logger
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/logger
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.logger
+
+    - name: Image region
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/region
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.region
+
+    - name: Image scheduler
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/scheduler
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.scheduler
+
+    - name: Image apigateway
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/apigateway
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.apigateway
+
+    - name: Image s3gateway
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/s3gateway
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.s3gateway
+
+    - name: Image ansibleserver
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/ansibleserver
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.ansibleserver
+
+    - name: Image cloudnet
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudnet
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.cloudnet
+
+    - name: Image glance
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/glance
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.glance
+
+    - name: Image notify
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/notify
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.notify
+
+    - name: Image host
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/host
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.host
+
+    - name: Image host-deployer
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/host-deployer
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.host-deployer
+
+    - name: Image cloudevent
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/cloudevent
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.cloudevent
+
+    - name: Image devtool
+      uses: elgohr/Publish-Docker-Github-Action@master
+      with:
+        name: registry.cn-beijing.aliyuncs.com/yunionio/devtool
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.cn-beijing.aliyuncs.com
+        snapshot: true
+        dockerfile: build/docker/Dockerfile.devtool

CONTRIBUTING.md

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

Dockerfile

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

Makefile

@@ -32,8 +32,11 @@ LDFLAGS := "-w \
 
 
 #####################################################
-
-GO_BUILD_FLAGS:=-mod vendor -ldflags $(LDFLAGS)
+ifneq ($(DLV),)
+	GO_BUILD_FLAGS += -gcflags "all=-N -l"
+	LDFLAGS = ""
+endif
+GO_BUILD_FLAGS+=-mod vendor -ldflags $(LDFLAGS)
 GO_BUILD := go build $(GO_BUILD_FLAGS)
 GO_INSTALL := go install -ldflags $(LDFLAGS)
 GO_TEST := go test
@@ -44,8 +47,8 @@ CGO_CFLAGS_ENV = $(shell go env CGO_CFLAGS)
 CGO_LDFLAGS_ENV = $(shell go env CGO_LDFLAGS)
 
 ifdef LIBQEMUIO_PATH
-	X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
-	X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
+		X_CGO_CFLAGS := ${CGO_CFLAGS_ENV} -I${LIBQEMUIO_PATH}/src -I${LIBQEMUIO_PATH}/src/include
+		X_CGO_LDFLAGS := ${CGO_LDFLAGS_ENV} -laio -lqemuio -lpthread  -L ${LIBQEMUIO_PATH}/src
 endif
 
 export GO111MODULE:=on
@@ -80,6 +83,9 @@ test:
 vet:
 	go vet ./...
 
+cmd/esxi-agent: prepare_dir
+	CGO_ENABLED=0 $(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
+
 cmd/%: prepare_dir
 	$(GO_BUILD) -o $(BIN_DIR)/$(shell basename $@) $(REPO_PREFIX)/$@
 
@@ -233,11 +239,13 @@ help: export helpText:=$(helpText)
 help:
 	@echo "$$helpText"
 
+.PHONY: help
+
 gen-model-api-check:
 	which model-api-gen || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/model-api-gen)
 
 gen-model-api: gen-model-api-check
-	./scripts/codegen.py model-api
+	$(ROOT_DIR)/scripts/codegen.py model-api
 
 gen-swagger-check:
 	which swagger || (GO111MODULE=off go get -u github.com/go-swagger/go-swagger/cmd/swagger)
@@ -245,8 +253,22 @@ gen-swagger-check:
 	which swagger-serve || (GO111MODULE=off go get -u yunion.io/x/code-generator/cmd/swagger-serve)
 
 gen-swagger: gen-swagger-check
-	./scripts/codegen.py swagger-code
-	./scripts/codegen.py swagger-yaml
+	$(ROOT_DIR)/scripts/codegen.py swagger-code
+	$(ROOT_DIR)/scripts/codegen.py swagger-yaml
 
 swagger-serve: gen-swagger
-	./scripts/codegen.py swagger-serve
+	$(ROOT_DIR)/scripts/codegen.py swagger-serve
+
+.PHONY: gen-model-api-check gen-model-api gen-swagger-check gen-swagger swagger-serve
+
+REGISTRY ?= "registry.cn-beijing.aliyuncs.com/yunionio"
+VERSION ?= $(shell git describe --exact-match 2> /dev/null || \
+                git describe --match=$(git rev-parse --short=8 HEAD) --always --dirty --abbrev=8)
+
+image:
+	TAG=$(VERSION) REGISTRY=$(REGISTRY) $(ROOT_DIR)/scripts/docker_push.sh $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: image
+
+%:
+	@:

OWNERS

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

README-CN.md

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

README.md

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build/docker/Dockerfile.ansibleserver

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

build/docker/Dockerfile.ansibleserver-base

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

build/docker/Dockerfile.apigateway

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

build/docker/Dockerfile.baremetal-agent

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

build/docker/Dockerfile.baremetal-base

@@ -0,0 +1,34 @@
+FROM frolvlad/alpine-glibc:glibc-2.28
+
+MAINTAINER "Yaoqi Wan <wanyaoqi@yunionyun.com>"
+
+RUN mkdir -p /opt/yunion/bin
+
+RUN apk update && \
+    apk add --no-cache ipmitool ethtool tzdata ca-certificates && \
+    rm -rf /var/cache/apk/*
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+
+RUN mkdir -p /opt/cloud/yunion/baremetal
+
+# download baremetal-pxerom-*.x86_64.rpm and unpack rpm in current directory
+COPY ./opt/cloud/yunion/baremetal/bootia32.efi /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/bootx64.efi /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/chain.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/initramfs /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/isolinux.bin /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/kernel /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.e32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/ldlinux.e64 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/libcom32.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/libutil.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/lpxelinux.0 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/menu.c32 /opt/cloud/yunion/baremetal
+COPY ./opt/cloud/yunion/baremetal/pxelinux.0 /opt/cloud/yunion/baremetal
+
+# add mkisofs with bundles libraries
+ADD ./mkisofs /bin/mkisofs
+ADD ./.mkisofs.bin /bin/.mkisofs.bin
+ADD ./bundles/mkisofs /bin/bundles/mkisofs

build/docker/Dockerfile.climc

@@ -0,0 +1,5 @@
+FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:v20200308
+
+ADD ./build/climc/root/opt /opt
+
+ADD ./_output/bin/climc ./_output/bin/*cli /opt/yunion/bin/

build/docker/Dockerfile.climc-base

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

build/docker/Dockerfile.cloudevent

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

build/docker/Dockerfile.cloudnet

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

build/docker/Dockerfile.devtool

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

build/docker/Dockerfile.esxi-agent

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

build/docker/Dockerfile.glance

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

build/docker/Dockerfile.glance-base

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

build/docker/Dockerfile.host

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

build/docker/Dockerfile.host-deployer

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

build/docker/Dockerfile.keystone

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

build/docker/Dockerfile.logger

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

build/docker/Dockerfile.notify

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

build/docker/Dockerfile.onecloud-base

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

build/docker/Dockerfile.region

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

build/docker/Dockerfile.region-dns

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

build/docker/Dockerfile.s3gateway

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

build/docker/Dockerfile.scheduler

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

build/docker/Dockerfile.webconsole

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

build/docker/Dockerfile.webconsole-base

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

build/docker/Dockerfile.yunionconf

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

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

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

build/esxi-agent/vars

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

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

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

build/executor-server/vars

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

cmd/climc/shell/cloudaccounts.go

@@ -26,6 +26,28 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/options"
 )
 
+func parseGcpCredential(filename string) (jsonutils.JSONObject, error) {
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+	authParams, err := jsonutils.Parse(data)
+	if err != nil {
+		return nil, err
+	}
+	ret := jsonutils.NewDict()
+	for _, k := range []string{
+		"client_email",
+		"project_id",
+		"private_key_id",
+		"private_key",
+	} {
+		v, _ := authParams.Get(k)
+		ret.Add(v, fmt.Sprintf("gcp_%s", k))
+	}
+	return ret, nil
+}
+
 func init() {
 
 	type CloudaccountListOptions struct {
@@ -134,11 +156,7 @@ func init() {
 	R(&options.SGoogleCloudAccountCreateOptions{}, "cloud-account-create-google", "Create a Google cloud account", func(s *mcclient.ClientSession, args *options.SGoogleCloudAccountCreateOptions) error {
 		params := jsonutils.Marshal(args)
 		params.(*jsonutils.JSONDict).Add(jsonutils.NewString("Google"), "provider")
-		data, err := ioutil.ReadFile(args.GoogleJsonFile)
-		if err != nil {
-			return err
-		}
-		authParams, err := jsonutils.Parse(data)
+		authParams, err := parseGcpCredential(args.GoogleJsonFile)
 		if err != nil {
 			return err
 		}

cmd/climc/shell/hosts.go

@@ -350,7 +350,7 @@ func init() {
 		return nil
 	})
 
-	R(&HostDetailOptions{}, "host-stop", "Power on host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
+	R(&HostDetailOptions{}, "host-stop", "Power off host", func(s *mcclient.ClientSession, args *HostDetailOptions) error {
 		result, err := modules.Hosts.PerformAction(s, args.ID, "stop", nil)
 		if err != nil {
 			return err

cmd/climc/shell/images.go

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

cmd/climc/shell/k8s/event.go

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

cmd/climc/shell/k8s/k8s.go

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

cmd/climc/shell/policies.go

@@ -134,7 +134,7 @@ func init() {
 		return nil
 	}
 	R(&PolicyPatchOptions{}, "policy-patch", "Patch policy", updateFunc)
-	R(&PolicyPatchOptions{}, "policy-update", "Patch policy", updateFunc)
+	R(&PolicyPatchOptions{}, "policy-update", "Update policy", updateFunc)
 
 	type PolicyPerformOptions struct {
 		ID string `help:"ID of policy to update"`
@@ -285,12 +285,30 @@ func init() {
 		if err != nil {
 			log.Fatalf("Set log level %q: %v", "debug", err)
 		}
+		if args.Debug {
+			rbacutils.ShowMatchRuleDebug = true
+		}
 		auth.InitFromClientSession(s)
 		policy.EnableGlobalRbac(15*time.Second, 15*time.Second, false)
 		if args.Debug {
 			consts.EnableRbacDebug()
 		}
 
+		findPolicy := false
+		for !findPolicy {
+			all := policy.PolicyManager.AllPolicies()
+			for _, allP := range all {
+				if len(allP) > 0 {
+					findPolicy = true
+					break
+				}
+			}
+			if findPolicy {
+				break
+			}
+			time.Sleep(time.Second)
+		}
+
 		req := jsonutils.NewDict()
 		for i := 0; i < len(args.Request); i += 1 {
 			parts := strings.Split(args.Request[i], ":")
@@ -356,6 +374,7 @@ func init() {
 				Context: mcclient.SAuthContext{
 					Ip: args.Ip,
 				},
+				Token: "faketoken",
 			}
 		} else {
 			token = s.GetToken()
@@ -367,6 +386,10 @@ func init() {
 		}
 		printObject(result)
 
+		for _, r := range args.Role {
+			fmt.Println("role", r, "matched policies:", policy.PolicyManager.RoleMatchPolicies(r))
+		}
+
 		fmt.Println("userCred:", token)
 		for _, scope := range []rbacutils.TRbacScope{
 			rbacutils.ScopeSystem,
@@ -375,7 +398,7 @@ func init() {
 			rbacutils.ScopeUser,
 			rbacutils.ScopeNone,
 		} {
-			m := policy.PolicyManager.MatchedPolicies(scope, token)
+			m := policy.PolicyManager.MatchedPolicyNames(scope, token)
 			fmt.Println("matched", scope, "policies:", m)
 		}
 

cmd/climc/shell/pprof.go

@@ -0,0 +1,103 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"syscall"
+
+	"yunion.io/x/pkg/util/signalutils"
+
+	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules"
+	"yunion.io/x/onecloud/pkg/util/netutils2"
+	"yunion.io/x/onecloud/pkg/util/procutils"
+)
+
+func init() {
+	type TraceOptions struct {
+		Second  int    `help:"pprof seconds" short-token:"s"`
+		Service string `help:"Service type"`
+		Address string `help:"Service listen address"`
+	}
+
+	downloadToTemp := func(input io.Reader, pattern string) (string, error) {
+		tmpfile, err := ioutil.TempFile("", pattern)
+		if err != nil {
+			return "", err
+		}
+		defer tmpfile.Close()
+		if _, err := io.Copy(tmpfile, input); err != nil {
+			return "", err
+		}
+		return tmpfile.Name(), nil
+	}
+
+	pprofRun := func(s *mcclient.ClientSession, opts *TraceOptions, pType string, args ...string) error {
+		var (
+			src io.Reader
+			err error
+		)
+		if len(opts.Service) > 0 {
+			src, err = modules.GetPProfByType(s, opts.Service, pType, opts.Second)
+			if err != nil {
+				return err
+			}
+		} else if len(opts.Address) > 0 {
+			src, err = modules.GetNamedAddressPProfByType(s, opts.Address, pType, opts.Second)
+			if err != nil {
+				return err
+			}
+		} else {
+			return fmt.Errorf("no service address provide")
+		}
+
+		tempfile, err := downloadToTemp(src, pType)
+		if err != nil {
+			return err
+		}
+		defer func() { os.Remove(tempfile) }()
+
+		signalutils.RegisterSignal(func() {
+			os.Remove(tempfile)
+			os.Exit(0)
+		}, syscall.SIGHUP, syscall.SIGINT, syscall.SIGQUIT, syscall.SIGTERM)
+		signalutils.StartTrap()
+
+		argv := []string{"tool"}
+		argv = append(argv, args...)
+		argv = append(argv, tempfile)
+		cmd := procutils.NewCommand("go", argv...)
+		if err := cmd.Run(); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	R(&TraceOptions{}, "pprof-trace", "pprof trace of backend service", func(s *mcclient.ClientSession, args *TraceOptions) error {
+		return pprofRun(s, args, "trace", "trace")
+	})
+
+	R(&TraceOptions{}, "pprof-profile", "pprof profile of backend service", func(s *mcclient.ClientSession, args *TraceOptions) error {
+		port, err := netutils2.GetFreePort()
+		if err != nil {
+			return err
+		}
+		return pprofRun(s, args, "profile", "pprof", fmt.Sprintf("-http=:%d", port))
+	})
+}

cmd/climc/shell/servers.go

@@ -987,6 +987,7 @@ func init() {
 				config.Hosts[i].HostIp = yamlConfig.Hosts[i].HostIp
 				config.Hosts[i].XmlFilePath = yamlConfig.Hosts[i].XmlFilePath
 				config.Hosts[i].Servers = make([]compute.SLibvirtServerConfig, len(yamlConfig.Hosts[i].Servers))
+				config.Hosts[i].MonitorPath = yamlConfig.Hosts[i].MonitorPath
 				for j := 0; j < len(yamlConfig.Hosts[i].Servers); j++ {
 					config.Hosts[i].Servers[j].MacIp = make(map[string]string)
 					mac := yamlConfig.Hosts[i].Servers[j].Mac
@@ -1009,11 +1010,11 @@ func init() {
 		if err != nil {
 			return err
 		}
-		for i := 0; i < len(params); i++ {
-			val := jsonutils.NewDict()
-			val.Set(modules.Servers.KeywordPlural, params[i])
-			params[i] = val
-		}
+		//for i := 0; i < len(params); i++ {
+		//	val := jsonutils.NewDict()
+		//	val.Set(modules.Servers.KeywordPlural, params[i])
+		//	params[i] = val
+		//}
 
 		results := modules.Servers.BatchPerformClassAction(s, "import-from-libvirt", params)
 		printBatchResults(results, modules.Servers.GetColumns(s))

cmd/climc/shell/snapshot_policy.go

@@ -56,7 +56,7 @@ func init() {
 
 		RetentionDays  int   `help:"snapshot retention days"`
 		RepeatWeekdays []int `help:"snapshot create days on week"`
-		TimePoints     []int `help:"snapshot create time points on one day`
+		TimePoints     []int `help:"snapshot create time points on one day"`
 	}
 
 	R(&SnapshotPolicyCreateOptions{}, "snapshot-policy-create", "Create snapshot policy", func(s *mcclient.ClientSession, args *SnapshotPolicyCreateOptions) error {

cmd/esxi-agent/main.go

@@ -1,4 +1,4 @@
-// Copyright 2018, OpenCensus Authors
+// 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.
@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build !go1.11
-
-package trace
+package main
 
 import (
-	"context"
+	"yunion.io/x/onecloud/pkg/esxi/service"
+	"yunion.io/x/onecloud/pkg/util/atexit"
 )
 
-func startExecutionTracerTask(ctx context.Context, name string) (context.Context, func()) {
-	return ctx, func() {}
+func main() {
+	defer atexit.Handle()
+
+	service.New().StartService()
 }

cmd/executor-server/main.go

@@ -0,0 +1,115 @@
+// 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 (
+	"flag"
+	"net"
+	"os"
+	"strings"
+
+	"google.golang.org/grpc"
+
+	"yunion.io/x/executor/apis"
+	"yunion.io/x/executor/server"
+	"yunion.io/x/log"
+
+	"yunion.io/x/onecloud/pkg/util/sysutils"
+)
+
+var socketPath string
+
+func init() {
+	flag.StringVar(&socketPath, "socket-path", "/var/run/exec.sock", "execute service listen socket path")
+}
+
+func main() {
+	if !sysutils.IsRootPermission() {
+		log.Fatalln("executor must run on root permission")
+	}
+	Serve()
+}
+
+type SExecuteService struct {
+}
+
+func NewExecuteService() *SExecuteService {
+	return &SExecuteService{}
+}
+
+func (s *SExecuteService) fixPathEnv() error {
+	var paths = []string{
+		"/usr/local/sbin",
+		"/usr/local/bin",
+		"/sbin",
+		"/bin",
+		"/usr/sbin",
+		"/usr/bin",
+	}
+	return os.Setenv("PATH", strings.Join(paths, ":"))
+}
+
+func (s *SExecuteService) prepareEnv() error {
+	if err := s.fixPathEnv(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (s *SExecuteService) runService() {
+	grpcServer := grpc.NewServer()
+	apis.RegisterExecutorServer(grpcServer, &server.Executor{})
+	if _, err := os.Stat(socketPath); !os.IsNotExist(err) {
+		conn, err := net.Dial("unix", socketPath)
+		if err == nil {
+			conn.Close()
+			log.Fatalf("socket %s already listening", socketPath)
+		}
+
+		// socket file already exist, remove first
+		if err := os.Remove(socketPath); err != nil {
+			log.Fatalln(err)
+		}
+	}
+
+	listener, err := net.Listen("unix", socketPath)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	defer listener.Close()
+	log.Infof("Init net listener on %s succ", socketPath)
+	err = grpcServer.Serve(listener)
+	if err != nil {
+		log.Fatalln(err)
+	}
+}
+
+func (s *SExecuteService) initService() {
+	if len(socketPath) == 0 {
+		log.Fatalf("missing socket path")
+	}
+	if err := s.prepareEnv(); err != nil {
+		log.Fatalln(err)
+	}
+}
+
+func (s *SExecuteService) Run() {
+	s.initService()
+	s.runService()
+}
+
+func Serve() {
+	NewExecuteService().Run()
+}

docs/README.md

@@ -11,7 +11,7 @@ swagger文档，https://swagger.io/docs/specification/2-0/basic-structure/
 1. 首先启动swagger-ui
 
     sudo docker pull swaggerapi/swagger-ui
-    sudo docker run -p 80:8080 swaggerapi/swagger-ui
+    sudo docker run -d -p 80:8080 swaggerapi/swagger-ui
 
 2. 用python启动本地的http server，这是允许CORS的SimpleHTTPServer，监听在8000端口
 

docs/ansibleplaybook/ansibleplaybook-run.yaml

@@ -0,0 +1,21 @@
+post:
+  summary: 执行ansibleplaybook
+  description: |
+    调用成功后
+
+     - start_time将置为当前时间
+     - end_time置为空
+     - status设置为running
+  parameters:
+    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
+    - name: ansibleplaybook
+      in: body
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
+  responses:
+    200:
+      description: ansibleplaybook的信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
+  tags:
+    - ansibleplaybooks

docs/ansibleplaybook/ansibleplaybook-stop.yaml

@@ -0,0 +1,20 @@
+post:
+  summary: 中止执行ansibleplaybook
+  description: |
+    调用成功后
+
+     - end_time置为当前时间
+     - status设置为canceled
+  parameters:
+    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
+    - name: ansibleplaybook
+      in: body
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
+  responses:
+    200:
+      description: ansibleplaybook的信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
+  tags:
+    - ansibleplaybooks

docs/ansibleplaybook/ansibleplaybook.yaml

@@ -0,0 +1,41 @@
+get:
+  summary: 获取指定ansibleplaybook的信息
+  parameters:
+    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
+  responses:
+    200:
+      description: ansibleplaybook信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
+  tags:
+    - ansibleplaybooks
+
+put:
+  summary: 更新ansibleplaybook自身参数
+  parameters:
+    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
+    - name: ansibleplaybook
+      in: body
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
+  responses:
+    200:
+      description: ansibleplaybook的信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
+  tags:
+    - ansibleplaybooks
+
+delete:
+  summary: 删除指定ansibleplaybook
+  description: |
+    处于运行状态的playbook需先中止执行才允许删除
+  parameters:
+    - $ref: "../parameters/ansibleplaybook.yaml#/ansibleplaybookId"
+  responses:
+    200:
+      description: 被删除ansibleplaybook的信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
+  tags:
+    - ansibleplaybooks

docs/ansibleplaybook/ansibleplaybooks.yaml

@@ -0,0 +1,23 @@
+get:
+  summary: 按指定条件列出ansibleplaybook实例
+  responses:
+    200:
+      description: 实例列表信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookListResponse"
+  tags:
+    - ansibleplaybooks
+post:
+  summary: 创建ansibleplaybook实例
+  parameters:
+    - name: ansibleplaybook
+      in: body
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookCreateRequest"
+  responses:
+    200:
+      description: 新创建的实例信息
+      schema:
+        $ref: "../schemas/ansibleplaybook.yaml#/AnsiblePlaybookResponse"
+  tags:
+    - ansibleplaybooks

docs/bucket/buckets.yaml

@@ -23,7 +23,7 @@ post:
       required: true
       schema:
         $ref: "../schemas/bucket.yaml#/BucketCreateInput"
-  response:
+  responses:
     200:
       description: 对象存储桶信息
       schema:

docs/bucket/limit.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 设置存储桶的储存限制，该限制只有在使用OneCloud作为访问对象存储网关才生效。
+  parameters:
+    - $ref: '../parameters/bucket.yaml#/bucket_name'
+    - name: bucket
+      in: body
+      required: true
+      schema:
+        $ref: "../schemas/bucket.yaml#/BucketSetLimitInput"
+  responses:
+    200:
+      description: 指定存储桶的Limit响应
+      schema:
+        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
+  tags:
+    - buckets

docs/cloudaccount/change-project.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 更新云账号所属项目
+  parameters: 
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+    - in: body
+      name: cloudaccount
+      required: true
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountChangeProject' 
+  responses:
+    200:
+      description: 云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount

docs/cloudaccount/cloudaccount.yaml

@@ -0,0 +1,40 @@
+get:
+  summary: 获取指定云账号详情信息
+  parameters:
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+  responses:
+    200:
+      description: 云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount
+
+put:
+  summary: 更新云账号信息
+  parameters:
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+    - in: body
+      name: cloudaccount
+      required: true
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountUpdate' 
+  responses:
+    200:
+      description: 云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount
+
+delete:
+  summary: 删除指定云账号
+  parameters:
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+  responses:
+    200:
+      description: 被删除云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount

docs/cloudaccount/cloudaccounts.yaml

@@ -0,0 +1,30 @@
+get:
+  summary: 按指定条件列出云账号
+  parameters:
+    - $ref: '../parameters/common.yaml#/limit'
+    - $ref: '../parameters/common.yaml#/offset'
+    - $ref: '../parameters/common.yaml#/provider'
+    - $ref: '../parameters/common.yaml#/cloud_env'
+
+  responses:
+    200:
+      description: 云账号列表信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountListResponse'
+  tags:
+    - cloudaccount
+post:
+  summary: 创建云账号
+  parameters:
+    - in: body
+      name: cloudaccount
+      required: true
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountCreate' 
+  responses:
+    200:
+      description: 新创建的云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount

docs/cloudaccount/public.yaml

@@ -0,0 +1,13 @@
+post:
+  summary: 云账号共享
+  parameters: 
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+    - $ref: "../parameters/cloudaccount.yaml#/scope"
+    - $ref: "../parameters/cloudaccount.yaml#/shared_projects"
+  responses:
+    200:
+      description: 云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount

docs/cloudaccount/sync.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 云账号信息同步
+  parameters: 
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+    - in: body
+      name: cloudaccount
+      required: true
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountSync' 
+  responses:
+    200:
+      description: 云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount

docs/cloudaccount/update-credential.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 更新云账号密码
+  parameters: 
+    - $ref: '../parameters/cloudaccount.yaml#/cloudaccountId'
+    - in: body
+      name: cloudaccount
+      required: true
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountUpdateCredential' 
+  responses:
+    200:
+      description: 云账号信息
+      schema:
+        $ref: '../schemas/cloudaccount.yaml#/CloudaccountResponse'
+  tags:
+    - cloudaccount

docs/disk/create-snapshot.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 磁盘创建快照
+  parameters: 
+    - $ref: '../parameters/disk.yaml#/diskId'
+    - in: body
+      name: server
+      required: true
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskCreateSanpshot'
+  responses:
+    200:
+      description: 磁盘信息
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk

docs/disk/disk.yaml

@@ -0,0 +1,39 @@
+get:
+  summary: 获取指定磁盘详情信息
+  parameters:
+    - $ref: '../parameters/disk.yaml#/diskId'
+  responses:
+    200:
+      description: 磁盘信息
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk
+put:
+  summary: 更新磁盘信息
+  parameters:
+    - $ref: '../parameters/disk.yaml#/diskId'
+    - in: body
+      name: server
+      required: true
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskUpdate' 
+  responses:
+    200:
+      description: 磁盘信息
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk
+delete:
+  summary: 删除指定磁盘
+  parameters:
+    - $ref: '../parameters/disk.yaml#/diskId'
+    - $ref: '../parameters/common.yaml#/override_pending_delete'
+  responses:
+    200:
+      description: 被删除磁盘的信息,删除前确保已解除删除保护,第一次删除时会先进入回收站(可恢复),第二次删除会真正释放资源
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk

docs/disk/disks.yaml

@@ -0,0 +1,37 @@
+get:
+  summary: 按指定条件列出磁盘
+  parameters:
+    - $ref: '../parameters/common.yaml#/offset'
+    - $ref: '../parameters/common.yaml#/limit'
+    - $ref: '../parameters/common.yaml#/pending_delete'
+    - $ref: '../parameters/common.yaml#/provider'
+    - $ref: '../parameters/common.yaml#/billing_type'
+    - $ref: '../parameters/disk.yaml#/unused'
+    - $ref: '../parameters/disk.yaml#/share'
+    - $ref: '../parameters/disk.yaml#/local'
+    - $ref: '../parameters/disk.yaml#/guest'
+    - $ref: '../parameters/disk.yaml#/storage'
+    - $ref: '../parameters/disk.yaml#/type'
+    - $ref: '../parameters/disk.yaml#/cloud_type'
+  responses:
+    200:
+      description: 磁盘列表信息
+      schema:
+        $ref: "../schemas/disk.yaml#/DiskListResponse"
+  tags:
+    - disk
+post:
+  summary: 创建磁盘
+  parameters:
+    - in: body
+      name: disk
+      required: true
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskCreate'
+  responses:
+    200:
+      description: 新建磁盘信息
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk

docs/disk/resize.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 扩容磁盘
+  parameters: 
+    - $ref: '../parameters/disk.yaml#/diskId'
+    - in: body
+      name: server
+      required: true
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResize'
+  responses:
+    200:
+      description: 磁盘信息
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk

docs/disk/save.yaml

@@ -0,0 +1,16 @@
+post:
+  summary: 磁盘保存镜像
+  parameters: 
+    - $ref: '../parameters/disk.yaml#/diskId'
+    - in: body
+      name: server
+      required: true
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskSave'
+  responses:
+    200:
+      description: 磁盘信息
+      schema:
+        $ref: '../schemas/disk.yaml#/DiskResponse'
+  tags:
+    - disk

docs/elasticip/elasticip.yaml

@@ -0,0 +1,39 @@
+get:
+  summary: 获取指定弹性IP详情信息
+  parameters: 
+    - $ref: "../parameters/elasticip.yaml#/elasticipId"
+  responses:
+    200:
+      description: 弹性IP详情信息
+      schema:
+        $ref: "../schemas/elasticip.yaml#/ElasticIpResponse"
+  tags:
+    - elasticips
+
+delete:
+  summary: 删除指定弹性IP
+  parameters:
+    - $ref: '../parameters/elasticip.yaml#/elasticipId'
+  responses:
+    200:
+      schema:
+        $ref: '../schemas/elasticip.yaml#/ElasticIpResponse'
+  tags:
+    - elasticips
+
+put:
+  summary: 更新弹性IP信息
+  parameters:
+    - $ref: '../parameters/elasticip.yaml#/elasticipId'
+    - in: body
+      name: elasticip
+      required: true
+      schema:
+        $ref: '../schemas/elasticip.yaml#/ElasticIpUpdate' 
+  responses:
+    200:
+      description: 弹性IP信息
+      schema:
+        $ref: '../schemas/elasticip.yaml#/ElasticIpResponse'
+  tags:
+    - elasticips

docs/elasticip/elasticips.yaml

@@ -0,0 +1,38 @@
+post:
+  summary: 创建弹性IP
+  parameters:
+    - in: body
+      name: elasticip
+      required: true
+      schema:
+        $ref: '../schemas/elasticip.yaml#/ElasticIpCreate'
+  responses:
+    200:
+      description: 新建弹性IP的信息
+      schema:
+        $ref: '../schemas/elasticip.yaml#/ElasticIpResponse'
+  tags:
+    - elasticips
+
+get:
+  summary: 按指定条件列出弹性IP列表
+  parameters:
+    - $ref: '../parameters/common.yaml#/limit'
+    - $ref: '../parameters/common.yaml#/offset'
+    - $ref: '../parameters/common.yaml#/cloudprovider'
+    - $ref: '../parameters/common.yaml#/cloudaccount'
+    - $ref: '../parameters/common.yaml#/provider'
+    - $ref: '../parameters/common.yaml#/brand'
+    - $ref: '../parameters/common.yaml#/cloud_env'
+    - $ref: '../parameters/common.yaml#/public_cloud'
+    - $ref: '../parameters/common.yaml#/private_cloud'
+    - $ref: '../parameters/elasticip.yaml#/usable_eip_for_associate_type'
+    - $ref: '../parameters/elasticip.yaml#/usable_eip_for_associate_id'
+    - $ref: '../parameters/elasticip.yaml#/usable'
+  responses:
+    200:
+      description: 弹性IP列表信息
+      schema:
+        $ref: '../schemas/elasticip.yaml#/ElasticIpListResponse'
+  tags:
+    - elasticips

docs/host/host.yaml

@@ -0,0 +1,40 @@
+get:
+  summary: 获取指定宿主机详情信息
+  parameters:
+    - $ref: '../parameters/host.yaml#/hostId'
+    - $ref: '../parameters/common.yaml#/pending_delete'
+  responses:
+    200:
+      description: 宿主机信息
+      schema:
+        $ref: '../schemas/host.yaml#/HostResponse'
+  tags:
+    - host
+put:
+  summary: 更新宿主机信息
+  parameters:
+    - $ref: '../parameters/host.yaml#/hostId'
+    - in: body
+      name: host
+      required: true
+      schema:
+        $ref: '../schemas/host.yaml#/HostUpdate' 
+  responses:
+    200:
+      description: 宿主机信息
+      schema:
+        $ref: '../schemas/host.yaml#/HostResponse'
+  tags:
+    - host
+delete:
+  summary: 删除指定宿主机
+  parameters:
+    - $ref: '../parameters/host.yaml#/hostId'
+    - $ref: '../parameters/common.yaml#/override_pending_delete'
+  responses:
+    200:
+      description: 被删除宿主机的信息,删除前确保已解除删除保护
+      schema:
+        $ref: '../schemas/host.yaml#/HostResponse'
+  tags:
+    - host

docs/host/hosts.yaml

@@ -0,0 +1,44 @@
+get:
+  summary: 按指定条件列出宿主机
+  parameters:
+    - $ref: '../parameters/common.yaml#/limit'
+    - $ref: '../parameters/common.yaml#/offset'
+    - $ref: '../parameters/common.yaml#/provider'
+    - $ref: '../parameters/common.yaml#/zone'
+    - $ref: '../parameters/common.yaml#/wire'
+    - $ref: '../parameters/common.yaml#/vpc'
+    - $ref: '../parameters/common.yaml#/region'
+    - $ref: '../parameters/host.yaml#/enable'
+    - $ref: '../parameters/host.yaml#/disable'
+    - $ref: '../parameters/host.yaml#/host_type'
+    - $ref: '../parameters/host.yaml#/is_empty'
+    - $ref: '../parameters/host.yaml#/storage'
+    - $ref: '../parameters/host.yaml#/usable'
+    - $ref: '../parameters/host.yaml#/hypervisor'
+    - $ref: '../parameters/host.yaml#/any_mac'
+    - $ref: '../parameters/host.yaml#/cachedimage'
+    - $ref: '../parameters/host.yaml#/is_baremetal'
+    - $ref: '../parameters/host.yaml#/resource_type'
+    - $ref: '../parameters/host.yaml#/storage_not_attached'
+  responses:
+    200:
+      description: 宿主机列表信息
+      schema:
+        $ref: '../schemas/host.yaml#/HostListResponse'
+  tags:
+    - host
+post:
+  summary: 注册物理机
+  parameters:
+    - in: body
+      name: host
+      required: true
+      schema:
+        $ref: '../schemas/host.yaml#/HostCreate' 
+  responses:
+    200:
+      description: 新创建的宿主机信息
+      schema:
+        $ref: '../schemas/host.yaml#/HostResponse'
+  tags:
+    - host

docs/image/image.yaml

@@ -104,7 +104,10 @@ put:
     - $ref: "../parameters/image.yaml#/x-image-meta-property-os_arch"
     - $ref: "../parameters/image.yaml#/x-image-meta-property-os_distribution"
     - $ref: "../parameters/image.yaml#/x-image-meta-property-os_version"
-  summary: 更新镜像信息
+    - in: body 
+      type: file 
+      description: 镜像二进制文件内容
+  summary: 更新镜像信息或上传镜像文件
   responses:
     200:
       description: 镜像信息
@@ -118,10 +121,13 @@ get:
   parameters:
     - in: query
       name: format
+      enum: [vhd,vmdk,qcow2]
       type: string
+      description: 镜像下载格式
     - in: query
       name: torrent
       type: boolean
+      description: 下载torrent种子
   tags:
     - images 
 

docs/index.yaml

@@ -49,6 +49,79 @@ paths:
   /storages/{storageId}/offline:
     $ref: "./storage/storage.yaml#/offline"
 
+  /storagecaches:
+    $ref: "./storagecache/storagecaches.yaml"
+  /storagecaches/{storagecacheId}:
+    $ref: "./storagecache/storagecache.yaml"
+  /storagecaches/{storagecacheId}/cache-image:
+    $ref: "./storagecache/cache-image.yaml"
+
+  /disks:
+    $ref: "./disk/disks.yaml"
+  /disks/{diskId}:
+    $ref: "./disk/disk.yaml"
+  /disks/{diskId}/resize:
+    $ref: "./disk/resize.yaml"
+  /disks/{diskId}/save:
+    $ref: "./disk/save.yaml"
+  /disks/{diskId}/private:
+    $ref: "./disk/private.yaml"
+  /disks/{diskId}/public:
+    $ref: "./disk/public.yaml"
+  /disks/{diskId}/purge:
+    $ref: "./disk/purge.yaml"
+  /disks/{diskId}/reset:
+    $ref: "./disk/reset.yaml"
+  /disks/{diskId}/create-snapshot:
+    $ref: "./disk/create-snapshot.yaml"
+
+  /hosts:
+    $ref: "./host/hosts.yaml"
+  /hosts/{hostId}:
+    $ref: "./host/host.yaml"
+  /hosts/{hostId}/ping:
+    $ref: "./host/ping.yaml"
+  /hosts/{hostId}/enable:
+    $ref: "./host/enable.yaml"
+  /hosts/{hostId}/disable:
+    $ref: "./host/disable.yaml"
+  /hosts/{hostId}/syncstatus:
+    $ref: "./host/syncstatus.yaml"
+  /hosts/{hostId}/prepare:
+    $ref: "./host/prepare.yaml"
+  /hosts/{hostId}/ipmi:
+    $ref: "./host/ipmi.yaml"
+  /hosts/{hostId}/convert-hypervisor:
+    $ref: "./host/convert-hypervisor.yaml"
+  /hosts/{hostId}/undo-convert:
+    $ref: "./host/undo-convert.yaml"
+  /hosts/{hostId}/maintenance:
+    $ref: "./host/maintenance.yaml"
+  /hosts/{hostId}/unmaintenance:
+    $ref: "./host/unmaintenance.yaml"
+  /hosts/{hostId}/stop:
+    $ref: "./host/stop.yaml"
+  /hosts/{hostId}/start:
+    $ref: "./host/start.yaml"
+  /hosts/{hostId}/reset:
+    $ref: "./host/reset.yaml"
+  # /hosts/{hostId}/add-netif:
+  #   $ref: "./host/add-netif.yaml"
+  # /hosts/{hostId}/remove-netif:
+  #   $ref: "./host/remove-netif.yaml"
+  # /hosts/{hostId}/enable-netif:
+  #   $ref: "./host/enable-netif.yaml"
+  # /hosts/{hostId}/disable-netif:
+  #   $ref: "./host/disable-netif.yaml"
+  # /hosts/{hostId}/remove-all-netifs:
+  #   $ref: "./host/remove-all-netifs.yaml"
+  /hosts/{hostId}/undo-prepaid-recycle:
+    $ref: "./host/undo-prepaid-recycle.yaml"
+  /hosts/{hostId}/renew-prepaid-recycle:
+    $ref: "./host/renew-prepaid-recycle.yaml"
+  /hosts/{hostId}/spec:
+    $ref: "./host/spec.yaml"
+
   /hoststorages:
     $ref: "./hoststorage/hoststorage.yaml"
   /hosts/{hostId}/storages/{storageId}:
@@ -92,7 +165,7 @@ paths:
   /servers/{instanceId}/change-bandwidth:
     $ref: "./instance/change-bandwidth.yaml"
   /servers/{instanceId}/change-config:
-    $ref: "./instance/change-bandwidth.yaml"
+    $ref: "./instance/change-config.yaml"
   /servers/{instanceId}/change-ip-addr:
     $ref: "./instance/change-ip-addr.yaml"
   /servers/{instanceId}/create-backup:
@@ -248,6 +321,15 @@ paths:
     $ref: "./loadbalancer/loadbalancerlisteners.yaml"
   /loadbalancerlisteners/{loadbalancerlistenerId}:
     $ref: "./loadbalancer/loadbalancerlistener.yaml"
+  /loadbalancerlisteners/{loadbalancerlistenerId}/backend-status:
+    $ref: "./loadbalancer/loadbalancerlistener-backend-status.yaml"
+
+  /loadbalancerlistenerrules:
+    $ref: "./loadbalancer/loadbalancerlistenerrules.yaml"
+  /loadbalancerlistenerrules/{loadbalancerlistenerruleId}:
+    $ref: "./loadbalancer/loadbalancerlistenerrule.yaml"
+  /loadbalancerlistenerrules/{loadbalancerlistenerruleId}/backend-status:
+    $ref: "./loadbalancer/loadbalancerlistenerrule-backend-status.yaml"
 
   /loadbalancerbackendgroups:
     $ref: "./loadbalancer/loadbalancerbackendgroups.yaml"
@@ -259,6 +341,22 @@ paths:
   /loadbalancerbackends/{loadbalancerbackendId}:
     $ref: "./loadbalancer/loadbalancerbackend.yaml"
 
+  /loadbalancerclusters:
+    $ref: "./loadbalancer/loadbalancerclusters.yaml"
+  /loadbalancerclusters/{loadbalancerClusterId}:
+    $ref: "./loadbalancer/loadbalancercluster.yaml"
+
+  /loadbalanceragents:
+    $ref: "./loadbalancer/loadbalanceragents.yaml"
+  /loadbalanceragents/{loadbalancerAgentId}:
+    $ref: "./loadbalancer/loadbalanceragent.yaml"
+  /loadbalanceragents/{loadbalancerAgentId}/params-patch:
+    $ref: "./loadbalancer/loadbalanceragent-params-patch.yaml"
+  /loadbalanceragents/{loadbalancerAgentId}/deploy:
+    $ref: "./loadbalancer/loadbalanceragent-deploy.yaml"
+  /loadbalanceragents/{loadbalancerAgentId}/undeploy:
+    $ref: "./loadbalancer/loadbalanceragent-undeploy.yaml"
+
   /identity_providers:
     $ref: "./identity/identity_providers.yaml"
   /identity_providers/{idp_id}:
@@ -357,11 +455,37 @@ paths:
   /serverskus/{serverskuId}/cache-sku:
     $ref: "./serversku/cache-sku.yaml"
 
+  /secgroups:
+    $ref: "./secgroup/secgroups.yaml"
+  /secgroups/{secgroupId}:
+    $ref: "./secgroup/secgroup.yaml"
+  /secgroups/{secgroupId}/clone:
+    $ref: "./secgroup/clone.yaml"
+  /secgroups/{secgroupId}/union:
+    $ref: "./secgroup/union.yaml"
+  /secgroups/{secgroupId}/add-rule:
+    $ref: "./secgroup/add-rule.yaml"
+  /secgroups/{secgroupId}/public:
+    $ref: "./secgroup/public.yaml"
+  /secgroups/{secgroupId}/private:
+    $ref: "./secgroup/private.yaml"
+  /secgroups/{secgroupId}/cache-secgroup:
+    $ref: "./secgroup/cache-secgroup.yaml"
+  /secgroups/{secgroupId}/uncache-secgroup:
+    $ref: "./secgroup/uncache-secgroup.yaml"
+
+
   /secgroupcaches:
     $ref: "./secgroupcache/secgroupcaches.yaml"
   /secgroupcaches/{cacheId}:
     $ref: "./secgroupcache/secgroupcache.yaml"
 
+
+  /secgrouprules:
+    $ref: "./secgrouprule/secgrouprules.yaml"
+  /secgrouprules/{secgroupruleId}:
+    $ref: "./secgrouprule/secgrouprule.yaml"
+
   /keypairs:
     $ref: "./keypair/keypairs.yaml"
   /keypairs/{keypairId}:
@@ -410,6 +534,14 @@ paths:
   /buckets/{bucketName}/access-info:
     $ref: "./bucket/access.yaml"
 
+  /ansibleplaybooks:
+    $ref: "./ansibleplaybook/ansibleplaybooks.yaml"
+  /ansibleplaybooks/{ansibleplaybookId}:
+    $ref: "./ansibleplaybook/ansibleplaybook.yaml"
+  /ansibleplaybooks/{ansibleplaybookId}/run:
+    $ref: "./ansibleplaybook/ansibleplaybook-run.yaml"
+  /ansibleplaybooks/{ansibleplaybookId}/stop:
+    $ref: "./ansibleplaybook/ansibleplaybook-stop.yaml"
   /dbinstances:
     $ref: "./dbinstance/dbinstances.yaml"
   /dbinstances/{dbinstanceId}:
@@ -535,4 +667,3 @@ paths:
     $ref: "./cloudaccount/enable-auto-sync.yaml"
   /cloudaccounts/{cloudaccountId}/disable-auto-sync:
     $ref: "./cloudaccount/disable-auto-sync.yaml"
->>>>>>> add rds operation

docs/keypair/keypair.yaml

@@ -0,0 +1,39 @@
+get:
+  summary: 获取指定秘钥详情信息
+  parameters: 
+    - $ref: "../parameters/keypair.yaml#/keypairId"
+  responses:
+    200:
+      description: 秘钥详情信息
+      schema:
+        $ref: "../schemas/keypair.yaml#/KeypairResponse"
+  tags:
+    - keypairs
+
+delete:
+  summary: 删除指定秘钥
+  parameters:
+    - $ref: '../parameters/keypair.yaml#/keypairId'
+  responses:
+    200:
+      schema:
+        $ref: '../schemas/keypair.yaml#/KeypairResponse'
+  tags:
+    - keypairs
+
+put:
+  summary: 更新秘钥信息
+  parameters:
+    - $ref: '../parameters/keypair.yaml#/keypairId'
+    - in: body
+      name: keypair
+      required: true
+      schema:
+        $ref: '../schemas/keypair.yaml#/KeypairUpdate' 
+  responses:
+    200:
+      description: 秘钥信息
+      schema:
+        $ref: '../schemas/keypair.yaml#/KeypairResponse'
+  tags:
+    - keypairs

docs/keypair/keypairs.yaml

@@ -0,0 +1,29 @@
+post:
+  summary: 创建秘钥
+  parameters:
+    - in: body
+      name: keypair
+      required: true
+      schema:
+        $ref: '../schemas/keypair.yaml#/KeypairCreate'
+  responses:
+    200:
+      description: 新建秘钥的信息
+      schema:
+        $ref: '../schemas/keypair.yaml#/KeypairResponse'
+  tags:
+    - keypairs
+
+get:
+  summary: 按指定条件列出秘钥列表
+  parameters:
+    - $ref: '../parameters/common.yaml#/limit'
+    - $ref: '../parameters/common.yaml#/offset'
+    - $ref: '../parameters/keypair.yaml#/admin'
+  responses:
+    200:
+      description: 秘钥列表信息
+      schema:
+        $ref: '../schemas/keypair.yaml#/KeypairListResponse'
+  tags:
+    - keypairs

docs/loadbalancer/loadbalancer.yaml

@@ -6,7 +6,7 @@ get:
     200:
       description: 实例信息
       schema:
-        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerCachedAclListResponse"
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerResponse"
   tags:
     - loadbalancers
 delete:

docs/loadbalancer/loadbalanceragent-deploy.yaml

@@ -0,0 +1,32 @@
+post:
+  summary: 部署和更新转发实例上的守护程序
+  description: |
+    部署前，需要先准备好keystone账号，用于lbagent程序访问api服务同步配置信息
+
+    keystone账号通过host.vars指定，描述如下
+
+     - `user`, 用户名
+     - `pass`，密码
+     - `proj`，项目名，一般情况下该值应当为`system`
+
+    当`deploy_method`为`yum`时，需要同时指定yum源相关的变量
+
+     - `repo_base_url`，一般情况下该值应当为`https://controller-host-ip/yumrepo`
+     - `repo_sslverify`，默认为0，表示访问仓库时不校验tls证书
+     
+       若`repo_base_url`使用https，且使用自签名证书时，一般应当关闭tls证书校验
+
+    该操作依赖ansibleserver执行具体的部署任务。对应的ansibleplaybook任务id记录在deployment.ansibleplaybook，可通过这个ID获得部署执行的结果
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerAgentId"
+    - name: params
+      in: body
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentDeployRequest"
+  responses:
+    200:
+      description: 变更后的转发实例信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents

docs/loadbalancer/loadbalanceragent-params-patch.yaml

@@ -0,0 +1,15 @@
+post:
+  summary: 更改loadbalancer转发实例的守护进程的参数
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerAgentId"
+    - name: params
+      in: body
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentParams"
+  responses:
+    200:
+      description: 变更后的转发实例信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents

docs/loadbalancer/loadbalanceragent-undeploy.yaml

@@ -0,0 +1,18 @@
+post:
+  summary: 下线转发实例
+  description: |
+    该操作要求被下线的转发实例之前通过lbagent-deploy部署
+
+    下线的执行操作包括
+
+     - 卸载lbagent
+     - 停止正在运行的与转发相关的守护进程
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerAgentId"
+  responses:
+    200:
+      description: 变更后的转发实例信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents

docs/loadbalancer/loadbalanceragent.yaml

@@ -0,0 +1,46 @@
+get:
+  summary: 获取指定loadbalancer转发实例信息
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerAgentId"
+  responses:
+    200:
+      description: 转发实例信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents
+put:
+  summary: 更新loadbalancer转发实例自身参数
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerAgentId"
+    - name: loadbalanceragent
+      in: body
+      schema:
+        type: object
+        properties:
+          hb_timeout:
+            description: 转发实例心跳超时时间
+            in: body
+            type: integer
+            minimum: 1
+            example: 3600
+  responses:
+    200:
+      description: 转发实例信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents
+delete:
+  summary: 删除指定loadbalancer转发实例
+  description: |
+    删除操作仅涉及数据库记录，实际节点的下线计划需要管理员计划实施
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerId"
+  responses:
+    200:
+      description: 被删除转发实例的信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents

docs/loadbalancer/loadbalanceragents.yaml

@@ -0,0 +1,25 @@
+get:
+  summary: 按指定条件列出loadbalancer转发实例
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/cluster"
+  responses:
+    200:
+      description: 实例列表信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentListResponse"
+  tags:
+    - loadbalanceragents
+post:
+  summary: 创建loadbalancer转发实例
+  parameters:
+    - name: loadbalanceragent
+      in: body
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentCreateRequest"
+  responses:
+    200:
+      description: 新创建的实例信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerAgentResponse"
+  tags:
+    - loadbalanceragents

docs/loadbalancer/loadbalancercluster.yaml

@@ -0,0 +1,26 @@
+get:
+  summary: 获取指定loadbalancer集群信息
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerClusterId"
+  responses:
+    200:
+      description: 集群信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerClusterResponse"
+  tags:
+    - loadbalancerclusters
+delete:
+  summary: 删除指定loadbalancer集群
+  description: |
+    该操作会同时删除指定集群下的LoadbalancerAgent对象。
+
+    该操作仅删除数据库记录，并不对实际的转发节点进行配置变更，转发节点的下线需要由管理员另外执行。
+  parameters:
+    - $ref: "../parameters/loadbalancer.yaml#/loadbalancerClusterId"
+  responses:
+    200:
+      description: 被删除实例的信息
+      schema:
+        $ref: "../schemas/loadbalancer.yaml#/LoadbalancerClusterResponse"
+  tags:
+    - loadbalancerclusters