From 8dc3c3b51a89167225788c331f6b6f2c9a58a79d Mon Sep 17 00:00:00 2001 From: zhouqunjie Date: Thu, 31 Aug 2023 17:20:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 591b567ea1e657ebc884ed274419180b98fde6ba --- api/desc/vm/pcm-vm.api | 78 ++++++++++++++++++------------------- api/internal/types/types.go | 78 ++++++++++++++++++------------------- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/api/desc/vm/pcm-vm.api b/api/desc/vm/pcm-vm.api index 2aa1e661..7a71b3aa 100644 --- a/api/desc/vm/pcm-vm.api +++ b/api/desc/vm/pcm-vm.api @@ -12,37 +12,37 @@ type ( Rate{ } Absolute{ - maxServerMeta int64 `form:"maxServerMeta,optional"` - maxPersonality int64 `form:"maxPersonality,optional"` - totalServerGroupsUsed int64 `form:"totalServerGroupsUsed,optional"` - maxImageMeta int64 `form:"maxImageMeta,optional"` - maxPersonalitySize int64 `form:"maxPersonalitySize,optional"` - maxTotalKeypairs int64 `form:"maxTotalKeypairs,optional"` - maxSecurityGroupRules int64 `form:"maxSecurityGroupRules,optional"` - maxServerGroups int64 `form:"maxServerGroups,optional"` - totalCoresUsed int64 `form:"totalCoresUsed,optional"` - totalRAMUsed int64 `form:"totalRAMUsed,optional"` - totalInstancesUsed int64 `form:"totalInstancesUsed,optional"` - maxSecurityGroups int64 `form:"maxSecurityGroups,optional"` - totalFloatingIpsUsed int64 `form:"totalFloatingIpsUsed,optional"` - maxTotalCores int64 `form:"maxTotalCores,optional"` - maxServerGroupMembers int64 `form:"maxServerGroupMembers,optional"` - maxTotalFloatingIps int64 `form:"maxTotalFloatingIps,optional"` - totalSecurityGroupsUsed int64 `form:"totalSecurityGroupsUsed,optional"` - maxTotalInstances int64 `form:"maxTotalInstances,optional"` - maxTotalRAMSize int64 `form:"maxTotalRAMSize,optional"` + MaxServerMeta int64 `json:"max_server_meta,optional"` + MaxPersonality int64 `json:"max_personality,optional"` + TotalServerGroupsUsed int64 `json:"total_server_groups_used,optional"` + MaxImageMeta int64 `json:"max_image_meta,optional"` + MaxPersonalitySize int64 `json:"max_personality_size,optional"` + MaxTotalKeypairs int64 `json:"max_total_keypairs,optional"` + MaxSecurityGroupRules int64 `json:"max_security_group_rules,optional"` + MaxServerGroups int64 `json:"max_server_groups,optional"` + TotalCoresUsed int64 `json:"total_cores_used,optional"` + TotalRAMUsed int64 `json:"total_ram_used,optional"` + TotalInstancesUsed int64 `json:"total_instances_used,optional"` + MaxSecurityGroups int64 `json:"max_security_groups,optional"` + TotalFloatingIpsUsed int64 `json:"total_floating_ips_used,optional"` + MaxTotalCores int64 `json:"max_total_cores,optional"` + MaxServerGroupMembers int64 `json:"max_server_group_members,optional"` + MaxTotalFloatingIps int64 `json:"max_total_floating_ips,optional"` + TotalSecurityGroupsUsed int64 `json:"total_security_groups_used,optional"` + MaxTotalInstances int64 `json:"max_total_instances,optional"` + MaxTotalRAMSize int64 `json:"max_total_ram_size,optional"` } Limits{ - rate Rate `form:"rate,optional"` - absolute Absolute`form:"absolute,optional"` + rate Rate `json:"rate,optional"` + absolute Absolute`json:"absolute,optional"` } GetComputeLimitsReq{ - Limit int32 `form:"limit,optional"` - OffSet int32 `form:"offSet,optional"` + Limit int32 `json:"limit,optional"` + OffSet int32 `json:"offSet,optional"` } GetComputeLimitsResp{ - limits Limits `form:"limits,optional"` + limits Limits `json:"limits,optional"` Code int32 `json:"code,omitempty"` Msg string `json:"msg,omitempty"` ErrorMsg string `json:"errorMsg,omitempty"` @@ -54,28 +54,28 @@ type ( VolumeRate{ } VolumeAbsolute{ - totalSnapshotsUsed int32 `form:"totalSnapshotsUsed,optional"` - maxTotalBackups int32 `form:"maxTotalBackups,optional"` - maxTotalVolumeGigabytes int32 `form:"maxTotalVolumeGigabytes,optional"` - maxTotalSnapshots int32 `form:"maxTotalSnapshots,optional"` - maxTotalBackupGigabytes int32 `form:"maxTotalBackupGigabytes,optional"` - totalBackupGigabytesUsed int32 `form:"totalBackupGigabytesUsed,optional"` - maxTotalVolumes int32 `form:"maxTotalVolumes,optional"` - totalVolumesUsed int32 `form:"totalVolumesUsed,optional"` - totalBackupsUsed int32 `form:"totalBackupsUsed,optional"` - totalGigabytesUsed int32 `form:"totalGigabytesUsed,optional"` + TotalSnapshotsUsed int32 `json:"total_snapshots_used,optional"` + MaxTotalBackups int32 `json:"max_total_backups,optional"` + MaxTotalVolumeGigabytes int32 `json:"max_total_volume_gigabytes,optional"` + MaxTotalSnapshots int32 `json:"max_total_snapshots,optional"` + MaxTotalBackupGigabytes int32 `json:"max_total_backup_gigabytes,optional"` + TotalBackupGigabytesUsed int32 `json:"total_backup_gigabytes_used,optional"` + MaxTotalVolumes int32 `json:"max_total_volumes,optional"` + TotalVolumesUsed int32 `json:"total_volumes_used,optional"` + TotalBackupsUsed int32 `json:"total_backups_used,optional"` + TotalGigabytesUsed int32 `json:"total_gigabytes_used,optional"` } VolumeLimits{ - rate VolumeRate `form:"rate,optional"` - absolute VolumeAbsolute`form:"absolute,optional"` + rate VolumeRate `json:"rate,optional"` + absolute VolumeAbsolute`json:"absolute,optional"` } GetVolumeLimitsReq{ - Limit int32 `form:"limit,optional"` - OffSet int32 `form:"offSet,optional"` + Limit int32 `json:"limit,optional"` + OffSet int32 `json:"offSet,optional"` } GetVolumeLimitsResp{ - limits VolumeLimits `form:"limits,optional"` + limits VolumeLimits `json:"limits,optional"` Code int32 `json:"code,omitempty"` Msg string `json:"msg,omitempty"` ErrorMsg string `json:"errorMsg,omitempty"` diff --git a/api/internal/types/types.go b/api/internal/types/types.go index 6525602e..bd1c6c0d 100644 --- a/api/internal/types/types.go +++ b/api/internal/types/types.go @@ -2106,39 +2106,39 @@ type Rate struct { } type Absolute struct { - MaxServerMeta int64 `form:"maxServerMeta,optional"` - MaxPersonality int64 `form:"maxPersonality,optional"` - TotalServerGroupsUsed int64 `form:"totalServerGroupsUsed,optional"` - MaxImageMeta int64 `form:"maxImageMeta,optional"` - MaxPersonalitySize int64 `form:"maxPersonalitySize,optional"` - MaxTotalKeypairs int64 `form:"maxTotalKeypairs,optional"` - MaxSecurityGroupRules int64 `form:"maxSecurityGroupRules,optional"` - MaxServerGroups int64 `form:"maxServerGroups,optional"` - TotalCoresUsed int64 `form:"totalCoresUsed,optional"` - TotalRAMUsed int64 `form:"totalRAMUsed,optional"` - TotalInstancesUsed int64 `form:"totalInstancesUsed,optional"` - MaxSecurityGroups int64 `form:"maxSecurityGroups,optional"` - TotalFloatingIpsUsed int64 `form:"totalFloatingIpsUsed,optional"` - MaxTotalCores int64 `form:"maxTotalCores,optional"` - MaxServerGroupMembers int64 `form:"maxServerGroupMembers,optional"` - MaxTotalFloatingIps int64 `form:"maxTotalFloatingIps,optional"` - TotalSecurityGroupsUsed int64 `form:"totalSecurityGroupsUsed,optional"` - MaxTotalInstances int64 `form:"maxTotalInstances,optional"` - MaxTotalRAMSize int64 `form:"maxTotalRAMSize,optional"` + MaxServerMeta int64 `json:"max_server_meta,optional"` + MaxPersonality int64 `json:"max_personality,optional"` + TotalServerGroupsUsed int64 `json:"total_server_groups_used,optional"` + MaxImageMeta int64 `json:"max_image_meta,optional"` + MaxPersonalitySize int64 `json:"max_personality_size,optional"` + MaxTotalKeypairs int64 `json:"max_total_keypairs,optional"` + MaxSecurityGroupRules int64 `json:"max_security_group_rules,optional"` + MaxServerGroups int64 `json:"max_server_groups,optional"` + TotalCoresUsed int64 `json:"total_cores_used,optional"` + TotalRAMUsed int64 `json:"total_ram_used,optional"` + TotalInstancesUsed int64 `json:"total_instances_used,optional"` + MaxSecurityGroups int64 `json:"max_security_groups,optional"` + TotalFloatingIpsUsed int64 `json:"total_floating_ips_used,optional"` + MaxTotalCores int64 `json:"max_total_cores,optional"` + MaxServerGroupMembers int64 `json:"max_server_group_members,optional"` + MaxTotalFloatingIps int64 `json:"max_total_floating_ips,optional"` + TotalSecurityGroupsUsed int64 `json:"total_security_groups_used,optional"` + MaxTotalInstances int64 `json:"max_total_instances,optional"` + MaxTotalRAMSize int64 `json:"max_total_ram_size,optional"` } type Limits struct { - Rate Rate `form:"rate,optional"` - Absolute Absolute `form:"absolute,optional"` + Rate Rate `json:"rate,optional"` + Absolute Absolute `json:"absolute,optional"` } type GetComputeLimitsReq struct { - Limit int32 `form:"limit,optional"` - OffSet int32 `form:"offSet,optional"` + Limit int32 `json:"limit,optional"` + OffSet int32 `json:"offSet,optional"` } type GetComputeLimitsResp struct { - Limits Limits `form:"limits,optional"` + Limits Limits `json:"limits,optional"` Code int32 `json:"code,omitempty"` Msg string `json:"msg,omitempty"` ErrorMsg string `json:"errorMsg,omitempty"` @@ -2148,30 +2148,30 @@ type VolumeRate struct { } type VolumeAbsolute struct { - TotalSnapshotsUsed int32 `form:"totalSnapshotsUsed,optional"` - MaxTotalBackups int32 `form:"maxTotalBackups,optional"` - MaxTotalVolumeGigabytes int32 `form:"maxTotalVolumeGigabytes,optional"` - MaxTotalSnapshots int32 `form:"maxTotalSnapshots,optional"` - MaxTotalBackupGigabytes int32 `form:"maxTotalBackupGigabytes,optional"` - TotalBackupGigabytesUsed int32 `form:"totalBackupGigabytesUsed,optional"` - MaxTotalVolumes int32 `form:"maxTotalVolumes,optional"` - TotalVolumesUsed int32 `form:"totalVolumesUsed,optional"` - TotalBackupsUsed int32 `form:"totalBackupsUsed,optional"` - TotalGigabytesUsed int32 `form:"totalGigabytesUsed,optional"` + TotalSnapshotsUsed int32 `json:"total_snapshots_used,optional"` + MaxTotalBackups int32 `json:"max_total_backups,optional"` + MaxTotalVolumeGigabytes int32 `json:"max_total_volume_gigabytes,optional"` + MaxTotalSnapshots int32 `json:"max_total_snapshots,optional"` + MaxTotalBackupGigabytes int32 `json:"max_total_backup_gigabytes,optional"` + TotalBackupGigabytesUsed int32 `json:"total_backup_gigabytes_used,optional"` + MaxTotalVolumes int32 `json:"max_total_volumes,optional"` + TotalVolumesUsed int32 `json:"total_volumes_used,optional"` + TotalBackupsUsed int32 `json:"total_backups_used,optional"` + TotalGigabytesUsed int32 `json:"total_gigabytes_used,optional"` } type VolumeLimits struct { - Rate VolumeRate `form:"rate,optional"` - Absolute VolumeAbsolute `form:"absolute,optional"` + Rate VolumeRate `json:"rate,optional"` + Absolute VolumeAbsolute `json:"absolute,optional"` } type GetVolumeLimitsReq struct { - Limit int32 `form:"limit,optional"` - OffSet int32 `form:"offSet,optional"` + Limit int32 `json:"limit,optional"` + OffSet int32 `json:"offSet,optional"` } type GetVolumeLimitsResp struct { - Limits VolumeLimits `form:"limits,optional"` + Limits VolumeLimits `json:"limits,optional"` Code int32 `json:"code,omitempty"` Msg string `json:"msg,omitempty"` ErrorMsg string `json:"errorMsg,omitempty"`