diff --git a/services/udb/apis.go b/services/udb/apis.go index 44008c5..4039e1c 100644 --- a/services/udb/apis.go +++ b/services/udb/apis.go @@ -646,8 +646,8 @@ type CreateUDBInstanceRequest struct { // UDB实例模式类型, 可选值如下: "Normal": 普通版UDB实例 "HA": 高可用版UDB实例 默认是"Normal" InstanceMode *string `required:"false"` - // 【该字段已废弃,请谨慎使用】 - InstanceType *string `required:"false" deprecated:"true"` + // UDB数据库机型: "SATA_SSD": "SSD机型" , "PCIE_SSD": "SSD高性能机型" , "Normal_Volume": "标准大容量机型", "SATA_SSD_Volume": "SSD大容量机型" , "PCIE_SSD_Volume": "SSD高性能大容量机型", "NVMe_SSD": "快杰机型" + InstanceType *string `required:"false"` // 规格类型ID,当SpecificationType为1时有效 MachineType *string `required:"false"` diff --git a/services/udb/models.go b/services/udb/models.go index 9bb0d1c..340f559 100644 --- a/services/udb/models.go +++ b/services/udb/models.go @@ -47,6 +47,18 @@ type UDBBackupSet struct { Zone string } +/* +UFileDataSet - 增加ufile的描述 +*/ +type UFileDataSet struct { + + // bucket名称 + Bucket string + + // Ufile的令牌tokenid + TokenID string +} + /* UDBSlaveInstanceSet - DescribeUDBSlaveInstance */ @@ -173,18 +185,6 @@ type UDBSlaveInstanceSet struct { Zone string } -/* -UFileDataSet - 增加ufile的描述 -*/ -type UFileDataSet struct { - - // bucket名称 - Bucket string - - // Ufile的令牌tokenid - TokenID string -} - /* UDBInstanceSet - DescribeUDBInstance */ diff --git a/services/uhost/apis.go b/services/uhost/apis.go index 0f14002..2b17057 100644 --- a/services/uhost/apis.go +++ b/services/uhost/apis.go @@ -90,6 +90,9 @@ type CreateCustomImageRequest struct { // [公共参数] 可用区。参见 [可用区列表](https://docs.ucloud.cn/api/summary/regionlist) // Zone *string `required:"false"` + // 【数组】关联的云盘数据盘id列表。注意: 云盘数据盘需要开启快照服务 + DataUDiskIds []string `required:"false"` + // 镜像描述 ImageDescription *string `required:"false"` @@ -104,6 +107,9 @@ type CreateCustomImageRequest struct { type CreateCustomImageResponse struct { response.CommonBase + // 云盘数据盘快照id列表 + DataSnapshotIds []string + // 镜像Id ImageId string } @@ -195,12 +201,6 @@ func (c *UHostClient) CreateIsolationGroup(req *CreateIsolationGroupRequest) (*C return &res, nil } -/* -UHostDiskCustomBackup is request schema for complex param -*/ -type UHostDiskCustomBackup struct { -} - /* CreateUHostInstanceParamNetworkInterfaceIPv6 is request schema for complex param */ @@ -231,6 +231,36 @@ type CreateUHostInstanceParamNetworkInterfaceEIP struct { ShareBandwidthId *string `required:"false"` } +/* +UHostDiskCustomBackup is request schema for complex param +*/ +type UHostDiskCustomBackup struct { +} + +/* +CreateUHostInstanceParamNetworkInterface is request schema for complex param +*/ +type CreateUHostInstanceParamNetworkInterface struct { + + // 申请并绑定一个教育网EIP。True为申请并绑定,False为不会申请绑定,默认False。当前只支持具有HPC特性的机型。 + CreateCernetIp *bool `required:"false"` + + // + EIP *CreateUHostInstanceParamNetworkInterfaceEIP `required:"false"` +} + +/* +CreateUHostInstanceParamVolumes is request schema for complex param +*/ +type CreateUHostInstanceParamVolumes struct { + + // 【该字段已废弃,请谨慎使用】 + CouponId *string `required:"false" deprecated:"true"` + + // 【该字段已废弃,请谨慎使用】 + IsBoot *string `required:"false" deprecated:"true"` +} + /* UHostDisk is request schema for complex param */ @@ -282,30 +312,6 @@ type CreateUHostInstanceParamFeatures struct { UNI *bool `required:"false"` } -/* -CreateUHostInstanceParamNetworkInterface is request schema for complex param -*/ -type CreateUHostInstanceParamNetworkInterface struct { - - // 申请并绑定一个教育网EIP。True为申请并绑定,False为不会申请绑定,默认False。当前只支持具有HPC特性的机型。 - CreateCernetIp *bool `required:"false"` - - // - EIP *CreateUHostInstanceParamNetworkInterfaceEIP `required:"false"` -} - -/* -CreateUHostInstanceParamVolumes is request schema for complex param -*/ -type CreateUHostInstanceParamVolumes struct { - - // 【该字段已废弃,请谨慎使用】 - CouponId *string `required:"false" deprecated:"true"` - - // 【该字段已废弃,请谨慎使用】 - IsBoot *string `required:"false" deprecated:"true"` -} - // CreateUHostInstanceRequest is request schema for CreateUHostInstance action type CreateUHostInstanceRequest struct { request.CommonBase @@ -1150,21 +1156,6 @@ func (c *UHostClient) GetAttachedDiskUpgradePrice(req *GetAttachedDiskUpgradePri return &res, nil } -/* -GetUHostInstancePriceParamVolumes is request schema for complex param -*/ -type GetUHostInstancePriceParamVolumes struct { - - // 【该字段已废弃,请谨慎使用】 - IsBoot *string `required:"false" deprecated:"true"` - - // 【该字段已废弃,请谨慎使用】 - Size *int `required:"false" deprecated:"true"` - - // 【该字段已废弃,请谨慎使用】 - Type *string `required:"false" deprecated:"true"` -} - /* getUHostInstancePriceParamDisks is request schema for complex param */ @@ -1183,6 +1174,21 @@ type getUHostInstancePriceParamDisks struct { Type *string `required:"true"` } +/* +GetUHostInstancePriceParamVolumes is request schema for complex param +*/ +type GetUHostInstancePriceParamVolumes struct { + + // 【该字段已废弃,请谨慎使用】 + IsBoot *string `required:"false" deprecated:"true"` + + // 【该字段已废弃,请谨慎使用】 + Size *int `required:"false" deprecated:"true"` + + // 【该字段已废弃,请谨慎使用】 + Type *string `required:"false" deprecated:"true"` +} + // GetUHostInstancePriceRequest is request schema for GetUHostInstancePrice action type GetUHostInstancePriceRequest struct { request.CommonBase diff --git a/services/uhost/models.go b/services/uhost/models.go index 748691a..f2a919b 100644 --- a/services/uhost/models.go +++ b/services/uhost/models.go @@ -214,6 +214,9 @@ type UHostImageSet struct { // 创建时间,格式为Unix时间戳 CreateTime int + // 关联的云盘数据盘快照Id列表 + DataSnapshotIds []string + // 特殊状态标识,目前包含NetEnhnced(网络增强1.0), NetEnhanced_Ultra(网络增强2.0), NetEnhanced_Extreme(网络增强3.0), HotPlug(热升级), GPU(GPU镜像),CloudInit, IPv6(支持IPv6网络),RssdAttachable(支持RSSD云盘),Vgpu_AMD(支持AMD的vgpu),Vgpu_NVIDIA(支持NVIDIA的vgpu),Aarch64_Type(支持arm64架构) Features []string @@ -317,15 +320,6 @@ type UDSetUDHostAttribute struct { UDSetId string } -/* -SpotAttribute - 竞价实例属性 -*/ -type SpotAttribute struct { - - // 回收时间 - RecycleTime int -} - /* UHostDiskSet - DescribeUHostInstance */ @@ -359,18 +353,6 @@ type UHostDiskSet struct { Type string } -/* -UHostKeyPair - 主机密钥信息 -*/ -type UHostKeyPair struct { - - // 密钥对ID - KeyPairId string - - // 主机密钥对状态,Normal 正常,Deleted 删除 - KeyPairState string -} - /* UHostIPSet - DescribeUHostInstance */ @@ -410,6 +392,27 @@ type UHostIPSet struct { Weight int } +/* +UHostKeyPair - 主机密钥信息 +*/ +type UHostKeyPair struct { + + // 密钥对ID + KeyPairId string + + // 主机密钥对状态,Normal 正常,Deleted 删除 + KeyPairState string +} + +/* +SpotAttribute - 竞价实例属性 +*/ +type SpotAttribute struct { + + // 回收时间 + RecycleTime int +} + /* UHostInstanceSet - DescribeUHostInstance */ diff --git a/services/umem/models.go b/services/umem/models.go index 95196a1..51b5aca 100644 --- a/services/umem/models.go +++ b/services/umem/models.go @@ -38,18 +38,6 @@ type UDRedisSlowlogSet struct { StartTime int } -/* -UMemSpaceAddressSet - DescribeUMemSpace -*/ -type UMemSpaceAddressSet struct { - - // UMem实例访问IP - IP string - - // UMem实例访问Port - Port int -} - /* UMemSlaveDataSet - DescribeUMem */ @@ -125,6 +113,18 @@ type UMemSlaveDataSet struct { Zone string } +/* +UMemSpaceAddressSet - DescribeUMemSpace +*/ +type UMemSpaceAddressSet struct { + + // UMem实例访问IP + IP string + + // UMem实例访问Port + Port int +} + /* UMemDataSet - DescribeUMem */ diff --git a/services/unet/models.go b/services/unet/models.go index 5dc64e5..3dc3a9e 100644 --- a/services/unet/models.go +++ b/services/unet/models.go @@ -78,18 +78,18 @@ type UnetBandwidthUsageEIPSet struct { } /* -EIPBinding - EIP绑定内网IP关系数据 +ShareBandwidthSet - DescribeEIP */ -type EIPBinding struct { +type ShareBandwidthSet struct { - // 外网ip - EIP string + // 共享带宽带宽值 + ShareBandwidth int - // 内网ip - PrivateIP string + // 共享带宽ID + ShareBandwidthId string - // 内网ip类型:PrimaryIP(默认)、SecondaryIP(非默认) - PrivateIPType string + // 共享带宽的资源名称 + ShareBandwidthName string } /* @@ -123,18 +123,18 @@ type UnetEIPResourceSet struct { } /* -ShareBandwidthSet - DescribeEIP +EIPBinding - EIP绑定内网IP关系数据 */ -type ShareBandwidthSet struct { +type EIPBinding struct { - // 共享带宽带宽值 - ShareBandwidth int + // 外网ip + EIP string - // 共享带宽ID - ShareBandwidthId string + // 内网ip + PrivateIP string - // 共享带宽的资源名称 - ShareBandwidthName string + // 内网ip类型:PrimaryIP(默认)、SecondaryIP(非默认) + PrivateIPType string } /* diff --git a/tests/setup_test.go b/tests/setup_test.go index ef16ea8..17e56ea 100644 --- a/tests/setup_test.go +++ b/tests/setup_test.go @@ -60,13 +60,13 @@ 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/udns" "github.com/ucloud/ucloud-sdk-go/services/udts" "github.com/ucloud/ucloud-sdk-go/services/uec" "github.com/ucloud/ucloud-sdk-go/services/ufs" "github.com/ucloud/ucloud-sdk-go/services/uk8s" "github.com/ucloud/ucloud-sdk-go/services/umedia" "github.com/ucloud/ucloud-sdk-go/services/unvs" + "github.com/ucloud/ucloud-sdk-go/services/usms" ) func TestMain(m *testing.M) { @@ -178,9 +178,6 @@ func testSetup() { spec.AddFixture("UDB", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { return udb.NewClient(&cfg, &credential), nil })) - spec.AddFixture("UDNS", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { - return udns.NewClient(&cfg, &credential), nil - })) spec.AddFixture("UDPN", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { return udpn.NewClient(&cfg, &credential), nil })) @@ -223,6 +220,9 @@ func testSetup() { spec.AddFixture("UPHost", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { return uphost.NewClient(&cfg, &credential), nil })) + spec.AddFixture("USMS", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { + return usms.NewClient(&cfg, &credential), nil + })) spec.AddFixture("VPC", driver.SetupClientFixture(func() (ucloud.ServiceClient, error) { return vpc.NewClient(&cfg, &credential), nil })) diff --git a/ucloud/version/version.go b/ucloud/version/version.go index 8a31d66..a843c92 100644 --- a/ucloud/version/version.go +++ b/ucloud/version/version.go @@ -1,3 +1,3 @@ package version -const Version = "0.22.24" +const Version = "0.22.25"