fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-21 00:24:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: deprecated-by => yunion:deprecated-by

Browse Source
This commit is contained in:
Qiu Jian
2020-04-15 22:51:57 +08:00
parent 5651805eb0
commit 98fcd1df0f
46 changed files with 162 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/cloudcommon/proxy/proxy.go
View File

@@ -53,7 +53,11 @@ func (ps *SProxySetting) IsZero() bool {
type ProxySettingResourceInput struct {
// 代理配置
ProxySettingId string `json:"proxy_setting_id"`
ProxySetting string `json:"proxy_setting"`
// swagger:ignore
// Deprecated
// ProxySettingId string `json:"proxy_setting_id" "yunion:deprecated-by":"proxy_setting"`
}
type ProxySettingTestInput struct {

7
pkg/apis/compute/api.go
View File

@@ -285,7 +285,7 @@ type ServerConfigs struct {
// swagger:ignore
// Deprecated
// alias for InstanceType
Sku string `json:"sku" deprecated-by:"instance_type"`
Sku string `json:"sku" "yunion:deprecated-by":"instance_type"`
// 虚拟机高可用(创建备机)
// default: false
@@ -358,11 +358,12 @@ type ServerCreateInput struct {
UserData string `json:"user_data"`
// swagger:ignore
Keypair string `json:"keypair" deprecated-by:"keypair_id"`
// Deprecated
KeypairId string `json:"keypair_id" "yunion:deprecated-by":"keypair"`
// 秘钥对Id
// required: false
KeypairId string `json:"keypair_id"`
Keypair string `json:"keypair"`
// 密码
// 要求: 密码长度 >= 20, 至少包含一个数字一个小写字母一个大小字母及特殊字符~`!@#$%^&*()-_=+[]{}|:';\",./<>?中的一个

2
pkg/apis/compute/cachedloadbalancercertificate.go
View File

@@ -43,7 +43,7 @@ type LoadbalancerCertificateResourceInput struct {
// swagger:ignore
// Deprecated
CertificateId string `json:"certificate_id" deprecated-by:"certificate"`
CertificateId string `json:"certificate_id" "yunion:deprecated-by":"certificate"`
}
type LoadbalancerCertificateFilterListInput struct {

4
pkg/apis/compute/cloudaccount.go
View File

@@ -66,7 +66,7 @@ type CloudenvResourceListInput struct {
Providers []string `json:"providers"`
// swagger:ignore
// Deprecated
Provider []string `json:"provider" deprecated-by:"providers"`
Provider []string `json:"provider" "yunion:deprecated-by":"providers"`
// 列出指定云平台品牌的资源，一般来说brand和provider相同，除了以上支持的provider之外，还支持以下band
//
@@ -77,7 +77,7 @@ type CloudenvResourceListInput struct {
Brands []string `json:"brands"`
// swagger:ignore
// Deprecated
Brand []string `json:"brand" deprecated-by:"brands"`
Brand []string `json:"brand" "yunion:deprecated-by":"brands"`
// 列出指定云环境的资源，支持云环境如下：
//

12
pkg/apis/compute/cloudprovider.go
View File

@@ -147,15 +147,15 @@ type CloudproviderResourceInput struct {
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
Manager string `json:"manager" deprecated-by:"cloudprovider"`
Manager string `json:"manager" "yunion:deprecated-by":"cloudprovider"`
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
ManagerId string `json:"manager_id" deprecated-by:"cloudprovider"`
ManagerId string `json:"manager_id" "yunion:deprecated-by":"cloudprovider"`
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
CloudproviderId string `json:"cloudprovider_id" deprecated-by:"cloudprovider"`
CloudproviderId string `json:"cloudprovider_id" "yunion:deprecated-by":"cloudprovider"`
}
type ManagedResourceListInput struct {
@@ -169,15 +169,15 @@ type ManagedResourceListInput struct {
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
CloudaccountId string `json:"cloudaccount_id" deprecated-by:"cloudaccount"`
CloudaccountId string `json:"cloudaccount_id" "yunion:deprecated-by":"cloudaccount"`
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
Account string `json:"account" deprecated-by:"cloudaccount"`
Account string `json:"account" "yunion:deprecated-by":"cloudaccount"`
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
AccountId string `json:"account_id" deprecated-by:"cloudaccount"`
AccountId string `json:"account_id" "yunion:deprecated-by":"cloudaccount"`
// 过滤资源，是否为非OneCloud内置私有云管理的资源
// default: false

2
pkg/apis/compute/dbinstance.go
View File

@@ -306,7 +306,7 @@ type DBInstanceResourceInput struct {
// swagger:ignore
// Deprecated
DBInstanceId string `json:"dbinstance_id" deprecated-by:"dbinstance"`
DBInstanceId string `json:"dbinstance_id" "yunion:deprecated-by":"dbinstance"`
}
type DBInstanceFilterListInputBase struct {

10
pkg/apis/compute/disk.go
View File

@@ -88,7 +88,7 @@ type SnapshotPolicyResourceInput struct {
// swagger:ignore
// Deprecated
// filter disk by snapshotpolicy_id
SnapshotpolicyId string `json:"snapshotpolicy_id" deprecated-by:"snapshotpolicy"`
SnapshotpolicyId string `json:"snapshotpolicy_id" "yunion:deprecated-by":"snapshotpolicy"`
}
type SnapshotPolicyFilterListInput struct {
@@ -113,7 +113,7 @@ type DiskListInput struct {
// swagger:ignore
// Deprecated
// filter by disk type
Type string `json:"type" deprecated-by:"disk_type"`
Type string `json:"type" "yunion:deprecated-by":"disk_type"`
// 过滤指定disk_type的磁盘列表，可能的值为：sys, data, swap. volume
//
// | disk_type值 | 说明 |
@@ -137,13 +137,13 @@ type DiskListInput struct {
Template string `json:"template"`
// swagger:ignore
// Deprecated
TemplateId string `json:"template_id" deprecated-by:"template"`
TemplateId string `json:"template_id" "yunion:deprecated-by":"template"`
// 快照
Snapshot string `json:"snapshot"`
// swagger:ignore
// Deprecated
SnapshotId string `json:"snapshot_id" deprecated-by:"snapshot"`
SnapshotId string `json:"snapshot_id" "yunion:deprecated-by":"snapshot"`
}
type DiskResourceInput struct {
@@ -152,7 +152,7 @@ type DiskResourceInput struct {
// swagger:ignore
// Deprecated
// filter by disk_id
DiskId string `json:"disk_id" deprecated-by:"disk"`
DiskId string `json:"disk_id" "yunion:deprecated-by":"disk"`
}
type DiskFilterListInputBase struct {

2
pkg/apis/compute/elasticcache.go
View File

@@ -53,7 +53,7 @@ type ELasticcacheResourceInput struct {
// swagger:ignore
// Deprecated
ElasticcacheId string `json:"elasticcache_id" deprecated-by:"elasticcache"`
ElasticcacheId string `json:"elasticcache_id" "yunion:deprecated-by":"elasticcache"`
}
type ElasticcacheFilterListInput struct {

8
pkg/apis/compute/geo_input.go
View File

@@ -24,15 +24,15 @@ type CloudregionResourceInput struct {
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
CloudregionId string `json:"cloudregion_id" deprecated-by:"cloudregion"`
CloudregionId string `json:"cloudregion_id" "yunion:deprecated-by":"cloudregion"`
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
Region string `json:"region" deprecated-by:"cloudregion"`
Region string `json:"region" "yunion:deprecated-by":"cloudregion"`
// swagger:ignore
// Deprecated
// description: this param will be deprecate at 3.0
RegionId string `json:"region_id" deprecated-by:"cloudregion"`
RegionId string `json:"region_id" "yunion:deprecated-by":"cloudregion"`
}
type RegionalFilterListInput struct {
@@ -117,5 +117,5 @@ type ZoneResourceInput struct {
// swagger:ignore
// Deprecated
ZoneId string `json:"zone_id" deprecated-by:"zone"`
ZoneId string `json:"zone_id" "yunion:deprecated-by":"zone"`
}

2
pkg/apis/compute/globalvpc.go
View File

@@ -39,7 +39,7 @@ type GlobalVpcResourceInput struct {
// swagger:ignore
// Deprecated
GlobalvpcId string `json:"globalvpc_id" deprecated-by:"globalvpc"`
GlobalvpcId string `json:"globalvpc_id" "yunion:deprecated-by":"globalvpc"`
}
type GlobalVpcResourceListInput struct {

6
pkg/apis/compute/guests.go
View File

@@ -262,15 +262,15 @@ type ServerResourceInput struct {
// swagger:ignore
// Deprecated
// Filter by guest Id
ServerId string `json:"server_id" deprecated-by:"server"`
ServerId string `json:"server_id" "yunion:deprecated-by":"server"`
// swagger:ignore
// Deprecated
// Filter by guest Id
Guest string `json:"guest" deprecated-by:"server"`
Guest string `json:"guest" "yunion:deprecated-by":"server"`
// swagger:ignore
// Deprecated
// Filter by guest Id
GuestId string `json:"guest_id" deprecated-by:"server"`
GuestId string `json:"guest_id" "yunion:deprecated-by":"server"`
}
type ServerFilterListInput struct {

2
pkg/apis/compute/host.go
View File

@@ -217,7 +217,7 @@ type HostResourceInput struct {
// swagger:ignore
// Deprecated
// filter by host_id
HostId string `json:"host_id" deprecated-by:"host"`
HostId string `json:"host_id" "yunion:deprecated-by":"host"`
}
type HostRegisterMetadata struct {

2
pkg/apis/compute/hostjoin.go
View File

@@ -21,7 +21,7 @@ type HostJointResourceDetailsBase struct {
Host string `json:"host"`
// 裸金属服务器名称
// Deprecated
Baremetal string `json:"baremetal" deprecated-by:"host"`
Baremetal string `json:"baremetal" "yunion:deprecated-by":"host"`
}
type HostJointResourceDetails struct {

2
pkg/apis/compute/input.go
View File

@@ -150,7 +150,7 @@ type GuestTemplateFilterListInput struct {
GuestTemplate string `json:"guest_template"`
// swagger:ignore
// Deprecated
GuestTemplateId string `json:"guest_template_id" deprecated-by:"guest_template"`
GuestTemplateId string `json:"guest_template_id" "yunion:deprecated-by":"guest_template"`
}
type ServiceCatalogListInput struct {

2
pkg/apis/compute/instance_group.go
View File

@@ -50,7 +50,7 @@ type GroupResourceInput struct {
// swagger:ignore
// Deprecated
// Filter by instance group Id
GroupId string `json:"group_id" deprecated-by:"group"`
GroupId string `json:"group_id" "yunion:deprecated-by":"group"`
}
type GroupFilterListInput struct {

2
pkg/apis/compute/loadbalancer.go
View File

@@ -202,7 +202,7 @@ type LoadbalancerResourceInput struct {
// swagger:ignore
// Deprecated
LoadbalancerId string `json:"loadbalancer_id" deprecated-by:"loadbalancer"`
LoadbalancerId string `json:"loadbalancer_id" "yunion:deprecated-by":"loadbalancer"`
}
type LoadbalancerFilterListInput struct {

2
pkg/apis/compute/loadbalancerbackendgroup.go
View File

@@ -39,7 +39,7 @@ type LoadbalancerBackendGroupResourceInput struct {
// swagger:ignore
// Deprecated
BackendGroupId string `json:"backend_group_id" deprecated-by:"backend_group"`
BackendGroupId string `json:"backend_group_id" "yunion:deprecated-by":"backend_group"`
}
type LoadbalancerBackendGroupFilterListInput struct {

2
pkg/apis/compute/loadbalancercluster.go
View File

@@ -45,7 +45,7 @@ type LoadbalancerClusterResourceInput struct {
// swagger:ignore
// Deprecated
ClusterId string `json:"cluster_id" deprecated-by:"cluster"`
ClusterId string `json:"cluster_id" "yunion:deprecated-by":"cluster"`
}
type LoadbalancerClusterFilterListInput struct {

2
pkg/apis/compute/loadbalancerlistener.go
View File

@@ -45,7 +45,7 @@ type LoadbalancerListenerResourceInput struct {
// 负载均衡监听器ID
// swagger:ignore
// Deprecated
ListenerId string `json:"listener_id" deprecated-by:"listener"`
ListenerId string `json:"listener_id" "yunion:deprecated-by":"listener"`
}
type LoadbalancerListenerFilterListInput struct {

2
pkg/apis/compute/natgateway.go
View File

@@ -89,7 +89,7 @@ type NatGatewayResourceInput struct {
// swagger:ignore
// Deprecated
NatgatewayId string `json:"natgateway_id" deprecated-by:"natgateway"`
NatgatewayId string `json:"natgateway_id" "yunion:deprecated-by":"natgateway"`
}
type NatGatewayFilterListInput struct {

4
pkg/apis/compute/network.go
View File

@@ -24,7 +24,7 @@ type WireResourceInput struct {
// swagger:ignore
// Deprecated
// fitler by wire id
WireId string `json:"wire_id" deprecated-by:"wire"`
WireId string `json:"wire_id" "yunion:deprecated-by":"wire"`
}
type WireFilterListBase struct {
@@ -47,7 +47,7 @@ type NetworkResourceInput struct {
// swagger:ignore
// Deprecated
// filter by networkId
NetworkId string `json:"network_id" deprecated-by:"network"`
NetworkId string `json:"network_id" "yunion:deprecated-by":"network"`
}
type NetworkFilterListBase struct {

4
pkg/apis/compute/schedtag.go
View File

@@ -45,7 +45,7 @@ type SchedtagResourceInput struct {
// swagger:ignore
// Deprecated
// filter by schedtag_id
SchedtagId string `json:"schedtag_id" deprecated-by:"schedtag"`
SchedtagId string `json:"schedtag_id" "yunion:deprecated-by":"schedtag"`
}
type SchedtagFilterListInput struct {
@@ -69,7 +69,7 @@ type SchedtagListInput struct {
// swagger:ignore
// Deprecated
// filter by type, alias for resource_type
Type string `json:"type" deprecated-by:"resource_type"`
Type string `json:"type" "yunion:deprecated-by":"resource_type"`
DefaultStrategy []string `json:"default_strategy"`
}

2
pkg/apis/compute/secgroup.go
View File

@@ -178,7 +178,7 @@ type SecgroupResourceInput struct {
// swagger:ignore
// Deprecated
// filter by secgroup_id
SecgroupId string `json:"secgroup_id" deprecated-by:"secgroup"`
SecgroupId string `json:"secgroup_id" "yunion:deprecated-by":"secgroup"`
}
type SecgroupFilterListInput struct {

2
pkg/apis/compute/storage_const.go
View File

@@ -144,7 +144,7 @@ type StorageResourceInput struct {
// swagger:ignore
// Deprecated
// filter by storage_id
StorageId string `json:"storage_id" deprecated-by:"storage"`
StorageId string `json:"storage_id" "yunion:deprecated-by":"storage"`
}
type StorageFilterListInputBase struct {

4
pkg/apis/compute/storagecachedimage.go
View File

@@ -48,13 +48,13 @@ type StoragecachedimageListInput struct {
Storagecache string `json:"storagecache"`
// Deprecated
// swagger:ignore
StoragecacheId string `json:"storagecache_id" deprecated-by:"storagecache"`
StoragecacheId string `json:"storagecache_id" "yunion:deprecated-by":"storagecache"`
// 以镜像缓存过滤
Cachedimage string `json:"cachedimage"`
// Deprecated
// swagger:ignore
CachedimageId string `json:"cachedimage_id" deprecated-by:"cachedimage_id"`
CachedimageId string `json:"cachedimage_id" "yunion:deprecated-by":"cachedimage"`
// 镜像状态
Status []string `json:"status"`

2
pkg/apis/compute/vpc.go
View File

@@ -80,7 +80,7 @@ type VpcResourceInput struct {
// swagger:ignore
// Deprecated
// filter by vpc Id
VpcId string `json:"vpc_id" deprecated-by:"vpc"`
VpcId string `json:"vpc_id" "yunion:deprecated-by":"vpc"`
}
type VpcFilterListInputBase struct {

4
pkg/apis/identity/identityprovider.go
View File

@@ -68,10 +68,10 @@ type IdentityProviderCreateInput struct {
Template string `json:"template"`
// 默认导入用户和组的域
TargetDomainId string `json:"target_domain_id"`
TargetDomain string `json:"target_domain"`
// swagger:ignore
// Deprecated
TargetDomain string `json:"target_domain" "yunion:deprecated-by":"target_domain_id"`
TargetDomainId string `json:"target_domain_id" "yunion:deprecated-by":"target_domain"`
// 新建域的时候是否自动新建第一个项目
AutoCreateProject *bool `json:"auto_create_project"`

18
pkg/apis/identity/input.go
View File

@@ -48,22 +48,22 @@ type ProjectFilterListInput struct {
ProjectDomain string `json:"project_domain"`
// swagger:ignore
// Deprecated
ProjectDomainId string `json:"project_domain_id" deprecated-by:"project-domain"`
ProjectDomainId string `json:"project_domain_id" "yunion:deprecated-by":"project-domain"`
// 以项目（ID或Name）过滤列表结果
Project string `json:"project"`
// swagger:ignore
// Deprecated
// filter by project_id
ProjectId string `json:"project_id" deprecated-by:"project"`
ProjectId string `json:"project_id" "yunion:deprecated-by":"project"`
// swagger:ignore
// Deprecated
// filter by tenant
Tenant string `json:"tenant" deprecated-by:"project"`
Tenant string `json:"tenant" "yunion:deprecated-by":"project"`
// swagger:ignore
// Deprecated
// filter by tenant_id
TenantId string `json:"tenant_id" deprecated-by:"project"`
TenantId string `json:"tenant_id" "yunion:deprecated-by":"project"`
}
type UserFilterListInput struct {
@@ -78,7 +78,7 @@ type UserFilterListInput struct {
// swagger:ignore
// Deprecated
// filter by user_id
UserId string `json:"user_id" deprecated-by:"user"`
UserId string `json:"user_id" "yunion:deprecated-by":"user"`
}
type GroupFilterListInput struct {
@@ -93,7 +93,7 @@ type GroupFilterListInput struct {
// swagger:ignore
// Deprecated
// filter by group_id
GroupId string `json:"group_id" deprecated-by:"group"`
GroupId string `json:"group_id" "yunion:deprecated-by":"group"`
}
type RoleFilterListInput struct {
@@ -108,7 +108,7 @@ type RoleFilterListInput struct {
// swagger:ignore
// Deprecated
// filter by role_id
RoleId string `json:"role_id" deprecated-by:"role"`
RoleId string `json:"role_id" "yunion:deprecated-by":"role"`
}
type ServiceFilterListInput struct {
@@ -120,7 +120,7 @@ type ServiceFilterListInput struct {
// swagger:ignore
// Deprecated
// filter by service_id
ServiceId string `json:"service_id" deprecated-by:"service"`
ServiceId string `json:"service_id" "yunion:deprecated-by":"service"`
// 以服务名称排序
OrderByService string `json:"order_by_service"`
@@ -320,7 +320,7 @@ type RegionFilterListInput struct {
Region string `json:"region"`
// swagger:ignore
// Deprecated
RegionId string `json:"region_id" deprecated-by:"region"`
RegionId string `json:"region_id" "yunion:deprecated-by":"region"`
}
type RegionListInput struct {

12
pkg/apis/input.go
View File

@@ -21,15 +21,15 @@ type DomainizedResourceInput struct {
// swagger:ignore
// Deprecated
Domain string `json:"domain" deprecated-by:"project_domain"`
Domain string `json:"domain" "yunion:deprecated-by":"project_domain"`
// swagger:ignore
// Deprecated
// Project domain Id filter, alias for project_domain
ProjectDomainId string `json:"project_domain_id" deprecated-by:"project_domain"`
ProjectDomainId string `json:"project_domain_id" "yunion:deprecated-by":"project_domain"`
// swagger:ignore
// Deprecated
// Domain Id filter, alias for project_domain
DomainId string `json:"domain_id" deprecated-by:"project_domain"`
DomainId string `json:"domain_id" "yunion:deprecated-by":"project_domain"`
}
type ProjectizedResourceInput struct {
@@ -39,15 +39,15 @@ type ProjectizedResourceInput struct {
// swagger:ignore
// Deprecated
// Filter by project_id, alias for project
ProjectId string `json:"project_id" deprecated-by:"project"`
ProjectId string `json:"project_id" "yunion:deprecated-by":"project"`
// swagger:ignore
// Deprecated
// Filter by tenant ID or Name, alias for project
Tenant string `json:"tenant" deprecated-by:"project"`
Tenant string `json:"tenant" "yunion:deprecated-by":"project"`
// swagger:ignore
// Deprecated
// Filter by tenant_id, alias for project
TenantId string `json:"tenant_id" deprecated-by:"project"`
TenantId string `json:"tenant_id" "yunion:deprecated-by":"project"`
}
type DomainizedResourceCreateInput struct {

4
pkg/apis/list.go
View File

@@ -50,7 +50,7 @@ type ProjectizedResourceListInput struct {
OrderByProject string `json:"order_by_project"`
// swagger:ignore
// Deprecated
OrderByTenant string `json:"order_by_tenant" deprecated-by:"order_by_project"`
OrderByTenant string `json:"order_by_tenant" "yunion:deprecated-by":"order_by_project"`
}
type UserResourceListInput struct {
@@ -59,7 +59,7 @@ type UserResourceListInput struct {
// swagger:ignore
// Deprecated
// Filter by userId
UserId string `json:"user_id" deprecated-by:"user"`
UserId string `json:"user_id" "yunion:deprecated-by":"user"`
}
type ModelBaseListInput struct {

4
pkg/apis/output.go
View File

@@ -133,11 +133,11 @@ type ProjectizedResourceInfo struct {
// 资源归属项目的ID(向后兼容别名）
// Deprecated
TenantId string `json:"project_id" deprecated-by:"tenant_id"`
TenantId string `json:"project_id" "yunion:deprecated-by":"tenant_id"`
// 资源归属项目的名称（向后兼容别名）
// Deprecated
Tenant string `json:"project" deprecated-by:"tenant"`
Tenant string `json:"project" "yunion:deprecated-by":"tenant"`
}
type ScopedResourceBaseInfo struct {

4
pkg/apis/yunionconf/input.go
View File

@@ -28,14 +28,14 @@ type ParameterListInput struct {
// Deprecated
// swagger:ignore
ServiceId string `json:"service_id" deprecated-by:"service"`
ServiceId string `json:"service_id" "yunion:deprecated-by":"service"`
// 用户名称或ID
User string `json:"user"`
// Deprecated
// swagger:ignore
UserId string `json:"user_id" deprecated-by:"user"`
UserId string `json:"user_id" "yunion:deprecated-by":"user"`
// filter by name
Name []string `json:"name"`