diff --git a/services/ucompshare/apis.go b/services/ucompshare/apis.go index 1b78d4c0..cf738cfb 100644 --- a/services/ucompshare/apis.go +++ b/services/ucompshare/apis.go @@ -119,129 +119,67 @@ func (c *UCompShareClient) CreateCompShareInstance(req *CreateCompShareInstanceR return &res, nil } -// CreateULHostInstanceRequest is request schema for CreateULHostInstance action -type CreateULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // 套餐ID。如:"ulh.c1m1s40b30t800" - BundleId *string `required:"true"` - - // 计费模式。枚举值: \\ > Year,按年付费; \\ > Month,按月付费;默认:Month - ChargeType *string `required:"false"` - - // 主机代金券ID。请通过DescribeCoupon接口查询,或登录用户中心查看 - CouponId *string `required:"false"` - - // 镜像ID。 请通过 [DescribeImage](describe_image.html)获取 - ImageId *string `required:"true"` - - // 轻量应用主机名称。默认:套餐ID。请遵照[[api:uhost-api:specification|字段规范]]设定实例名称。 - Name *string `required:"false"` - - // ULHost密码。请遵照[[api:uhost-api:specification|字段规范]]设定密码。密码需使用base64进行编码,举例如下:# echo -n Password1 | base64 - Password *string `required:"true"` - - // 购买时长。默认:1。不支持购买到月末 - Quantity *int `required:"false"` - - // 防火墙ID,默认:Web推荐防火墙。如何查询SecurityGroupId请参见 [DescribeFirewall](api/unet-api/describe_firewall.html)。 - SecurityGroupId *string `required:"false"` - - // 子网 ID。默认为当前地域的默认子网。 - SubnetId *string `required:"false"` - - // VPC ID。默认为当前地域的默认VPC。 - VPCId *string `required:"false"` -} - -// CreateULHostInstanceResponse is response schema for CreateULHostInstance action -type CreateULHostInstanceResponse struct { - response.CommonBase - - // 错误信息 - Message string - - // 实例ID - ULHostId string -} - -// NewCreateULHostInstanceRequest will create request of CreateULHostInstance action. -func (c *UCompShareClient) NewCreateULHostInstanceRequest() *CreateULHostInstanceRequest { - req := &CreateULHostInstanceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(false) - return req -} - /* -API: CreateULHostInstance - -创建轻量应用云主机 +DescribeCommunityImagesParamSortCondition is request schema for complex param */ -func (c *UCompShareClient) CreateULHostInstance(req *CreateULHostInstanceRequest) (*CreateULHostInstanceResponse, error) { - var err error - var res CreateULHostInstanceResponse +type DescribeCommunityImagesParamSortCondition struct { - reqCopier := *req + // 是否升序排列 + ASC *string `required:"false"` - err = c.Client.InvokeAction("CreateULHostInstance", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil + // 排序条件。- Favor:按热度排序,获取热点镜像;- PubTime:按发布时间排序,获取最新社区镜像;- Price 按价格排序;- CreatedCount 按使用量排序;默认:"PubTime" + Field *string `required:"false"` } -// DescribeCompShareInstanceRequest is request schema for DescribeCompShareInstance action -type DescribeCompShareInstanceRequest struct { +// DescribeCommunityImagesRequest is request schema for DescribeCommunityImages action +type DescribeCommunityImagesRequest struct { request.CommonBase // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) // ProjectId *string `required:"false"` // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"false"` + // Region *string `required:"true"` // [公共参数] 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Zone *string `required:"false"` + // Zone *string `required:"true"` + + // 搜索指定作者发布的镜像 + Author *string `required:"false"` + + // 镜像Id。支持指定镜像Id查询 + CompShareImageId *string `required:"false"` // 返回数据长度,默认为20,最大100 - Limit *int `required:"false"` + Limit *string `required:"false"` + + // 镜像名称。模糊搜索 + Name *string `required:"false"` // 列表起始位置偏移量,默认为0 Offset *int `required:"false"` - // 【数组】UHost主机的资源ID,例如UHostIds.0代表希望获取信息 的主机1,UHostIds.1代表主机2。 如果不传入,则返回当前Region 所有符合条件的UHost实例。 - UHostIds []string `required:"false"` + // + SortCondition *DescribeCommunityImagesParamSortCondition `required:"false"` - // 无卡GPU - WithoutGpu *bool `required:"false"` + // 按标签名称搜索,精确匹配 + Tag *string `required:"false"` } -// DescribeCompShareInstanceResponse is response schema for DescribeCompShareInstance action -type DescribeCompShareInstanceResponse struct { +// DescribeCommunityImagesResponse is response schema for DescribeCommunityImages action +type DescribeCommunityImagesResponse struct { response.CommonBase - // UHostInstance总数 - TotalCount int + // 镜像详情列表 + ImageSet []CompShareImage - // 云主机实例列表,每项参数可见下面 UHostInstanceSet - UHostSet []CompShareInstanceSet + // 总数量 + TotalCount int } -// NewDescribeCompShareInstanceRequest will create request of DescribeCompShareInstance action. -func (c *UCompShareClient) NewDescribeCompShareInstanceRequest() *DescribeCompShareInstanceRequest { - req := &DescribeCompShareInstanceRequest{} +// NewDescribeCommunityImagesRequest will create request of DescribeCommunityImages action. +func (c *UCompShareClient) NewDescribeCommunityImagesRequest() *DescribeCommunityImagesRequest { + req := &DescribeCommunityImagesRequest{} // setup request with client config c.Client.SetupRequest(req) @@ -252,17 +190,17 @@ func (c *UCompShareClient) NewDescribeCompShareInstanceRequest() *DescribeCompSh } /* -API: DescribeCompShareInstance +API: DescribeCommunityImages -获取用户所有地域下主机资源信息列表 +获取社区镜像列表 */ -func (c *UCompShareClient) DescribeCompShareInstance(req *DescribeCompShareInstanceRequest) (*DescribeCompShareInstanceResponse, error) { +func (c *UCompShareClient) DescribeCommunityImages(req *DescribeCommunityImagesRequest) (*DescribeCommunityImagesResponse, error) { var err error - var res DescribeCompShareInstanceResponse + var res DescribeCommunityImagesResponse reqCopier := *req - err = c.Client.InvokeAction("DescribeCompShareInstance", &reqCopier, &res) + err = c.Client.InvokeAction("DescribeCommunityImages", &reqCopier, &res) if err != nil { return &res, err } @@ -270,8 +208,8 @@ func (c *UCompShareClient) DescribeCompShareInstance(req *DescribeCompShareInsta return &res, nil } -// DescribeULHostBundlesRequest is request schema for DescribeULHostBundles action -type DescribeULHostBundlesRequest struct { +// DescribeCompShareCustomImagesRequest is request schema for DescribeCompShareCustomImages action +type DescribeCompShareCustomImagesRequest struct { request.CommonBase // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) @@ -280,84 +218,33 @@ type DescribeULHostBundlesRequest struct { // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) // Region *string `required:"true"` -} - -// DescribeULHostBundlesResponse is response schema for DescribeULHostBundles action -type DescribeULHostBundlesResponse struct { - response.CommonBase - - // 套餐列表 - Bundles []Bundle - - // 错误信息 - Message string -} - -// NewDescribeULHostBundlesRequest will create request of DescribeULHostBundles action. -func (c *UCompShareClient) NewDescribeULHostBundlesRequest() *DescribeULHostBundlesRequest { - req := &DescribeULHostBundlesRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: DescribeULHostBundles - -获取轻量应用云主机套餐列表 -*/ -func (c *UCompShareClient) DescribeULHostBundles(req *DescribeULHostBundlesRequest) (*DescribeULHostBundlesResponse, error) { - var err error - var res DescribeULHostBundlesResponse - - reqCopier := *req - - err = c.Client.InvokeAction("DescribeULHostBundles", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} - -// DescribeULHostInstanceRequest is request schema for DescribeULHostInstance action -type DescribeULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` + // [公共参数] 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) + // Zone *string `required:"true"` - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` + // 指定镜像Id查询 + CompShareImageId *string `required:"false"` // 返回数据长度,默认为20,最大100 Limit *int `required:"false"` // 列表起始位置偏移量,默认为0 Offset *int `required:"false"` - - // 【数组】轻量应用云主机ID。 - ULHostIds []string `required:"false"` } -// DescribeULHostInstanceResponse is response schema for DescribeULHostInstance action -type DescribeULHostInstanceResponse struct { +// DescribeCompShareCustomImagesResponse is response schema for DescribeCompShareCustomImages action +type DescribeCompShareCustomImagesResponse struct { response.CommonBase - // 错误信息 - Message string + // 镜像详情信息 + ImageSet []CompShareImage - // 实例列表 - ULHostInstanceSets []ULHostInstanceSet + // 总数量 + TotalCount int } -// NewDescribeULHostInstanceRequest will create request of DescribeULHostInstance action. -func (c *UCompShareClient) NewDescribeULHostInstanceRequest() *DescribeULHostInstanceRequest { - req := &DescribeULHostInstanceRequest{} +// NewDescribeCompShareCustomImagesRequest will create request of DescribeCompShareCustomImages action. +func (c *UCompShareClient) NewDescribeCompShareCustomImagesRequest() *DescribeCompShareCustomImagesRequest { + req := &DescribeCompShareCustomImagesRequest{} // setup request with client config c.Client.SetupRequest(req) @@ -368,17 +255,17 @@ func (c *UCompShareClient) NewDescribeULHostInstanceRequest() *DescribeULHostIns } /* -API: DescribeULHostInstance +API: DescribeCompShareCustomImages -获取轻量应用云主机列表 +获取自制镜像列表 */ -func (c *UCompShareClient) DescribeULHostInstance(req *DescribeULHostInstanceRequest) (*DescribeULHostInstanceResponse, error) { +func (c *UCompShareClient) DescribeCompShareCustomImages(req *DescribeCompShareCustomImagesRequest) (*DescribeCompShareCustomImagesResponse, error) { var err error - var res DescribeULHostInstanceResponse + var res DescribeCompShareCustomImagesResponse reqCopier := *req - err = c.Client.InvokeAction("DescribeULHostInstance", &reqCopier, &res) + err = c.Client.InvokeAction("DescribeCompShareCustomImages", &reqCopier, &res) if err != nil { return &res, err } @@ -386,8 +273,8 @@ func (c *UCompShareClient) DescribeULHostInstance(req *DescribeULHostInstanceReq return &res, nil } -// GetULHostInstancePriceRequest is request schema for GetULHostInstancePrice action -type GetULHostInstancePriceRequest struct { +// DescribeCompShareImagesRequest is request schema for DescribeCompShareImages action +type DescribeCompShareImagesRequest struct { request.CommonBase // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) @@ -396,89 +283,45 @@ type GetULHostInstancePriceRequest struct { // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) // Region *string `required:"true"` - // 套餐ID - BundleId *string `required:"true"` - - // 获取指定计费模式的价格。枚举值:\\ > Year,按年付费; \\ > Month。未指定时,返回所有计费模式价格 - ChargeType *string `required:"false"` - - // 购买台数,范围[1,5]。默认:1 - Count *int `required:"false"` - - // 购买时长。默认: 1。不支持购买到月末 - Quantity *int `required:"false"` -} - -// GetULHostInstancePriceResponse is response schema for GetULHostInstancePrice action -type GetULHostInstancePriceResponse struct { - response.CommonBase - - // 错误信息 - Message string - - // - PriceSet []ULHostPriceSet -} - -// NewGetULHostInstancePriceRequest will create request of GetULHostInstancePrice action. -func (c *UCompShareClient) NewGetULHostInstancePriceRequest() *GetULHostInstancePriceRequest { - req := &GetULHostInstancePriceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: GetULHostInstancePrice - -获取轻量应用云主机套餐价格 -*/ -func (c *UCompShareClient) GetULHostInstancePrice(req *GetULHostInstancePriceRequest) (*GetULHostInstancePriceResponse, error) { - var err error - var res GetULHostInstancePriceResponse - - reqCopier := *req + // [公共参数] 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) + // Zone *string `required:"false"` - err = c.Client.InvokeAction("GetULHostInstancePrice", &reqCopier, &res) - if err != nil { - return &res, err - } + // 镜像作者昵称 + Author *string `required:"false"` - return &res, nil -} + // 镜像Id。支持指定Id查询 + CompShareImageId *string `required:"false"` -// GetULHostRenewPriceRequest is request schema for GetULHostRenewPrice action -type GetULHostRenewPriceRequest struct { - request.CommonBase + // 镜像类型。枚举值- System 平台镜像- App 应用镜像默认:System + ImageType *string `required:"false"` - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` + // 返回数据长度,默认为20,最大100 + Limit *int `required:"false"` - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` + // 镜像名称。支持模糊搜索 + Name *string `required:"false"` - // 计费类型。支持:Year/Month;默认:Month - ChargeType *string `required:"false"` + // 列表起始位置偏移量,默认为0 + Offset *int `required:"false"` - // ULHost实例ID - ULHostId *string `required:"true"` + // 镜像标签 + Tag *string `required:"false"` } -// GetULHostRenewPriceResponse is response schema for GetULHostRenewPrice action -type GetULHostRenewPriceResponse struct { +// DescribeCompShareImagesResponse is response schema for DescribeCompShareImages action +type DescribeCompShareImagesResponse struct { response.CommonBase - // - PriceSet []ULHostPriceSet + // 镜像详情列表 + ImageSet []CompShareImage + + // 总数量 + TotalCount int } -// NewGetULHostRenewPriceRequest will create request of GetULHostRenewPrice action. -func (c *UCompShareClient) NewGetULHostRenewPriceRequest() *GetULHostRenewPriceRequest { - req := &GetULHostRenewPriceRequest{} +// NewDescribeCompShareImagesRequest will create request of DescribeCompShareImages action. +func (c *UCompShareClient) NewDescribeCompShareImagesRequest() *DescribeCompShareImagesRequest { + req := &DescribeCompShareImagesRequest{} // setup request with client config c.Client.SetupRequest(req) @@ -489,17 +332,17 @@ func (c *UCompShareClient) NewGetULHostRenewPriceRequest() *GetULHostRenewPriceR } /* -API: GetULHostRenewPrice +API: DescribeCompShareImages -获取主机续费价格 +可获取平台、应用镜像信息 */ -func (c *UCompShareClient) GetULHostRenewPrice(req *GetULHostRenewPriceRequest) (*GetULHostRenewPriceResponse, error) { +func (c *UCompShareClient) DescribeCompShareImages(req *DescribeCompShareImagesRequest) (*DescribeCompShareImagesResponse, error) { var err error - var res GetULHostRenewPriceResponse + var res DescribeCompShareImagesResponse reqCopier := *req - err = c.Client.InvokeAction("GetULHostRenewPrice", &reqCopier, &res) + err = c.Client.InvokeAction("DescribeCompShareImages", &reqCopier, &res) if err != nil { return &res, err } @@ -507,93 +350,46 @@ func (c *UCompShareClient) GetULHostRenewPrice(req *GetULHostRenewPriceRequest) return &res, nil } -// ModifyULHostAttributeRequest is request schema for ModifyULHostAttribute action -type ModifyULHostAttributeRequest struct { +// DescribeCompShareInstanceRequest is request schema for DescribeCompShareInstance action +type DescribeCompShareInstanceRequest struct { request.CommonBase // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) // ProjectId *string `required:"false"` // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // 名称。和Remark至少选择一个进行修改 - Name *string `required:"false"` - - // 备注。和Name至少选择一个进行修改 - Remark *string `required:"false"` - - // ULHost实例Id - ULHostId *string `required:"true"` -} - -// ModifyULHostAttributeResponse is response schema for ModifyULHostAttribute action -type ModifyULHostAttributeResponse struct { - response.CommonBase - - // 错误信息 - Message string - - // ULHost实例Id - ULHostId string -} - -// NewModifyULHostAttributeRequest will create request of ModifyULHostAttribute action. -func (c *UCompShareClient) NewModifyULHostAttributeRequest() *ModifyULHostAttributeRequest { - req := &ModifyULHostAttributeRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: ModifyULHostAttribute - -修改指定ULHost实例属性信息,包含名称和备注 -*/ -func (c *UCompShareClient) ModifyULHostAttribute(req *ModifyULHostAttributeRequest) (*ModifyULHostAttributeResponse, error) { - var err error - var res ModifyULHostAttributeResponse - - reqCopier := *req - - err = c.Client.InvokeAction("ModifyULHostAttribute", &reqCopier, &res) - if err != nil { - return &res, err - } + // Region *string `required:"false"` - return &res, nil -} + // [公共参数] 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) + // Zone *string `required:"false"` -// PoweroffULHostInstanceRequest is request schema for PoweroffULHostInstance action -type PoweroffULHostInstanceRequest struct { - request.CommonBase + // 返回数据长度,默认为20,最大100 + Limit *int `required:"false"` - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` + // 列表起始位置偏移量,默认为0 + Offset *int `required:"false"` - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` + // 【数组】UHost主机的资源ID,例如UHostIds.0代表希望获取信息 的主机1,UHostIds.1代表主机2。 如果不传入,则返回当前Region 所有符合条件的UHost实例。 + UHostIds []string `required:"false"` - // ULHost实例ID - ULHostId *string `required:"true"` + // 无卡GPU + WithoutGpu *bool `required:"false"` } -// PoweroffULHostInstanceResponse is response schema for PoweroffULHostInstance action -type PoweroffULHostInstanceResponse struct { +// DescribeCompShareInstanceResponse is response schema for DescribeCompShareInstance action +type DescribeCompShareInstanceResponse struct { response.CommonBase - // ULHost实例ID - ULHostId string + // UHostInstance总数 + TotalCount int + + // 云主机实例列表,每项参数可见下面 UHostInstanceSet + UHostSet []CompShareInstanceSet } -// NewPoweroffULHostInstanceRequest will create request of PoweroffULHostInstance action. -func (c *UCompShareClient) NewPoweroffULHostInstanceRequest() *PoweroffULHostInstanceRequest { - req := &PoweroffULHostInstanceRequest{} +// NewDescribeCompShareInstanceRequest will create request of DescribeCompShareInstance action. +func (c *UCompShareClient) NewDescribeCompShareInstanceRequest() *DescribeCompShareInstanceRequest { + req := &DescribeCompShareInstanceRequest{} // setup request with client config c.Client.SetupRequest(req) @@ -604,17 +400,17 @@ func (c *UCompShareClient) NewPoweroffULHostInstanceRequest() *PoweroffULHostIns } /* -API: PoweroffULHostInstance +API: DescribeCompShareInstance -直接关闭UHost实例电源,无需等待实例正常关闭。 +获取用户所有地域下主机资源信息列表 */ -func (c *UCompShareClient) PoweroffULHostInstance(req *PoweroffULHostInstanceRequest) (*PoweroffULHostInstanceResponse, error) { +func (c *UCompShareClient) DescribeCompShareInstance(req *DescribeCompShareInstanceRequest) (*DescribeCompShareInstanceResponse, error) { var err error - var res PoweroffULHostInstanceResponse + var res DescribeCompShareInstanceResponse reqCopier := *req - err = c.Client.InvokeAction("PoweroffULHostInstance", &reqCopier, &res) + err = c.Client.InvokeAction("DescribeCompShareInstance", &reqCopier, &res) if err != nil { return &res, err } @@ -678,59 +474,6 @@ func (c *UCompShareClient) RebootCompShareInstance(req *RebootCompShareInstanceR return &res, nil } -// RebootULHostInstanceRequest is request schema for RebootULHostInstance action -type RebootULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // ULHost实例ID - ULHostId *string `required:"true"` -} - -// RebootULHostInstanceResponse is response schema for RebootULHostInstance action -type RebootULHostInstanceResponse struct { - response.CommonBase - - // ULHost实例ID - ULHostId string -} - -// NewRebootULHostInstanceRequest will create request of RebootULHostInstance action. -func (c *UCompShareClient) NewRebootULHostInstanceRequest() *RebootULHostInstanceRequest { - req := &RebootULHostInstanceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: RebootULHostInstance - -重新启动UHost实例。 -*/ -func (c *UCompShareClient) RebootULHostInstance(req *RebootULHostInstanceRequest) (*RebootULHostInstanceResponse, error) { - var err error - var res RebootULHostInstanceResponse - - reqCopier := *req - - err = c.Client.InvokeAction("RebootULHostInstance", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} - // ReinstallCompShareInstanceRequest is request schema for ReinstallCompShareInstance action type ReinstallCompShareInstanceRequest struct { request.CommonBase @@ -793,68 +536,6 @@ func (c *UCompShareClient) ReinstallCompShareInstance(req *ReinstallCompShareIns return &res, nil } -// ReinstallULHostInstanceRequest is request schema for ReinstallULHostInstance action -type ReinstallULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // 镜像Id。暂不支持使用自定义镜像重装 - ImageId *string `required:"true"` - - // 登陆密码。密码需使用base64进行编码,举例如下:# echo -n Password1 | base64UGFzc3dvcmQx - Password *string `required:"true"` - - // 实例Id - ULHostId *string `required:"true"` -} - -// ReinstallULHostInstanceResponse is response schema for ReinstallULHostInstance action -type ReinstallULHostInstanceResponse struct { - response.CommonBase - - // 错误信息 - Message string - - // 实例Id - ULHostId string -} - -// NewReinstallULHostInstanceRequest will create request of ReinstallULHostInstance action. -func (c *UCompShareClient) NewReinstallULHostInstanceRequest() *ReinstallULHostInstanceRequest { - req := &ReinstallULHostInstanceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: ReinstallULHostInstance - -重装轻量应用云主机 -*/ -func (c *UCompShareClient) ReinstallULHostInstance(req *ReinstallULHostInstanceRequest) (*ReinstallULHostInstanceResponse, error) { - var err error - var res ReinstallULHostInstanceResponse - - reqCopier := *req - - err = c.Client.InvokeAction("ReinstallULHostInstance", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} - // ResetCompShareInstancePasswordRequest is request schema for ResetCompShareInstancePassword action type ResetCompShareInstancePasswordRequest struct { request.CommonBase @@ -914,62 +595,6 @@ func (c *UCompShareClient) ResetCompShareInstancePassword(req *ResetCompShareIns return &res, nil } -// ResetULHostInstancePasswordRequest is request schema for ResetULHostInstancePassword action -type ResetULHostInstancePasswordRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // ULHost新密码(密码格式使用BASE64编码) - Password *string `required:"true"` - - // ULHost实例ID - ULHostId *string `required:"true"` -} - -// ResetULHostInstancePasswordResponse is response schema for ResetULHostInstancePassword action -type ResetULHostInstancePasswordResponse struct { - response.CommonBase - - // ULHost实例ID - ULHostId string -} - -// NewResetULHostInstancePasswordRequest will create request of ResetULHostInstancePassword action. -func (c *UCompShareClient) NewResetULHostInstancePasswordRequest() *ResetULHostInstancePasswordRequest { - req := &ResetULHostInstancePasswordRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: ResetULHostInstancePassword - -重置轻量应用云主机管理员密码。 -*/ -func (c *UCompShareClient) ResetULHostInstancePassword(req *ResetULHostInstancePasswordRequest) (*ResetULHostInstancePasswordResponse, error) { - var err error - var res ResetULHostInstancePasswordResponse - - reqCopier := *req - - err = c.Client.InvokeAction("ResetULHostInstancePassword", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} - // StartCompShareInstanceRequest is request schema for StartCompShareInstance action type StartCompShareInstanceRequest struct { request.CommonBase @@ -1026,59 +651,6 @@ func (c *UCompShareClient) StartCompShareInstance(req *StartCompShareInstanceReq return &res, nil } -// StartULHostInstanceRequest is request schema for StartULHostInstance action -type StartULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // ULHost实例ID - ULHostId *string `required:"true"` -} - -// StartULHostInstanceResponse is response schema for StartULHostInstance action -type StartULHostInstanceResponse struct { - response.CommonBase - - // ULHost实例ID - ULHostId string -} - -// NewStartULHostInstanceRequest will create request of StartULHostInstance action. -func (c *UCompShareClient) NewStartULHostInstanceRequest() *StartULHostInstanceRequest { - req := &StartULHostInstanceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: StartULHostInstance - -启动处于关闭状态的UHost实例。 -*/ -func (c *UCompShareClient) StartULHostInstance(req *StartULHostInstanceRequest) (*StartULHostInstanceResponse, error) { - var err error - var res StartULHostInstanceResponse - - reqCopier := *req - - err = c.Client.InvokeAction("StartULHostInstance", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} - // StopCompShareInstanceRequest is request schema for StopCompShareInstance action type StopCompShareInstanceRequest struct { request.CommonBase @@ -1135,59 +707,6 @@ func (c *UCompShareClient) StopCompShareInstance(req *StopCompShareInstanceReque return &res, nil } -// StopULHostInstanceRequest is request schema for StopULHostInstance action -type StopULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // ULHost实例ID。 - ULHostId *string `required:"true"` -} - -// StopULHostInstanceResponse is response schema for StopULHostInstance action -type StopULHostInstanceResponse struct { - response.CommonBase - - // ULHost实例ID - ULHostId string -} - -// NewStopULHostInstanceRequest will create request of StopULHostInstance action. -func (c *UCompShareClient) NewStopULHostInstanceRequest() *StopULHostInstanceRequest { - req := &StopULHostInstanceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: StopULHostInstance - -指停止处于运行状态的ULHost实例 -*/ -func (c *UCompShareClient) StopULHostInstance(req *StopULHostInstanceRequest) (*StopULHostInstanceResponse, error) { - var err error - var res StopULHostInstanceResponse - - reqCopier := *req - - err = c.Client.InvokeAction("StopULHostInstance", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} - // TerminateCompShareInstanceRequest is request schema for TerminateCompShareInstance action type TerminateCompShareInstanceRequest struct { request.CommonBase @@ -1243,62 +762,3 @@ func (c *UCompShareClient) TerminateCompShareInstance(req *TerminateCompShareIns return &res, nil } - -// TerminateULHostInstanceRequest is request schema for TerminateULHostInstance action -type TerminateULHostInstanceRequest struct { - request.CommonBase - - // [公共参数] 项目ID。不填写为默认项目,子帐号必须填写。 请参考[GetProjectList接口](https://docs.ucloud.cn/api/summary/get_project_list) - // ProjectId *string `required:"false"` - - // [公共参数] 地域。 参见 [地域和可用区列表](https://docs.ucloud.cn/api/summary/regionlist) - // Region *string `required:"true"` - - // 删除主机时是否同时删除挂载的数据盘。默认为false。 - ReleaseUDisk *bool `required:"false"` - - // ULHost资源Id - ULHostId *string `required:"true"` -} - -// TerminateULHostInstanceResponse is response schema for TerminateULHostInstance action -type TerminateULHostInstanceResponse struct { - response.CommonBase - - // 用于判断主机删除时是否进入回收站。放入回收站:"Yes", 彻底删除:“No”。 - InRecycle string - - // ULHost 实例 Id - ULHostId string -} - -// NewTerminateULHostInstanceRequest will create request of TerminateULHostInstance action. -func (c *UCompShareClient) NewTerminateULHostInstanceRequest() *TerminateULHostInstanceRequest { - req := &TerminateULHostInstanceRequest{} - - // setup request with client config - c.Client.SetupRequest(req) - - // setup retryable with default retry policy (retry for non-create action and common error) - req.SetRetryable(true) - return req -} - -/* -API: TerminateULHostInstance - -删除指定数据中心的ULHost实例。 -*/ -func (c *UCompShareClient) TerminateULHostInstance(req *TerminateULHostInstanceRequest) (*TerminateULHostInstanceResponse, error) { - var err error - var res TerminateULHostInstanceResponse - - reqCopier := *req - - err = c.Client.InvokeAction("TerminateULHostInstance", &reqCopier, &res) - if err != nil { - return &res, err - } - - return &res, nil -} diff --git a/services/ucompshare/models.go b/services/ucompshare/models.go index 050a777b..01fb7d7f 100644 --- a/services/ucompshare/models.go +++ b/services/ucompshare/models.go @@ -3,42 +3,123 @@ package ucompshare /* -UHostIPSet - +Projects - 项目详情 */ -type UHostIPSet struct { +type Projects struct { - // IP对应的带宽, 单位: Mb (内网IP不显示带宽信息) - Bandwidth int + // 账号Id + AccountId string - // 内网 Private 类型下,表示是否为默认网卡。true: 是默认网卡;其他值:不是。 - Default string + // 账号昵称 + AccountName string +} - // IP地址 - IP string +/* +Software - +*/ +type Software struct { - // 外网IP资源ID 。(内网IP无对应的资源ID) - IPId string + // 【array of string】应用列表 + Applications []string - // IPv4/IPv6; - IPMode string + // CUDA版本 + CUDAVersion string - // 内网 Private 类型下,当前网卡的Mac。 - Mac string + // 框架名称 + Framework string - // 弹性网卡为默认网卡时,返回对应的 ID 值 - NetworkInterfaceId string + // 框架版本 + FrameworkVersion string +} - // IP地址对应的子网 ID。(北京一不支持,字段返回为空) - SubnetId string +/* +CompShareImage - 算力共享平台镜像详情 +*/ +type CompShareImage struct { - // 国际: Internation,BGP: Bgp,内网: Private - Type string + // 镜像作者认证信息 + AuthInfo int - // IP地址对应的VPC ID。(北京一不支持,字段返回为空) - VPCId string + // 镜像作者昵称 + Author string - // 当前EIP的权重。权重最大的为当前的出口IP。 - Weight int + // 镜像Id + CompShareImageId string + + // 是否为容器镜像。- True 容器镜像- False 虚机镜像 + Container string + + // 镜像封面URL + Cover string + + // 创建时间戳 + CreateTime string + + // 镜像引用创建计数 + CreatedCount string + + // 镜像描述信息 + Description string + + // 镜像制作失败错误原因 + FailedReason string + + // 镜像收藏计数 + FavoritesCount string + + // 镜像来源。- Official 平台镜像;- Community 社区镜像 + ImageOwnerAlias string + + // 镜像类型。- System 平台提供的公共镜像;- App 平台提供的应用镜像;- Custom 自制镜像;- Community 社区镜像 + ImageType string + + // 来源是否为官方镜像【仅自制镜像信息返回该字段】 + IsOfficial bool + + // 镜像名称 + Name string + + // 镜像所属账号信息 + Owner Projects + + // 镜像价格。单位:元 + Price float64 + + // 发布时间戳 + PubTime string + + // 镜像详细描述。仅指定镜像Id查询时返回 + Readme string + + // 镜像大小。单位MB + Size int + + // 镜像软件信息 + Softwares Software + + // 镜像状态。- Making 制作中;- Available 可用;- UnAvailable 不可用;- Reviewing 审核中;- Offline 已下线 + Status string + + // 【array of string】镜像标签 + Tags []string + + // 可见性。0:私密镜像;1:公开至镜像社区 + Visibility int +} + +/* +DiskPriceInfo - 磁盘价格信息列表 +*/ +type DiskPriceInfo struct { + + // 计费类型 + ChargeType string + + // 是否为系统盘 + IsBoot bool + + // 磁盘价格 + Price float64 } /* @@ -56,6 +137,21 @@ type WithoutGpuSpec struct { Memory int } +/* +GpuMonitorInfo - GPU卡监控信息 +*/ +type GpuMonitorInfo struct { + + // GPU卡名称 + GPU string + + // GPU卡使用率 + GpuUsageRate string + + // GPU显存使用率 + MemoryUsageRate string +} + /* UHostDiskSet - */ @@ -86,6 +182,60 @@ type UHostDiskSet struct { Type string } +/* +UHostIPSet - +*/ +type UHostIPSet struct { + + // IP对应的带宽, 单位: Mb (内网IP不显示带宽信息) + Bandwidth int + + // 内网 Private 类型下,表示是否为默认网卡。true: 是默认网卡;其他值:不是。 + Default string + + // IP地址 + IP string + + // 外网IP资源ID 。(内网IP无对应的资源ID) + IPId string + + // IPv4/IPv6; + IPMode string + + // 内网 Private 类型下,当前网卡的Mac。 + Mac string + + // 弹性网卡为默认网卡时,返回对应的 ID 值 + NetworkInterfaceId string + + // IP地址对应的子网 ID。(北京一不支持,字段返回为空) + SubnetId string + + // 国际: Internation,BGP: Bgp,内网: Private + Type string + + // IP地址对应的VPC ID。(北京一不支持,字段返回为空) + VPCId string + + // 当前EIP的权重。权重最大的为当前的出口IP。 + Weight int +} + +/* +MonitorMessage - 监控信息 +*/ +type MonitorMessage struct { + + // CPU使用率 + CpuUsageRate string + + // GPU卡监控信息 + GpuInfo []GpuMonitorInfo + + // 内存使用率 + MemUsageRate string +} + /* GraphicsMemory - GPU的显存指标 */ @@ -154,6 +304,9 @@ type CompShareInstanceSet struct { // 创建时间 CreateTime int + // 磁盘价格信息,详见:DiskPriceInfo + DiskPriceInfo []DiskPriceInfo + // 详情见UHostDiskSet DiskSet []UHostDiskSet @@ -187,6 +340,9 @@ type CompShareInstanceSet struct { // 内存大小,单位:MB Memory int + // 监控信息,详见:MonitorMessage + MonitorMessages MonitorMessage + // 实例名称 Name string @@ -199,6 +355,12 @@ type CompShareInstanceSet struct { // 主机密码。由Base64编码 Password string + // 后付费关机计费信息列表,详见:详见:DiskPriceInfo + PostPayPowerOffBillingResource []DiskPriceInfo + + // 释放时间(关机时候返回) + ReleaseTime int + // 实例备注 Remark string @@ -211,6 +373,12 @@ type CompShareInstanceSet struct { // 实例状态,枚举值:\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting; \\ >升级改配中: Resizing; \\ > 未知(空字符串,获取状态超时或出错): State string + // 计划关机时间 + StopSchedulerTime int + + // 定时关机时间 + StopTime int + // 此实例是否支持无卡开机 SupportWithoutGpuStart bool @@ -223,162 +391,12 @@ type CompShareInstanceSet struct { // 实例Id UHostId string + // 虚机状态更新时间 + UpdateTime int + // 无卡配置规格,详情见:WithoutGpuSpecInfo WithoutGpuSpec WithoutGpuSpec // 可用区 Zone string } - -/* -Bundle - 轻量应用云主机套餐 -*/ -type Bundle struct { - - // 外网带宽。单位:Mbps。 - Bandwidth int - - // 套餐ID。 - BundleId string - - // CPU核数。 - CPU int - - // 内存大小。单位:MB。 - Memory int - - // 系统盘大小。单位:GB。 - SysDiskSpace int - - // 流量包大小。单位:GB。 - TrafficPacket int -} - -/* -ExclusiveUTPInfo - 流量包详情 -*/ -type ExclusiveUTPInfo struct { - - // 当前周期剩余流量 - AvailableSize int - - // 创建时间 - CreateTime int - - // 当前周期超出限额的流量 - ExcessSize int - - // 上次重置时间 - LastResetTime int - - // 下次重置时间 - NextResetTime int - - // 当前周期总流量 - TotalSize int - - // 当前周期已使用流量 - UsedSize int -} - -/* -ULHostDiskSet - 轻量应用主机的磁盘信息 -*/ -type ULHostDiskSet struct { - - // 磁盘Id - DiskId string - - // 磁盘类型。如:"CLOUD_RSSD"、"CLOUD_SSD" - DiskType string - - // 磁盘盘符。系统盘:"vda" - Drive string - - // 是否为系统盘。是:"True";否:"False" - IsBoot string - - // 磁盘大小。单位:GB - Size int - - // 磁盘类型。系统盘:"Boot";数据盘:"Data" - Type string -} - -/* -ULHostInstanceSet - 轻量应用云主机详情 -*/ -type ULHostInstanceSet struct { - - // 【数组】镜像包含的应用列表。 - Apps []string - - // 是否自动续费。枚举值:Yes/No - AutoRenew string - - // CPU核数。 - CPU int - - // 计费模式。枚举值:Month/Year - ChargeType string - - // 创建时间。Unix时间戳 - CreateTime int - - // 磁盘信息 - DiskSet []ULHostDiskSet - - // 流量包详情信息 - EIPExclusiveUTPInfo ExclusiveUTPInfo - - // 过期时间。Unix时间戳 - ExpireTime int - - // IP信息 - IPSet []UHostIPSet - - // 镜像Id。 - ImageId string - - // 镜像名称。 - ImageName string - - // 是否过期。枚举值:Yes/No - IsExpire string - - // 内存。单位:MB - Memory int - - // 实例名称。默认套餐Id - Name string - - // 备注。 - Remark string - - // 实例状态。枚举值:\\ >初始化: Initializing; \\ >启动中: Starting; \\> 运行中: Running; \\> 关机中: Stopping; \\ >关机: Stopped \\ >安装失败: Install Fail; \\ >重启中: Rebooting; \\ > 未知(空字符串,获取状态超时或出错):"" - State string - - // 业务组。 - Tag string - - // 实例Id。 - ULHostId string - - // 可用区。 - Zone string -} - -/* -ULHostPriceSet - 轻量应用主机价格详情 -*/ -type ULHostPriceSet struct { - - // 计费模式 - ChargeType string - - // 原价 - OriginalPrice float64 - - // 价格 - Price float64 -} diff --git a/tests/setup_test.go b/tests/setup_test.go index cc501cd8..e078b552 100644 --- a/tests/setup_test.go +++ b/tests/setup_test.go @@ -60,6 +60,7 @@ import ( "github.com/ucloud/ucloud-sdk-go/services/tidb" "github.com/ucloud/ucloud-sdk-go/services/ubox" "github.com/ucloud/ucloud-sdk-go/services/ucdn" + "github.com/ucloud/ucloud-sdk-go/services/ucompshare" "github.com/ucloud/ucloud-sdk-go/services/udts" "github.com/ucloud/ucloud-sdk-go/services/uec" "github.com/ucloud/ucloud-sdk-go/services/ufs" @@ -174,6 +175,9 @@ func testSetup() { spec.AddFixture("UCDN", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { return ucdn.NewClient(&cfg, &credential), nil })) + spec.AddFixture("UCompShare", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { + return ucompshare.NewClient(&cfg, &credential), nil + })) spec.AddFixture("UDB", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { return udb.NewClient(&cfg, &credential), nil })) diff --git a/ucloud/version/version.go b/ucloud/version/version.go index cd3b1f8a..8cd4aaea 100644 --- a/ucloud/version/version.go +++ b/ucloud/version/version.go @@ -1,3 +1,3 @@ package version -const Version = "0.22.56" +const Version = "0.22.57"