From 56741a74b63015f0d43b1363ec1cbdd408b3976c Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Mon, 29 Dec 2025 10:17:14 +0800 Subject: [PATCH] fix: fix missing json tag for struct fields (#24004) Co-authored-by: Qiu Jian --- pkg/apis/ansible/ansible.go | 14 +- pkg/apis/cloudcommon/proxy/proxy.go | 4 +- pkg/apis/cloudcommon/proxy/setting.go | 6 +- pkg/apis/cloudid/cloudgroup.go | 14 +- pkg/apis/cloudid/cloudpolicy.go | 4 +- pkg/apis/cloudid/samluser.go | 6 +- pkg/apis/cloudproxy/forwards.go | 66 +++---- pkg/apis/cloudproxy/proxy_endpoints.go | 20 +-- pkg/apis/compute/access_group_rules.go | 22 +-- pkg/apis/compute/api.go | 18 +- pkg/apis/compute/app.go | 66 +++---- pkg/apis/compute/backup.go | 36 ++-- pkg/apis/compute/baremetal.go | 26 +-- pkg/apis/compute/baremetal/profiles.go | 32 ++-- pkg/apis/compute/bucket.go | 74 ++++---- pkg/apis/compute/cdn.go | 16 +- pkg/apis/compute/cloudaccount.go | 22 +-- pkg/apis/compute/cloudprovider.go | 2 +- pkg/apis/compute/dbinstance.go | 18 +- pkg/apis/compute/dbinstance_account.go | 2 +- pkg/apis/compute/dbinstance_backup.go | 12 +- pkg/apis/compute/dbinstance_database.go | 2 +- pkg/apis/compute/disk.go | 60 +++---- pkg/apis/compute/elasticcache.go | 8 +- pkg/apis/compute/filesystem.go | 6 +- pkg/apis/compute/geo_input.go | 10 +- pkg/apis/compute/groupguest.go | 4 +- pkg/apis/compute/guest_disk.go | 2 +- pkg/apis/compute/guest_image.go | 38 ++-- pkg/apis/compute/guest_sshable.go | 40 ++--- pkg/apis/compute/guestnetwork.go | 6 +- pkg/apis/compute/guests.go | 78 ++++----- pkg/apis/compute/host.go | 28 +-- pkg/apis/compute/host_tap.go | 2 +- pkg/apis/compute/instance_backup.go | 8 +- pkg/apis/compute/inter_vpc_network.go | 2 +- .../compute/inter_vpc_network_routeset.go | 2 +- pkg/apis/compute/isolated_device.go | 16 +- pkg/apis/compute/keypair.go | 4 +- pkg/apis/compute/kube_node.go | 2 +- pkg/apis/compute/kube_node_pools.go | 2 +- pkg/apis/compute/loadbalancer.go | 6 +- pkg/apis/compute/loadbalancer_health_check.go | 24 +-- pkg/apis/compute/loadbalanceracl.go | 4 +- pkg/apis/compute/loadbalancerbackendgroup.go | 32 ++-- pkg/apis/compute/loadbalancercluster.go | 2 +- pkg/apis/compute/loadbalancerlistenerrule.go | 20 +-- pkg/apis/compute/modelarts_pool.go | 2 +- pkg/apis/compute/modelarts_pool_sku.go | 4 +- pkg/apis/compute/mongodb.go | 4 +- pkg/apis/compute/mount_targets.go | 2 +- pkg/apis/compute/nat.go | 24 +-- pkg/apis/compute/network_const.go | 20 +-- pkg/apis/compute/networkaddress.go | 28 +-- pkg/apis/compute/policy_assignment.go | 2 +- pkg/apis/compute/policy_definition.go | 8 +- pkg/apis/compute/project_mappings.go | 14 +- pkg/apis/compute/routetable.go | 4 +- pkg/apis/compute/routetable_routesets.go | 2 +- pkg/apis/compute/scaling_trigger.go | 2 +- pkg/apis/compute/secgroup.go | 8 +- pkg/apis/compute/serversku.go | 38 ++-- pkg/apis/compute/sslcertificate.go | 14 +- pkg/apis/compute/storage.go | 42 ++--- pkg/apis/compute/vpc_peering_connection.go | 8 +- pkg/apis/compute/waf_instance.go | 10 +- pkg/apis/compute/waf_rules.go | 6 +- pkg/apis/compute/wire.go | 4 +- pkg/apis/compute/zone.go | 8 +- pkg/apis/devtool/script.go | 42 ++--- pkg/apis/identity/aksk.go | 2 +- pkg/apis/identity/input.go | 24 +-- pkg/apis/identity/organization.go | 22 +-- pkg/apis/identity/policy.go | 14 +- pkg/apis/identity/user.go | 8 +- pkg/apis/identity/usrext.go | 38 ++-- pkg/apis/input.go | 10 +- pkg/apis/llm/dify.go | 2 +- pkg/apis/llm/instantmodel.go | 6 +- pkg/apis/llm/llm.go | 38 ++-- pkg/apis/llm/ollama.go | 4 +- pkg/apis/llm/sku.go | 18 +- pkg/apis/llm/volume.go | 42 ++--- pkg/apis/monitor/alert.go | 6 +- pkg/apis/monitor/alert_resource_record.go | 28 +-- pkg/apis/monitor/alertrecord.go | 6 +- pkg/apis/monitor/metric.go | 22 +-- pkg/apis/monitor/migration_alert.go | 10 +- pkg/apis/monitor/notification.go | 14 +- pkg/apis/monitor/unifiedmonitor_query.go | 22 +-- pkg/apis/notify/config.go | 162 +++++++++--------- pkg/apis/notify/notification.go | 34 ++-- pkg/apis/notify/receiver.go | 20 +-- pkg/apis/notify/subscriber.go | 50 +++--- pkg/apis/notify/template.go | 6 +- pkg/apis/notify/topic.go | 16 +- pkg/apis/output.go | 14 +- pkg/apis/scheduledtask/scheduled_task.go | 4 +- pkg/apis/scheduler/api.go | 34 ++-- pkg/apis/share.go | 16 +- pkg/apis/tasks.go | 16 +- 101 files changed, 946 insertions(+), 946 deletions(-) diff --git a/pkg/apis/ansible/ansible.go b/pkg/apis/ansible/ansible.go index 9247b4cab1..637575e565 100644 --- a/pkg/apis/ansible/ansible.go +++ b/pkg/apis/ansible/ansible.go @@ -24,8 +24,8 @@ import ( type AnsiblePlaybookCreateInput struct { apis.Meta - Name string - Playbook ansible.Playbook + Name string `json:"name"` + Playbook ansible.Playbook `json:"playbook"` } type AnsiblePlaybookUpdateInput AnsiblePlaybookCreateInput @@ -50,19 +50,19 @@ type AnsiblePlaybookReferenceUpdateInput struct { } type AnsiblePlaybookReferenceRunInput struct { - Host AnsibleHost - Args jsonutils.JSONObject + Host AnsibleHost `json:"host"` + Args jsonutils.JSONObject `json:"args"` } type AnsiblePlaybookReferenceRunOutput struct { - AnsiblePlaybookInstanceId string + AnsiblePlaybookInstanceId string `json:"ansible_playbook_instance_id"` } type AnsiblePlaybookReferenceStopInput struct { - AnsiblePlaybookInstanceId string + AnsiblePlaybookInstanceId string `json:"ansible_playbook_instance_id"` } type AnsiblePlaybookInstanceListInput struct { apis.StatusStandaloneResourceListInput - AnsiblePlayboookReferenceId string + AnsiblePlayboookReferenceId string `json:"ansible_playboook_reference_id"` } diff --git a/pkg/apis/cloudcommon/proxy/proxy.go b/pkg/apis/cloudcommon/proxy/proxy.go index ab36d5a0f2..c01320be55 100644 --- a/pkg/apis/cloudcommon/proxy/proxy.go +++ b/pkg/apis/cloudcommon/proxy/proxy.go @@ -61,6 +61,6 @@ type ProxySettingResourceInput struct { } type ProxySettingTestInput struct { - HttpProxy string - HttpsProxy string + HttpProxy string `json:"http_proxy"` + HttpsProxy string `json:"https_proxy"` } diff --git a/pkg/apis/cloudcommon/proxy/setting.go b/pkg/apis/cloudcommon/proxy/setting.go index 16a1a58d42..144e82d83a 100644 --- a/pkg/apis/cloudcommon/proxy/setting.go +++ b/pkg/apis/cloudcommon/proxy/setting.go @@ -24,9 +24,9 @@ import ( ) type ProxySetting struct { - HttpProxy string - HttpsProxy string - NoProxy string + HttpProxy string `json:"http_proxy"` + HttpsProxy string `json:"https_proxy"` + NoProxy string `json:"no_proxy"` } func (v *ProxySetting) Sanitize() error { diff --git a/pkg/apis/cloudid/cloudgroup.go b/pkg/apis/cloudid/cloudgroup.go index 8282a68719..93f00d470c 100644 --- a/pkg/apis/cloudid/cloudgroup.go +++ b/pkg/apis/cloudid/cloudgroup.go @@ -162,19 +162,19 @@ type CloudgroupResourceDetails struct { } type SPolicy struct { - Name string - ExternalId string - PolicyType string + Name string `json:"name"` + ExternalId string `json:"external_id"` + PolicyType string `json:"policy_type"` } type GroupUser struct { - Name string - ExternalId string + Name string `json:"name"` + ExternalId string `json:"external_id"` } type SGroup struct { - Id string - Name string + Id string `json:"id"` + Name string `json:"name"` } type GetCloudaccountSamlOutput struct { diff --git a/pkg/apis/cloudid/cloudpolicy.go b/pkg/apis/cloudid/cloudpolicy.go index f8d9976230..3dc7d875dc 100644 --- a/pkg/apis/cloudid/cloudpolicy.go +++ b/pkg/apis/cloudid/cloudpolicy.go @@ -55,8 +55,8 @@ type CloudpolicyListInput struct { } type PolicyUsage struct { - CloudgroupCount int - ClouduserCount int + CloudgroupCount int `json:"cloudgroup_count"` + ClouduserCount int `json:"clouduser_count"` } type CloudpolicyDetails struct { diff --git a/pkg/apis/cloudid/samluser.go b/pkg/apis/cloudid/samluser.go index 70be6107c0..7e608f20fb 100644 --- a/pkg/apis/cloudid/samluser.go +++ b/pkg/apis/cloudid/samluser.go @@ -39,9 +39,9 @@ type SamluserDetails struct { CloudgroupResourceDetails CloudaccountResourceDetails - CloudaccountId string - ManagerId string - Manager string + CloudaccountId string `json:"cloudaccount_id"` + ManagerId string `json:"manager_id"` + Manager string `json:"manager"` SSamluser } diff --git a/pkg/apis/cloudproxy/forwards.go b/pkg/apis/cloudproxy/forwards.go index ded71b9f94..7ced032ab3 100644 --- a/pkg/apis/cloudproxy/forwards.go +++ b/pkg/apis/cloudproxy/forwards.go @@ -23,58 +23,58 @@ import ( type ForwardCreateInput struct { apis.VirtualResourceCreateInput - ProxyEndpointId string - ProxyAgentId string - Type string - BindPortReq int `json:",omitzero"` - RemoteAddr string - RemotePort string + ProxyEndpointId string `json:"proxy_endpoint_id"` + ProxyAgentId string `json:"proxy_agent_id"` + Type string `json:"type"` + BindPortReq int `json:"bind_port_req,omitzero"` + RemoteAddr string `json:"remote_addr"` + RemotePort string `json:"remote_port"` - LastSeenTimeout int `json:",omitzero"` + LastSeenTimeout int `json:"last_seen_timeout,omitzero"` - Opaque string + Opaque string `json:"opaque"` } type ForwardCreateFromServerInput struct { - ServerId string + ServerId string `json:"server_id"` - Type string - BindPortReq int `json:",omitzero"` - RemotePort int `json:",omitzero"` + Type string `json:"type"` + BindPortReq int `json:"bind_port_req,omitzero"` + RemotePort int `json:"remote_port,omitzero"` - LastSeenTimeout int `json:",omitzero"` + LastSeenTimeout int `json:"last_seen_timeout,omitzero"` } type ForwardHeartbeatInput struct{} type ForwardListInput struct { - ProxyAgentId string - ProxyEndpointId string + ProxyAgentId string `json:"proxy_agent_id"` + ProxyEndpointId string `json:"proxy_endpoint_id"` - Type string - RemoteAddr string - RemotePort *int - BindPortReq *int + Type string `json:"type"` + RemoteAddr string `json:"remote_addr"` + RemotePort *int `json:"remote_port"` + BindPortReq *int `json:"bind_port_req"` - Opaque string + Opaque string `json:"opaque"` } type ForwardDetails struct { - ProxyEndpoint string - ProxyEndpointId string - ProxyAgent string - ProxyAgentId string + ProxyEndpoint string `json:"proxy_endpoint"` + ProxyEndpointId string `json:"proxy_endpoint_id"` + ProxyAgent string `json:"proxy_agent"` + ProxyAgentId string `json:"proxy_agent_id"` - Type string - BindPortReq int - BindPort int - RemoteAddr string - RemotePort int + Type string `json:"type"` + BindPortReq int `json:"bind_port_req"` + BindPort int `json:"bind_port"` + RemoteAddr string `json:"remote_addr"` + RemotePort int `json:"remote_port"` - LastSeen time.Time - LastSeenTimeout int + LastSeen time.Time `json:"last_seen"` + LastSeenTimeout int `json:"last_seen_timeout"` - Opaque string + Opaque string `json:"opaque"` - BindAddr string + BindAddr string `json:"bind_addr"` } diff --git a/pkg/apis/cloudproxy/proxy_endpoints.go b/pkg/apis/cloudproxy/proxy_endpoints.go index fa39cd8f3a..ac7791980e 100644 --- a/pkg/apis/cloudproxy/proxy_endpoints.go +++ b/pkg/apis/cloudproxy/proxy_endpoints.go @@ -21,19 +21,19 @@ import ( type ProxyEndpointCreateInput struct { apis.VirtualResourceCreateInput - User string - Host string - Port int `json:",omitzero"` - PrivateKey string + User string `json:"user"` + Host string `json:"host"` + Port int `json:"port,omitzero"` + PrivateKey string `json:"private_key"` - IntranetIpAddr string + IntranetIpAddr string `json:"intranet_ip_addr"` } type ProxyEndpointCreateFromServerInput struct { - Name string - GenerateName string + Name string `json:"name"` + GenerateName string `json:"generate_name"` - ServerId string + ServerId string `json:"server_id"` } type ProxyEndpointUpdateInput struct { @@ -48,6 +48,6 @@ type ProxyEndpointUpdateInput struct { type ProxyEndpointListInput struct { apis.VirtualResourceListInput - VpcId string - NetworkId string + VpcId string `json:"vpc_id"` + NetworkId string `json:"network_id"` } diff --git a/pkg/apis/compute/access_group_rules.go b/pkg/apis/compute/access_group_rules.go index 70f0a05c89..922d9e4ad7 100644 --- a/pkg/apis/compute/access_group_rules.go +++ b/pkg/apis/compute/access_group_rules.go @@ -31,18 +31,18 @@ type AccessGroupRuleDetails struct { type AccessGroupRuleCreateInput struct { apis.ResourceBaseCreateInput - Priority int - Source string - RWAccessType string - UserAccessType string - Description string - AccessGroupId string + Priority int `json:"priority"` + Source string `json:"source"` + RWAccessType string `json:"rw_access_type"` + UserAccessType string `json:"user_access_type"` + Description string `json:"description"` + AccessGroupId string `json:"access_group_id"` } type AccessGroupRuleUpdateInput struct { - Priority *int - Source string - RWAccessType string - UserAccessType string - Description string + Priority *int `json:"priority"` + Source string `json:"source"` + RWAccessType string `json:"rw_access_type"` + UserAccessType string `json:"user_access_type"` + Description string `json:"description"` } diff --git a/pkg/apis/compute/api.go b/pkg/apis/compute/api.go index 3289559efb..82b0adbf5b 100644 --- a/pkg/apis/compute/api.go +++ b/pkg/apis/compute/api.go @@ -762,15 +762,15 @@ type GuestBatchMigrateRequest struct { } type GuestBatchMigrateParams struct { - Id string - LiveMigrate bool - SkipCpuCheck bool - SkipKernelCheck bool - EnableTLS *bool - RescueMode bool - OldStatus string - MaxBandwidthMb *int64 - QuciklyFinish *bool + Id string `json:"id"` + LiveMigrate bool `json:"live_migrate"` + SkipCpuCheck bool `json:"skip_cpu_check"` + SkipKernelCheck bool `json:"skip_kernel_check"` + EnableTLS *bool `json:"enable_tls"` + RescueMode bool `json:"rescue_mode"` + OldStatus string `json:"old_status"` + MaxBandwidthMb *int64 `json:"max_bandwidth_mb"` + QuciklyFinish *bool `json:"quickly_finish"` } type HostLoginInfo struct { diff --git a/pkg/apis/compute/app.go b/pkg/apis/compute/app.go index 544f3bff3e..c833a9e3e6 100644 --- a/pkg/apis/compute/app.go +++ b/pkg/apis/compute/app.go @@ -42,17 +42,17 @@ type AppDetails struct { apis.VirtualResourceDetails ManagedResourceInfo CloudregionResourceInfo - Network string - VpcId string - Vpc string + Network string `json:"network"` + VpcId string `json:"vpc_id"` + Vpc string `json:"vpc"` } type AppEnvironmentListInput struct { apis.VirtualResourceListInput apis.ExternalizedResourceBaseListInput - AppId string - InstanceType string + AppId string `json:"app_id"` + InstanceType string `json:"instance_type"` } type AppEnvironmentDetails struct { @@ -60,54 +60,54 @@ type AppEnvironmentDetails struct { } type AppHybirdConnection struct { - Id string - Name string - Hostname string - Namespace string - Port int + Id string `json:"id"` + Name string `json:"name"` + Hostname string `json:"hostname"` + Namespace string `json:"namespace"` + Port int `json:"port"` } type AppHybirdConnectionOutput struct { - Data []AppHybirdConnection + Data []AppHybirdConnection `json:"data"` } type AppBackup struct { - Id string - Name string - Type string + Id string `json:"id"` + Name string `json:"name"` + Type string `json:"type"` } type AppBackupOutput struct { - Data []AppBackup + Data []AppBackup `json:"data"` BackupConfig struct { - Enabled bool - FrequencyInterval int - FrequencyUnit string - RetentionPeriodInDays int - } + Enabled bool `json:"enabled"` + FrequencyInterval int `json:"frequency_interval"` + FrequencyUnit string `json:"frequency_unit"` + RetentionPeriodInDays int `json:"retention_period_in_days"` + } `json:"backup_config"` } type AppCertificate struct { - Id string - Name string - SubjectName string - Issuer string - IssueDate time.Time - Thumbprint string - ExpireTime time.Time + Id string `json:"id"` + Name string `json:"name"` + SubjectName string `json:"subject_name"` + Issuer string `json:"issuer"` + IssueDate time.Time `json:"issue_date"` + Thumbprint string `json:"thumbprint"` + ExpireTime time.Time `json:"expire_time"` } type AppCertificateOutput struct { - Data []AppCertificate + Data []AppCertificate `json:"data"` } type AppDomain struct { - Id string - Name string - Status string - SslState string + Id string `json:"id"` + Name string `json:"name"` + Status string `json:"status"` + SslState string `json:"ssl_state"` } type AppDomainOutput struct { - Data []AppDomain + Data []AppDomain `json:"data"` } diff --git a/pkg/apis/compute/backup.go b/pkg/apis/compute/backup.go index 5c2a6e8dd0..287377fe0d 100644 --- a/pkg/apis/compute/backup.go +++ b/pkg/apis/compute/backup.go @@ -150,20 +150,20 @@ type DiskBackupCreateInput struct { type DiskBackupRecoveryInput struct { // description: name of disk - Name string + Name string `json:"name"` } type DiskBackupSyncstatusInput struct { } type DiskBackupPackMetadata struct { - OsArch string - SizeMb int - DiskSizeMb int - DiskType string + OsArch string `json:"os_arch"` + SizeMb int `json:"size_mb"` + DiskSizeMb int `json:"disk_size_mb"` + DiskType string `json:"disk_type"` // 操作系统类型 - OsType string - DiskConfig *SBackupDiskConfig + OsType string `json:"os_type"` + DiskConfig *SBackupDiskConfig `json:"disk_config"` } type DiskBackupExportInfo struct { @@ -173,22 +173,22 @@ type DiskBackupExportInfo struct { } type DiskBackupImportTaskInput struct { - AccessUrl string + AccessUrl string `json:"access_url"` } type InstanceBackupPackMetadata struct { - OsArch string - ServerConfig jsonutils.JSONObject - ServerMetadata jsonutils.JSONObject - SecGroups jsonutils.JSONObject - KeypairId string - OsType string - InstanceType string - SizeMb int - DiskMetadatas []DiskBackupPackMetadata + OsArch string `json:"os_arch"` + ServerConfig jsonutils.JSONObject `json:"server_config"` + ServerMetadata jsonutils.JSONObject `json:"server_metadata"` + SecGroups jsonutils.JSONObject `json:"sec_groups"` + KeypairId string `json:"keypair_id"` + OsType string `json:"os_type"` + InstanceType string `json:"instance_type"` + SizeMb int `json:"size_mb"` + DiskMetadatas []DiskBackupPackMetadata `json:"disk_metadatas"` // 加密密钥ID - EncryptKeyId string + EncryptKeyId string `json:"encrypt_key_id"` // Instance Backup metadata Metadata map[string]string `json:"metadata"` } diff --git a/pkg/apis/compute/baremetal.go b/pkg/apis/compute/baremetal.go index d2e9479841..402234ffbc 100644 --- a/pkg/apis/compute/baremetal.go +++ b/pkg/apis/compute/baremetal.go @@ -15,13 +15,13 @@ package compute type SGMapItem struct { - SGDeviceName string - HostNumber int - Bus int - SCSIId int - Lun int - Type int - LinuxDeviceName string + SGDeviceName string `json:"sg_device_name"` + HostNumber int `json:"host_number"` + Bus int `json:"bus"` + SCSIId int `json:"scsi_id"` + Lun int `json:"lun"` + Type int `json:"type"` + LinuxDeviceName string `json:"linux_device_name"` } const ( @@ -30,10 +30,10 @@ const ( ) type IPMIUser struct { - Id int - Name string - Callin bool - LinkAuth bool - IPMIMsg bool - Priv string + Id int `json:"id"` + Name string `json:"name"` + Callin bool `json:"callin"` + LinkAuth bool `json:"link_auth"` + IPMIMsg bool `json:"ipmi_msg"` + Priv string `json:"priv"` } diff --git a/pkg/apis/compute/baremetal/profiles.go b/pkg/apis/compute/baremetal/profiles.go index 285dcad715..3a801dd2b9 100644 --- a/pkg/apis/compute/baremetal/profiles.go +++ b/pkg/apis/compute/baremetal/profiles.go @@ -44,21 +44,21 @@ func (input *BaremetalProfileListInput) Normalize() { type BaremetalProfileCreateInput struct { apis.StandaloneAnonResourceCreateInput - OemName string - Model string - LanChannel uint8 - RootId int - RootName string - StrongPass bool + OemName string `json:"oem_name"` + Model string `json:"model"` + LanChannel uint8 `json:"lan_channel"` + RootId int `json:"root_id"` + RootName string `json:"root_name"` + StrongPass bool `json:"strong_pass"` } type BaremetalProfileUpdateInput struct { apis.StandaloneAnonResourceBaseUpdateInput - LanChannel uint8 - RootId *int - RootName string - StrongPass *bool + LanChannel uint8 `json:"lan_channel"` + RootId *int `json:"root_id"` + RootName string `json:"root_name"` + StrongPass *bool `json:"strong_pass"` } type BaremetalProfileDetails struct { @@ -87,12 +87,12 @@ func (detail BaremetalProfileDetails) ToSpec() BaremetalProfileSpec { } type BaremetalProfileSpec struct { - OemName string - Model string - LanChannels []uint8 - RootName string - RootId int - StrongPass bool + OemName string `json:"oem_name"` + Model string `json:"model"` + LanChannels []uint8 `json:"lan_channels"` + RootName string `json:"root_name"` + RootId int `json:"root_id"` + StrongPass bool `json:"strong_pass"` } type BaremetalProfileSpecs []BaremetalProfileSpec diff --git a/pkg/apis/compute/bucket.go b/pkg/apis/compute/bucket.go index a79d4dc92c..28564d80a7 100644 --- a/pkg/apis/compute/bucket.go +++ b/pkg/apis/compute/bucket.go @@ -96,7 +96,7 @@ func (bucket BucketDetails) GetMetricPairs() map[string]string { } type BucketObjectsActionInput struct { - Key []string + Key []string `json:"key"` } type BucketAclInput struct { @@ -220,25 +220,25 @@ type BucketGetObjectsOutput struct { } type BucketWebsiteRoutingRule struct { - ConditionErrorCode string - ConditionPrefix string + ConditionErrorCode string `json:"condition_error_code"` + ConditionPrefix string `json:"condition_prefix"` - RedirectProtocol string - RedirectReplaceKey string - RedirectReplaceKeyPrefix string + RedirectProtocol string `json:"redirect_protocol"` + RedirectReplaceKey string `json:"redirect_replace_key"` + RedirectReplaceKeyPrefix string `json:"redirect_replace_key_prefix"` } type BucketWebsiteConf struct { // 主页 - Index string + Index string `json:"index"` // 错误时返回的文档 - ErrorDocument string + ErrorDocument string `json:"error_document"` // http或https - Protocol string + Protocol string `json:"protocol"` - Rules []BucketWebsiteRoutingRule + Rules []BucketWebsiteRoutingRule `json:"rules"` // 访问网站url - Url string + Url string `json:"url"` } func (input *BucketWebsiteConf) Validate() error { @@ -255,14 +255,14 @@ func (input *BucketWebsiteConf) Validate() error { } type BucketCORSRule struct { - AllowedMethods []string + AllowedMethods []string `json:"allowed_methods"` // 允许的源站，可以是* - AllowedOrigins []string - AllowedHeaders []string - MaxAgeSeconds int - ExposeHeaders []string + AllowedOrigins []string `json:"allowed_origins"` + AllowedHeaders []string `json:"allowed_headers"` + MaxAgeSeconds int `json:"max_age_seconds"` + ExposeHeaders []string `json:"expose_headers"` // 规则区别标识 - Id string + Id string `json:"id"` } type BucketCORSRules struct { @@ -270,11 +270,11 @@ type BucketCORSRules struct { } type BucketCORSRuleDeleteInput struct { - Id []string + Id []string `json:"id"` } type BucketPolicy struct { - Data []BucketPolicyStatement + Data []BucketPolicyStatement `json:"data"` } type BucketPolicyStatement struct { @@ -290,30 +290,30 @@ type BucketPolicyStatement struct { Condition map[string]map[string]interface{} `json:"Condition,omitempty"` // 解析字段，主账号id:子账号id - PrincipalId []string + PrincipalId []string `json:"principal_id"` // map[主账号id:子账号id]子账号name - PrincipalNames map[string]string + PrincipalNames map[string]string `json:"principal_names"` // Read|ReadWrite|FullControl - CannedAction string + CannedAction string `json:"canned_action"` // 资源路径 - ResourcePath []string + ResourcePath []string `json:"resource_path"` // 根据index 生成 - Id string + Id string `json:"id"` } type BucketPolicyStatementInput struct { // 主账号id:子账号id - PrincipalId []string + PrincipalId []string `json:"principal_id"` // Read|ReadWrite|FullControl - CannedAction string + CannedAction string `json:"canned_action"` // Allow|Deny - Effect string + Effect string `json:"effect"` // 被授权的资源地址,/* - ResourcePath []string + ResourcePath []string `json:"resource_path"` // ip 条件 - IpEquals []string - IpNotEquals []string + IpEquals []string `json:"ip_equals"` + IpNotEquals []string `json:"ip_not_equals"` } func (input *BucketPolicyStatementInput) Validate() error { @@ -338,7 +338,7 @@ func (input *BucketPolicyStatementInput) Validate() error { } type BucketPolicyDeleteInput struct { - Id []string + Id []string `json:"id"` } func (input *BucketCORSRules) Validate() error { @@ -356,11 +356,11 @@ func (input *BucketCORSRules) Validate() error { type BucketRefererConf struct { // Referer Type // enmu: Black-List, White-List - RefererType string + RefererType string `json:"referer_type"` // 域名列表 - DomainList []string + DomainList []string `json:"domain_list"` // 是否允许空referer 访问 - AllowEmptyRefer bool + AllowEmptyRefer bool `json:"allow_empty_refer"` // 是否开启 Enabled bool `json:"enabled"` @@ -377,9 +377,9 @@ func init() { } type BucketProbeResult struct { - UploadTime time.Duration - DownloadTime time.Duration - DeleteTime time.Duration + UploadTime time.Duration `json:"upload_time"` + DownloadTime time.Duration `json:"download_time"` + DeleteTime time.Duration `json:"delete_time"` } func (result BucketProbeResult) UploadDelayMs() float64 { diff --git a/pkg/apis/compute/cdn.go b/pkg/apis/compute/cdn.go index cb5930596e..474a235989 100644 --- a/pkg/apis/compute/cdn.go +++ b/pkg/apis/compute/cdn.go @@ -46,17 +46,17 @@ const ( type CdnDomain struct { // cdn加速域名 - Domain string + Domain string `json:"domain"` // 状态 rejected(域名未审核)|processing(部署中)|online|offline - Status string + Status string `json:"status"` // 区域 mainland|overseas|global - Area string + Area string `json:"area"` // cdn Cname - Cname string + Cname string `json:"cname"` // 源站 - Origin string + Origin string `json:"origin"` // 源站类型 domain|ip|bucket - OriginType string + OriginType string `json:"origin_type"` } type CdnDomains struct { @@ -97,9 +97,9 @@ type CDNDomainListInput struct { } type CDNCustomHostnameOutput struct { - Data []cloudprovider.CustomHostname + Data []cloudprovider.CustomHostname `json:"data"` } type CDNDeleteCustomHostnameInput struct { - Id string + Id string `json:"id"` } diff --git a/pkg/apis/compute/cloudaccount.go b/pkg/apis/compute/cloudaccount.go index 5584cc9e50..2cb6e2ffcc 100644 --- a/pkg/apis/compute/cloudaccount.go +++ b/pkg/apis/compute/cloudaccount.go @@ -143,10 +143,10 @@ type CloudaccountCreateInput struct { // enum: ["VMware", "Aliyun", "Qcloud", "Azure", "Aws", "Huawei", "OpenStack", "Ucloud", "ZStack", "Google", "Ctyun", "JDcloud"] Provider string `json:"provider"` // swagger:ignore - AccountId string + AccountId string `json:"account_id"` // 跳过重复账号注册检查 - SkipDuplicateAccountCheck bool + SkipDuplicateAccountCheck bool `json:"skip_duplicate_account_check"` // 指定云平台品牌, 此参数默认和provider相同 // requried: false @@ -169,9 +169,9 @@ type CloudaccountCreateInput struct { Brand string `json:"brand"` // swagger:ignore - IsPublicCloud bool + IsPublicCloud bool `json:"is_public_cloud"` // swagger:ignore - IsOnPremise bool + IsOnPremise bool `json:"is_on_premise"` // 指定云账号所属的项目 // Tenant string `json:"tenant"` @@ -231,7 +231,7 @@ type SProjectMappingResourceInput struct { type CloudaccountShareModeInput struct { apis.Meta - ShareMode string + ShareMode string `json:"share_mode"` } func (i CloudaccountShareModeInput) Validate() error { @@ -356,7 +356,7 @@ type CloudaccountDetail struct { ProjectMappingResourceInfo // 上次同步耗时 - LastSyncCost string + LastSyncCost string `json:"last_sync_cost"` } func (self CloudaccountDetail) GetMetricTags() map[string]string { @@ -454,8 +454,8 @@ type VSwitch struct { } type SimpleHost struct { - Id string - Name string + Id string `json:"id"` + Name string `json:"name"` } type CAWireNet struct { @@ -531,8 +531,8 @@ type EnrollmentAccountQuery struct { } type CloudaccountSyncSkusInput struct { - Resource string - Force bool + Resource string `json:"resource"` + Force bool `json:"force"` CloudregionResourceInput CloudproviderResourceInput @@ -580,7 +580,7 @@ func (self *SyncRangeInput) IsNotSkipSyncResource(res iRes) bool { } type SAccountPermission struct { - Permissions []string + Permissions []string `json:"permissions"` } type SkipSyncResources []string diff --git a/pkg/apis/compute/cloudprovider.go b/pkg/apis/compute/cloudprovider.go index 74f9966f5c..aabedf94e9 100644 --- a/pkg/apis/compute/cloudprovider.go +++ b/pkg/apis/compute/cloudprovider.go @@ -143,7 +143,7 @@ type CloudproviderDetails struct { ProjectMappingResourceInfo // 上次同步耗时 - LastSyncCost string + LastSyncCost string `json:"last_sync_cost"` } // 云订阅输入参数 diff --git a/pkg/apis/compute/dbinstance.go b/pkg/apis/compute/dbinstance.go index a97f8fb1d7..67d5c989d2 100644 --- a/pkg/apis/compute/dbinstance.go +++ b/pkg/apis/compute/dbinstance.go @@ -40,7 +40,7 @@ type DBInstanceCreateInput struct { // 创建只读实例时此参数必传 MasterInstance string `json:"master_instance"` // swagger:ignore - MasterInstanceId string + MasterInstanceId string `json:"master_instance_id"` // 安全组Id列表 // @@ -64,16 +64,16 @@ type DBInstanceCreateInput struct { Zone3 string `json:"zone3"` // swagger:ignore - ZoneId string + ZoneId string `json:"zone_id"` // swagger:ignore - CloudregionId string + CloudregionId string `json:"cloudregion_id"` // swagger:ignore - VpcId string + VpcId string `json:"vpc_id"` // swagger:ignore - ManagerId string + ManagerId string `json:"manager_id"` // 包年包月时间周期 Duration string `json:"duration"` @@ -87,9 +87,9 @@ type DBInstanceCreateInput struct { // 计费方式 // enum: ["postpaid", "prepaid"] - BillingType string + BillingType string `json:"billing_type"` // swagger:ignore - BillingCycle string + BillingCycle string `json:"billing_cycle"` // 套餐名称, 若此参数不填, 则必须有vmem_size_mb及vcpu_count参数 // 套餐列表可以通过 dbinstancesku 获取 @@ -169,8 +169,8 @@ type DBInstanceCreateInput struct { type SDBInstanceChangeConfigInput struct { apis.Meta - InstanceType string - DiskSizeGB int + InstanceType string `json:"instance_type"` + DiskSizeGB int `json:"disk_size_gb"` } type SDBInstanceRecoveryConfigInput struct { diff --git a/pkg/apis/compute/dbinstance_account.go b/pkg/apis/compute/dbinstance_account.go index fd57b0ec2e..ba5971178c 100644 --- a/pkg/apis/compute/dbinstance_account.go +++ b/pkg/apis/compute/dbinstance_account.go @@ -21,7 +21,7 @@ type SDBInstanceAccountPrivilege struct { // required: true Database string `json:"database"` // swagger:ignore - DBInstancedatabaseId string + DBInstancedatabaseId string `json:"db_instancedatabase_id"` // 权限类型 // diff --git a/pkg/apis/compute/dbinstance_backup.go b/pkg/apis/compute/dbinstance_backup.go index 2f5e526a76..84979d821b 100644 --- a/pkg/apis/compute/dbinstance_backup.go +++ b/pkg/apis/compute/dbinstance_backup.go @@ -29,18 +29,18 @@ type DBInstanceBackupCreateInput struct { // required: false Databases []string `json:"databases"` // swagger:ignore - DBNames string + DBNames string `json:"db_names"` // swagger:ignore - Engine string + Engine string `json:"engine"` // swagger:ignore - EngineVersion string + EngineVersion string `json:"engine_version"` // swagger:ignore - CloudregionId string + CloudregionId string `json:"cloudregion_id"` // swagger:ignore - BackupMode string + BackupMode string `json:"backup_mode"` // swagger:ignore - ManagerId string + ManagerId string `json:"manager_id"` } type DBInstanceBackupDetails struct { diff --git a/pkg/apis/compute/dbinstance_database.go b/pkg/apis/compute/dbinstance_database.go index 15abceb34f..0f6f46bef2 100644 --- a/pkg/apis/compute/dbinstance_database.go +++ b/pkg/apis/compute/dbinstance_database.go @@ -21,7 +21,7 @@ type SDBInstanceDatabasePrivilege struct { // required: true Account string `json:"account"` // swagger:ignore - DBInstanceaccountId string + DBInstanceaccountId string `json:"db_instanceaccount_id"` // 权限 // // diff --git a/pkg/apis/compute/disk.go b/pkg/apis/compute/disk.go index 7219b9c79b..9ec0c9da71 100644 --- a/pkg/apis/compute/disk.go +++ b/pkg/apis/compute/disk.go @@ -284,11 +284,11 @@ type DiskUpdateInput struct { } type DiskSaveInput struct { - Name string - Format string + Name string `json:"name"` + Format string `json:"format"` // swagger:ignore - ImageId string + ImageId string `json:"image_id"` } type DiskResizeInput struct { @@ -305,47 +305,47 @@ func (self DiskResizeInput) SizeMb() (int, error) { } type DiskAllocateInput struct { - Format string - DiskSizeMb int - ImageId string - ImageFormat string - FsFormat string - FsFeatures *DiskFsFeatures - Rebuild bool - BackingDiskId string - SnapshotId string + Format string `json:"format"` + DiskSizeMb int `json:"disk_size_mb"` + ImageId string `json:"image_id"` + ImageFormat string `json:"image_format"` + FsFormat string `json:"fs_format"` + FsFeatures *DiskFsFeatures `json:"fs_features"` + Rebuild bool `json:"rebuild"` + BackingDiskId string `json:"backing_disk_id"` + SnapshotId string `json:"snapshot_id"` - BackupId string - Backup *DiskAllocateFromBackupInput + BackupId string `json:"backup_id"` + Backup *DiskAllocateFromBackupInput `json:"backup"` - SnapshotUrl string - SnapshotOutOfChain bool - Protocol string - SrcDiskId string - SrcPool string - ExistingPath string + SnapshotUrl string `json:"snapshot_url"` + SnapshotOutOfChain bool `json:"snapshot_out_of_chain"` + Protocol string `json:"protocol"` + SrcDiskId string `json:"src_disk_id"` + SrcPool string `json:"src_pool"` + ExistingPath string `json:"existing_path"` // vmware - HostIp string - Datastore vcenter.SVCenterAccessInfo + HostIp string `json:"host_ip"` + Datastore vcenter.SVCenterAccessInfo `json:"datastore"` // encryption - Encryption bool - EncryptInfo apis.SEncryptInfo + Encryption bool `json:"encryption"` + EncryptInfo apis.SEncryptInfo `json:"encrypt_info"` } type DiskAllocateFromBackupInput struct { - BackupId string - BackupStorageId string - BackupStorageAccessInfo *jsonutils.JSONDict + BackupId string `json:"backup_id"` + BackupStorageId string `json:"backup_storage_id"` + BackupStorageAccessInfo *jsonutils.JSONDict `json:"backup_storage_access_info"` DiskConfig *DiskConfig `json:"disk_config"` BackupAsTar *DiskBackupAsTarInput `json:"backup_as_tar"` } type DiskDeleteInput struct { - SkipRecycle *bool - EsxiFlatFilePath string - CleanSnapshots bool + SkipRecycle *bool `json:"skip_recycle"` + EsxiFlatFilePath string `json:"esxi_flat_file_path"` + CleanSnapshots bool `json:"clean_snapshots"` } type DiskResetInput struct { diff --git a/pkg/apis/compute/elasticcache.go b/pkg/apis/compute/elasticcache.go index 5deec75a79..47312b9a04 100644 --- a/pkg/apis/compute/elasticcache.go +++ b/pkg/apis/compute/elasticcache.go @@ -238,10 +238,10 @@ type ElasticcacheCreateInput struct { PrivateIp string `json:"private_ip"` // swagger:ignore - VpcId string + VpcId string `json:"vpc_id"` // swagger:ignore - ManagerId string + ManagerId string `json:"manager_id"` // 包年包月时间周期 Duration string `json:"duration"` @@ -255,9 +255,9 @@ type ElasticcacheCreateInput struct { // 计费方式 // enum: ["postpaid", "prepaid"] - BillingType string + BillingType string `json:"billing_type"` // swagger:ignore - BillingCycle string + BillingCycle string `json:"billing_cycle"` // 弹性缓存维护时间段 // 华为云此参数可选,其它云该参数无效 diff --git a/pkg/apis/compute/filesystem.go b/pkg/apis/compute/filesystem.go index cb51bf02bb..ebd2a38318 100644 --- a/pkg/apis/compute/filesystem.go +++ b/pkg/apis/compute/filesystem.go @@ -105,9 +105,9 @@ type FileSystemDetails struct { ManagedResourceInfo CloudregionResourceInfo - Vpc string - Network string - Zone string + Vpc string `json:"vpc"` + Network string `json:"network"` + Zone string `json:"zone"` } type FileSystemRemoteUpdateInput struct { diff --git a/pkg/apis/compute/geo_input.go b/pkg/apis/compute/geo_input.go index 58fe3c9818..ae7716e11a 100644 --- a/pkg/apis/compute/geo_input.go +++ b/pkg/apis/compute/geo_input.go @@ -151,11 +151,11 @@ type ZoneListInput struct { Location []string `json:"location"` Contacts []string `json:"contacts"` - OrderByWires string - OrderByHosts string - OrderByHostsEnabled string - OrderByBaremetals string - OrderByBaremetalsEnabled string + OrderByWires string `json:"order_by_wires"` + OrderByHosts string `json:"order_by_hosts"` + OrderByHostsEnabled string `json:"order_by_hosts_enabled"` + OrderByBaremetals string `json:"order_by_baremetals"` + OrderByBaremetalsEnabled string `json:"order_by_baremetals_enabled"` } type ZoneResourceInput struct { diff --git a/pkg/apis/compute/groupguest.go b/pkg/apis/compute/groupguest.go index 19fd67de85..81d8aab389 100644 --- a/pkg/apis/compute/groupguest.go +++ b/pkg/apis/compute/groupguest.go @@ -33,8 +33,8 @@ type GroupJointsListInput struct { type GroupguestDetails struct { GroupJointResourceDetails - Server string - Guest string + Server string `json:"server"` + Guest string `json:"guest"` SGroupguest } diff --git a/pkg/apis/compute/guest_disk.go b/pkg/apis/compute/guest_disk.go index d8943323e1..d3f6fc7c8b 100644 --- a/pkg/apis/compute/guest_disk.go +++ b/pkg/apis/compute/guest_disk.go @@ -20,7 +20,7 @@ type GuestDiskDetails struct { SGuestdisk // 磁盘名称 - Disk string + Disk string `json:"disk"` // 存储类型 // example: local diff --git a/pkg/apis/compute/guest_image.go b/pkg/apis/compute/guest_image.go index 6f8c5c605f..9490468cb9 100644 --- a/pkg/apis/compute/guest_image.go +++ b/pkg/apis/compute/guest_image.go @@ -15,38 +15,38 @@ package compute type SSubImage struct { - Id string - Name string - MinDiskMB int32 - DiskFormat string + Id string `json:"id"` + Name string `json:"name"` + MinDiskMB int32 `json:"min_disk_mb"` + DiskFormat string `json:"disk_format"` } type SImagesInGuest struct { - Id string - Name string - RootImage SSubImage - DataImages []SSubImage + Id string `json:"id"` + Name string `json:"name"` + RootImage SSubImage `json:"root_image"` + DataImages []SSubImage `json:"data_images"` } type SGuestScreenDump struct { - S3AccessKey string - S3SecretKey string - S3Endpoint string - S3BucketName string - S3ObjectName string - S3UseSSL bool + S3AccessKey string `json:"s3_access_key"` + S3SecretKey string `json:"s3_secret_key"` + S3Endpoint string `json:"s3_endpoint"` + S3BucketName string `json:"s3_bucket_name"` + S3ObjectName string `json:"s3_object_name"` + S3UseSSL bool `json:"s3_use_ssl"` } type GuestScreenDumpListInput struct { - Server string + Server string `json:"server"` } type GetDetailsGuestScreenDumpInput struct { - ObjectName string + ObjectName string `json:"object_name"` } type GetDetailsGuestScreenDumpOutput struct { - GuestId string - Name string - ScreenDump string + GuestId string `json:"guest_id"` + Name string `json:"name"` + ScreenDump string `json:"screen_dump"` } diff --git a/pkg/apis/compute/guest_sshable.go b/pkg/apis/compute/guest_sshable.go index 96124894fd..5f01cb941e 100644 --- a/pkg/apis/compute/guest_sshable.go +++ b/pkg/apis/compute/guest_sshable.go @@ -22,54 +22,54 @@ const ( ) type GuestSshableMethodData struct { - Method string - Host string - Port int + Method string `json:"method"` + Host string `json:"host"` + Port int `json:"port"` - Sshable bool - Reason string + Sshable bool `json:"sshable"` + Reason string `json:"reason"` - ForwardDetails ForwardDetails + ForwardDetails ForwardDetails `json:"forward_details"` } type ForwardDetails struct { - ProxyAgentId string - ProxyEndpointId string + ProxyAgentId string `json:"proxy_agent_id"` + ProxyEndpointId string `json:"proxy_endpoint_id"` } type GuestSshableOutput struct { - User string - PublicKey string + User string `json:"user"` + PublicKey string `json:"public_key"` - MethodTried []GuestSshableMethodData + MethodTried []GuestSshableMethodData `json:"method_tried"` } type GuestHaveAgentInput struct { } type GuestHaveAgentOutput struct { - Have bool + Have bool `json:"have"` } type GuestMakeSshableInput struct { - User string - PrivateKey string - Password string - Port int + User string `json:"user"` + PrivateKey string `json:"private_key"` + Password string `json:"password"` + Port int `json:"port"` } type GuestMakeSshableOutput struct { - AnsiblePlaybookId string + AnsiblePlaybookId string `json:"ansible_playbook_id"` } type GuestMakeSshableCmdOutput struct { - ShellCmd string + ShellCmd string `json:"shell_cmd"` } type GuestSetSshportInput struct { - Port int + Port int `json:"port"` } type GuestSshportOutput struct { - Port int + Port int `json:"port"` } diff --git a/pkg/apis/compute/guestnetwork.go b/pkg/apis/compute/guestnetwork.go index 4ad1e3dc45..2c843aa81b 100644 --- a/pkg/apis/compute/guestnetwork.go +++ b/pkg/apis/compute/guestnetwork.go @@ -184,10 +184,10 @@ type GuestnetworkJsonDesc struct { } type SNicTrafficRecord struct { - RxTraffic int64 - TxTraffic int64 + RxTraffic int64 `json:"rx_traffic"` + TxTraffic int64 `json:"tx_traffic"` - HasBeenSetDown bool + HasBeenSetDown bool `json:"has_been_set_down"` } type GuestPortMappingProtocol string diff --git a/pkg/apis/compute/guests.go b/pkg/apis/compute/guests.go index 00046e52cd..2740fff002 100644 --- a/pkg/apis/compute/guests.go +++ b/pkg/apis/compute/guests.go @@ -656,28 +656,28 @@ type ServerStopInput struct { type ServerSaveImageInput struct { // 镜像名称 - Name string - GenerateName string - Notes string - IsPublic *bool + Name string `json:"name"` + GenerateName string `json:"generate_name"` + Notes string `json:"notes"` + IsPublic *bool `json:"is_public"` // 镜像格式 - Format string + Format string `json:"format"` // 保存镜像后是否自动启动,若实例状态为运行中,则会先关闭实例 // 公有云若支持开机保存镜像，此参数则不生效 // default: false - AutoStart bool + AutoStart bool `json:"auto_start"` // swagger:ignore - Restart bool + Restart bool `json:"restart"` // swagger:ignore - OsType string + OsType string `json:"os_type"` // swagger:ignore - OsArch string + OsArch string `json:"os_arch"` // swagger:ignore - ImageId string + ImageId string `json:"image_id"` } type ServerSaveGuestImageInput struct { @@ -690,23 +690,23 @@ type ServerSaveGuestImageInput struct { type ServerDeleteInput struct { // 是否越过回收站直接删除 // default: false - OverridePendingDelete bool + OverridePendingDelete bool `json:"override_pending_delete"` // 是否仅删除本地资源 // default: false - Purge bool + Purge bool `json:"purge"` // 是否删除快照 // default: false - DeleteSnapshots bool + DeleteSnapshots bool `json:"delete_snapshots"` // 是否删除关联的EIP // default: false - DeleteEip bool + DeleteEip bool `json:"delete_eip"` // 是否删除关联的数据盘 // default: false - DeleteDisks bool + DeleteDisks bool `json:"delete_disks"` } type ServerDetachnetworkInput struct { @@ -847,8 +847,8 @@ type ServerChangeConfigInput struct { // disks start from index 1, i.e. cannot change size of system disk(1st disk) Disks []DiskConfig `json:"disks"` - SetTrafficLimits []ServerNicTrafficLimit - ResetTrafficLimits []ServerNicTrafficLimit + SetTrafficLimits []ServerNicTrafficLimit `json:"set_traffic_limits"` + ResetTrafficLimits []ServerNicTrafficLimit `json:"reset_traffic_limits"` } type ServerUpdateInput struct { @@ -965,8 +965,8 @@ type GuestJsonDesc struct { } type SVCpuPin struct { - Vcpu int - Pcpu int + Vcpu int `json:"vcpu"` + Pcpu int `json:"pcpu"` } type SCpuNumaPin struct { @@ -1114,8 +1114,8 @@ type ServerGetCPUSetCoresResp struct { type ServerGetNumaInfoInput struct{} type ServerGetNumaInfoResp struct { - CpuNumaPin jsonutils.JSONObject - IsolatedDevicesNumaNode []int8 + CpuNumaPin jsonutils.JSONObject `json:"cpu_numa_pin"` + IsolatedDevicesNumaNode []int8 `json:"isolated_devices_numa_node"` } type ServerGetHardwareInfoInput struct{} @@ -1171,8 +1171,8 @@ type ServerGetHardwareInfoResp struct { } type ServerMonitorInput struct { - COMMAND string - QMP bool + COMMAND string `json:"command"` + QMP bool `json:"qmp"` } type ServerQemuInfo struct { @@ -1203,8 +1203,8 @@ type IfnameDetail struct { } type ServerQgaSetPasswordInput struct { - Username string - Password string + Username string `json:"username"` + Password string `json:"password"` } type ServerQgaGuestInfoTaskInput struct { @@ -1212,11 +1212,11 @@ type ServerQgaGuestInfoTaskInput struct { type ServerQgaSetNetworkInput struct { ServerQgaTimeoutInput - Device string - Ipmask string - Gateway string - Ip6mask string - Gateway6 string + Device string `json:"device"` + Ipmask string `json:"ipmask"` + Gateway string `json:"gateway"` + Ip6mask string `json:"ip6mask"` + Gateway6 string `json:"gateway6"` } type ServerQgaGetNetworkInput struct { @@ -1224,21 +1224,21 @@ type ServerQgaGetNetworkInput struct { type ServerQgaTimeoutInput struct { // qga execute timeout second - Timeout int + Timeout int `json:"timeout"` } type ServerQgaCommandInput struct { ServerQgaTimeoutInput - Command string + Command string `json:"command"` } type ServerSetPasswordInput struct { - Username string - Password string + Username string `json:"username"` + Password string `json:"password"` // deploy params - ResetPassword bool - AutoStart bool + ResetPassword bool `json:"reset_password"` + AutoStart bool `json:"auto_start"` } type ServerInsertVfdInput struct { @@ -1356,9 +1356,9 @@ type ServerChangeConfigSpecs struct { } type DiskResizeSpec struct { - DiskId string - SizeMb int - OldSizeMb int + DiskId string `json:"disk_id"` + SizeMb int `json:"size_mb"` + OldSizeMb int `json:"old_size_mb"` } type ServerChangeConfigSettings struct { diff --git a/pkg/apis/compute/host.go b/pkg/apis/compute/host.go index 31c1066012..17e3e996ee 100644 --- a/pkg/apis/compute/host.go +++ b/pkg/apis/compute/host.go @@ -268,9 +268,9 @@ type HostDetails struct { // reserved resource for isolated device ReservedResourceForGpu *IsolatedDeviceReservedResourceInput `json:"reserved_resource_for_gpu"` // isolated device count - IsolatedDeviceCount int - IsolatedDeviceTypeCount map[string]int - GuestPinnedCpus []int + IsolatedDeviceCount int `json:"isolated_device_count"` + IsolatedDeviceTypeCount map[string]int `json:"isolated_device_type_count"` + GuestPinnedCpus []int `json:"guest_pinned_cpus"` // host init warnning SysWarn string `json:"sys_warn"` @@ -605,8 +605,8 @@ type HostUpdateInput struct { } type HostOfflineInput struct { - UpdateHealthStatus *bool `json:"update_health_status"` - Reason string + UpdateHealthStatus *bool `json:"update_health_status"` + Reason string `json:"reason"` } type SHostStorageStat struct { @@ -641,8 +641,8 @@ type SHostReportDmesgInput struct { } type HostReserveCpusInput struct { - Cpus string - Mems string + Cpus string `json:"cpus"` + Mems string `json:"mems"` DisableSchedLoadBalance *bool `json:"disable_sched_load_balance"` ProcessesPrefix []string `json:"processes_prefix"` } @@ -733,15 +733,15 @@ type HostRemoveNetifInput struct { } type HostError struct { - Type string - Id string - Name string - Content string - Time time.Time + Type string `json:"type"` + Id string `json:"id"` + Name string `json:"name"` + Content string `json:"content"` + Time time.Time `json:"time"` } type HostSyncErrorsInput struct { - HostErrors []HostError + HostErrors []HostError `json:"host_errors"` } type HostLoginInfoInput struct { @@ -775,7 +775,7 @@ type HostUploadGuestsStatusInput struct { } type HostIsolatedDeviceNumaStatsInput struct { - DevType string + DevType string `json:"dev_type"` } type GuestUploadContainerStatusResponse struct { diff --git a/pkg/apis/compute/host_tap.go b/pkg/apis/compute/host_tap.go index 1e799c6c6a..f70fbdaced 100644 --- a/pkg/apis/compute/host_tap.go +++ b/pkg/apis/compute/host_tap.go @@ -60,7 +60,7 @@ type STapServiceConfig struct { Ifname string `json:"ifname"` - Mirrors []SMirrorConfig + Mirrors []SMirrorConfig `json:"mirrors"` } type SHostTapConfig struct { diff --git a/pkg/apis/compute/instance_backup.go b/pkg/apis/compute/instance_backup.go index 8c6fdd866d..f8fbf2ab6c 100644 --- a/pkg/apis/compute/instance_backup.go +++ b/pkg/apis/compute/instance_backup.go @@ -99,16 +99,16 @@ type SSimpleBackup struct { type InstanceBackupRecoveryInput struct { // description: name of guest - Name string + Name string `json:"name"` } type InstanceBackupPackInput struct { - PackageName string + PackageName string `json:"package_name"` } type InstanceBackupManagerCreateFromPackageInput struct { apis.VirtualResourceCreateInput - BackupStorageId string - PackageName string + BackupStorageId string `json:"backup_storage_id"` + PackageName string `json:"package_name"` } diff --git a/pkg/apis/compute/inter_vpc_network.go b/pkg/apis/compute/inter_vpc_network.go index 21a7915da9..1675bf9b5a 100644 --- a/pkg/apis/compute/inter_vpc_network.go +++ b/pkg/apis/compute/inter_vpc_network.go @@ -68,7 +68,7 @@ type InterVpcNetworkAddVpcInput struct { } type InterVpcNetworkRemoveVpcInput struct { - VpcId string + VpcId string `json:"vpc_id"` } type InterVpcNetworkFilterListBase struct { diff --git a/pkg/apis/compute/inter_vpc_network_routeset.go b/pkg/apis/compute/inter_vpc_network_routeset.go index 6408cd927e..c72ee62087 100644 --- a/pkg/apis/compute/inter_vpc_network_routeset.go +++ b/pkg/apis/compute/inter_vpc_network_routeset.go @@ -38,6 +38,6 @@ type InterVpcNetworkRouteSetListInput struct { apis.EnabledStatusStandaloneResourceListInput apis.ExternalizedResourceBaseListInput VpcFilterListInput - InterVpcNetworkId string + InterVpcNetworkId string `json:"inter_vpc_network_id"` Cidr string `json:"cidr"` } diff --git a/pkg/apis/compute/isolated_device.go b/pkg/apis/compute/isolated_device.go index 77ec83d54e..7b3f724204 100644 --- a/pkg/apis/compute/isolated_device.go +++ b/pkg/apis/compute/isolated_device.go @@ -277,8 +277,8 @@ const ( ) type PCIEVersionThroughput struct { - Version string - Throughput float64 + Version string `json:"version"` + Throughput float64 `json:"throughput"` } func NewPCIEVersionThroughput(version string) PCIEVersionThroughput { @@ -360,10 +360,10 @@ type HostIsolatedDeviceModelDetails struct { // 存储Id IsolatedDeviceModelId string `json:"isolated_device_model_id"` - Model string - VendorId string - DeviceId string - DevType string - HotPluggable bool - DisableAutoDetect bool + Model string `json:"model"` + VendorId string `json:"vendor_id"` + DeviceId string `json:"device_id"` + DevType string `json:"dev_type"` + HotPluggable bool `json:"hot_pluggable"` + DisableAutoDetect bool `json:"disable_auto_detect"` } diff --git a/pkg/apis/compute/keypair.go b/pkg/apis/compute/keypair.go index d59b056545..189caa1e72 100644 --- a/pkg/apis/compute/keypair.go +++ b/pkg/apis/compute/keypair.go @@ -31,10 +31,10 @@ type KeypairCreateInput struct { PublicKey string `json:"public_key"` // swagger:ignore - PrivateKey string + PrivateKey string `json:"private_key"` // swagger:ignore - Fingerprint string + Fingerprint string `json:"fingerprint"` // 秘钥类型 // enum: ["RSA"] diff --git a/pkg/apis/compute/kube_node.go b/pkg/apis/compute/kube_node.go index 898ef1b8a7..e93580fd0e 100644 --- a/pkg/apis/compute/kube_node.go +++ b/pkg/apis/compute/kube_node.go @@ -30,7 +30,7 @@ type KubeNodeCreateInput struct { type KubeNodeDetails struct { apis.StatusStandaloneResourceDetails apis.InfrasResourceBaseDetails - DomainId string + DomainId string `json:"domain_id"` } type KubeNodeUpdateInput struct { diff --git a/pkg/apis/compute/kube_node_pools.go b/pkg/apis/compute/kube_node_pools.go index 286906a1ac..16afdbb222 100644 --- a/pkg/apis/compute/kube_node_pools.go +++ b/pkg/apis/compute/kube_node_pools.go @@ -54,7 +54,7 @@ type KubeNodePoolCreateInput struct { type KubeNodePoolDetails struct { apis.StatusStandaloneResourceDetails apis.InfrasResourceBaseDetails - DomainId string + DomainId string `json:"domain_id"` } type KubeNodePoolUpdateInput struct { diff --git a/pkg/apis/compute/loadbalancer.go b/pkg/apis/compute/loadbalancer.go index 7dc64d9cc5..74920fc26d 100644 --- a/pkg/apis/compute/loadbalancer.go +++ b/pkg/apis/compute/loadbalancer.go @@ -25,8 +25,8 @@ import ( type LoadbalancerAgentDeployInput struct { apis.Meta - Host ansible.Host - DeployMethod string + Host ansible.Host `json:"host"` + DeployMethod string `json:"deploy_method"` } const ( @@ -213,7 +213,7 @@ type LoadbalancerCreateInput struct { NetworkResourceInput // 多子网 // swagger:ignore - Networks []string + Networks []string `json:"networks"` // Network string `json:"network"` CloudproviderResourceInput // Manager string `json:"manager"` diff --git a/pkg/apis/compute/loadbalancer_health_check.go b/pkg/apis/compute/loadbalancer_health_check.go index 2be08b103e..346f5e884a 100644 --- a/pkg/apis/compute/loadbalancer_health_check.go +++ b/pkg/apis/compute/loadbalancer_health_check.go @@ -39,21 +39,21 @@ type SLoadbalancerHealthCheckCreateInput struct { CloudregionResourceInput CloudproviderResourceInput - HealthCheckType string + HealthCheckType string `json:"health_check_type"` - HealthCheckDomain string - HealthCheckURI string - HealthCheckHttpCode string - HealthCheckMethod string - HealthCheckPort int + HealthCheckDomain string `json:"health_check_domain"` + HealthCheckURI string `json:"health_check_uri"` + HealthCheckHttpCode string `json:"health_check_http_code"` + HealthCheckMethod string `json:"health_check_method"` + HealthCheckPort int `json:"health_check_port"` - HealthCheckRise int - HealthCheckFall int - HealthCheckTimeout int - HealthCheckInterval int + HealthCheckRise int `json:"health_check_rise"` + HealthCheckFall int `json:"health_check_fall"` + HealthCheckTimeout int `json:"health_check_timeout"` + HealthCheckInterval int `json:"health_check_interval"` - HealthCheckReq string - HealthCheckExp string + HealthCheckReq string `json:"health_check_req"` + HealthCheckExp string `json:"health_check_exp"` } type SLoadbalancerHealthCheckUpdateInput struct { diff --git a/pkg/apis/compute/loadbalanceracl.go b/pkg/apis/compute/loadbalanceracl.go index 930f58fc90..6ee3ca9d9c 100644 --- a/pkg/apis/compute/loadbalanceracl.go +++ b/pkg/apis/compute/loadbalanceracl.go @@ -71,8 +71,8 @@ type LoadbalancerAclFilterListInput struct { } type SAclEntry struct { - Cidr string - Comment string + Cidr string `json:"cidr"` + Comment string `json:"comment"` } type SAclEntries []SAclEntry diff --git a/pkg/apis/compute/loadbalancerbackendgroup.go b/pkg/apis/compute/loadbalancerbackendgroup.go index 3222a55632..09128c4ecf 100644 --- a/pkg/apis/compute/loadbalancerbackendgroup.go +++ b/pkg/apis/compute/loadbalancerbackendgroup.go @@ -78,17 +78,17 @@ type LoadbalancerBackendGroupCreateInput struct { Type string `json:"type"` Backends []struct { - Index int - Weight int - Port int - Id string - Name string - ExternalId string - BackendType string - BackendRole string - Address string - ZoneId string - HostName string + Index int `json:"index"` + Weight int `json:"weight"` + Port int `json:"port"` + Id string `json:"id"` + Name string `json:"name"` + ExternalId string `json:"external_id"` + BackendType string `json:"backend_type"` + BackendRole string `json:"backend_role"` + Address string `json:"address"` + ZoneId string `json:"zone_id"` + HostName string `json:"host_name"` } `json:"backends"` } @@ -106,11 +106,11 @@ type LoadbalancerBackendGroupListInput struct { type ListenerRuleBackendGroup struct { // 后端服务器组组ID - Id string + Id string `json:"id"` // swagger:ignore - Name string + Name string `json:"name"` // swagger:ignore - ExternalId string + ExternalId string `json:"external_id"` } type ListenerRuleBackendGroups []ListenerRuleBackendGroup @@ -124,8 +124,8 @@ func (groups ListenerRuleBackendGroups) IsZero() bool { } type ListenerRuleRedirectPool struct { - RegionPools map[string]ListenerRuleBackendGroups - CountryPools map[string]ListenerRuleBackendGroups + RegionPools map[string]ListenerRuleBackendGroups `json:"region_pools"` + CountryPools map[string]ListenerRuleBackendGroups `json:"country_pools"` } func (pool ListenerRuleRedirectPool) String() string { diff --git a/pkg/apis/compute/loadbalancercluster.go b/pkg/apis/compute/loadbalancercluster.go index 452997380f..ef1543be81 100644 --- a/pkg/apis/compute/loadbalancercluster.go +++ b/pkg/apis/compute/loadbalancercluster.go @@ -23,7 +23,7 @@ type LoadbalancerClusterDetails struct { SLoadbalancerCluster - RefCounts map[string]int + RefCounts map[string]int `json:"ref_counts"` } type LoadbalancerClusterResourceInfo struct { diff --git a/pkg/apis/compute/loadbalancerlistenerrule.go b/pkg/apis/compute/loadbalancerlistenerrule.go index 746375f4a7..8fc0a58a54 100644 --- a/pkg/apis/compute/loadbalancerlistenerrule.go +++ b/pkg/apis/compute/loadbalancerlistenerrule.go @@ -75,11 +75,11 @@ type LoadbalancerListenerRuleCreateInput struct { HttpRequstRate int `json:"http_request_rate"` HttpRequstRatePerSec int `json:"http_request_rate_per_sec"` - Redirect string - RedirectCode int64 - RedirectScheme string - RedirectHost string - RedirectPath string + Redirect string `json:"redirect"` + RedirectCode int64 `json:"redirect_code"` + RedirectScheme string `json:"redirect_scheme"` + RedirectHost string `json:"redirect_host"` + RedirectPath string `json:"redirect_path"` Condition string `json:"conditon"` } @@ -144,11 +144,11 @@ type LoadbalancerListenerRuleUpdateInput struct { HttpRequstRate int `json:"http_request_rate"` HttpRequstRatePerSec int `json:"http_request_rate_per_sec"` - Redirect string - RedirectCode int64 - RedirectScheme string - RedirectHost string - RedirectPath string + Redirect string `json:"redirect"` + RedirectCode int64 `json:"redirect_code"` + RedirectScheme string `json:"redirect_scheme"` + RedirectHost string `json:"redirect_host"` + RedirectPath string `json:"redirect_path"` Condition string `json:"conditon"` } diff --git a/pkg/apis/compute/modelarts_pool.go b/pkg/apis/compute/modelarts_pool.go index 848362d7fd..89e77d7339 100644 --- a/pkg/apis/compute/modelarts_pool.go +++ b/pkg/apis/compute/modelarts_pool.go @@ -89,5 +89,5 @@ type ModelartsPoolSyncstatusInput struct { } type ModelartsPoolChangeConfigInput struct { - NodeCount int + NodeCount int `json:"node_count"` } diff --git a/pkg/apis/compute/modelarts_pool_sku.go b/pkg/apis/compute/modelarts_pool_sku.go index ddbf577fb1..e0c60b39e7 100644 --- a/pkg/apis/compute/modelarts_pool_sku.go +++ b/pkg/apis/compute/modelarts_pool_sku.go @@ -36,6 +36,6 @@ type ModelartsPoolSkuListInput struct { apis.ExternalizedResourceBaseListInput RegionalFilterListInput - ProcessorType string - CpuArch string + ProcessorType string `json:"processor_type"` + CpuArch string `json:"cpu_arch"` } diff --git a/pkg/apis/compute/mongodb.go b/pkg/apis/compute/mongodb.go index ed5406f524..19e8577bd1 100644 --- a/pkg/apis/compute/mongodb.go +++ b/pkg/apis/compute/mongodb.go @@ -26,8 +26,8 @@ type MongoDBCreateInput struct { type SMongoDBChangeConfigInput struct { apis.Meta - InstanceType string - DiskSizeGB int + InstanceType string `json:"instance_type"` + DiskSizeGB int `json:"disk_size_gb"` } type MongoDBListInput struct { diff --git a/pkg/apis/compute/mount_targets.go b/pkg/apis/compute/mount_targets.go index 6fe7ff64de..fad0b371a8 100644 --- a/pkg/apis/compute/mount_targets.go +++ b/pkg/apis/compute/mount_targets.go @@ -48,7 +48,7 @@ type MountTargetDetails struct { VpcResourceInfo NetworkResourceInfo - FileSystem string + FileSystem string `json:"file_system"` } type MountTargetCreateInput struct { diff --git a/pkg/apis/compute/nat.go b/pkg/apis/compute/nat.go index 6d6b278056..5be0062301 100644 --- a/pkg/apis/compute/nat.go +++ b/pkg/apis/compute/nat.go @@ -19,31 +19,31 @@ import "yunion.io/x/onecloud/pkg/apis" type SNatSCreateInput struct { apis.Meta - Name string - NatgatewayId string - NetworkId string + Name string `json:"name"` + NatgatewayId string `json:"natgateway_id"` + NetworkId string `json:"network_id"` // swagger:ignore - Ip string + Ip string `json:"ip"` // swagger:ignore ExternalIpId string `json:"external_ip_id" yunion-deprecated-by:"eip"` Eip string `json:"eip"` - SourceCidr string + SourceCidr string `json:"source_cidr"` } type SNatDCreateInput struct { apis.Meta - Name string - NatgatewayId string - InternalIp string - InternalPort int - ExternalIp string + Name string `json:"name"` + NatgatewayId string `json:"natgateway_id"` + InternalIp string `json:"internal_ip"` + InternalPort int `json:"internal_port"` + ExternalIp string `json:"external_ip"` Eip string `json:"eip"` // swagger:ignore ExternalIpId string `json:"external_ip_id" yunion-deprecated-by:"eip"` - ExternalPort int - IpProtocol string + ExternalPort int `json:"external_port"` + IpProtocol string `json:"ip_protocol"` } type NatDEntryDetails struct { diff --git a/pkg/apis/compute/network_const.go b/pkg/apis/compute/network_const.go index a289b9b461..2b625a9d0d 100644 --- a/pkg/apis/compute/network_const.go +++ b/pkg/apis/compute/network_const.go @@ -106,14 +106,14 @@ const ( ) type SNetworkUsedAddress struct { - IpAddr string - Ip6Addr string - MacAddr string - Owner string - OwnerId string - OwnerStatus string - OwnerType string - AssociateId string - AssociateType string - CreatedAt time.Time + IpAddr string `json:"ip_addr"` + Ip6Addr string `json:"ip6_addr"` + MacAddr string `json:"mac_addr"` + Owner string `json:"owner"` + OwnerId string `json:"owner_id"` + OwnerStatus string `json:"owner_status"` + OwnerType string `json:"owner_type"` + AssociateId string `json:"associate_id"` + AssociateType string `json:"associate_type"` + CreatedAt time.Time `json:"created_at"` } diff --git a/pkg/apis/compute/networkaddress.go b/pkg/apis/compute/networkaddress.go index 9fd94a5be3..ab4c19611f 100644 --- a/pkg/apis/compute/networkaddress.go +++ b/pkg/apis/compute/networkaddress.go @@ -40,13 +40,13 @@ var NetworkAddressParentTypes = choices.NewChoices( type NetworkAddressCreateInput struct { apis.StandaloneAnonResourceCreateInput - ParentType TNetworkAddressParentType - ParentId int64 - GuestId string - GuestnetworkIndex int8 + ParentType TNetworkAddressParentType `json:"parent_type"` + ParentId int64 `json:"parent_id"` + GuestId string `json:"guest_id"` + GuestnetworkIndex int8 `json:"guestnetwork_index"` - Type string - NetworkId string + Type string `json:"type"` + NetworkId string `json:"network_id"` IPAddr string `json:"ip_addr"` IPAddrs []string `json:"ip_addrs"` } @@ -55,7 +55,7 @@ type NetworkAddressListInput struct { apis.StandaloneAnonResourceListInput NetworkFilterListInput - GuestId []string + GuestId []string `json:"guest_id"` ManagedResourceListInput } @@ -64,13 +64,13 @@ type NetworkAddressDetails struct { apis.StandaloneAnonResourceDetails NetworkResourceInfo - Type string - ParentType string - ParentId string - NetworkId string - IpAddr string + Type string `json:"type"` + ParentType string `json:"parent_type"` + ParentId string `json:"parent_id"` + NetworkId string `json:"network_id"` + IpAddr string `json:"ip_addr"` - SubCtrVid int + SubCtrVid int `json:"sub_ctr_vid"` - Guestnetwork GuestnetworkDetails + Guestnetwork GuestnetworkDetails `json:"guestnetwork"` } diff --git a/pkg/apis/compute/policy_assignment.go b/pkg/apis/compute/policy_assignment.go index d822709630..388155fae7 100644 --- a/pkg/apis/compute/policy_assignment.go +++ b/pkg/apis/compute/policy_assignment.go @@ -17,7 +17,7 @@ package compute import "yunion.io/x/onecloud/pkg/apis" type PolicyDefinitionResourceListInput struct { - Policydefinition string + Policydefinition string `json:"policydefinition"` } type PolicyAssignmentListInput struct { diff --git a/pkg/apis/compute/policy_definition.go b/pkg/apis/compute/policy_definition.go index 094ef99d1a..395e7740a6 100644 --- a/pkg/apis/compute/policy_definition.go +++ b/pkg/apis/compute/policy_definition.go @@ -46,16 +46,16 @@ type PolicyDefinitionDetails struct { } type PolicyDefinitionResourceInfo struct { - Policydefinition string + Policydefinition string `json:"policydefinition"` } type SCloudregionPolicyDefinition struct { - Id string - Name string + Id string `json:"id"` + Name string `json:"name"` } type SCloudregionPolicyDefinitions struct { - Cloudregions []SCloudregionPolicyDefinition + Cloudregions []SCloudregionPolicyDefinition `json:"cloudregions"` } type PolicyDefinitionSyncstatusInput struct { diff --git a/pkg/apis/compute/project_mappings.go b/pkg/apis/compute/project_mappings.go index 48a6e7c15b..ac09616b7c 100644 --- a/pkg/apis/compute/project_mappings.go +++ b/pkg/apis/compute/project_mappings.go @@ -158,10 +158,10 @@ func (rules MappingRules) Validate() error { type ProjectMappingRuleInfoDetails struct { ProjectMappingRuleInfo - Project string - TenantId string - Tenant string - Domain string + Project string `json:"project"` + TenantId string `json:"tenant_id"` + Tenant string `json:"tenant"` + Domain string `json:"domain"` } type SProjectMappingAccount struct { @@ -174,7 +174,7 @@ type ProjectMappingDetails struct { apis.EnabledStatusInfrasResourceBaseDetails - Rules []ProjectMappingRuleInfoDetails + Rules []ProjectMappingRuleInfoDetails `json:"rules"` // 所绑定的云账号列表 Accounts []SProjectMappingAccount `json:"accounts"` @@ -195,7 +195,7 @@ type ProjectMappingListInput struct { } type ProjectMappingResourceInfo struct { - ProjectMapping string + ProjectMapping string `json:"project_mapping"` } type ProjectMappingUpdateInput struct { @@ -207,7 +207,7 @@ type ProjectMappingUpdateInput struct { type ProjectMappingFilterListInput struct { ProjectMappingId string `json:"project_mapping_id"` - OrderByProjectMapping string + OrderByProjectMapping string `json:"order_by_project_mapping"` } func (self MappingRules) String() string { diff --git a/pkg/apis/compute/routetable.go b/pkg/apis/compute/routetable.go index aa9102b756..9e7fe64426 100644 --- a/pkg/apis/compute/routetable.go +++ b/pkg/apis/compute/routetable.go @@ -41,8 +41,8 @@ type RouteTableDetails struct { SRouteTable - RouteSetCount int - AccociationCount int + RouteSetCount int `json:"route_set_count"` + AccociationCount int `json:"accociation_count"` } type SRoute struct { diff --git a/pkg/apis/compute/routetable_routesets.go b/pkg/apis/compute/routetable_routesets.go index c6d7e005bd..975159d85a 100644 --- a/pkg/apis/compute/routetable_routesets.go +++ b/pkg/apis/compute/routetable_routesets.go @@ -29,7 +29,7 @@ const ( type RouteTableRouteSetCreateInput struct { apis.StatusStandaloneResourceCreateInput - RouteTableId string + RouteTableId string `json:"route_table_id"` Cidr string `json:"cidr"` NextHopType string `json:"next_hop_type"` NextHopId string `json:"next_hop_id"` diff --git a/pkg/apis/compute/scaling_trigger.go b/pkg/apis/compute/scaling_trigger.go index 7f7608ed48..ea8566a4eb 100644 --- a/pkg/apis/compute/scaling_trigger.go +++ b/pkg/apis/compute/scaling_trigger.go @@ -19,7 +19,7 @@ import "time" type TimerCreateInput struct { // description: 执行时间 - ExecTime time.Time + ExecTime time.Time `json:"exec_time"` } type CycleTimerCreateInput struct { diff --git a/pkg/apis/compute/secgroup.go b/pkg/apis/compute/secgroup.go index 2f80e0d20b..27151d70d6 100644 --- a/pkg/apis/compute/secgroup.go +++ b/pkg/apis/compute/secgroup.go @@ -57,9 +57,9 @@ type SSecgroupRuleResource struct { Ports string `json:"ports"` // swagger:ignore - PortStart int + PortStart int `json:"port_start"` // swagger:ignore - PortEnd int + PortEnd int `json:"port_end"` // 方向 // enum: ["in", "out"] @@ -334,8 +334,8 @@ type ElasticcachesecgroupDetails struct { } type SecurityGroupCloneInput struct { - Name string - Description string + Name string `json:"name"` + Description string `json:"description"` } type SecgroupImportRulesInput struct { diff --git a/pkg/apis/compute/serversku.go b/pkg/apis/compute/serversku.go index 96462b8104..41adf2f20c 100644 --- a/pkg/apis/compute/serversku.go +++ b/pkg/apis/compute/serversku.go @@ -30,7 +30,7 @@ type ServerSkuCreateInput struct { ZoneId string `json:"zone_id"` // swagger:ignore - InstanceTypeFamily string + InstanceTypeFamily string `json:"instance_type_family"` // 套餐类型 // @@ -50,7 +50,7 @@ type ServerSkuCreateInput struct { InstanceTypeCategory string `json:"instance_type_category"` // swagger:ignore - LocalCategory string + LocalCategory string `json:"local_category"` // 预付费状态 // default: available @@ -72,55 +72,55 @@ type ServerSkuCreateInput struct { MemorySizeMB int64 `json:"memory_size_mb"` // swagger:ignore - OsName string + OsName string `json:"os_name"` // swagger:ignore - SysDiskResizable *bool + SysDiskResizable *bool `json:"sys_disk_resizable"` // swagger:ignore - SysDiskType string + SysDiskType string `json:"sys_disk_type"` // swagger:ignore - SysDiskMinSizeGB int + SysDiskMinSizeGB int `json:"sys_disk_min_size_gb"` // swagger:ignore - SysDiskMaxSizeGB int + SysDiskMaxSizeGB int `json:"sys_disk_max_size_gb"` // swagger:ignore - AttachedDiskType string + AttachedDiskType string `json:"attached_disk_type"` // swagger:ignore - AttachedDiskSizeGB int + AttachedDiskSizeGB int `json:"attached_disk_size_gb"` // swagger:ignore - AttachedDiskCount int + AttachedDiskCount int `json:"attached_disk_count"` // swagger:ignore - DataDiskTypes string + DataDiskTypes string `json:"data_disk_types"` // swagger:ignore - DataDiskMaxCount int + DataDiskMaxCount int `json:"data_disk_max_count"` // swagger:ignore - NicType string + NicType string `json:"nic_type"` // swagger:ignore - NicMaxCount int + NicMaxCount int `json:"nic_max_count"` // swagger:ignore - GpuAttachable *bool + GpuAttachable *bool `json:"gpu_attachable"` // swagger:ignore - GpuSpec string + GpuSpec string `json:"gpu_spec"` // swagger:ignore - GpuCount int + GpuCount int `json:"gpu_count"` // swagger:ignore - GpuMaxCount int + GpuMaxCount int `json:"gpu_max_count"` // swagger:ignore - Provider string + Provider string `json:"provider"` } type ServerSkuDetails struct { diff --git a/pkg/apis/compute/sslcertificate.go b/pkg/apis/compute/sslcertificate.go index 0653c440de..4da3a21c41 100644 --- a/pkg/apis/compute/sslcertificate.go +++ b/pkg/apis/compute/sslcertificate.go @@ -32,13 +32,13 @@ type SSLCertificateCreateInput struct { DnsZoneId string `json:"dns_zone_id"` Sans string `json:"sans"` - Province string - Common string - Country string - City string - OrgName string - Certificate string - PrivateKey string + Province string `json:"province"` + Common string `json:"common"` + Country string `json:"country"` + City string `json:"city"` + OrgName string `json:"org_name"` + Certificate string `json:"certificate"` + PrivateKey string `json:"private_key"` } type SSLCertificateDetails struct { diff --git a/pkg/apis/compute/storage.go b/pkg/apis/compute/storage.go index a8bb8c3491..f2dca487d2 100644 --- a/pkg/apis/compute/storage.go +++ b/pkg/apis/compute/storage.go @@ -23,11 +23,11 @@ import ( ) type StorageUsage struct { - HostCount int - DiskCount int - SnapshotCount int - Used int64 - Wasted int64 + HostCount int `json:"host_count"` + DiskCount int `json:"disk_count"` + SnapshotCount int `json:"snapshot_count"` + Used int64 `json:"used"` + Wasted int64 `json:"wasted"` } func (self StorageUsage) IsZero() bool { @@ -84,14 +84,14 @@ type StorageCreateInput struct { AutoCacheImages *bool `json:"auto_cache_images"` // swagger:ignore - MonHost string + MonHost string `json:"mon_host"` // ceph使用的pool, storage_type为 rbd 时,此参数为必传项 // example: rbd RbdPool string `json:"rbd_pool"` // swagger:ignore - Pool string + Pool string `json:"pool"` // ceph集群密码,若ceph集群开启cephx认证,此参数必传 // 可在ceph集群主机的/etc/ceph/ceph.client.admin.keyring文件中找到 @@ -99,12 +99,12 @@ type StorageCreateInput struct { RbdKey string `json:"rbd_key"` // swagger:ignore - Key string + Key string `json:"key"` RbdTimeoutInput // swagger:ignore - ClientMountTimeout int + ClientMountTimeout int `json:"client_mount_timeout"` // swagger:ignore StorageConf *jsonutils.JSONDict @@ -120,10 +120,10 @@ type StorageCreateInput struct { // swagger:ignore HardwareInfo *StorageHardwareInfo `json:"hardware_info"` // CLVM VG Name - CLVMVgName string + CLVMVgName string `json:"clvm_vg_name"` // SLVM VG Name - SLVMVgName string - Lvmlockd bool + SLVMVgName string `json:"slvm_vg_name"` + Lvmlockd bool `json:"lvmlockd"` } type RbdTimeoutInput struct { @@ -132,14 +132,14 @@ type RbdTimeoutInput struct { RbdRadosMonOpTimeout int `json:"rbd_rados_mon_op_timeout"` // swagger:ignore - RadosMonOpTimeout int + RadosMonOpTimeout int `json:"rados_mon_op_timeout"` // ceph osd 操作超时时间, 单位秒 // default: 1200 RbdRadosOsdOpTimeout int `json:"rbd_rados_osd_op_timeout"` // swagger:ignore - RadosOsdOpTimeout int + RadosOsdOpTimeout int `json:"rados_osd_op_timeout"` // ceph CephFS挂载超时时间, 单位秒 // default: 120 @@ -160,10 +160,10 @@ type SStorageCapacityInfo struct { } type StorageHost struct { - Id string - Name string - Status string - HostStatus string + Id string `json:"id"` + Name string `json:"name"` + Status string `json:"status"` + HostStatus string `json:"host_status"` } type StorageDetails struct { @@ -255,13 +255,13 @@ type StorageUpdateInput struct { RbdTimeoutInput // swagger:ignore - StorageConf *jsonutils.JSONDict + StorageConf *jsonutils.JSONDict `json:"storage_conf"` - UpdateStorageConf bool + UpdateStorageConf bool `json:"update_storage_conf"` // swagger:ignore HardwareInfo *StorageHardwareInfo `json:"hardware_info"` - MasterHost string + MasterHost string `json:"master_host"` } type RbdStorageConf struct { diff --git a/pkg/apis/compute/vpc_peering_connection.go b/pkg/apis/compute/vpc_peering_connection.go index bac4ffdb61..49d05a03d9 100644 --- a/pkg/apis/compute/vpc_peering_connection.go +++ b/pkg/apis/compute/vpc_peering_connection.go @@ -34,23 +34,23 @@ type VpcPeeringConnectionDetails struct { apis.EnabledStatusInfrasResourceBaseDetails VpcResourceInfo - PeerVpcName string + PeerVpcName string `json:"peer_vpc_name"` } type VpcPeeringConnectionCreateInput struct { apis.EnabledStatusInfrasResourceBaseCreateInput SVpcResourceBase - PeerVpcId string + PeerVpcId string `json:"peer_vpc_id"` //跨区域vpc对等连接带宽，仅对腾讯云有效 //单位Mbps,可选值 10,20,50,100,200,500,1000 - Bandwidth int + Bandwidth int `json:"bandwidth"` } type VpcPeeringConnectionListInput struct { apis.EnabledStatusInfrasResourceBaseListInput apis.ExternalizedResourceBaseListInput VpcFilterListInput - PeerVpcId string + PeerVpcId string `json:"peer_vpc_id"` } type VpcPeeringConnectionUpdateInput struct { diff --git a/pkg/apis/compute/waf_instance.go b/pkg/apis/compute/waf_instance.go index 43540ea4ce..7968676ada 100644 --- a/pkg/apis/compute/waf_instance.go +++ b/pkg/apis/compute/waf_instance.go @@ -45,14 +45,14 @@ type WafInstanceCreateInput struct { // 关联云资源列表 // 阿里云要求输入此参数或source_ips - CloudResources []cloudprovider.SCloudResource + CloudResources []cloudprovider.SCloudResource `json:"cloud_resources"` CloudregionResourceInput CloudproviderResourceInput - Type cloudprovider.TWafType + Type cloudprovider.TWafType `json:"type"` - DefaultAction *cloudprovider.DefaultAction + DefaultAction *cloudprovider.DefaultAction `json:"default_action"` } type WafInstanceDetails struct { @@ -61,7 +61,7 @@ type WafInstanceDetails struct { CloudregionResourceInfo SWafInstance - Rules []SWafRule + Rules []SWafRule `json:"rules"` } type WafInstanceListInput struct { @@ -76,5 +76,5 @@ type WafSyncstatusInput struct { } type WafDeleteRuleInput struct { - WafRuleId string + WafRuleId string `json:"waf_rule_id"` } diff --git a/pkg/apis/compute/waf_rules.go b/pkg/apis/compute/waf_rules.go index b01daa3ed6..818bfe35bf 100644 --- a/pkg/apis/compute/waf_rules.go +++ b/pkg/apis/compute/waf_rules.go @@ -70,14 +70,14 @@ type WafRuleCreateInput struct { WafRuleGroupId string `json:"waf_rule_group_id"` // 条件表达式 - Statements []cloudprovider.SWafStatement + Statements []cloudprovider.SWafStatement `json:"statements"` } type WafRuleDetails struct { apis.EnabledStatusStandaloneResourceDetails SWafRule - Statements []cloudprovider.SWafStatement + Statements []cloudprovider.SWafStatement `json:"statements"` } type WafRuleUpdateInput struct { @@ -92,7 +92,7 @@ type WafRuleUpdateInput struct { Priority *int `json:"priority"` // 条件表达式 - Statements []cloudprovider.SWafStatement + Statements []cloudprovider.SWafStatement `json:"statements"` } type WafRuleEnableInput struct { diff --git a/pkg/apis/compute/wire.go b/pkg/apis/compute/wire.go index 33b94c9d85..eae9684f91 100644 --- a/pkg/apis/compute/wire.go +++ b/pkg/apis/compute/wire.go @@ -90,8 +90,8 @@ type WireResourceInfo struct { } type SSimpleWire struct { - Wire string - WireId string + Wire string `json:"wire"` + WireId string `json:"wire_id"` } type WireUpdateInput struct { diff --git a/pkg/apis/compute/zone.go b/pkg/apis/compute/zone.go index 92515f1163..20747681d8 100644 --- a/pkg/apis/compute/zone.go +++ b/pkg/apis/compute/zone.go @@ -20,14 +20,14 @@ type ZoneCreateInput struct { apis.StatusStandaloneResourceCreateInput // 区域名称或Id,建议使用Id - Cloudregion string + Cloudregion string `json:"cloudregion"` // swagger:ignore - Region string + Region string `json:"region"` // swagger:ignore - RegionId string + RegionId string `json:"region_id"` // swagger:ignore - CloudregionId string + CloudregionId string `json:"cloudregion_id"` } type ZoneGeneralUsage struct { diff --git a/pkg/apis/devtool/script.go b/pkg/apis/devtool/script.go index 48584de577..ca472914e6 100644 --- a/pkg/apis/devtool/script.go +++ b/pkg/apis/devtool/script.go @@ -20,41 +20,41 @@ type ScriptApplyInput struct { // description: server id // required: true // example: b48c5c84-9952-4394-8ca9-c3b84e946a03 - ServerID string + ServerID string `json:"server_id"` } type ScriptApplyOutput struct { // description: Instantiation of script apply // example: cf1d1a0f-9b9d-4629-8036-af3ed87c0821 - ScriptApplyId string + ScriptApplyId string `json:"script_apply_id"` } type ScriptBatchApplyInput struct { - ServerIds []string + ServerIds []string `json:"server_ids"` } type ScriptBatchApplyOutput struct { - Results []ScriptBatchApplyResult + Results []ScriptBatchApplyResult `json:"results"` } type ScriptBatchApplyResult struct { - ServerId string - Succeed bool - Reason string - ScriptApplyId string + ServerId string `json:"server_id"` + Succeed bool `json:"succeed"` + Reason string `json:"reason"` + ScriptApplyId string `json:"script_apply_id"` } type ScriptApplyRecoredListInput struct { apis.StatusStandaloneResourceListInput // description: Id of Script // example: cc2e2ba6-e33d-4be3-8e2d-4d2aa843dd03 - ScriptId string + ScriptId string `json:"script_id"` // description: Id of Server // example: a4b3n2c9-dbb7-4c51-8e1a-d2d4b331ccec - ServerId string + ServerId string `json:"server_id"` // description: Id of script apply // example: a70eb6e6-dbb7-4c51-8e1a-d2d4b331ccec - ScriptApplyId string + ScriptApplyId string `json:"script_apply_id"` } type ScriptApplyRecordDetails struct { @@ -62,37 +62,37 @@ type ScriptApplyRecordDetails struct { SScriptApplyRecord // description: Id of Script // example: cc2e2ba6-e33d-4be3-8e2d-4d2aa843dd03 - ScriptId string + ScriptId string `json:"script_id"` // description: Id of Server // example: a4b3n2c9-dbb7-4c51-8e1a-d2d4b331ccec - ServerId string + ServerId string `json:"server_id"` } type ScriptCreateInput struct { apis.SharableVirtualResourceCreateInput // description: Id or Name of ansible playbook reference // example: cf1d1a0f-9b9d-4629-8036-af3ed87c0821 - PlaybookReference string + PlaybookReference string `json:"playbook_reference"` // description: The script may fail to execute, MaxTryTime represents the maximum number of attempts to execute - MaxTryTimes int + MaxTryTimes int `json:"max_try_times"` } type ScriptDetails struct { apis.SharableVirtualResourceDetails SScript - ApplyInfos []SApplyInfo + ApplyInfos []SApplyInfo `json:"apply_infos"` } type SApplyInfo struct { - ServerId string - TryTimes int + ServerId string `json:"server_id"` + TryTimes int `json:"try_times"` } type DevtoolManagerServiceUrlInput struct { - ServiceName string - ServerId string + ServiceName string `json:"service_name"` + ServerId string `json:"server_id"` } type DevtoolManagerServiceUrlOutput struct { - ServiceUrl string + ServiceUrl string `json:"service_url"` } diff --git a/pkg/apis/identity/aksk.go b/pkg/apis/identity/aksk.go index 715d95cea5..8111b98a13 100644 --- a/pkg/apis/identity/aksk.go +++ b/pkg/apis/identity/aksk.go @@ -42,6 +42,6 @@ func (info SAccessKeySecretBlob) IsValid() bool { } type SAccessKeySecretInfo struct { - AccessKey string + AccessKey string `json:"access_key"` SAccessKeySecretBlob } diff --git a/pkg/apis/identity/input.go b/pkg/apis/identity/input.go index 4286745dff..54a4c72bb1 100644 --- a/pkg/apis/identity/input.go +++ b/pkg/apis/identity/input.go @@ -235,7 +235,7 @@ type SJoinProjectsInput struct { Projects []string `json:"projects"` Roles []string `json:"roles"` // 启用用户, 仅用户禁用时生效 - Enabled bool + Enabled bool `json:"enabled"` } func (input SJoinProjectsInput) Validate() error { @@ -273,10 +273,10 @@ func (input SLeaveProjectsInput) Validate() error { } type SProjectAddUserGroupInput struct { - Users []string - Groups []string - Roles []string - EnableAllUsers bool + Users []string `json:"users"` + Groups []string `json:"groups"` + Roles []string `json:"roles"` + EnableAllUsers bool `json:"enable_all_users"` } func (input SProjectAddUserGroupInput) Validate() error { @@ -290,17 +290,17 @@ func (input SProjectAddUserGroupInput) Validate() error { } type SUserRole struct { - User string - Role string + User string `json:"user"` + Role string `json:"role"` } type SGroupRole struct { - Group string - Role string + Group string `json:"group"` + Role string `json:"role"` } type SProjectRemoveUserGroupInput struct { - UserRoles []SUserRole - GroupRoles []SGroupRole + UserRoles []SUserRole `json:"user_roles"` + GroupRoles []SGroupRole `json:"group_roles"` } func (input SProjectRemoveUserGroupInput) Validate() error { @@ -603,5 +603,5 @@ type UserLinkIdpInput struct { type UserUnlinkIdpInput UserLinkIdpInput type SProjectSetAdminInput struct { - UserId string + UserId string `json:"user_id"` } diff --git a/pkg/apis/identity/organization.go b/pkg/apis/identity/organization.go index 1a4d4bd75e..d55c5adbe2 100644 --- a/pkg/apis/identity/organization.go +++ b/pkg/apis/identity/organization.go @@ -117,15 +117,15 @@ type OrganizationPerformAddLevelsInput struct { } type OrganizationPerformAddNodeInput struct { - Tags map[string]string - Weight int - Description string + Tags map[string]string `json:"tags"` + Weight int `json:"weight"` + Description string `json:"description"` } type OrganizationPerformSyncInput struct { - ResourceType string + ResourceType string `json:"resource_type"` - Reset *bool + Reset *bool `json:"reset"` } type OrganizationNodePerformBindInput struct { @@ -198,15 +198,15 @@ type OrganizationNodeListInput struct { } type SProjectOrganization struct { - Id string - Name string - Keys []string - Nodes []SProjectOrganizationNode + Id string `json:"id"` + Name string `json:"name"` + Keys []string `json:"keys"` + Nodes []SProjectOrganizationNode `json:"nodes"` } type SProjectOrganizationNode struct { - Id string - Labels []string + Id string `json:"id"` + Labels []string `json:"labels"` } type SOrganizationNodeDetails struct { diff --git a/pkg/apis/identity/policy.go b/pkg/apis/identity/policy.go index eb6dc2ee70..90a53a3b21 100644 --- a/pkg/apis/identity/policy.go +++ b/pkg/apis/identity/policy.go @@ -22,12 +22,12 @@ import ( ) type SOrganizationNodeInfo struct { - Id string - FullLabel string - OrgId string - Organization string - Tags tagutils.TTagSet - Type TOrgType + Id string `json:"id"` + FullLabel string `json:"full_label"` + OrgId string `json:"org_id"` + Organization string `json:"organization"` + Tags tagutils.TTagSet `json:"tags"` + Type TOrgType `json:"type"` } type PolicyDetails struct { @@ -36,7 +36,7 @@ type PolicyDetails struct { SPolicy - OrgNodes []SOrganizationNodeInfo + OrgNodes []SOrganizationNodeInfo `json:"org_nodes"` } type PolicyBindRoleInput struct { diff --git a/pkg/apis/identity/user.go b/pkg/apis/identity/user.go index babedc6236..cd5d3ddec0 100644 --- a/pkg/apis/identity/user.go +++ b/pkg/apis/identity/user.go @@ -24,10 +24,10 @@ const ( ) type SUserGroup struct { - Id string - Name string - Domain string - DomainId string + Id string `json:"id"` + Name string `json:"name"` + Domain string `json:"domain"` + DomainId string `json:"domain_id"` } type UserDetails struct { diff --git a/pkg/apis/identity/usrext.go b/pkg/apis/identity/usrext.go index a86a241a76..b299a3d437 100644 --- a/pkg/apis/identity/usrext.go +++ b/pkg/apis/identity/usrext.go @@ -17,29 +17,29 @@ package identity import "time" type SUserExtended struct { - Id string - Name string - Enabled bool - ExpiredAt time.Time - DefaultProjectId string - CreatedAt time.Time - LastActiveAt time.Time - DomainId string + Id string `json:"id"` + Name string `json:"name"` + Enabled bool `json:"enabled"` + ExpiredAt time.Time `json:"expired_at"` + DefaultProjectId string `json:"default_project_id"` + CreatedAt time.Time `json:"created_at"` + LastActiveAt time.Time `json:"last_active_at"` + DomainId string `json:"domain_id"` - IsSystemAccount bool + IsSystemAccount bool `json:"is_system_account"` - Displayname string - Email string - Mobile string + Displayname string `json:"displayname"` + Email string `json:"email"` + Mobile string `json:"mobile"` - LocalId int - LocalName string - LocalFailedAuthCount int - DomainName string - DomainEnabled bool - IsLocal bool + LocalId int `json:"local_id"` + LocalName string `json:"local_name"` + LocalFailedAuthCount int `json:"local_failed_auth_count"` + DomainName string `json:"domain_name"` + DomainEnabled bool `json:"domain_enabled"` + IsLocal bool `json:"is_local"` // IdpId string // IdpName string - AuditIds []string + AuditIds []string `json:"audit_ids"` } diff --git a/pkg/apis/input.go b/pkg/apis/input.go index d26fa535e5..ec71ac03f6 100644 --- a/pkg/apis/input.go +++ b/pkg/apis/input.go @@ -385,14 +385,14 @@ type GetMetadataInput struct { type GetMetadataOutput map[string]string type DistinctFieldInput struct { - Field []string - ExtraField []string + Field []string `json:"field"` + ExtraField []string `json:"extra_field"` } type DistinctFieldsInput struct { - Field []string - ExtraField []string - ExtraResource string + Field []string `json:"field"` + ExtraField []string `json:"extra_field"` + ExtraResource string `json:"extra_resource"` } type PostpaidExpireInput struct { diff --git a/pkg/apis/llm/dify.go b/pkg/apis/llm/dify.go index 2d5fab3798..5bc4252618 100644 --- a/pkg/apis/llm/dify.go +++ b/pkg/apis/llm/dify.go @@ -20,5 +20,5 @@ type DifyListInput struct { type DifyCreateInput struct { LLMBaseCreateInput - DifySkuId string + DifySkuId string `json:"dify_sku_id"` } diff --git a/pkg/apis/llm/instantmodel.go b/pkg/apis/llm/instantmodel.go index f04d1b9896..1d3f46f94c 100644 --- a/pkg/apis/llm/instantmodel.go +++ b/pkg/apis/llm/instantmodel.go @@ -56,10 +56,10 @@ type InstantModelUpdateInput struct { type InstantModelDetails struct { apis.SharableVirtualResourceDetails - Image string + Image string `json:"image"` - CacheCount int - CachedCount int + CacheCount int `json:"cache_count"` + CachedCount int `json:"cached_count"` IconBase64 string `json:"icon_base64"` } diff --git a/pkg/apis/llm/llm.go b/pkg/apis/llm/llm.go index 01eddd3ba2..84db10a07f 100644 --- a/pkg/apis/llm/llm.go +++ b/pkg/apis/llm/llm.go @@ -12,18 +12,18 @@ const ( type LLMBaseCreateInput struct { apis.VirtualResourceCreateInput - PreferHost string - AutoStart bool - BandwidthMB int `json:"bandwidth_mb"` - DebugMode bool `json:"debug_mode"` - RootfsUnlimit bool `json:"rootfs_unlimit"` + PreferHost string `json:"prefer_host"` + AutoStart bool `json:"auto_start"` + BandwidthMB int `json:"bandwidth_mb"` + DebugMode bool `json:"debug_mode"` + RootfsUnlimit bool `json:"rootfs_unlimit"` } type LLMCreateInput struct { LLMBaseCreateInput - LLMSkuId string - LLMImageId string + LLMSkuId string `json:"llm_sku_id"` + LLMImageId string `json:"llm_image_id"` } type LLMBaseListInput struct { @@ -59,21 +59,21 @@ type ModelInfo struct { } type LLMPerformQuickModelsInput struct { - Models []ModelInfo - Method TQuickModelMethod + Models []ModelInfo `json:"models"` + Method TQuickModelMethod `json:"method"` } type LLMBatchPerformOutput struct { - Data []LLMPerformOutput - Task *taskman.STask + Data []LLMPerformOutput `json:"data"` + Task *taskman.STask `json:"task"` } type LLMPerformOutput struct { - Id string - Name string - RequestStatus int - Msg string - TaskId string + Id string `json:"id"` + Name string `json:"name"` + RequestStatus int `json:"request_status"` + Msg string `json:"msg"` + TaskId string `json:"task_id"` } type LLMSyncModelTaskInput struct { @@ -86,9 +86,9 @@ type LLMSyncModelTaskInput struct { } type LLMMountDirInfo struct { - ImageId string - Host string - Container string + ImageId string `json:"image_id"` + Host string `json:"host"` + Container string `json:"container"` } func (info LLMMountDirInfo) ToOverlay() apis.ContainerVolumeMountDiskPostOverlay { diff --git a/pkg/apis/llm/ollama.go b/pkg/apis/llm/ollama.go index 6b181b0b4f..580ba5cb44 100644 --- a/pkg/apis/llm/ollama.go +++ b/pkg/apis/llm/ollama.go @@ -49,8 +49,8 @@ type OllamaAccessGgufFileInput struct { } type OllamaModelFileMessage struct { - Role string - Content string + Role string `json:"role"` + Content string `json:"content"` } func (m *OllamaModelFileMessage) ValidateRole() error { diff --git a/pkg/apis/llm/sku.go b/pkg/apis/llm/sku.go index 6372020974..08478f4f81 100644 --- a/pkg/apis/llm/sku.go +++ b/pkg/apis/llm/sku.go @@ -23,10 +23,10 @@ func IsLLMSkuBaseNetworkType(t string) bool { } type HostInfo struct { - HostId string - Host string - HostAccessIp string - HostEIP string + HostId string `json:"host_id"` + Host string `json:"host"` + HostAccessIp string `json:"host_access_ip"` + HostEIP string `json:"host_eip"` } func init() { @@ -111,12 +111,12 @@ func (s Envs) IsZero() bool { type LLMSkuDetails struct { apis.SharableVirtualResourceDetails // 当前大模型套餐包含的实例个数。 - LLMCapacity int - Image string - ImageLabel string - ImageName string + LLMCapacity int `json:"llm_capacity"` + Image string `json:"image"` + ImageLabel string `json:"image_label"` + ImageName string `json:"image_name"` - Template string + Template string `json:"template"` } type MountedAppResourceDetails struct { diff --git a/pkg/apis/llm/volume.go b/pkg/apis/llm/volume.go index c137b84d99..81e2bebe72 100644 --- a/pkg/apis/llm/volume.go +++ b/pkg/apis/llm/volume.go @@ -46,25 +46,25 @@ type VolumeDetails struct { Volume - Template string + Template string `json:"template"` - DesktopId string - DesktopName string - DesktopStatus string + DesktopId string `json:"desktop_id"` + DesktopName string `json:"desktop_name"` + DesktopStatus string `json:"desktop_status"` - Disk string + Disk string `json:"disk"` - StorageId string - Storage string - StorageStatus string - StorageHosts []computeapi.StorageHost + StorageId string `json:"storage_id"` + Storage string `json:"storage"` + StorageStatus string `json:"storage_status"` + StorageHosts []computeapi.StorageHost `json:"storage_hosts"` - Hosts []HostInfo + Hosts []HostInfo `json:"hosts"` HostInfo - InstanceId string - InstanceName string + InstanceId string `json:"instance_id"` + InstanceName string `json:"instance_name"` } type ContainerVolumeRelation struct { @@ -88,11 +88,11 @@ func (s ContainerVolumeRelations) IsZero() bool { type Volume struct { // db.SStandaloneAnonResourceBase - Id string - Name string - StorageType string - TemplateId string - SizeMB int + Id string `json:"id"` + Name string `json:"name"` + StorageType string `json:"storage_type"` + TemplateId string `json:"template_id"` + SizeMB int `json:"size_mb"` // Container index to mount path relation Containers ContainerVolumeRelations `json:"containers"` } @@ -125,11 +125,11 @@ func (s Volumes) IsZero() bool { type VolumeCreateInput struct { apis.VirtualResourceCreateInput - ImageId string - Size int - StorageType string + ImageId string `json:"image_id"` + Size int `json:"size"` + StorageType string `json:"storage_type"` - PreferHost string + PreferHost string `json:"prefer_host"` } type VolumePerformResetInput struct { diff --git a/pkg/apis/monitor/alert.go b/pkg/apis/monitor/alert.go index da288b227a..86697aa883 100644 --- a/pkg/apis/monitor/alert.go +++ b/pkg/apis/monitor/alert.go @@ -144,9 +144,9 @@ type AlertCreateInput struct { } type MeterCustomizeConfig struct { - UnitDesc string - Name string - Currency string + UnitDesc string `json:"unit_desc"` + Name string `json:"name"` + Currency string `json:"currency"` } type AlertUpdateInput struct { diff --git a/pkg/apis/monitor/alert_resource_record.go b/pkg/apis/monitor/alert_resource_record.go index 47e514a2e2..3daf329b9a 100644 --- a/pkg/apis/monitor/alert_resource_record.go +++ b/pkg/apis/monitor/alert_resource_record.go @@ -31,24 +31,24 @@ type AlertResourceRecordCreateInput struct { apis.Meta apis.SStandaloneResourceBase - EvalData EvalMatch - AlertTime time.Time - ResName string - ResType string - Brand string - TriggerVal string - AlertRecordId string - AlertId string - SendState string + EvalData EvalMatch `json:"eval_data"` + AlertTime time.Time `json:"alert_time"` + ResName string `json:"res_name"` + ResType string `json:"res_type"` + Brand string `json:"brand"` + TriggerVal string `json:"trigger_val"` + AlertRecordId string `json:"alert_record_id"` + AlertId string `json:"alert_id"` + SendState string `json:"send_state"` } type AlertResourceRecordDetails struct { apis.StatusStandaloneResourceDetails apis.ScopedResourceBaseInfo - AlertName string `json:"alert_name"` - AlertRule jsonutils.JSONObject - ResType string - Level string - State string + AlertName string `json:"alert_name"` + AlertRule jsonutils.JSONObject `json:"alert_rule"` + ResType string `json:"res_type"` + Level string `json:"level"` + State string `json:"state"` } diff --git a/pkg/apis/monitor/alertrecord.go b/pkg/apis/monitor/alertrecord.go index 7da5d64590..050c365f6b 100644 --- a/pkg/apis/monitor/alertrecord.go +++ b/pkg/apis/monitor/alertrecord.go @@ -49,9 +49,9 @@ type AlertRecordDetails struct { apis.StandaloneAnonResourceDetails apis.ScopedResourceBaseInfo - ResNum int64 `json:"res_num"` - AlertName string `json:"alert_name"` - TriggerTime time.Time + ResNum int64 `json:"res_num"` + AlertName string `json:"alert_name"` + TriggerTime time.Time `json:"trigger_time"` } type AlertRecordCreateInput struct { diff --git a/pkg/apis/monitor/metric.go b/pkg/apis/monitor/metric.go index f5777b38ae..eb07d27d3c 100644 --- a/pkg/apis/monitor/metric.go +++ b/pkg/apis/monitor/metric.go @@ -131,7 +131,7 @@ type MetricFieldCreateInput struct { type MetricFieldUpdateInput struct { apis.StandaloneResourceBaseUpdateInput - Id string + Id string `json:"id"` DisplayName string `json:"display_name"` Unit string `json:"unit"` ValueType string `json:"value_type"` @@ -186,14 +186,14 @@ type MetricFieldDetail struct { type InfluxMeasurement struct { apis.Meta - Database string - Measurement string - MeasurementDisplayName string - ResType string - Score int - TagKey []string - TagValue map[string][]string - FieldKey []string - FieldDescriptions map[string]MetricFieldDetail - Unit []string + Database string `json:"database"` + Measurement string `json:"measurement"` + MeasurementDisplayName string `json:"measurement_display_name"` + ResType string `json:"res_type"` + Score int `json:"score"` + TagKey []string `json:"tag_key"` + TagValue map[string][]string `json:"tag_value"` + FieldKey []string `json:"field_key"` + FieldDescriptions map[string]MetricFieldDetail `json:"field_descriptions"` + Unit []string `json:"unit"` } diff --git a/pkg/apis/monitor/migration_alert.go b/pkg/apis/monitor/migration_alert.go index b4afab6480..bdc166144a 100644 --- a/pkg/apis/monitor/migration_alert.go +++ b/pkg/apis/monitor/migration_alert.go @@ -74,11 +74,11 @@ const ( ) type MetricQueryFields struct { - ResourceType MigrationAlertResourceType - Database string - Measurement string - Field string - Comparator string + ResourceType MigrationAlertResourceType `json:"resource_type"` + Database string `json:"database"` + Measurement string `json:"measurement"` + Field string `json:"field"` + Comparator string `json:"comparator"` } type IMigrationAlertMetric interface { diff --git a/pkg/apis/monitor/notification.go b/pkg/apis/monitor/notification.go index 007f2950d7..f24e709a56 100644 --- a/pkg/apis/monitor/notification.go +++ b/pkg/apis/monitor/notification.go @@ -86,13 +86,13 @@ type NotificationSettingOneCloud struct { } type SendWebhookSync struct { - Url string - User string - Password string - Body string - HttpMethod string - HttpHeader map[string]string - ContentType string + Url string `json:"url"` + User string `json:"user"` + Password string `json:"password"` + Body string `json:"body"` + HttpMethod string `json:"http_method"` + HttpHeader map[string]string `json:"http_header"` + ContentType string `json:"content_type"` } type NotificationSettingDingding struct { diff --git a/pkg/apis/monitor/unifiedmonitor_query.go b/pkg/apis/monitor/unifiedmonitor_query.go index 295a36d99e..6aa0a7881b 100644 --- a/pkg/apis/monitor/unifiedmonitor_query.go +++ b/pkg/apis/monitor/unifiedmonitor_query.go @@ -134,10 +134,10 @@ type SimpleQueryOutput struct { } type MetricsQueryResult struct { - SeriesTotal int64 - Series TimeSeriesSlice - Metas []QueryResultMeta - ReducedResult *ReducedResult + SeriesTotal int64 `json:"series_total"` + Series TimeSeriesSlice `json:"series"` + Metas []QueryResultMeta `json:"metas"` + ReducedResult *ReducedResult `json:"reduced_result"` } type TimeSeriesPoints []TimePoint @@ -261,12 +261,12 @@ type QueryResultMeta struct { const ConditionTypeMetricQuery = "metricquery" type CdfQueryData struct { - Vmrange string - Metric float64 - Value int - ValueAsc int - ValueDesc int - Total int + Vmrange string `json:"vmrange"` + Metric float64 `json:"metric"` + Value int `json:"value"` + ValueAsc int `json:"value_asc"` + ValueDesc int `json:"value_desc"` + Total int `json:"total"` } func (c CdfQueryData) Copy() CdfQueryData { @@ -310,5 +310,5 @@ func (c CdfQueryDataSet) Less(i, j int) bool { } type CdfQueryOutput struct { - Data CdfQueryDataSet + Data CdfQueryDataSet `json:"data"` } diff --git a/pkg/apis/notify/config.go b/pkg/apis/notify/config.go index 9cca7dab10..c56bc7e6e1 100644 --- a/pkg/apis/notify/config.go +++ b/pkg/apis/notify/config.go @@ -98,28 +98,28 @@ type ConfigManagerGetTypesOutput struct { } type SsNotification struct { - ContactType string - Topic string - Message string - Event SNotifyEvent - AdvanceDays int - RobotUseTemplate bool + ContactType string `json:"contact_type"` + Topic string `json:"topic"` + Message string `json:"message"` + Event SNotifyEvent `json:"event"` + AdvanceDays int `json:"advance_days"` + RobotUseTemplate bool `json:"robot_use_template"` } type SBatchSendParams struct { - ContactType string - Contacts []string - Topic string - Message string - Priority string - Lang string + ContactType string `json:"contact_type"` + Contacts []string `json:"contacts"` + Topic string `json:"topic"` + Message string `json:"message"` + Priority string `json:"priority"` + Lang string `json:"lang"` } type SNotifyReceiver struct { - Contact string - DomainId string - Enabled bool - Lang string + Contact string `json:"contact"` + DomainId string `json:"domain_id"` + Enabled bool `json:"enabled"` + Lang string `json:"lang"` callback func(error) } @@ -131,44 +131,44 @@ func (self *SNotifyReceiver) Callback(err error) { } type SSendParams struct { - ContactType string - Contact string - Topic string - Message string - Priority string - Title string - RemoteTemplate string - Lang string - Receiver SNotifyReceiver + ContactType string `json:"contact_type"` + Contact string `json:"contact"` + Topic string `json:"topic"` + Message string `json:"message"` + Priority string `json:"priority"` + Title string `json:"title"` + RemoteTemplate string `json:"remote_template"` + Lang string `json:"lang"` + Receiver SNotifyReceiver `json:"receiver"` } type SNotificationGroupSearchInput struct { - StartTime time.Time - EndTime time.Time - GroupKey string - ReceiverId string - ContactType string + StartTime time.Time `json:"start_time"` + EndTime time.Time `json:"end_time"` + GroupKey string `json:"group_key"` + ReceiverId string `json:"receiver_id"` + ContactType string `json:"contact_type"` } type SendParams struct { - Title string - Message string - Priority string - RemoteTemplate string - Topic string - Event string - Receivers SNotifyReceiver - EmailMsg SEmailMessage - Header jsonutils.JSONObject - Body jsonutils.JSONObject - MsgKey string - DomainId string - RemoteTemplateParam SRemoteTemplateParam - GroupKey string + Title string `json:"title"` + Message string `json:"message"` + Priority string `json:"priority"` + RemoteTemplate string `json:"remote_template"` + Topic string `json:"topic"` + Event string `json:"event"` + Receivers SNotifyReceiver `json:"receivers"` + EmailMsg SEmailMessage `json:"email_msg"` + Header jsonutils.JSONObject `json:"header"` + Body jsonutils.JSONObject `json:"body"` + MsgKey string `json:"msg_key"` + DomainId string `json:"domain_id"` + RemoteTemplateParam SRemoteTemplateParam `json:"remote_template_param"` + GroupKey string `json:"group_key"` // minutes - GroupTimes uint - ReceiverId string - SendTime time.Time + GroupTimes uint `json:"group_times"` + ReceiverId string `json:"receiver_id"` + SendTime time.Time `json:"send_time"` } type SRemoteTemplateParam struct { @@ -180,22 +180,22 @@ type SRemoteTemplateParam struct { } type SSMSSendParams struct { - RemoteTemplate string - RemoteTemplateParam SRemoteTemplateParam + RemoteTemplate string `json:"remote_template"` + RemoteTemplateParam SRemoteTemplateParam `json:"remote_template_param"` - AppKey string - AppSecret string - From string - To string - TemplateId string - TemplateParas string - Signature string + AppKey string `json:"app_key"` + AppSecret string `json:"app_secret"` + From string `json:"from"` + To string `json:"to"` + TemplateId string `json:"template_id"` + TemplateParas string `json:"template_paras"` + Signature string `json:"signature"` } type NotifyConfig struct { SNotifyConfigContent - Attribution string - DomainId string + Attribution string `json:"attribution"` + DomainId string `json:"domain_id"` } func (self *NotifyConfig) GetDomainId() string { @@ -207,35 +207,35 @@ func (self *NotifyConfig) GetDomainId() string { type SNotifyConfigContent struct { // Email - Hostname string - Hostport int - Password string - SslGlobal bool - Username string - SenderAddress string + Hostname string `json:"hostname"` + Hostport int `json:"hostport"` + Password string `json:"password"` + SslGlobal bool `json:"ssl_global"` + Username string `json:"username"` + SenderAddress string `json:"sender_address"` //Lark - AppId string - AppSecret string - AccessToken string - AccessTokenExpireTime time.Time + AppId string `json:"app_id"` + AppSecret string `json:"app_secret"` + AccessToken string `json:"access_token"` + AccessTokenExpireTime time.Time `json:"access_token_expire_time"` // workwx - AgentId string - CorpId string - Secret string + AgentId string `json:"agent_id"` + CorpId string `json:"corp_id"` + Secret string `json:"secret"` // dingtalk //AgentId string //AppSecret string - AppKey string + AppKey string `json:"app_key"` // sms - VerifiyCode string - AlertsCode string - ErrorCode string - PhoneNumber string - AccessKeyId string - AccessKeySecret string - ServiceUrl string - Signature string - SmsDriver string + VerifiyCode string `json:"verifiy_code"` + AlertsCode string `json:"alerts_code"` + ErrorCode string `json:"error_code"` + PhoneNumber string `json:"phone_number"` + AccessKeyId string `json:"access_key_id"` + AccessKeySecret string `json:"access_key_secret"` + ServiceUrl string `json:"service_url"` + Signature string `json:"signature"` + SmsDriver string `json:"sms_driver"` } func (self SNotifyConfigContent) String() string { diff --git a/pkg/apis/notify/notification.go b/pkg/apis/notify/notification.go index be3a894717..7b86cea5c9 100644 --- a/pkg/apis/notify/notification.go +++ b/pkg/apis/notify/notification.go @@ -83,10 +83,10 @@ type NotificationDetails struct { type NotificationListInput struct { apis.StatusStandaloneResourceListInput - ContactType string - ReceiverId string - Tag string - TopicType string + ContactType string `json:"contact_type"` + ReceiverId string `json:"receiver_id"` + Tag string `json:"tag"` + TopicType string `json:"topic_type"` } type SContact struct { @@ -119,13 +119,13 @@ type NotificationManagerEventNotifyInput struct { // description: event trigger sending notification // required: true // example: SERVER_DELETE - Event string - ResourceType string + Event string `json:"event"` + ResourceType string `json:"resource_type"` - CloudAccountName string - Action SAction + CloudAccountName string `json:"cloud_account_name"` + Action SAction `json:"action"` // failed,succeed - Result SResult + Result SResult `json:"result"` // description: day left before the event // required: false // example: 0 @@ -133,21 +133,21 @@ type NotificationManagerEventNotifyInput struct { // description: domainId of the resource that triggered the event notification // required: false // example: default - ProjectDomainId string + ProjectDomainId string `json:"project_domain_id"` // description: projectId of the resource that triggered the event notification // required: false // example: f627e09f038645f08ce6880c8d9cb8fd - ProjectId string `json:"project_id"` - IsFailed SResult + ProjectId string `json:"project_id"` + IsFailed SResult `json:"is_failed"` } type NotificationManagerEventNotifyOutput struct { - FailedList []FailedElem + FailedList []FailedElem `json:"failed_list"` } type FailedElem struct { - ContactType string - Reason string + ContactType string `json:"contact_type"` + Reason string `json:"reason"` } type NotificationManagerContactNotifyInput struct { @@ -167,6 +167,6 @@ type NotificationManagerContactNotifyInput struct { // example: {"adfb720ccdd34c638346ea4fa7a713a8"} RobotIds []string `json:"robot_ids"` RoleIds []string `json:"role_ids"` - Subject string - Body string + Subject string `json:"subject"` + Body string `json:"body"` } diff --git a/pkg/apis/notify/receiver.go b/pkg/apis/notify/receiver.go index 527ea1b2b1..23c8ce4403 100644 --- a/pkg/apis/notify/receiver.go +++ b/pkg/apis/notify/receiver.go @@ -132,9 +132,9 @@ type ReceiverDetails struct { } type VerifiedInfo struct { - ContactType string - Verified bool - Note string + ContactType string `json:"contact_type"` + Verified bool `json:"verified"` + Note string `json:"note"` } type ReceiverListInput struct { @@ -205,17 +205,17 @@ type ReceiverEnableContactTypeInput struct { } type ReceiverGetSubscriptionOptions struct { - Id string - ShowDisabled bool + Id string `json:"id"` + ShowDisabled bool `json:"show_disabled"` } type SRoleContactInput struct { - RoleIds []string - Scope string - ProjectDomainId string - ProjectId string `json:"project_id"` + RoleIds []string `json:"role_ids"` + Scope string `json:"scope"` + ProjectDomainId string `json:"project_domain_id"` + ProjectId string `json:"project_id"` } type SRoleContactOutput struct { - ContactType []string + ContactType []string `json:"contact_type"` } diff --git a/pkg/apis/notify/subscriber.go b/pkg/apis/notify/subscriber.go index 83cd622e18..31146933ed 100644 --- a/pkg/apis/notify/subscriber.go +++ b/pkg/apis/notify/subscriber.go @@ -21,61 +21,61 @@ type SubscriberCreateInput struct { // description: Id of Topic // required - TopicID string + TopicID string `json:"topic_id"` // description: scope of resource // enum: ["system","domain","project"] - ResourceScope string + ResourceScope string `json:"resource_scope"` // description: project id or domain id of resource // example: 1e3824756bac4ac084e784ed297ec652 - ResourceAttributionId string + ResourceAttributionId string `json:"resource_attribution_id"` - ResourceAttributionName string + ResourceAttributionName string `json:"resource_attribution_name"` // description: domain id of resource // example: 1e3824756bac4ac084e784ed297ec652 - DomainId string + DomainId string `json:"domain_id"` // description: Type of subscriber // enum: ["receiver","robot","role"] - Type string + Type string `json:"type"` // description: receivers which is required when the type is 'receiver' will Subscribe TopicID - Receivers []string + Receivers []string `json:"receivers"` // description: Role(Id or Name) which is required when the type is 'role' will Subscribe TopicID - Role string + Role string `json:"role"` // description: The scope of role subscribers // enum: ["system","domain","project"] - RoleScope string + RoleScope string `json:"role_scope"` // description: Robot(Id or Name) which is required when the type is 'robot' will Subscribe TopicID - Robot string + Robot string `json:"robot"` // description: scope // enum: ["system","domain"] - Scope string + Scope string `json:"scope"` // minutes - GroupTimes *uint32 + GroupTimes *uint32 `json:"group_times"` } type SubscriberChangeInput struct { // description: receivers which is required when the type is 'receiver' will Subscribe TopicID - Receivers []string + Receivers []string `json:"receivers"` // description: Role(Id or Name) which is required when the type is 'role' will Subscribe TopicID - Role string + Role string `json:"role"` // description: The scope of role subscribers // enum: ["system","domain","project"] - RoleScope string + RoleScope string `json:"role_scope"` // description: Robot(Id or Name) which is required when the type is 'robot' will Subscribe TopicID - Robot string + Robot string `json:"robot"` // minutes - GroupTimes *uint32 + GroupTimes *uint32 `json:"group_times"` } type SubscriberListInput struct { @@ -83,19 +83,19 @@ type SubscriberListInput struct { apis.EnabledResourceBaseListInput // description: topic id - TopicID string + TopicID string `json:"topic_id"` // description: scope of resource // enum: ["system","domain","project"] - ResourceScope string + ResourceScope string `json:"resource_scope"` // description: type // enum: ["receiver","robot","role"] - Type string + Type string `json:"type"` // description: scope // enum: ["system","domain"] - Scope string + Scope string `json:"scope"` } type Identification struct { @@ -110,15 +110,15 @@ type SubscriberDetails struct { SSubscriber // description: receivers - Receivers []Identification + Receivers []Identification `json:"receivers"` // description: role - Role Identification + Role Identification `json:"role"` // description: robot - Robot Identification + Robot Identification `json:"robot"` } type SubscriberSetReceiverInput struct { - Receivers []string + Receivers []string `json:"receivers"` } diff --git a/pkg/apis/notify/template.go b/pkg/apis/notify/template.go index da64797524..61bff33a98 100644 --- a/pkg/apis/notify/template.go +++ b/pkg/apis/notify/template.go @@ -47,9 +47,9 @@ type TemplateCreateInput struct { } type TemplateManagerSaveInput struct { - ContactType string - Templates []TemplateCreateInput - Force bool + ContactType string `json:"contact_type"` + Templates []TemplateCreateInput `json:"templates"` + Force bool `json:"force"` } type TemplateListInput struct { diff --git a/pkg/apis/notify/topic.go b/pkg/apis/notify/topic.go index eacd5b5f6f..582a18a5fa 100644 --- a/pkg/apis/notify/topic.go +++ b/pkg/apis/notify/topic.go @@ -45,14 +45,14 @@ const ( type TopicUpdateInput struct { apis.EnabledStatusStandaloneResourceBaseUpdateInput - TitleCn string - TitleEn string - ContentCn string - ContentEn string - AdvanceDays []int `json:"advance_days"` - WebconsoleDisable *bool - Actions []string - Resources []string + TitleCn string `json:"title_cn"` + TitleEn string `json:"title_en"` + ContentCn string `json:"content_cn"` + ContentEn string `json:"content_en"` + AdvanceDays []int `json:"advance_days"` + WebconsoleDisable *bool `json:"webconsole_disable"` + Actions []string `json:"actions"` + Resources []string `json:"resources"` } type TopicListInput struct { diff --git a/pkg/apis/output.go b/pkg/apis/output.go index b0a2840b4e..d1db202908 100644 --- a/pkg/apis/output.go +++ b/pkg/apis/output.go @@ -261,7 +261,7 @@ type OpsLogDetails struct { } type StatusStatisticStatusInfo struct { - Status string + Status string `json:"status"` // 资源总数 TotalCount int64 `json:"total_count"` // 回收站数量 @@ -272,15 +272,15 @@ type StatusStatisticStatusInfo struct { type StatusStatistic struct { StatusInfo []StatusStatisticStatusInfo `json:"status_info,allowempty"` // CPU总量 - TotalCpuCount int + TotalCpuCount int `json:"total_cpu_count"` // 内存总量 - TotalMemSizeMb int + TotalMemSizeMb int `json:"total_mem_size_mb"` // 存储总量 - TotalDiskSizeMb int + TotalDiskSizeMb int `json:"total_disk_size_mb"` } type ProjectStatistic struct { - Count int - Id string - Name string + Count int `json:"count"` + Id string `json:"id"` + Name string `json:"name"` } diff --git a/pkg/apis/scheduledtask/scheduled_task.go b/pkg/apis/scheduledtask/scheduled_task.go index eb7bce0f49..614cba537b 100644 --- a/pkg/apis/scheduledtask/scheduled_task.go +++ b/pkg/apis/scheduledtask/scheduled_task.go @@ -110,13 +110,13 @@ type ScheduledTaskCreateInput struct { LabelType string `json:"label_type"` // description: labels // example: {g-12345} - Labels []string + Labels []string `json:"labels"` } type TimerCreateInput struct { // description: 执行时间 - ExecTime time.Time + ExecTime time.Time `json:"exec_time"` } type CycleTimerCreateInput struct { diff --git a/pkg/apis/scheduler/api.go b/pkg/apis/scheduler/api.go index a1f5c6167f..37f1bf04c5 100644 --- a/pkg/apis/scheduler/api.go +++ b/pkg/apis/scheduler/api.go @@ -104,11 +104,11 @@ type ScheduleInput struct { ReuseNetwork bool `json:"reuse_network"` // Change config - ChangeConfig bool + ChangeConfig bool `json:"change_config"` // guest who change config has isolated device - HasIsolatedDevice bool + HasIsolatedDevice bool `json:"has_isolated_device"` - PendingUsages []jsonutils.JSONObject + PendingUsages []jsonutils.JSONObject `json:"pending_usages"` } func (input ScheduleInput) ToConditionInput() *jsonutils.JSONDict { @@ -129,9 +129,9 @@ type CandidateDiskV2 struct { } type CandidateStorage struct { - Id string - Name string - FreeCapacity int64 + Id string `json:"id"` + Name string `json:"name"` + FreeCapacity int64 `json:"free_capacity"` } type CandidateNet struct { @@ -140,12 +140,12 @@ type CandidateNet struct { } type SFreeNumaCpuMem struct { - FreeCpuCount int - MemSize int - EnableNumaAllocate bool + FreeCpuCount int `json:"free_cpu_count"` + MemSize int `json:"mem_size"` + EnableNumaAllocate bool `json:"enable_numa_allocate"` - CpuCount int - NodeId int + CpuCount int `json:"cpu_count"` + NodeId int `json:"node_id"` } type SortedFreeNumaCpuMam []*SFreeNumaCpuMem @@ -198,15 +198,15 @@ func NodesFreeCpuEnough(nodeCount, vcpuCount int, cpuNumaFree []*SFreeNumaCpuMem } type SCpuPin struct { - Vcpu int - Pcpu int + Vcpu int `json:"vcpu"` + Pcpu int `json:"pcpu"` } type SCpuNumaPin struct { - CpuPin []int - NodeId int - MemSizeMB *int - ExtraCpuCount int + CpuPin []int `json:"cpu_pin"` + NodeId int `json:"node_id"` + MemSizeMB *int `json:"mem_size_mb"` + ExtraCpuCount int `json:"extra_cpu_count"` } type CandidateResource struct { diff --git a/pkg/apis/share.go b/pkg/apis/share.go index 8bf6c9e050..c7d6308c6a 100644 --- a/pkg/apis/share.go +++ b/pkg/apis/share.go @@ -27,17 +27,17 @@ const ( ) type SAccountShareInfo struct { - IsPublic bool - PublicScope rbacscope.TRbacScope - ShareMode string - SharedDomains []string + IsPublic bool `json:"is_public"` + PublicScope rbacscope.TRbacScope `json:"public_scope"` + ShareMode string `json:"share_mode"` + SharedDomains []string `json:"shared_domains"` } type SShareInfo struct { - IsPublic bool - PublicScope rbacscope.TRbacScope - SharedDomains []string - SharedProjects []string + IsPublic bool `json:"is_public"` + PublicScope rbacscope.TRbacScope `json:"public_scope"` + SharedDomains []string `json:"shared_domains"` + SharedProjects []string `json:"shared_projects"` } func (i SAccountShareInfo) GetProjectShareInfo() SShareInfo { diff --git a/pkg/apis/tasks.go b/pkg/apis/tasks.go index bd2358466e..c0c1fd16b1 100644 --- a/pkg/apis/tasks.go +++ b/pkg/apis/tasks.go @@ -75,14 +75,14 @@ type TaskDetails struct { DomainId string `json:"domain_id"` ProjectId string `json:"tenant_id"` - Id string - ObjName string - ObjId string - TaskName string - Params jsonutils.JSONObject - UserCred jsonutils.JSONObject - Stage string - ParentTaskId string + Id string `json:"id"` + ObjName string `json:"obj_name"` + ObjId string `json:"obj_id"` + TaskName string `json:"task_name"` + Params jsonutils.JSONObject `json:"params"` + UserCred jsonutils.JSONObject `json:"user_cred"` + Stage string `json:"stage"` + ParentTaskId string `json:"parent_task_id"` } type TaskCancelInput struct {