diff --git a/docs/image/images.yaml b/docs/image/images.yaml index 34ee936c27..df08533b33 100644 --- a/docs/image/images.yaml +++ b/docs/image/images.yaml @@ -3,6 +3,7 @@ get: parameters: - $ref: '/parameters/common.yaml#offset' - $ref: '/parameters/common.yaml#limit' + - $ref: '/parameters/common.yaml#pending_delete' - $ref: '/parameters/image.yaml#is_public' - $ref: '/parameters/image.yaml#owner' - $ref: '/parameters/image.yaml#name' diff --git a/docs/instance/instance.yaml b/docs/instance/instance.yaml index 9cab4c7976..7fec554fd7 100644 --- a/docs/instance/instance.yaml +++ b/docs/instance/instance.yaml @@ -2,6 +2,7 @@ get: summary: 获取指定实例详情信息 parameters: - $ref: '/parameters/instance.yaml#instanceId' + - $ref: '/parameters/common.yaml#pending_delete' responses: 200: description: 实例信息 @@ -29,9 +30,10 @@ delete: summary: 删除指定实例 parameters: - $ref: '/parameters/instance.yaml#instanceId' + - $ref: '/parameters/common.yaml#override_pending_delete' responses: 200: - description: 被删除实例的信息 + description: 被删除实例的信息,删除前确保已解除删除保护,第一次删除时会先进入回收站(可恢复),第二次删除会真正释放资源 schema: $ref: '/schemas/instance.yaml#InstanceResponse' tags: diff --git a/docs/instance/instances.yaml b/docs/instance/instances.yaml index 633aa671c2..7f4d62a783 100644 --- a/docs/instance/instances.yaml +++ b/docs/instance/instances.yaml @@ -12,6 +12,7 @@ get: - $ref: '/parameters/common.yaml#network' - $ref: '/parameters/common.yaml#vpc' - $ref: '/parameters/common.yaml#region' + - $ref: '/parameters/common.yaml#pending_delete' - $ref: '/parameters/instance.yaml#host' - $ref: '/parameters/instance.yaml#with_eip' diff --git a/docs/parameters/common.yaml b/docs/parameters/common.yaml index ea82827525..67828aa55b 100644 --- a/docs/parameters/common.yaml +++ b/docs/parameters/common.yaml @@ -66,3 +66,15 @@ cloudregion: in: query type: string description: 根据区域过滤列表 +pending_delete: + name: pending_delete + in: query + type: string + default: true + enum: [true,false,all] + description: 默认不显示回收站资源,true则只显示回收站资源,all则显示所有资源,含不再回收站和在回收站的资源支持实例,磁盘,镜像过滤 +override_pending_delete: + name: override_pending_delete + in: query + type: boolean + description: 从回收站删除资源时需要指定此参数为true, 回收站资源到期会自动释放。到期清理时间由服务参数PendingDeleteExpireSeconds确定。默认是259200秒(3天) \ No newline at end of file