Merge pull request #17403 from gouqi11/automated-cherry-pick-of-#17395-upstream-release-3.10

Automated cherry pick of #17395: fix(notify): add more details for emailqueue
Merge pull request #17415 from ioito/automated-cherry-pick-of-#17414-upstream-release-3.10
2026-09-20 16:13:56 +08:00 · 2023-06-30 10:15:30 +08:00 · 2023-06-29 20:21:15 +08:00 · 2023-06-29 20:16:31 +08:00 · 2023-06-29 20:15:43 +08:00 · 2023-06-29 20:13:10 +08:00
632 changed files with 226541 additions and 20746 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,3 @@
+[*.sh]
+indent_style = space
+indent_size = 4
--- a/cmd/climc/shell/compute/cloudproviderregions.go
+++ b/cmd/climc/shell/compute/cloudproviderregions.go
@@ -42,8 +42,8 @@ func init() {
 		}
 		var result *printutils.ListResult
 		var err error
-		if len(args.Manager) > 0 {
-			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager, params)
+		if len(args.Manager) == 1 {
+			result, err = modules.CloudproviderregionManager.ListDescendent(s, args.Manager[0], params)
 		} else if len(args.Region) > 0 {
 			result, err = modules.CloudproviderregionManager.ListDescendent2(s, args.Region, params)
 		} else {
--- a/cmd/climc/shell/compute/webconsole.go
+++ b/cmd/climc/shell/compute/webconsole.go
@@ -24,19 +24,23 @@ import (

 	webconsole_api "yunion.io/x/onecloud/pkg/apis/webconsole"
 	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/mcclient/modules/webconsole"
 	o "yunion.io/x/onecloud/pkg/mcclient/options"
 	"yunion.io/x/onecloud/pkg/webconsole/command"
 )

-const (
-	DefaultWebconsoleServer = "https://console.yunion.cn/web-console"
-)
-
 func init() {
-	handleResult := func(opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
+	handleResult := func(s *mcclient.ClientSession, opt o.WebConsoleOptions, obj jsonutils.JSONObject) error {
 		if opt.WebconsoleUrl == "" {
-			opt.WebconsoleUrl = DefaultWebconsoleServer
+			resp, err := identity.ServicesV3.GetSpecific(s, "common", "config", nil)
+			if err != nil {
+				return err
+			}
+			apiServer, _ := resp.GetString("config", "default", "api_server")
+			if len(apiServer) > 0 {
+				opt.WebconsoleUrl = fmt.Sprintf("%s/web-console", apiServer)
+			}
 		}
 		u, err := url.Parse(opt.WebconsoleUrl)
 		if err != nil {
@@ -52,7 +56,7 @@ func init() {
 			return err
 		} else if !utils.IsInStringArray(protocol, []string{
 			command.PROTOCOL_TTY, webconsole_api.VNC,
-			webconsole_api.SPICE, webconsole_api.WMKS,
+			webconsole_api.SPICE, webconsole_api.WMKS, webconsole_api.WS,
 		}) {
 			fmt.Println(connectParams)
 			return nil
@@ -74,7 +78,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})

@@ -87,7 +91,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})

@@ -96,7 +100,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})

@@ -109,7 +113,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})

@@ -118,7 +122,7 @@ func init() {
 		if err != nil {
 			return err
 		}
-		handleResult(args.WebConsoleOptions, ret)
+		handleResult(s, args.WebConsoleOptions, ret)
 		return nil
 	})
 }
--- a/cmd/climc/shell/identity/users.go
+++ b/cmd/climc/shell/identity/users.go
@@ -17,15 +17,25 @@ package identity
 import (
 	"yunion.io/x/jsonutils"

+	"yunion.io/x/onecloud/cmd/climc/shell"
 	api "yunion.io/x/onecloud/pkg/apis/identity"
 	"yunion.io/x/onecloud/pkg/mcclient"
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
+	identity_options "yunion.io/x/onecloud/pkg/mcclient/options/identity"
 )

 func init() {
-	type UserListOptions struct {
+	cmd := shell.NewResourceCmd(&modules.UsersV3)
+	cmd.List(&identity_options.UserListOptions{})
+	cmd.Perform("user-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-user-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("set-class-metadata", &options.ResourceMetadataOptions{})
+	cmd.Perform("metadata", &options.ResourceMetadataOptions{})
+
+	/*type UserListOptions struct {
 		options.BaseListOptions
 		Name                    string `help:"Filter by name"`
 		OrderByDomain           string `help:"order by domain name" choices:"asc|desc"`
@@ -50,7 +60,7 @@ func init() {
 			printList(result, modules.UsersV3.GetColumns(s))
 		}
 		return nil
-	})
+	})*/

 	type UserDetailOptions struct {
 		ID     string `help:"ID of user"`
@@ -76,6 +86,7 @@ func init() {
 		printObject(user)
 		return nil
 	})
+
 	R(&UserDetailOptions{}, "user-delete", "Delete user", func(s *mcclient.ClientSession, args *UserDetailOptions) error {
 		query := jsonutils.NewDict()
 		if len(args.Domain) > 0 {
--- a/cmd/climc/shell/logger/actions.go
+++ b/cmd/climc/shell/logger/actions.go
@@ -45,8 +45,9 @@ type BaseActionListOptions struct {

 type ActionListOptions struct {
 	BaseActionListOptions
-	Id   string   `help:"" metavar:"OBJ_ID"`
-	Type []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
+	Service []string `help:"service name`
+	Id      string   `help:"" metavar:"OBJ_ID"`
+	Type    []string `help:"Type of relevant object" metavar:"OBJ_TYPE"`
 }

 type TypeActionListOptions struct {
@@ -56,6 +57,9 @@ type TypeActionListOptions struct {

 func doActionList(s *mcclient.ClientSession, args *ActionListOptions) error {
 	params := jsonutils.NewDict()
+	if len(args.Service) > 0 {
+		params.Add(jsonutils.NewStringArray(args.Service), "service")
+	}
 	if len(args.Type) > 0 {
 		params.Add(jsonutils.NewStringArray(args.Type), "obj_type")
 	}
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,20 +0,0 @@
-# swagger.yaml
-
-使用swagger编辑器
-
-	docker run -d -p 8081:8080 swaggerapi/swagger-editor
-
-swagger文档，https://swagger.io/docs/specification/2-0/basic-structure/
-
-编辑测试：
-
-1. 首先启动swagger-ui
-
-    sudo docker pull swaggerapi/swagger-ui
-    sudo docker run -d -p 80:8080 swaggerapi/swagger-ui
-
-2. 用python启动本地的http server，这是允许CORS的SimpleHTTPServer，监听在8000端口
-
-   python server.py
-
-3. 用浏览器打开swagger-ui的URL：http://<swagger_ui_host>?url=http://<simple_http_server_host>:8000/index.yaml
--- a/docs/ansibleplaybook/ansibleplaybook-run.yaml
+++ b/docs/ansibleplaybook/ansibleplaybook-run.yaml
@@ -1,21 +0,0 @@
-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
--- a/docs/ansibleplaybook/ansibleplaybook-stop.yaml
+++ b/docs/ansibleplaybook/ansibleplaybook-stop.yaml
@@ -1,20 +0,0 @@
-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
--- a/docs/ansibleplaybook/ansibleplaybook.yaml
+++ b/docs/ansibleplaybook/ansibleplaybook.yaml
@@ -1,41 +0,0 @@
-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
--- a/docs/ansibleplaybook/ansibleplaybooks.yaml
+++ b/docs/ansibleplaybook/ansibleplaybooks.yaml
@@ -1,23 +0,0 @@
-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
--- a/docs/bucket/access.yaml
+++ b/docs/bucket/access.yaml
@@ -1,11 +0,0 @@
-get:
-  summary: 获取存储桶的后端访问信息，例如ceph RADOS的endpint/ak/sk信息等
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-  responses:
-    200:
-      description: 指定存储桶访问信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketAccessInfoResponse"
-  tags:
-    - buckets
--- a/docs/bucket/acl.yaml
+++ b/docs/bucket/acl.yaml
@@ -1,32 +0,0 @@
-post:
-  summary: 设置存储桶或者对象的ACL
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketSetACLInput"
-  responses:
-    200:
-      description: 指定存储桶或者对象的ACL响应
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
-  tags:
-    - buckets
-
-get:
-  summary: 获取存储桶或者对象的ACL
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: key
-      in: query
-      type: string
-      description: 如果查询对象的ACL，通过key指定对象的名称
-  responses:
-    200:
-      description: 指定存储桶或者对象的ACL响应
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetACLResponse"
-  tags:
-    - buckets
--- a/docs/bucket/bucket.yaml
+++ b/docs/bucket/bucket.yaml
@@ -1,40 +0,0 @@
-get:
-  summary: 获得指定对象存储桶的详情
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-  responses:
-    200:
-      description: 对象存储桶信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
-  tags:
-    - buckets
-
-put:
-  summary: 更新指定对象存储桶的信息
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketPutRequestInput"
-  responses:
-    200:
-      description: 对象存储桶信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
-  tags:
-    - buckets
-
-delete:
-  summary: 删除指定的对象存储桶
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-  responses:
-    200:
-      description: 被删除的对象存储桶信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
-  tags:
-    - buckets
--- a/docs/bucket/buckets.yaml
+++ b/docs/bucket/buckets.yaml
@@ -1,32 +0,0 @@
-get:
-  summary: 按指定条件列出对象存储桶
-  parameters:
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/provider'
-    - $ref: '../parameters/common.yaml#/brand'
-    - $ref: '../parameters/common.yaml#/region'
-    - $ref: '../parameters/common.yaml#/account'
-  responses:
-    200:
-      description: 对象存储桶列表信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketListResponse"
-  tags:
-    - buckets
-
-post:
-  summary: 新建对象存储桶
-  parameters:
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketCreateInput"
-  responses:
-    200:
-      description: 对象存储桶信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketGetResponse"
-  tags:
-    - buckets
--- a/docs/bucket/deleteobjects.yaml
+++ b/docs/bucket/deleteobjects.yaml
@@ -1,16 +0,0 @@
-post:
-  summary: 删除指定桶下的指定对象
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketObjectDeleteInput"
-  responses:
-    200:
-      description: 对象删除结果
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketObjectDeleteResponse"
-  tags:
-    - buckets
--- a/docs/bucket/limit.yaml
+++ b/docs/bucket/limit.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/bucket/listobjects.yaml
+++ b/docs/bucket/listobjects.yaml
@@ -1,13 +0,0 @@
-get:
-  summary: 获得指定对象存储桶的对象列表
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - $ref: '../parameters/bucket.yaml#/prefix'
-    - $ref: '../parameters/bucket.yaml#/recursive'
-  responses:
-    200:
-      description: 对象存储桶的对象列表信息
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketObjectListResponse"
-  tags:
-    - buckets
--- a/docs/bucket/makedir.yaml
+++ b/docs/bucket/makedir.yaml
@@ -1,14 +0,0 @@
-post:
-  summary: 创建一个大小为0的对象，用来做目录的占位
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketMakedirInput"
-  responses:
-    200:
-      description: 创建成功
-  tags:
-    - buckets
--- a/docs/bucket/tempurl.yaml
+++ b/docs/bucket/tempurl.yaml
@@ -1,16 +0,0 @@
-post:
-  summary: 生成访问指定对象的临时URL
-  parameters:
-    - $ref: '../parameters/bucket.yaml#/bucket_name'
-    - name: bucket
-      in: body
-      required: true
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketObjectTempUrlInput"
-  responses:
-    200:
-      description: 指定对象的临时URL响应
-      schema:
-        $ref: "../schemas/bucket.yaml#/BucketObjectTempUrlResponse"
-  tags:
-    - buckets
--- a/docs/bucket/uploadobject.yaml
+++ b/docs/bucket/uploadobject.yaml
@@ -1,14 +0,0 @@
-post:
-  summary: 上传对象
-  parameters:
-    - $ref: "../parameters/bucket.yaml#/bucket_name"
-    - $ref: "../parameters/bucket.yaml#/x-bucket-object-key"
-    - $ref: "../parameters/bucket.yaml#/x-bucket-content-type"
-    - $ref: "../parameters/bucket.yaml#/x-bucket-content-length"
-    - $ref: "../parameters/bucket.yaml#/x-bucket-storage-class"
-    - $ref: "../parameters/bucket.yaml#/x-bucket-acl"
-  responses:
-    200:
-      description: 上传成功
-  tags:
-    - buckets
--- a/docs/build/build-host-image.md
+++ b/docs/build/build-host-image.md
@@ -1,61 +0,0 @@
-# 制作 host-image
-
-目前 host-image 依赖 qemu 的 libqemuio.a 的静态库，制作相对麻烦，流程如下：
-
- 需要准备 arm64 和 x86_64 两台架构的编译机器
- clone qemu 代码，编译 libqemuio.a
- 两台不通架构的机器分别制作 arm64 和 x86_64 的 host-image 镜像
- 把 arm64 和 x86_64 的镜像 manifest 打包到一块
-
-## 编译 libqemuio.a
-
-下面是在 arm64 的机器上编译，x86_64 的机器上也是同样的步骤。
-
-```bash
-# clone qemu 代码
-$ git clone ssh://git@git.yunion.io/cloud/qemu.git && cd qemu
-
-# libqemuio 代码在 release/2.9 分支
-$ git checkout release/2.9
-
-# 使用 docker 编译 libqemuio.a
-$ docker run --network host -v $(pwd):/root/qemu -it debian:10
-root@ampere:/$ sed -i 's|http://deb.debian.org|http://mirrors.aliyun.com|g' /etc/apt/sources.list
-root@ampere:/$ apt-get update 
-root@ampere:/$ apt-get install -y gcc make python pkg-config flex bison libpixman-1-dev libudev-dev libaio-dev libcurl4-openssl-dev zlib1g-dev libglib2.0-dev libusb-1.0-0-dev libusbredirparser-dev libusbredirhost-dev libcapstone-dev libcephfs-dev librbd-dev librados-dev libspice-server-dev libspice-protocol-dev libfdt-dev
-root@ampere:/$ cd /root/qemu/src && make clean
-root@ampere:~/qemu/src$ ./configure --target-list=aarch64-softmmu --enable-libusb --extra-ldflags=-lrt --enable-spice --enable-rbd
-root@ampere:~/qemu/src$ make libqemuio.a
-
-# 然后退出 docker，libqemuio.a 已经编译在 qemu/src 目录里面了
-```
-
-## 编译 host-image 镜像
-
-libqemuio.a 编译出来后，开始编译 host-image 镜像，需要设置 LIBQEMUIO_PATH 这个环境变量。
-下面是在 arm64 的机器上编译，x86_64 的机器上也是同样的步骤。
-
-```bash
-# 假设 libqemuio.a 的 qemu 代码在 /root/go/src/yunion.io/x/qemu
-$ export LIBQEMUIO_PATH=/root/go/src/yunion.io/x/qemu
-
-# 这条 make image host-image 的命令会根据当前架构生成 tag=$VERSION-$arch 的镜像
-$ VERSION=dev-test make image host-image
-....
-Digest: sha256:3f92e5878e319326f5307f44daef137ded4d43564bfe7091ee2b83111fa282a4
-Status: Downloaded newer image for registry.cn-beijing.aliyuncs.com/yunionio/host-image:dev-test-arm64
-registry.cn-beijing.aliyuncs.com/yunionio/host-image:dev-test-arm64
-
-# 如果在 x86_64 上编译，就会生成 registry.cn-beijing.aliyuncs.com/yunionio/host-image:dev-test-amd64 的镜像
-```
-
-## 把 arm64 和 x86_64 的镜像 bundle 在一起
-
-通过上面两个步骤把 x86_64 和 arm64 的 host-image 做出来后，需要把它们 manifest bundle 到一块，命令如下：
-
-```bash
-$ cd build/docker
-$ HOST_IMAGE_VERSION=dev-test make host-image
-```
-
-这条命令会把 registry.cn-beijing.aliyuncs.com/yunionio/host-image:dev-test-amd64 和 registry.cn-beijing.aliyuncs.com/yunionio/host-image:dev-test-arm64 两个镜像 manifest bundle 到一个叫做 registry.cn-beijing.aliyuncs.com/yunionio/host-image:dev-test 的镜像，这个镜像就可以同时给 arm64 和 x86_64 使用了。
--- a/docs/cloudaccount/change-project.yaml
+++ b/docs/cloudaccount/change-project.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/cloudaccount/cloudaccount.yaml
+++ b/docs/cloudaccount/cloudaccount.yaml
@@ -1,40 +0,0 @@
-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
--- a/docs/cloudaccount/cloudaccounts.yaml
+++ b/docs/cloudaccount/cloudaccounts.yaml
@@ -1,30 +0,0 @@
-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
--- a/docs/cloudaccount/disable-auto-sync.yaml
+++ b/docs/cloudaccount/disable-auto-sync.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 关闭云账号自动同步
-  parameters:
-    - $ref: "../parameters/cloudaccount.yaml#/cloudaccountId"
-  responses:
-    200:
-      description: 云账号信息
-      schema:
-        $ref: "../schemas/cloudaccount.yaml#/CloudaccountResponse"
-
-  tags:
-    - cloudaccount
--- a/docs/cloudaccount/disable.yaml
+++ b/docs/cloudaccount/disable.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 禁用云账号
-  parameters:
-    - $ref: "../parameters/cloudaccount.yaml#/cloudaccountId"
-  responses:
-    200:
-      description: 禁用的云账号信息
-      schema:
-        $ref: "../schemas/cloudaccount.yaml#/CloudaccountResponse"
-
-  tags:
-    - cloudaccount
--- a/docs/cloudaccount/enable-auto-sync.yaml
+++ b/docs/cloudaccount/enable-auto-sync.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 开启云账号自动同步
-  parameters:
-    - $ref: "../parameters/cloudaccount.yaml#/cloudaccountId"
-    - in: body
-      name: cloudaccount
-      required: true
-      schema:
-        $ref: "../schemas/cloudaccount.yaml#/CloudaccountEnableAutoSync"
-  responses:
-    200:
-      description: 云账号信息
-      schema:
-        $ref: "../schemas/cloudaccount.yaml#/CloudaccountResponse"
-
-  tags:
-    - cloudaccount
--- a/docs/cloudaccount/enable.yaml
+++ b/docs/cloudaccount/enable.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 启用云账号
-  parameters:
-    - $ref: "../parameters/cloudaccount.yaml#/cloudaccountId"
-  responses:
-    200:
-      description: 启用的云账号信息
-      schema:
-        $ref: "../schemas/cloudaccount.yaml#/CloudaccountResponse"
-
-  tags:
-    - cloudaccount
--- a/docs/cloudaccount/private.yaml
+++ b/docs/cloudaccount/private.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 取消云账号共享
-  parameters:
-    - $ref: "../parameters/cloudaccount.yaml#/cloudaccountId"
-  responses:
-    200:
-      description: 云账号信息
-      schema:
-        $ref: "../schemas/cloudaccount.yaml#/CloudaccountResponse"
-
-  tags:
-    - cloudaccount
--- a/docs/cloudaccount/public.yaml
+++ b/docs/cloudaccount/public.yaml
@@ -1,13 +0,0 @@
-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
--- a/docs/cloudaccount/sync.yaml
+++ b/docs/cloudaccount/sync.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/cloudaccount/update-credential.yaml
+++ b/docs/cloudaccount/update-credential.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/dbinstance/change-config.yaml
+++ b/docs/dbinstance/change-config.yaml
@@ -1,16 +0,0 @@
-post:
-  summary: 调整RDS实例配置
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/dbinstanceId"
-    - in: body
-      name: dbinstance
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance.yaml#/DBInstanceChangeConfig"
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: "../schemas/dbinstance.yaml#/DBInstanceResponse"
-  tags:
-    - dbinstance
--- a/docs/dbinstance/dbinstance.yaml
+++ b/docs/dbinstance/dbinstance.yaml
@@ -1,24 +0,0 @@
-get:
-  summary: 获取指定RDS实例详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/dbinstanceId'
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceResponse'
-  tags:
-    - dbinstance
-
-delete:
-  summary: 删除指定RDS实例
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/dbinstanceId'
-    - $ref: '../parameters/dbinstance.yaml#/keep_backup'
-  responses:
-    200:
-      description: 被删除RDS实例的信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceResponse'
-  tags:
-    - dbinstance
--- a/docs/dbinstance/dbinstanceaccount.yaml
+++ b/docs/dbinstance/dbinstanceaccount.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例用户详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/accountId'
-  responses:
-    200:
-      description: RDS实例用户信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse'
-  tags:
-    - dbinstanceaccount
-
-delete:
-  summary: 删除指定RDS实例用户
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/accountId'
-  responses:
-    200:
-      description: 被删除RDS实例的用户信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse'
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstance/dbinstanceaccounts.yaml
+++ b/docs/dbinstance/dbinstanceaccounts.yaml
@@ -1,30 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例用户列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-  responses:
-    200:
-      description: RDS实例用户列表信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountListResponse'
-  tags:
-    - dbinstanceaccount
-
-post:
-  summary: 创建RDS实例账号
-  parameters:
-    - in: body
-      name: dbinstanceaccount
-      required: true
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountCreate'
-  responses:
-    200:
-      description: 新建RDS实例账号信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse'
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstance/dbinstancebackup.yaml
+++ b/docs/dbinstance/dbinstancebackup.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例备份详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/backupId'
-  responses:
-    200:
-      description: RDS实例备份信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupResponse'
-  tags:
-    - dbinstancebackup
-
-delete:
-  summary: 删除指定RDS实例备份
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/backupId'
-  responses:
-    200:
-      description: 被删除RDS实例的备份信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupResponse'
-  tags:
-    - dbinstancebackup
--- a/docs/dbinstance/dbinstancebackups.yaml
+++ b/docs/dbinstance/dbinstancebackups.yaml
@@ -1,16 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例备份列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/common.yaml#/cloudregion'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-
-  responses:
-    200:
-      description: RDS实例备份列表信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupListResponse'
-  tags:
-    - dbinstancebackup
--- a/docs/dbinstance/dbinstancedatabase.yaml
+++ b/docs/dbinstance/dbinstancedatabase.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例数据库详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/databaseId'
-  responses:
-    200:
-      description: RDS实例数据库信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseResponse'
-  tags:
-    - dbinstancedatabase
-
-delete:
-  summary: 删除指定RDS实例数据库
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/databaseId'
-  responses:
-    200:
-      description: 被删除RDS实例的数据库信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseResponse'
-  tags:
-    - dbinstancedatabase
--- a/docs/dbinstance/dbinstancedatabases.yaml
+++ b/docs/dbinstance/dbinstancedatabases.yaml
@@ -1,14 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例数据库列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-  responses:
-    200:
-      description: RDS实例数据库列表信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseListResponse'
-  tags:
-    - dbinstancedatabase
--- a/docs/dbinstance/dbinstancenetwork.yaml
+++ b/docs/dbinstance/dbinstancenetwork.yaml
@@ -1,12 +0,0 @@
-get:
-  summary: 列出指定RDS实例网络信息
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/dbinstanceId"
-
-  responses:
-    200:
-      description: RDS实例网络列表信息
-      schema:
-        $ref: '../schemas/dbinstance_network.yaml#/DBInstanceNetworkListResponse'
-  tags:
-    - dbinstance
--- a/docs/dbinstance/dbinstancenetworks.yaml
+++ b/docs/dbinstance/dbinstancenetworks.yaml
@@ -1,13 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例网络信息
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-
-  responses:
-    200:
-      description: RDS实例网络列表信息
-      schema:
-        $ref: '../schemas/dbinstance_network.yaml#/DBInstanceNetworkListResponse'
-  tags:
-    - dbinstancenetwork
--- a/docs/dbinstance/dbinstanceparameter.yaml
+++ b/docs/dbinstance/dbinstanceparameter.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例参数详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/parameterId'
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: '../schemas/dbinstance_parameter.yaml#/DBInstanceParameterResponse'
-  tags:
-    - dbinstanceparameter
-
-delete:
-  summary: 删除指定RDS实例参数
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/parameterId'
-  responses:
-    200:
-      description: 被删除RDS实例的参数信息
-      schema:
-        $ref: '../schemas/dbinstance_parameter.yaml#/DBInstanceParameterResponse'
-  tags:
-    - dbinstanceparameter
--- a/docs/dbinstance/dbinstanceparameters.yaml
+++ b/docs/dbinstance/dbinstanceparameters.yaml
@@ -1,14 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例参数列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-  responses:
-    200:
-      description: RDS实例参数列表信息
-      schema:
-        $ref: '../schemas/dbinstance_parameter.yaml#/DBInstanceParameterListResponse'
-  tags:
-    - dbinstanceparameter
--- a/docs/dbinstance/dbinstances.yaml
+++ b/docs/dbinstance/dbinstances.yaml
@@ -1,36 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/common.yaml#/provider'
-    - $ref: '../parameters/common.yaml#/account'
-    - $ref: '../parameters/common.yaml#/cloudprovider'
-    - $ref: '../parameters/common.yaml#/billing_type'
-    - $ref: '../parameters/common.yaml#/cloudregion'
-    - $ref: '../parameters/common.yaml#/zone'
-    - $ref: '../parameters/common.yaml#/vpc'
-
-  responses:
-    200:
-      description: RDS实例列表信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceListResponse'
-  tags:
-    - dbinstance
-
-post:
-  summary: 创建RDS实例
-  parameters:
-    - in: body
-      name: dbinstance
-      required: true
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceCreate'
-  responses:
-    200:
-      description: 新建RDS实例信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceResponse'
-  tags:
-    - dbinstance
--- a/docs/dbinstance/public-connection.yaml
+++ b/docs/dbinstance/public-connection.yaml
@@ -1,16 +0,0 @@
-post:
-  summary: 开放关闭RDS实例外网地址
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/dbinstanceId"
-    - in: body
-      name: dbinstance
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance.yaml#/DBInstancePublicConnection"
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: "../schemas/dbinstance.yaml#/DBInstanceResponse"
-  tags:
-    - dbinstance
--- a/docs/dbinstance/purge.yaml
+++ b/docs/dbinstance/purge.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 抹除RDS实例
-  description: 仅删除本地数据库记录，不删除公有云RDS实例
-  parameters: 
-    - $ref: '../parameters/dbinstance.yaml#/dbinstanceId'
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceResponse'
-  tags:
-    - dbinstance
--- a/docs/dbinstance/reboot.yaml
+++ b/docs/dbinstance/reboot.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 重启RDS实例
-  description: 要求RDS实例状态正常或重启失败
-  parameters: 
-    - $ref: '../parameters/dbinstance.yaml#/dbinstanceId'
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceResponse'
-  tags:
-    - dbinstance
--- a/docs/dbinstance/recovery.yaml
+++ b/docs/dbinstance/recovery.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 从备份恢复实例数据库
-  description: 要求RDS实例状态正常
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/dbinstanceId"
-    - in: body
-      name: dbinstance
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance.yaml#/DBInstanceRecovery"
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: "../schemas/dbinstance.yaml#/DBInstanceResponse"
-  tags:
-    - dbinstance
--- a/docs/dbinstance/sync-status.yaml
+++ b/docs/dbinstance/sync-status.yaml
@@ -1,11 +0,0 @@
-post:
-  summary: 同步RDS实例状态
-  parameters: 
-    - $ref: '../parameters/dbinstance.yaml#/dbinstanceId'
-  responses:
-    200:
-      description: RDS实例信息
-      schema:
-        $ref: '../schemas/dbinstance.yaml#/DBInstanceResponse'
-  tags:
-    - dbinstance
--- a/docs/dbinstance_sku/dbinstance_sku.yaml
+++ b/docs/dbinstance_sku/dbinstance_sku.yaml
@@ -1,12 +0,0 @@
-get:
-  summary: 获取指定RDS套餐详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance_sku.yaml#/skuId'
-  responses:
-    200:
-      description: RDS套餐信息
-      schema:
-        $ref: '../schemas/dbinstance_sku.yaml#/DBInstanceSkuResponse'
-  tags:
-    - dbinstance-sku
-
--- a/docs/dbinstance_sku/dbinstance_skus.yaml
+++ b/docs/dbinstance_sku/dbinstance_skus.yaml
@@ -1,15 +0,0 @@
-get:
-  summary: 按指定条件列出RDS套餐
-  parameters:
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/provider'
-    - $ref: '../parameters/common.yaml#/cloudregion'
-  responses:
-    200:
-      description: RDS套餐列表信息
-      schema:
-        $ref: "../schemas/dbinstance_sku.yaml#/DBInstanceSkuListResponse"
-  tags:
-    - dbinstance-sku
-
--- a/docs/dbinstanceaccount/account.yaml
+++ b/docs/dbinstanceaccount/account.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例用户详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/accountId'
-  responses:
-    200:
-      description: RDS实例用户信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse'
-  tags:
-    - dbinstanceaccount
-
-delete:
-  summary: 删除指定RDS实例用户
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/accountId'
-  responses:
-    200:
-      description: 被删除RDS实例的用户信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse'
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstanceaccount/accounts.yaml
+++ b/docs/dbinstanceaccount/accounts.yaml
@@ -1,30 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例用户列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-  responses:
-    200:
-      description: RDS实例用户列表信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountListResponse'
-  tags:
-    - dbinstanceaccount
-
-post:
-  summary: 创建RDS实例账号
-  parameters:
-    - in: body
-      name: dbinstanceaccount
-      required: true
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountCreate'
-  responses:
-    200:
-      description: 新建RDS实例账号信息
-      schema:
-        $ref: '../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse'
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstanceaccount/grant-privilege.yaml
+++ b/docs/dbinstanceaccount/grant-privilege.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 赋予RDS实例的数据库权限
-  description: 要求RDS实例状态正常
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/accountId"
-    - in: body
-      name: dbinstanceaccount
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountGrantPrivilege"
-  responses:
-    200:
-      description: RDS实例账户信息
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse"
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstanceaccount/reset-password.yaml
+++ b/docs/dbinstanceaccount/reset-password.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 重置RDS实例用户密码
-  description: 要求RDS实例状态正常
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/accountId"
-    - in: body
-      name: dbinstanceaccount
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountResetPassword"
-  responses:
-    200:
-      description: RDS实例账户信息
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse"
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstanceaccount/revoke-privilege.yaml
+++ b/docs/dbinstanceaccount/revoke-privilege.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 解除RDS实例的数据库权限
-  description: 要求RDS实例状态正常
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/accountId"
-    - in: body
-      name: dbinstanceaccount
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountRevokePrivilege"
-  responses:
-    200:
-      description: RDS实例账户信息
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse"
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstanceaccount/set-privileges.yaml
+++ b/docs/dbinstanceaccount/set-privileges.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 设置RDS实例的数据库权限
-  description: 要求RDS实例及账号状态正常
-  parameters:
-    - $ref: "../parameters/dbinstance.yaml#/accountId"
-    - in: body
-      name: dbinstanceaccount
-      required: true
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountSetPrivileges"
-  responses:
-    200:
-      description: RDS实例账户信息
-      schema:
-        $ref: "../schemas/dbinstance_account.yaml#/DBInstanceAccountResponse"
-  tags:
-    - dbinstanceaccount
--- a/docs/dbinstancebackup/backup.yaml
+++ b/docs/dbinstancebackup/backup.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例备份详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/backupId'
-  responses:
-    200:
-      description: RDS实例备份信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupResponse'
-  tags:
-    - dbinstancebackup
-
-delete:
-  summary: 删除指定RDS实例备份
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/backupId'
-  responses:
-    200:
-      description: 被删除RDS实例的备份信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupResponse'
-  tags:
-    - dbinstancebackup
--- a/docs/dbinstancebackup/backups.yaml
+++ b/docs/dbinstancebackup/backups.yaml
@@ -1,32 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例备份列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/common.yaml#/cloudregion'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-
-  responses:
-    200:
-      description: RDS实例备份列表信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupListResponse'
-  tags:
-    - dbinstancebackup
-
-post:
-  summary: 创建RDS实例备份
-  parameters:
-    - in: body
-      name: dbinstancebackup
-      required: true
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupCreate'
-  responses:
-    200:
-      description: 新建RDS实例账号信息
-      schema:
-        $ref: '../schemas/dbinstance_backup.yaml#/DBInstanceBackupResponse'
-  tags:
-    - dbinstancebackup
--- a/docs/dbinstancedatabase/database.yaml
+++ b/docs/dbinstancedatabase/database.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定RDS实例数据库详情信息
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/databaseId'
-  responses:
-    200:
-      description: RDS实例数据库信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseResponse'
-  tags:
-    - dbinstancedatabase
-
-delete:
-  summary: 删除指定RDS实例数据库
-  parameters:
-    - $ref: '../parameters/dbinstance.yaml#/databaseId'
-  responses:
-    200:
-      description: 被删除RDS实例的数据库信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseResponse'
-  tags:
-    - dbinstancedatabase
--- a/docs/dbinstancedatabase/databases.yaml
+++ b/docs/dbinstancedatabase/databases.yaml
@@ -1,30 +0,0 @@
-get:
-  summary: 按指定条件列出RDS实例数据库列表
-  parameters:
-    - $ref: '../parameters/common.yaml#/limit'
-    - $ref: '../parameters/common.yaml#/offset'
-    - $ref: '../parameters/dbinstance.yaml#/dbinstance'
-
-  responses:
-    200:
-      description: RDS实例数据库列表信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseListResponse'
-  tags:
-    - dbinstancedatabase
-
-post:
-  summary: 创建RDS实例数据库
-  parameters:
-    - in: body
-      name: dbinstancedatabase
-      required: true
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseCreate'
-  responses:
-    200:
-      description: 新建RDS实例数据库信息
-      schema:
-        $ref: '../schemas/dbinstance_database.yaml#/DBInstanceDatabaseResponse'
-  tags:
-    - dbinstancedatabase
--- a/docs/disk/create-snapshot.yaml
+++ b/docs/disk/create-snapshot.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/disk/disk.yaml
+++ b/docs/disk/disk.yaml
@@ -1,39 +0,0 @@
-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
--- a/docs/disk/disks.yaml
+++ b/docs/disk/disks.yaml
@@ -1,37 +0,0 @@
-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
--- a/docs/disk/private.yaml
+++ b/docs/disk/private.yaml
@@ -1,11 +0,0 @@
-post:
-  summary: 取消磁盘共享
-  parameters:
-    - $ref: "../parameters/disk.yaml#/diskId"
-  responses:
-    200:
-      description: 磁盘信息
-      schema:
-        $ref: "../schemas/disk.yaml#/DiskResponse"
-  tags:
-    - disk
--- a/docs/disk/public.yaml
+++ b/docs/disk/public.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 磁盘共享
-  parameters:
-    - $ref: "../parameters/disk.yaml#/diskId"
-  responses:
-    200:
-      description: 磁盘信息
-      schema:
-        $ref: "../schemas/disk.yaml#/DiskResponse"
-
-  tags:
-    - disk
--- a/docs/disk/purge.yaml
+++ b/docs/disk/purge.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 清除磁盘数据库记录
-  parameters:
-    - $ref: "../parameters/disk.yaml#/diskId"
-  responses:
-    200:
-      description: 磁盘信息
-      schema:
-        $ref: "../schemas/disk.yaml#/DiskResponse"
-
-  tags:
-    - disk
--- a/docs/disk/reset.yaml
+++ b/docs/disk/reset.yaml
@@ -1,17 +0,0 @@
-post:
-  summary: 回滚磁盘到指定快照
-  parameters:
-    - $ref: "../parameters/disk.yaml#/diskId"
-    - in: body
-      name: disk
-      required: true
-      schema:
-        $ref: "../schemas/disk.yaml#/DiskReset"
-  responses:
-    200:
-      description: 磁盘信息
-      schema:
-        $ref: "../schemas/disk.yaml#/DiskResponse"
-
-  tags:
-    - disk
--- a/docs/disk/resize.yaml
+++ b/docs/disk/resize.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/disk/save.yaml
+++ b/docs/disk/save.yaml
@@ -1,16 +0,0 @@
-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
--- a/docs/elasticcache/allocate-public-connection.yaml
+++ b/docs/elasticcache/allocate-public-connection.yaml
@@ -1,15 +0,0 @@
-post:
-  summary: 获取ElasticCache实例公网访问地址
-  parameters:
-    - in: body
-      name: elasticcache
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAllocatePublicConnection"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/change-spec.yaml
+++ b/docs/elasticcache/change-spec.yaml
@@ -1,15 +0,0 @@
-post:
-  summary: 变更ElasticCache实例规格
-  parameters:
-    - in: body
-      name: elasticcache
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheChangeSpec"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/elasticcache.yaml
+++ b/docs/elasticcache/elasticcache.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定ElasticCache实例详情信息
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/elasticcacheId"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
-
-delete:
-  summary: 删除指定ElasticCache实例
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/elasticcacheId"
-  responses:
-    200:
-      description: 被删除ElasticCache实例的信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/elasticcacheaccount.yaml
+++ b/docs/elasticcache/elasticcacheaccount.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定ElasticCache实例用户详情信息
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/accountId"
-  responses:
-    200:
-      description: ElasticCache实例用户信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAccountResponse"
-  tags:
-    - elasticcacheaccount
-
-delete:
-  summary: 删除指定ElasticCache实例用户
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/accountId"
-  responses:
-    200:
-      description: 被删除ElasticCache实例的用户信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAccountResponse"
-  tags:
-    - elasticcacheaccount
--- a/docs/elasticcache/elasticcacheaccounts.yaml
+++ b/docs/elasticcache/elasticcacheaccounts.yaml
@@ -1,30 +0,0 @@
-get:
-  summary: 按指定条件列出ElasticCache实例用户列表
-  parameters:
-    - $ref: "../parameters/common.yaml#/limit"
-    - $ref: "../parameters/common.yaml#/offset"
-    - $ref: "../parameters/elasticcache.yaml#/elasticcache_id"
-
-  responses:
-    200:
-      description: ElasticCache实例用户列表信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAccountListResponse"
-  tags:
-    - elasticcacheaccount
-
-post:
-  summary: 创建ElasticCache实例管理账号
-  parameters:
-    - in: body
-      name: elasticcacheaccount
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAccountCreate"
-  responses:
-    200:
-      description: 新创建的ElasticCache实例账号信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAccountResponse"
-  tags:
-    - elasticcacheaccount
--- a/docs/elasticcache/elasticcacheacl.yaml
+++ b/docs/elasticcache/elasticcacheacl.yaml
@@ -1,40 +0,0 @@
-get:
-  summary: 获取指定ElasticCache实例访问控制详情信息
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/aclId"
-  responses:
-    200:
-      description: ElasticCache实例访问控制信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclResponse"
-  tags:
-    - elasticcacheacl
-
-put:
-  summary: 更新指定ElasticCache实例访问控制
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/aclId"
-    - in: body
-      name: elasticcacheacl
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclUpdate"
-  responses:
-    200:
-      description: 被删除ElasticCache实例的访问控制信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclResponse"
-  tags:
-    - elasticcacheacl
-
-delete:
-  summary: 删除指定ElasticCache实例访问控制
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/aclId"
-  responses:
-    200:
-      description: 被删除ElasticCache实例的访问控制信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclResponse"
-  tags:
-    - elasticcacheacl
--- a/docs/elasticcache/elasticcacheacls.yaml
+++ b/docs/elasticcache/elasticcacheacls.yaml
@@ -1,30 +0,0 @@
-get:
-  summary: 按指定条件列出ElasticCache实例访问控制列表
-  parameters:
-    - $ref: "../parameters/common.yaml#/limit"
-    - $ref: "../parameters/common.yaml#/offset"
-    - $ref: "../parameters/elasticcache.yaml#/elasticcache_id"
-
-  responses:
-    200:
-      description: ElasticCache实例访问控制列表信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclListResponse"
-  tags:
-    - elasticcacheacl
-
-post:
-  summary: 创建ElasticCache实例ACL
-  parameters:
-    - in: body
-      name: elasticcacheacl
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclCreate"
-  responses:
-    200:
-      description: 新创建的ElasticCache实例ACL信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAclResponse"
-  tags:
-    - elasticcacheacl
--- a/docs/elasticcache/elasticcachebackup.yaml
+++ b/docs/elasticcache/elasticcachebackup.yaml
@@ -1,23 +0,0 @@
-get:
-  summary: 获取指定ElasticCache实例备份详情信息
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/backupId"
-  responses:
-    200:
-      description: ElasticCache实例备份信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheBackupResponse"
-  tags:
-    - elasticcachebackup
-
-delete:
-  summary: 删除指定ElasticCache实例备份
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/backupId"
-  responses:
-    200:
-      description: 被删除ElasticCache实例的备份信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheBackupResponse"
-  tags:
-    - elasticcachebackup
--- a/docs/elasticcache/elasticcachebackups.yaml
+++ b/docs/elasticcache/elasticcachebackups.yaml
@@ -1,25 +0,0 @@
-get:
-  summary: 按指定条件列出ElasticCache实例备份列表
-  parameters:
-    - $ref: "../parameters/common.yaml#/limit"
-    - $ref: "../parameters/common.yaml#/offset"
-    - $ref: "../parameters/common.yaml#/cloudregion"
-    - $ref: "../parameters/elasticcache.yaml#/elasticcache_id"
-
-  responses:
-    200:
-      description: ElasticCache实例备份列表信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheBackupListResponse"
-  tags:
-    - elasticcachebackup
-
-post:
-  summary: 创建ElasticCache实例备份
-  responses:
-    200:
-      description: 新创建的ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheBackupResponse"
-  tags:
-    - elasticcachebackup
--- a/docs/elasticcache/elasticcacheparameter.yaml
+++ b/docs/elasticcache/elasticcacheparameter.yaml
@@ -1,40 +0,0 @@
-get:
-  summary: 获取指定ElasticCache实例参数详情信息
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/parameterId"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheParameterResponse"
-  tags:
-    - elasticcacheparameter
-
-put:
-  summary: 更新ElasticCache实例配置参数
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/parameterId"
-    - in: body
-      name: elasticcacheparameter
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheParameterUpdate"
-  responses:
-    200:
-      description: ElasticCache实例配置参数信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheParameterResponse"
-  tags:
-    - elasticcacheparameter
-
-delete:
-  summary: 删除指定ElasticCache实例参数
-  parameters:
-    - $ref: "../parameters/elasticcache.yaml#/parameterId"
-  responses:
-    200:
-      description: 被删除ElasticCache实例的参数信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheParameterResponse"
-  tags:
-    - elasticcacheparameter
--- a/docs/elasticcache/elasticcacheparameters.yaml
+++ b/docs/elasticcache/elasticcacheparameters.yaml
@@ -1,14 +0,0 @@
-get:
-  summary: 按指定条件列出ElasticCache实例参数列表
-  parameters:
-    - $ref: "../parameters/common.yaml#/limit"
-    - $ref: "../parameters/common.yaml#/offset"
-    - $ref: "../parameters/elasticcache.yaml#/elasticcache_id"
-
-  responses:
-    200:
-      description: ElasticCache实例参数列表信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheParameterListResponse"
-  tags:
-    - elasticcacheparameter
--- a/docs/elasticcache/elasticcaches.yaml
+++ b/docs/elasticcache/elasticcaches.yaml
@@ -1,36 +0,0 @@
-get:
-  summary: 按指定条件列出ElasticCache实例
-  parameters:
-    - $ref: "../parameters/common.yaml#/limit"
-    - $ref: "../parameters/common.yaml#/offset"
-    - $ref: "../parameters/common.yaml#/provider"
-    - $ref: "../parameters/common.yaml#/account"
-    - $ref: "../parameters/common.yaml#/cloudprovider"
-    - $ref: "../parameters/common.yaml#/billing_type"
-    - $ref: "../parameters/common.yaml#/cloudregion"
-    - $ref: "../parameters/common.yaml#/zone"
-    - $ref: "../parameters/common.yaml#/vpc"
-
-  responses:
-    200:
-      description: ElasticCache实例列表信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheListResponse"
-  tags:
-    - elasticcache
-
-post:
-  summary: 创建ElasticCache实例
-  parameters:
-    - in: body
-      name: elasticcache
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheCreate"
-  responses:
-    200:
-      description: 新创建的ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/elasticcacheskus.yaml
+++ b/docs/elasticcache/elasticcacheskus.yaml
@@ -1,19 +0,0 @@
-get:
-  summary: 按指定条件列出ElasticCaches实例套餐列表
-  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#/city"
-    - $ref: "../parameters/common.yaml#/cloudregion"
-    - $ref: "../parameters/elasticcache.yaml#/engine_version"
-    - $ref: "../parameters/elasticcache.yaml#/local_category"
-
-  responses:
-    200:
-      description: ElasticCache实例套餐信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheSkuListResponse"
-  tags:
-    - elasticcachesku
--- a/docs/elasticcache/flush-instance.yaml
+++ b/docs/elasticcache/flush-instance.yaml
@@ -1,9 +0,0 @@
-post:
-  summary: 清空ElasticCache实例
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/login-info.yaml
+++ b/docs/elasticcache/login-info.yaml
@@ -1,9 +0,0 @@
-get:
-  summary: 获取指定ElasticCache实例管理员密码
-  responses:
-    200:
-      description: ElasticCache实例密码信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheLoginInfoResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/release-public-connection.yaml
+++ b/docs/elasticcache/release-public-connection.yaml
@@ -1,9 +0,0 @@
-post:
-  summary: 释放ElasticCache实例公网访问地址
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/reset-password.yaml
+++ b/docs/elasticcache/reset-password.yaml
@@ -1,15 +0,0 @@
-post:
-  summary: 重置ElasticCache实例账号密码
-  parameters:
-    - in: body
-      name: elasticcacheaccount
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResetPassword"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAccountResponse"
-  tags:
-    - elasticcacheaccount
--- a/docs/elasticcache/restart.yaml
+++ b/docs/elasticcache/restart.yaml
@@ -1,9 +0,0 @@
-post:
-  summary: 重启ElasticCache实例
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/restore-instance.yaml
+++ b/docs/elasticcache/restore-instance.yaml
@@ -1,9 +0,0 @@
-post:
-  summary: ElasticCache实例备份恢复
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheBackupResponse"
-  tags:
-    - elasticcachebackup
--- a/docs/elasticcache/set-maintain-time.yaml
+++ b/docs/elasticcache/set-maintain-time.yaml
@@ -1,15 +0,0 @@
-post:
-  summary: 设置ElasticCache实例维护时间段
-  parameters:
-    - in: body
-      name: elasticcache
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheSetMaintainTime"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/update-auth-mode.yaml
+++ b/docs/elasticcache/update-auth-mode.yaml
@@ -1,15 +0,0 @@
-post:
-  summary: 设置ElasticCache实例密码认证
-  parameters:
-    - in: body
-      name: elasticcache
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheAuthMode"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/update-backup-policy.yaml
+++ b/docs/elasticcache/update-backup-policy.yaml
@@ -1,15 +0,0 @@
-post:
-  summary: 设置ElasticCache实例备份策略
-  parameters:
-    - in: body
-      name: elasticcache
-      required: true
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheBackupPolicy"
-  responses:
-    200:
-      description: ElasticCache实例信息
-      schema:
-        $ref: "../schemas/elasticcache.yaml#/ElasticCacheResponse"
-  tags:
-    - elasticcache
--- a/docs/elasticcache/update-instance-parameters.yaml
+++ b/docs/elasticcache/update-instance-parameters.yaml
--- a/docs/elasticip/associate.yaml
+++ b/docs/elasticip/associate.yaml
@@ -1,14 +0,0 @@
-post:
-  summary: 绑定资源
-  parameters:
-    - $ref: "../parameters/elasticip.yaml#/elasticipId"
-    - $ref: "../parameters/elasticip.yaml#/instance_id"
-    - $ref: "../parameters/elasticip.yaml#/instance_type"
-  responses:
-    200:
-      description: 弹性IP信息
-      schema:
-        $ref: "../schemas/elasticip.yaml#/ElasticIpResponse"
-
-  tags:
-    - elasticips
--- a/docs/elasticip/change-bandwidth.yaml
+++ b/docs/elasticip/change-bandwidth.yaml
@@ -1,13 +0,0 @@
-post:
-  summary: 更改弹性IP带宽大小
-  parameters:
-    - $ref: "../parameters/elasticip.yaml#/elasticipId"
-    - $ref: "../parameters/elasticip.yaml#/bandwidth"
-  responses:
-    200:
-      description: 弹性IP信息
-      schema:
-        $ref: "../schemas/elasticip.yaml#/ElasticIpResponse"
-
-  tags:
-    - elasticips
--- a/docs/elasticip/dissociate.yaml
+++ b/docs/elasticip/dissociate.yaml
@@ -1,13 +0,0 @@
-post:
-  summary: 解绑弹性EIP
-  parameters:
-    - $ref: "../parameters/elasticip.yaml#/elasticipId"
-    - $ref: "../parameters/elasticip.yaml#/auto_delete"
-  responses:
-    200:
-      description: 弹性IP信息
-      schema:
-        $ref: "../schemas/elasticip.yaml#/ElasticIpResponse"
-
-  tags:
-    - elasticips
--- a/docs/elasticip/elasticip.yaml
+++ b/docs/elasticip/elasticip.yaml
@@ -1,39 +0,0 @@
-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
--- a/docs/elasticip/elasticips.yaml
+++ b/docs/elasticip/elasticips.yaml
@@ -1,38 +0,0 @@
-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
--- a/docs/elasticip/purge.yaml
+++ b/docs/elasticip/purge.yaml
@@ -1,12 +0,0 @@
-post:
-  summary: 清除弹性EIP数据库记录(并不真正删除资源)
-  parameters:
-    - $ref: "../parameters/elasticip.yaml#/elasticipId"
-  responses:
-    200:
-      description: 弹性IP信息
-      schema:
-        $ref: "../schemas/elasticip.yaml#/ElasticIpResponse"
-
-  tags:
-    - elasticips
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zexi Li	53a83b59ff	Merge pull request #17403 from gouqi11/automated-cherry-pick-of-#17395-upstream-release-3.10 Automated cherry pick of #17395: fix(notify): add more details for emailqueue	2023-06-30 10:15:30 +08:00
Zexi Li	61401b2aa4	Merge pull request #17415 from ioito/automated-cherry-pick-of-#17414-upstream-release-3.10 Automated cherry pick of #17414: fix(region): vendor update	2023-06-29 20:21:15 +08:00
Zexi Li	fe2f9ba4ba	Merge pull request #17417 from ioito/automated-cherry-pick-of-#17416-upstream-release-3.10 Automated cherry pick of #17416: fix(host): log storage offline reason	2023-06-29 20:16:31 +08:00
Zexi Li	c9b30c53b5	Merge pull request #17420 from zexi/vpcagent-fetch-region-data fix(vpcagent): fetch data from region server defaultly	2023-06-29 20:15:43 +08:00
马鸿飞	d0992b4ad6	fix(notify): add more details for emailqueue	2023-06-29 20:13:10 +08:00
Zexi Li	8a155219cf	fix(vpcagent): fetch data from region server defaultly	2023-06-29 19:59:54 +08:00
ioito	6e80c69cc9	fix(host): log storage offline reason	2023-06-29 17:47:59 +08:00
ioito	6080f04e65	fix(region): vendor update	2023-06-29 17:25:10 +08:00
Zexi Li	cdabda1c06	Merge pull request #17411 from ioito/automated-cherry-pick-of-#17410-upstream-release-3.10 Automated cherry pick of #17410: fix(region): pve create	2023-06-29 16:26:02 +08:00
ioito	810fa8b819	fix(region): pve create	2023-06-29 15:49:58 +08:00
Zexi Li	48ffbd274b	Merge pull request #17407 from ioito/automated-cherry-pick-of-#17406-upstream-release-3.10 Automated cherry pick of #17406: fix(image): optimized iso format check	2023-06-29 15:40:48 +08:00
Zexi Li	21aa000920	Merge pull request #17405 from ioito/automated-cherry-pick-of-#17404-upstream-release-3.10 Automated cherry pick of #17404: fix(region): cached image info sync	2023-06-29 15:39:25 +08:00
ioito	979b7645cb	fix(image): optimized iso format check	2023-06-29 14:06:10 +08:00
ioito	e33e831594	fix(region): cached image info sync	2023-06-29 13:26:14 +08:00
Zexi Li	94a4d43332	Merge pull request #17402 from swordqiu/automated-cherry-pick-of-#17401-upstream-release-3.10 Automated cherry pick of #17401: fix: bucket short descption	2023-06-29 06:30:15 +08:00
Qiu Jian	439ee1a4da	fix: bucket short descption	2023-06-29 02:51:59 +08:00
Zexi Li	86b12e92dc	fix(host): add some logs for dhcp relay (#17386 )	2023-06-27 23:50:42 +08:00
Zexi Li	9cd1a2fde5	Merge pull request #17369 from gouqi11/automated-cherry-pick-of-#17361-upstream-release-3.10 Automated cherry pick of #17361: fix(notify): add getSubscriberFunc more details	2023-06-27 20:23:07 +08:00
Zexi Li	df81b6c20d	Merge pull request #17378 from ioito/automated-cherry-pick-of-#17377-upstream-release-3.10 Automated cherry pick of #17377: fix(region): vendor update	2023-06-27 11:03:24 +08:00
ioito	d1f8750f65	fix(region): vendor update	2023-06-27 10:33:33 +08:00
Zexi Li	77bbeeb4d1	Merge pull request #17371 from ioito/automated-cherry-pick-of-#17370-upstream-release-3.10 Automated cherry pick of #17370: fix(region): sync zstack vm ip	2023-06-26 16:40:11 +08:00
ioito	94e7607bdd	fix(region): sync zstack vm ip	2023-06-26 15:56:01 +08:00
马鸿飞	ffa2a508b1	fix(notify): add getSubscriberFunc more details	2023-06-26 10:45:26 +08:00
Zexi Li	c906a0e18a	Merge pull request #17367 from ioito/automated-cherry-pick-of-#17366-upstream-release-3.10 Automated cherry pick of #17366: fix(region): avoid aliyun elastic cache cycle sync	2023-06-26 10:12:58 +08:00
ioito	07afb19599	fix(region): avoid aliyun elastic cache cycle sync	2023-06-25 21:04:32 +08:00
Jian Qiu	ec8b24d6f3	fix: force no paging limit for list (#17355 ) Co-authored-by: Qiu Jian <qiujian@yunionyun.com>	2023-06-21 20:16:51 +08:00
Zexi Li	579c51896d	Merge pull request #17352 from gouqi11/automated-cherry-pick-of-#17351-upstream-release-3.10 Automated cherry pick of #17351: fix(notify): add topic_type for get subscription	2023-06-21 17:16:29 +08:00
Zexi Li	86077b4a8d	Merge pull request #17346 from swordqiu/automated-cherry-pick-of-#17345-upstream-release-3.10 Automated cherry pick of #17345: fix: add process timeout option default_process_timeout_seconds	2023-06-21 16:39:09 +08:00
Zexi Li	56246be1c7	Merge pull request #17350 from ioito/automated-cherry-pick-of-#17349-upstream-release-3.10 Automated cherry pick of #17349: fix(region): cloudaccount filter	2023-06-21 16:38:19 +08:00
马鸿飞	a1ea2a412d	fix(notify): add topic_type for get subscription	2023-06-21 16:36:12 +08:00
ioito	5ea21bc87e	fix(region): cloudaccount filter	2023-06-21 16:00:09 +08:00
Qiu Jian	3451419a99	fix: add process timeout option default_process_timeout_seconds	2023-06-21 13:03:08 +08:00
Jian Qiu	2c64932e81	fix: async create external project (#17320 ) Co-authored-by: Qiu Jian <qiujian@yunionyun.com>	2023-06-21 10:04:53 +08:00
屈轩	642345a464	fix(region): vendor update (#17333 )	2023-06-21 10:04:33 +08:00
wanyaoqi	785770f037	fix(region): remove capabilites debug query (#17338 )	2023-06-21 10:03:22 +08:00
Jian Qiu	bd07ba2af6	fix: detailed pending usage error (#17341 ) Co-authored-by: Qiu Jian <qiujian@yunionyun.com>	2023-06-21 10:02:14 +08:00
Zexi Li	293ec30c01	Merge pull request #17324 from wanyaoqi/automated-cherry-pick-of-#17323-upstream-release-3.10 Automated cherry pick of #17323: fix(host-deployer): ubuntu like uos detect	2023-06-20 10:43:23 +08:00
Zexi Li	df7cb20337	Merge pull request #17326 from zexi/bm-power-metrics-panic fix(baremetal): panic occured when fetch powerMetrics	2023-06-20 10:42:39 +08:00
Zexi Li	d3a1623c8c	Merge pull request #17330 from gouqi11/automated-cherry-pick-of-#17329-upstream-release-3.10 Automated cherry pick of #17329: fix(region): listitemfilter ignore empty slice	2023-06-20 10:42:28 +08:00
马鸿飞	4e33ab354d	fix(region): listitemfilter ignore empty slice	2023-06-20 10:38:28 +08:00
Zexi Li	5b62533240	fix(baremetal): panic occured when fetch powerMetrics	2023-06-19 14:49:46 +08:00
wanyaoqi	4c2aac4f2f	fix(host-deployer): ubuntu like uos detect	2023-06-19 14:02:06 +08:00
Zexi Li	991a5c66d0	Merge pull request #17317 from ioito/automated-cherry-pick-of-#17316-upstream-release-3.10 Automated cherry pick of #17316: fix(region): 支持1/2类似的gpu数量	2023-06-15 20:52:45 +08:00
ioito	8045af3d4c	fix(region): 支持1/2类似的gpu数量	2023-06-15 20:32:39 +08:00
Zexi Li	226cae2af1	Merge pull request #17315 from ioito/automated-cherry-pick-of-#17286-upstream-release-3.10 Automated cherry pick of #17286: fix(region): optimized sku sync	2023-06-15 20:26:40 +08:00
ioito	0588283628	fix(region): optimized sku sync	2023-06-15 20:11:42 +08:00
Zexi Li	7e5cac0fea	Merge pull request #17313 from gouqi11/automated-cherry-pick-of-#17267-upstream-release-3.10 Automated cherry pick of #17267: fix(region): support slice for list	2023-06-15 16:10:26 +08:00
马鸿飞	70061c7ec2	fix(region): support slice for list	2023-06-15 15:59:47 +08:00
Zexi Li	e8eb570372	Merge pull request #17309 from gouqi11/automated-cherry-pick-of-#17308-upstream-release-3.10 Automated cherry pick of #17308: fix(notify): add option to filter disabled subscription	2023-06-15 15:48:45 +08:00
马鸿飞	d6bad55f9e	fix(notify): add option to filter disabled subscription	2023-06-15 00:35:36 +08:00
Zexi Li	eeb9573ad0	Merge pull request #17307 from wanyaoqi/automated-cherry-pick-of-#17306-upstream-release-3.10 Automated cherry pick of #17306: fix(region): guest detach disk task duplicate callback	2023-06-15 00:03:39 +08:00
Zexi Li	08bc1f0258	Merge pull request #17301 from ioito/automated-cherry-pick-of-#17300-upstream-release-3.10 Automated cherry pick of #17300: fix(region): vendor update	2023-06-14 22:48:17 +08:00
Zexi Li	56ff9a63e6	Merge pull request #17276 from wanyaoqi/automated-cherry-pick-of-#17275-upstream-release-3.10 Automated cherry pick of #17275: fix(region,host): virtio dirver local disk live migrate	2023-06-14 22:47:20 +08:00
Zexi Li	e11240ea22	Merge pull request #17285 from wanyaoqi/automated-cherry-pick-of-#17284-upstream-release-3.10 Automated cherry pick of #17284: fix(host): host add option no_hpet	2023-06-14 22:46:40 +08:00
Zexi Li	606767ba92	Merge pull request #17290 from zexi/automated-cherry-pick-of-#17288-upstream-release-3.10 Automated cherry pick of #17288: fix(baremetal): skip 'Volatile Size' line when detecting memory size	2023-06-14 22:46:00 +08:00
wanyaoqi	1686157d07	fix(region): guest detach disk task duplicate callback	2023-06-14 16:57:57 +08:00
Zexi Li	2d3e204d7e	Merge pull request #17304 from zhasm/automated-cherry-pick-of-#17299-upstream-release-3.10 Automated cherry pick of #17299: [wip] fix(docker,buildx): 兼容本地registry 模式	2023-06-14 15:31:54 +08:00
Zhang Dongliang	79208776a5	fix(docker,buildx): 兼容本地registry 模式	2023-06-14 15:21:10 +08:00
ioito	41c4469fd4	fix(region): vendor update	2023-06-14 15:11:18 +08:00
Zexi Li	3dddaf2000	Merge pull request #17293 from zhasm/automated-cherry-pick-of-#17292-upstream-release-3.10 Automated cherry pick of #17292: fix(docker,buildx): 跨平台编译优化	2023-06-13 17:27:43 +08:00
Zhang Dongliang	4132453665	fix(docker,buildx): 跨平台编译优化	2023-06-13 17:10:13 +08:00
wanyaoqi	ef152f7fc5	fix(region,host): virtio dirver local disk live migrate Guest using the virtio-blk driver for local disks, iothread is used to handle IO operations, Qemu will segfault when copying disks during live migration. To address this issue, use nbd server and drive_mirror approach to copy the disks.	2023-06-13 16:33:30 +08:00
Zexi Li	7818033a36	Merge pull request #17278 from wanyaoqi/automated-cherry-pick-of-#17277-upstream-release-3.10 Automated cherry pick of #17277: fix(region): qga set password not record logininfo	2023-06-13 13:18:52 +08:00
Zexi Li	88f3b3d23b	Merge pull request #17283 from wanyaoqi/automated-cherry-pick-of-#17282-upstream-release-3.10 Automated cherry pick of #17282: fix(host): get live migration port before generate desc	2023-06-13 13:18:18 +08:00
Zexi Li	680cefff1f	fix(baremetal): skip 'Volatile Size' line when detecting memory size	2023-06-13 13:16:21 +08:00
wanyaoqi	13bc96a0c8	fix(host): host add option no_hpet Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>	2023-06-12 17:32:31 +08:00
wanyaoqi	3166f36aa8	fix(host): get live migration port before generate desc Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>	2023-06-12 16:27:41 +08:00
wanyaoqi	5e95055854	fix(region): qga set password not record logininfo guest create from iso no login_account, record login_account when login account is empty.	2023-06-12 10:46:03 +08:00
Zexi Li	a13cf1116e	Merge pull request #17249 from ioito/automated-cherry-pick-of-#17183-upstream-release-3.10 Automated cherry pick of #17183: fix(region): snapshot policy create and update	2023-06-12 10:09:09 +08:00
Zexi Li	5b9a44dbb5	Merge pull request #17272 from ioito/automated-cherry-pick-of-#17229-upstream-release-3.10 Automated cherry pick of #17229: fix(webconsole): ssh exit	2023-06-09 16:46:36 +08:00
ioito	b0b3a0ea89	fix(webconsole): ssh exit	2023-06-09 16:34:34 +08:00
Zexi Li	b002d434fa	Merge pull request #17271 from ioito/automated-cherry-pick-of-#16208-upstream-release-3.10 Automated cherry pick of #16208: fix(webconsole): websocket ssh	2023-06-09 16:33:56 +08:00
ioito	645d171a74	fix(webconsole): websocket ssh	2023-06-09 16:20:38 +08:00
Zexi Li	82ef3ef3f2	Merge pull request #17259 from wanyaoqi/automated-cherry-pick-of-#17258-upstream-release-3.10 Automated cherry pick of #17258: fix(region): validate isolated device register	2023-06-09 16:18:08 +08:00
屈轩	b08b3ec64f	fix(region): qcloud hypervisor (#17264 )	2023-06-08 21:20:16 +08:00
wanyaoqi	13d4b4785b	fix(region): validate isolated device register Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>	2023-06-07 16:38:31 +08:00
Zexi Li	b607321abc	Merge pull request #17248 from wanyaoqi/automated-cherry-pick-of-#17246-upstream-release-3.10 Automated cherry pick of #17246: feat(region,host): support lvm disk as guest sys disk	2023-06-06 14:20:27 +08:00
Zexi Li	dffc97e745	Merge pull request #17251 from ioito/automated-cherry-pick-of-#17250-upstream-release-3.10 Automated cherry pick of #17250: fix(region): filter host by ips	2023-06-06 14:17:25 +08:00
ioito	06ed8ee803	fix(region): filter host by ips	2023-06-05 17:06:18 +08:00
ioito	0d6a95e195	fix(region): snapshot policy create and update	2023-06-05 16:44:56 +08:00
wanyaoqi	e1a6549947	feat(region,host): support lvm disk as guest sys disk	2023-06-05 16:21:26 +08:00
Zexi Li	cb27d631c2	Merge pull request #17241 from wanyaoqi/automated-cherry-pick-of-#17240-upstream-release-3.10 Automated cherry pick of #17240: fix(host): don't sync status on resume from postmigrate	2023-06-03 10:58:24 +08:00
Zexi Li	fd7ccd1b60	Merge pull request #17239 from ioito/automated-cherry-pick-of-#17238-upstream-release-3.10 Automated cherry pick of #17238: fix(region): swagger api update	2023-06-03 10:56:39 +08:00
wanyaoqi	c91dfc8ba4	fix(host): don't sync status on resume from postmigrate Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>	2023-06-02 18:43:46 +08:00
ioito	6c05d72e3d	fix(region): swagger api update	2023-06-02 18:33:01 +08:00
wanyaoqi	4de21692eb	fix(host): nics get sys conf quiet (#17206 )	2023-06-01 20:46:12 +08:00
Jian Qiu	e3172f8d20	fix: allow LDAP sync extra tags (#17203 ) Co-authored-by: Qiu Jian <qiujian@yunionyun.com>	2023-06-01 20:45:27 +08:00
Zexi Li	3e02111248	feat(climc): add service option for action-show command (#17222 )	2023-06-01 20:43:57 +08:00
Zexi Li	6e2b36bf53	Merge pull request #17226 from gouqi11/automated-cherry-pick-of-#17225-upstream-release-3.10 Automated cherry pick of #17225: fix(apigateway): add handler for user to get self topic subscriptions	2023-06-01 17:55:10 +08:00
马鸿飞	ef94cd885d	fix(apigateway): add handler for user to get self topic subscriptions	2023-06-01 16:59:08 +08:00
Zexi Li	cc0948b577	Merge pull request #17220 from ioito/automated-cherry-pick-of-#17219-upstream-release-3.10 Automated cherry pick of #17219: fix(region): vendor update	2023-05-31 21:37:33 +08:00
ioito	39fd6df5c7	fix(region): vendor update	2023-05-31 20:30:41 +08:00
Zexi Li	360d344aed	Merge pull request #17215 from gouqi11/automated-cherry-pick-of-#17214-upstream-release-3.10 Automated cherry pick of #17214: fix(region): fix region.CreatedAt	2023-05-31 19:08:26 +08:00
马鸿飞	4c28049297	fix(region): fix region.CreatedAt	2023-05-31 16:16:12 +08:00
Zexi Li	b2ec3756d9	Merge pull request #17208 from zexi/monitor-time-perf optimized(monitor): query metrics time	2023-05-31 15:19:41 +08:00
Zexi Li	30895fdaed	optimized(monitor): query metrics time	2023-05-31 15:01:32 +08:00