fix: update model api

This commit is contained in:
Qiu Jian
2023-11-26 16:38:22 +08:00
parent 20167c2afd
commit f8284d8bc1
6 changed files with 122 additions and 70 deletions
-1
View File
@@ -32,7 +32,6 @@ type DnsTrafficPolicyCreateInput struct {
type DnsTrafficPolicyDetails struct {
apis.EnabledStatusInfrasResourceBaseDetails
SDnsTrafficPolicy
}
type DnsTrafficPolicyListInput struct {
-1
View File
@@ -30,7 +30,6 @@ type DnsZoneCacheCreateInput struct {
type DnsZoneCacheDetails struct {
apis.StatusStandaloneResourceDetails
SDnsZoneCache
Account string
Brand string
+1 -1
View File
@@ -17,7 +17,7 @@ package compute
type HostwireDetails struct {
HostJointResourceDetails
SHostwire
SHostwireDeprecated
// 二层网络名称
Wire string `json:"wire"`
+87 -58
View File
@@ -95,8 +95,6 @@ type SBackupStorage struct {
CapacityMb int `json:"capacity_mb"`
}
// SBaremetalagent is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SBaremetalagent.
type SBaremetalagent struct {
apis.SStandaloneResourceBase
@@ -305,6 +303,7 @@ type SCloudimage struct {
type SCloudprovider struct {
apis.SEnabledStatusStandaloneResourceBase
apis.SProjectizedResourceBase
apis.SExternalizedResourceBase
SSyncableBaseResource
// 云端服务健康状态。例如欠费、项目冻结都属于不健康状态。
// | HealthStatus | 说明 |
@@ -325,6 +324,9 @@ type SCloudprovider struct {
CloudaccountId string `json:"cloudaccount_id"`
// 云账号的平台信息
Provider string `json:"provider"`
// 云上同步资源是否在本地被更改过配置, local: 更改过, cloud: 未更改过
// example: local
ProjectSrc string `json:"project_src"`
SProjectMappingResourceBase
}
@@ -348,9 +350,9 @@ type SCloudproviderQuota struct {
QuotaRange string `json:"quota_range"`
// 已使用的配额
// -1代表未从云平台拿到已使用配额信息
UsedCount int `json:"used_count"`
UsedCount int64 `json:"used_count"`
// 最大配额限制
MaxCount int `json:"max_count"`
MaxCount int64 `json:"max_count"`
// 配额类型
QuotaType string `json:"quota_type"`
}
@@ -626,6 +628,12 @@ type SDisk struct {
// swap: 交换盘
// example: sys
DiskType string `json:"disk_type"`
// 预分配策略
// off: 关闭预分配,默认关闭
// metadata: 精简制备
// falloc: 厚制制备延迟置零
// full: 厚制备快速置零
Preallocation string `json:"preallocation"`
// # is persistent
Nonpersistent bool `json:"nonpersistent"`
// 是否标记为SSD磁盘
@@ -660,48 +668,29 @@ type SDiskResourceBase struct {
DiskId string `json:"disk_id"`
}
// SDnsRecordis an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsRecord.
// SDnsRecord is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsRecord.
type SDnsRecord struct {
apis.SEnabledStatusStandaloneResourceBase
apis.SExternalizedResourceBase
SDnsZoneResourceBase
DnsType string `json:"dns_type"`
DnsValue string `json:"dns_value"`
TTL int64 `json:"ttl"`
MxPriority int64 `json:"mx_priority"`
}
// SDnsRecordSetTrafficPolicy is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsRecordSetTrafficPolicy.
type SDnsRecordSetTrafficPolicy struct {
apis.SJointResourceBase
DnsRecordsetId string `json:"dns_recordset_id"`
DnsTrafficPolicyId string `json:"dns_traffic_policy_id"`
}
// SDnsTrafficPolicy is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsTrafficPolicy.
type SDnsTrafficPolicy struct {
apis.SEnabledStatusInfrasResourceBase
Provider string `json:"provider"`
PolicyType string `json:"policy_type"`
PolicyValue string `json:"policy_value"`
Options *jsonutils.JSONDict `json:"options"`
// 解析线路类型
PolicyType string `json:"policy_type"`
// 解析线路
PolicyValue string `json:"policy_value"`
}
// SDnsZone is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsZone.
type SDnsZone struct {
apis.SEnabledStatusInfrasResourceBase
IsDirty bool `json:"is_dirty"`
ZoneType string `json:"zone_type"`
Options *jsonutils.JSONDict `json:"options"`
}
// SDnsZoneCache is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsZoneCache.
type SDnsZoneCache struct {
apis.SStatusStandaloneResourceBase
apis.SSharableVirtualResourceBase
apis.SEnabledResourceBase
apis.SExternalizedResourceBase
SDnsZoneResourceBase
// 归属云账号ID
CloudaccountId string `json:"cloudaccount_id"`
ProductType string `json:"product_type"`
SManagedResourceBase
ZoneType string `json:"zone_type"`
ProductType string `json:"product_type"`
}
// SDnsZoneResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SDnsZoneResourceBase.
@@ -766,10 +755,12 @@ type SElasticSearch struct {
type SElasticcache struct {
apis.SVirtualResourceBase
apis.SExternalizedResourceBase
SCloudregionResourceBase
SManagedResourceBase
SBillingResourceBase
SDeletePreventableResourceBase
SVpcResourceBase
SZoneResourceBase
VpcId string `json:"vpc_id"`
// 备可用区
SlaveZones string `json:"slave_zones"`
// 实例规格
@@ -797,9 +788,9 @@ type SElasticcache struct {
NetworkId string `json:"network_id"`
// 带宽
Bandwidth int `json:"bandwidth"`
// 内网DNS
// 内网DNS
PrivateDNS string `json:"private_dns"`
// 内网IP地址
// 内网IP地址
PrivateIpAddr string `json:"private_ip_addr"`
// 内网访问端口
PrivateConnectPort int `json:"private_connect_port"`
@@ -984,6 +975,9 @@ type SExternalProject struct {
apis.SVirtualResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
// 优先级,同一个本地项目映射多个云上项目,优先级高的优先选择
// 数值越高,优先级越大
Priority int `json:"priority"`
ExternalDomainId string `json:"external_domain_id"`
// 归属云账号ID
CloudaccountId string `json:"cloudaccount_id"`
@@ -1083,8 +1077,10 @@ type SGuest struct {
SHostResourceBase
apis.SEncryptedResource
// CPU大小
CpuSockets int `json:"cpu_sockets"`
// CPU大小
VcpuCount int `json:"vcpu_count"`
// 内存大小, 单位Mb
// 内存大小, 单位MB
VmemSize int `json:"vmem_size"`
// 启动顺序
BootOrder string `json:"boot_order"`
@@ -1129,6 +1125,8 @@ type SGuest struct {
QgaStatus string `json:"qga_status"`
// power_states limit in [on, off, unknown]
PowerStates string `json:"power_states"`
// Used for guest rescue
RescueMode bool `json:"rescue_mode"`
}
// SGuestJointsBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SGuestJointsBase.
@@ -1202,6 +1200,12 @@ type SGuestnetwork struct {
NumQueues int `json:"num_queues"`
// 带宽限制,单位mbps
BwLimit int `json:"bw_limit"`
// 下行流量限制,单位 bytes
RxTrafficLimit int64 `json:"rx_traffic_limit"`
RxTrafficUsed int64 `json:"rx_traffic_used"`
// 上行流量限制,单位 bytes
TxTrafficLimit int64 `json:"tx_traffic_limit"`
TxTrafficUsed int64 `json:"tx_traffic_used"`
// 网卡序号
Index byte `json:"index"`
// 是否为虚拟接口(无IP
@@ -1338,6 +1342,8 @@ type SHostnetwork struct {
IpAddr string `json:"ip_addr"`
// MAC地址
MacAddr string `json:"mac_addr"`
// VLAN
VlanId int `json:"vlan_id"`
}
// SHostschedtag is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SHostschedtag.
@@ -1364,8 +1370,8 @@ type SHoststorage struct {
RealCapacity int64 `json:"real_capacity"`
}
// SHostwire is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SHostwire.
type SHostwire struct {
// SHostwireDeprecated is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SHostwireDeprecated.
type SHostwireDeprecated struct {
SHostJointsBase
Bridge string `json:"bridge"`
// 接口名称
@@ -1512,7 +1518,25 @@ type SIsolatedDevice struct {
// guest disk index
DiskIndex byte `json:"disk_index"`
// # pci address of `Bus:Device.Function` format, or usb bus address of `bus.addr`
Addr string `json:"addr"`
Addr string `json:"addr"`
// Is vgpu physical funcion, That means it cannot be attached to guest
// VGPUPhysicalFunction bool `nullable:"true" default:"false" list:"domain" create:"domain_optional"`
// nvidia vgpu config
// vgpu uuid generated on create
MdevId string `json:"mdev_id"`
// The frame rate limiter (FRL) configuration in frames per second
FRL string `json:"frl"`
// The frame buffer size in Mbytes
Framebuffer string `json:"framebuffer"`
// The maximum resolution per display head, eg: 5120x2880
MaxResolution string `json:"max_resolution"`
// The maximum number of virtual display heads that the vGPU type supports
// In computer graphics and display technology, the term "head" is commonly used to
// describe the physical interface of a display device or display output.
// It refers to a connection point on the monitor, such as HDMI, DisplayPort, or VGA interface.
NumHeads string `json:"num_heads"`
// The maximum number of vGPU instances per physical GPU
MaxInstance string `json:"max_instance"`
VendorDeviceId string `json:"vendor_device_id"`
// reserved memory size for isolated device
ReservedMemory int `json:"reserved_memory"`
@@ -1520,6 +1544,8 @@ type SIsolatedDevice struct {
ReservedCpu int `json:"reserved_cpu"`
// reserved storage size for isolated device
ReservedStorage int `json:"reserved_storage"`
// PciInfo stores extra PCIE information
PcieInfo *IsolatedDevicePCIEInfo `json:"pcie_info"`
}
// SIsolatedDeviceModel is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SIsolatedDeviceModel.
@@ -1569,6 +1595,7 @@ type SKafka struct {
// SKeypair is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SKeypair.
type SKeypair struct {
apis.SUserResourceBase
apis.SSharableBaseResource
// 加密类型
// example: RSA
Scheme string `json:"scheme"`
@@ -1851,9 +1878,9 @@ type SLoadbalancerHealthCheck struct {
// 健康检查路径 /
HealthCheckHttpCode string `json:"health_check_http_code"`
HealthCheckRise int `json:"health_check_rise"`
// 健康检查健康阈值 3秒
// 健康检查健康阈值 3秒
HealthCheckFall int `json:"health_check_fall"`
// 健康检查不健康阈值 15秒
// 健康检查不健康阈值 15秒
HealthCheckTimeout int `json:"health_check_timeout"`
// 健康检查超时时间 10秒
HealthCheckInterval int `json:"health_check_interval"`
@@ -2206,6 +2233,14 @@ type SNetwork struct {
BgpType string `json:"bgp_type"`
}
// SNetworkAdditionalWire is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNetworkAdditionalWire.
type SNetworkAdditionalWire struct {
NetworkId string `json:"network_id"`
WireId string `json:"wire_id"`
Synced *bool `json:"synced"`
Marked *bool `json:"marked"`
}
// SNetworkAddress is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SNetworkAddress.
type SNetworkAddress struct {
apis.SStandaloneAnonResourceBase
@@ -2476,7 +2511,7 @@ type SSchedtag struct {
apis.SStandaloneResourceBase
apis.SScopedResourceBase
DefaultStrategy string `json:"default_strategy"`
// Column(VARCHAR(16, charset='ascii'), nullable=True, default=)
// Column(VARCHAR(16, charset='ascii'), nullable=True, default='')
ResourceType string `json:"resource_type"`
}
@@ -2495,21 +2530,12 @@ type SSchedtagResourceBase struct {
// SSecurityGroup is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSecurityGroup.
type SSecurityGroup struct {
apis.SSharableVirtualResourceBase
IsDirty bool `json:"is_dirty"`
}
// SSecurityGroupCache is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSecurityGroupCache.
type SSecurityGroupCache struct {
apis.SStatusStandaloneResourceBase
apis.SExternalizedResourceBase
SCloudregionResourceBase
IsDirty bool `json:"is_dirty"`
SManagedResourceBase
SSecurityGroupResourceBase
// 被其他安全组引用的次数
ReferenceCount int `json:"reference_count"`
// 虚拟私有网络外部Id
VpcId string `json:"vpc_id"`
ExternalProjectId string `json:"external_project_id"`
SCloudregionResourceBase
SGlobalVpcResourceBase
SVpcResourceBase
}
// SSecurityGroupResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSecurityGroupResourceBase.
@@ -2521,9 +2547,11 @@ type SSecurityGroupResourceBase struct {
// SSecurityGroupRule is an autogenerated struct via yunion.io/x/onecloud/pkg/compute/models.SSecurityGroupRule.
type SSecurityGroupRule struct {
apis.SResourceBase
apis.SStatusResourceBase
apis.SExternalizedResourceBase
SSecurityGroupResourceBase
Id string `json:"id"`
Priority int64 `json:"priority"`
Priority int `json:"priority"`
Protocol string `json:"protocol"`
Ports string `json:"ports"`
Direction string `json:"direction"`
@@ -2877,6 +2905,7 @@ type SWafRuleStatement struct {
type SWire struct {
apis.SStatusInfrasResourceBase
apis.SExternalizedResourceBase
SManagedResourceBase
SVpcResourceBase
SZoneResourceBase
// 带宽大小, 单位Mbps
+24 -5
View File
@@ -19,7 +19,7 @@ import (
jsonutils "yunion.io/x/jsonutils"
apis "yunion.io/x/onecloud/pkg/apis"
"yunion.io/x/onecloud/pkg/apis"
tagutils "yunion.io/x/onecloud/pkg/util/tagutils"
)
@@ -63,6 +63,7 @@ type SCredential struct {
// SDomain is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SDomain.
type SDomain struct {
apis.SStandaloneResourceBase
apis.SPendingDeletedBase
// 额外信息
Extra *jsonutils.JSONDict `json:"extra"`
// 改域是否启用
@@ -77,7 +78,7 @@ type SDomain struct {
// SEnabledIdentityBaseResource is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SEnabledIdentityBaseResource.
type SEnabledIdentityBaseResource struct {
SIdentityBaseResource
Enabled *bool `json:"enabled,omitempty"`
apis.SEnabledResourceBase
}
// SEndpoint is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SEndpoint.
@@ -129,6 +130,7 @@ type SGroup struct {
type SIdentityBaseResource struct {
apis.SStandaloneResourceBase
apis.SDomainizedResourceBase
apis.SPendingDeletedBase
// 额外信息
Extra *jsonutils.JSONDict `json:"extra"`
}
@@ -200,7 +202,9 @@ type SNonlocalUser struct {
// SOrganization is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SOrganization.
type SOrganization struct {
apis.SEnabledStatusInfrasResourceBase
SEnabledIdentityBaseResource
apis.SSharableBaseResource
apis.SStatusResourceBase
Type string `json:"type"`
Keys string `json:"keys"`
Level int `json:"level"`
@@ -208,17 +212,19 @@ type SOrganization struct {
// SOrganizationDetails is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SOrganizationDetails.
type SOrganizationDetails struct {
apis.EnabledStatusInfrasResourceBaseDetails
EnabledIdentityBaseResourceDetails
apis.SharableResourceBaseInfo
SOrganization
}
// SOrganizationNode is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SOrganizationNode.
type SOrganizationNode struct {
apis.SStandaloneResourceBase
apis.SPendingDeletedBase
OrgId string `json:"org_id"`
FullLabel string `json:"full_label"`
Level int `json:"level"`
Weight *int `json:"weight"`
Weight int `json:"weight"`
}
// SOrganizationNodeDetails is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SOrganizationNodeDetails.
@@ -339,6 +345,19 @@ type SServiceCertificate struct {
CaPrivateKey string `json:"ca_private_key"`
}
// STokenCache is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.STokenCache.
type STokenCache struct {
apis.SStandaloneAnonResourceBase
Valid bool `json:"valid"`
Method string `json:"method"`
AuditIds string `json:"audit_ids"`
UserId string `json:"user_id"`
ProjectId string `json:"project_id"`
DomainId string `json:"domain_id"`
Source string `json:"source"`
Ip string `json:"ip"`
}
// SUser is an autogenerated struct via yunion.io/x/onecloud/pkg/keystone/models.SUser.
type SUser struct {
apis.SRecordChecksumResourceBase
+10 -4
View File
@@ -152,6 +152,7 @@ type SJointResourceBase struct {
// SKeystoneCacheObject is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SKeystoneCacheObject.
type SKeystoneCacheObject struct {
SStandaloneResourceBase
SPendingDeletedBase
DomainId string `json:"domain_id"`
Domain string `json:"domain"`
Lang string `json:"lang"`
@@ -212,6 +213,14 @@ type SOpsLog struct {
OwnerProjectId string `json:"owner_tenant_id"`
}
// SPendingDeletedBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SPendingDeletedBase.
type SPendingDeletedBase struct {
// 资源放入回收站时间
PendingDeletedAt time.Time `json:"pending_deleted_at"`
// 资源是否处于回收站中
PendingDeleted bool `json:"pending_deleted"`
}
// SProjectizedResourceBase is an autogenerated struct via yunion.io/x/onecloud/pkg/cloudcommon/db.SProjectizedResourceBase.
type SProjectizedResourceBase struct {
SDomainizedResourceBase
@@ -354,15 +363,12 @@ type SVirtualJointResourceBase struct {
type SVirtualResourceBase struct {
SStatusStandaloneResourceBase
SProjectizedResourceBase
SPendingDeletedBase
// 云上同步资源是否在本地被更改过配置, local: 更改过, cloud: 未更改过
// example: local
ProjectSrc string `json:"project_src"`
// 是否是系统资源
IsSystem bool `json:"is_system"`
// 资源放入回收站时间
PendingDeletedAt time.Time `json:"pending_deleted_at"`
// 资源是否处于回收站中
PendingDeleted bool `json:"pending_deleted"`
// 资源是否被冻结
Freezed bool `json:"freezed"`
}