opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: update autogen struct json field name for release/3.1

Browse Source
This commit is contained in:
Qiu Jian
2020-03-04 20:43:26 +08:00
parent edd7136d3e
commit 9adac58590
4 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/zz_generated.model.go
+48 -11
View File
@@ -119,7 +119,7 @@ type SCloudaccount struct {
apis.SDomainizedResourceBase
SSyncableBaseResource
LastAutoSync time.Time `json:"last_auto_sync"`
ProjectId string `json:"project_id"`
ProjectId string `json:"tenant_id"`
AccessUrl string `json:"access_url"`
Account string `json:"account"`
Secret string `json:"secret"`
@@ -222,7 +222,7 @@ type SDBInstanceAccount struct {
apis.SStatusStandaloneResourceBase
apis.SExternalizedResourceBase
Secret string `json:"secret"`
DBInstanceId string `json:"db_instance_id"`
DBInstanceId string `json:"dbinstance_id"`
}
// SDBInstanceBackup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDBInstanceBackup.
@@ -238,7 +238,7 @@ type SDBInstanceBackup struct {
BackupMode string `json:"backup_mode"`
DBNames string `json:"db_names"`
BackupSizeMb int `json:"backup_size_mb"`
DBInstanceId string `json:"db_instance_id"`
DBInstanceId string `json:"dbinstance_id"`
}
// SDBInstanceDatabase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDBInstanceDatabase.
@@ -246,13 +246,13 @@ type SDBInstanceDatabase struct {
apis.SStatusStandaloneResourceBase
apis.SExternalizedResourceBase
CharacterSet string `json:"character_set"`
DBInstanceId string `json:"db_instance_id"`
DBInstanceId string `json:"dbinstance_id"`
}
// SDBInstanceJointsBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDBInstanceJointsBase.
type SDBInstanceJointsBase struct {
apis.SVirtualJointResourceBase
DBInstanceId string `json:"db_instance_id"`
DBInstanceId string `json:"dbinstance_id"`
}
// SDBInstanceNetwork is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDBInstanceNetwork.
@@ -266,7 +266,7 @@ type SDBInstanceNetwork struct {
type SDBInstanceParameter struct {
apis.SStandaloneResourceBase
apis.SExternalizedResourceBase
DBInstanceId string `json:"db_instance_id"`
DBInstanceId string `json:"dbinstance_id"`
Key string `json:"key"`
Value string `json:"value"`
}
@@ -277,8 +277,8 @@ type SDBInstancePrivilege struct {
apis.SExternalizedResourceBase
Id string `json:"id"`
Privilege string `json:"privilege"`
DBInstanceaccountId string `json:"db_instanceaccount_id"`
DBInstancedatabaseId string `json:"db_instancedatabase_id"`
DBInstanceaccountId string `json:"dbinstanceaccount_id"`
DBInstancedatabaseId string `json:"dbinstancedatabase_id"`
}
// SDBInstanceSku is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDBInstanceSku.
@@ -536,8 +536,8 @@ type SGuest struct {
FlavorId string `json:"flavor_id"`
SecgrpId string `json:"secgrp_id"`
AdminSecgrpId string `json:"admin_secgrp_id"`
SrcIpCheck *bool `json:"omitempty,src_ip_check"`
SrcMacCheck *bool `json:"omitempty,src_mac_check"`
SrcIpCheck *bool `json:"src_ip_check,omitempty"`
SrcMacCheck *bool `json:"src_mac_check,omitempty"`
Hypervisor string `json:"hypervisor"`
InstanceType string `json:"instance_type"`
}
@@ -630,6 +630,7 @@ type SHost struct {
ZoneId string `json:"zone_id"`
HostType string `json:"host_type"`
Version string `json:"version"`
OvnVersion string `json:"ovn_version"`
IsBaremetal bool `json:"is_baremetal"`
IsMaintenance bool `json:"is_maintenance"`
LastPingAt time.Time `json:"last_ping_at"`
@@ -831,6 +832,7 @@ type SLoadbalancerAgentParamsHaproxy struct {
LogHttp bool `json:"log_http"`
LogTcp bool `json:"log_tcp"`
LogNormal bool `json:"log_normal"`
TuneHttpMaxhdr int `json:"tune_http_maxhdr"`
}
// SLoadbalancerAgentParamsTelegraf is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerAgentParamsTelegraf.
@@ -866,6 +868,7 @@ type SLoadbalancerBackend struct {
Address string `json:"address"`
Port int `json:"port"`
SendProxy string `json:"send_proxy"`
Ssl string `json:"ssl"`
}
// SLoadbalancerBackendGroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerBackendGroup.
@@ -919,6 +922,15 @@ type SLoadbalancerHTTPRateLimiter struct {
HTTPRequestRatePerSrc int `json:"http_request_rate_per_src"`
}
// SLoadbalancerHTTPRedirect is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerHTTPRedirect.
type SLoadbalancerHTTPRedirect struct {
Redirect string `json:"redirect"`
RedirectCode int `json:"redirect_code"`
RedirectScheme string `json:"redirect_scheme"`
RedirectHost string `json:"redirect_host"`
RedirectPath string `json:"redirect_path"`
}
// SLoadbalancerHTTPSListener is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerHTTPSListener.
type SLoadbalancerHTTPSListener struct {
CertificateId string `json:"certificate_id"`
@@ -970,6 +982,7 @@ type SLoadbalancerListener struct {
SLoadbalancerHTTPSListener
SLoadbalancerHealthCheck
SLoadbalancerHTTPRateLimiter
SLoadbalancerHTTPRedirect
}
// SLoadbalancerListenerRule is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerListenerRule.
@@ -986,6 +999,7 @@ type SLoadbalancerListenerRule struct {
Condition string `json:"condition"`
SLoadbalancerHealthCheck
SLoadbalancerHTTPRateLimiter
SLoadbalancerHTTPRedirect
}
// SLoadbalancerNetwork is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SLoadbalancerNetwork.
@@ -1083,6 +1097,29 @@ type SNetworkschedtag struct {
NetworkId string `json:"network_id"`
}
// SQcloudCachedLb is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SQcloudCachedLb.
type SQcloudCachedLb struct {
apis.SVirtualResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
SCloudregionResourceBase
BackendServerId string `json:"backend_server_id"`
BackendId string `json:"backend_id"`
CachedBackendGroupId string `json:"cached_backend_group_id"`
}
// SQcloudCachedLbbg is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SQcloudCachedLbbg.
type SQcloudCachedLbbg struct {
apis.SVirtualResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
SCloudregionResourceBase
LoadbalancerId string `json:"loadbalancer_id"`
BackendGroupId string `json:"backend_group_id"`
AssociatedId string `json:"associated_id"`
AssociatedType string `json:"associated_type"`
}
// SReservedip is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SReservedip.
type SReservedip struct {
apis.SResourceBase
@@ -1184,7 +1221,7 @@ type SServerSku struct {
CpuCoreCount int `json:"cpu_core_count"`
MemorySizeMB int `json:"memory_size_mb"`
OsName string `json:"os_name"`
SysDiskResizable *bool `json:"omitempty,sys_disk_resizable"`
SysDiskResizable *bool `json:"sys_disk_resizable,omitempty"`
SysDiskType string `json:"sys_disk_type"`
SysDiskMinSizeGB int `json:"sys_disk_min_size_gb"`
SysDiskMaxSizeGB int `json:"sys_disk_max_size_gb"`
pkg/apis/identity/zz_generated.model.go
+3 -3
View File
@@ -34,7 +34,7 @@ type SAssignment struct {
type SConfigOption struct {
apis.SResourceBase
ResType string `json:"res_type"`
ResId string `json:"res_id"`
ResId string `json:"domain_id"`
Group string `json:"group"`
Option string `json:"option"`
Value interface{} `json:"value"`
@@ -122,8 +122,8 @@ type SIdentityProvider struct {
type SIdmapping struct {
apis.SResourceBase
PublicId string `json:"public_id"`
IdpId string `json:"idp_id"`
IdpEntityId string `json:"idp_entity_id"`
IdpId string `json:"domain_id"`
IdpEntityId string `json:"local_id"`
EntityType string `json:"entity_type"`
}
pkg/apis/image/zz_generated.model.go
+4 -4
View File
@@ -21,7 +21,7 @@ import (
// SGuestImage is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SGuestImage.
type SGuestImage struct {
apis.SSharableVirtualResourceBase
Protected *bool `json:"omitempty,protected"`
Protected *bool `json:"protected,omitempty"`
}
// SGuestImageJoint is an autogenerated struct via yunion.io/x/onecloud/pkg/image/models.SGuestImageJoint.
@@ -40,9 +40,9 @@ type SImage struct {
Checksum string `json:"checksum"`
FastHash string `json:"fast_hash"`
Owner string `json:"owner"`
MinDiskMB int32 `json:"min_disk_mb"`
MinRamMB int32 `json:"min_ram_mb"`
Protected *bool `json:"omitempty,protected"`
MinDiskMB int32 `json:"min_disk"`
MinRamMB int32 `json:"min_ram"`
Protected *bool `json:"protected,omitempty"`
IsStandard *bool `json:"is_standard,omitempty"`
IsGuestImage *bool `json:"is_guest_image,omitempty"`
IsData *bool `json:"is_data,omitempty"`
pkg/apis/zz_generated.model.go
+2 -2
View File
@@ -57,7 +57,7 @@ type SKeystoneCacheObject struct {
// SProjectizedResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SProjectizedResourceBase.
type SProjectizedResourceBase struct {
SDomainizedResourceBase
ProjectId string `json:"project_id"`
ProjectId string `json:"tenant_id"`
}
// SResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SResourceBase.
@@ -72,7 +72,7 @@ type SResourceBase struct {
// SScopedResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SScopedResourceBase.
type SScopedResourceBase struct {
DomainId string `json:"domain_id"`
ProjectId string `json:"project_id"`
ProjectId string `json:"tenant_id"`
}
// SSharableBaseResource is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SSharableBaseResource.