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(cloudcommon): unify OS_ARCH constants

Browse Source
This commit is contained in:
Zexi Li
2021-04-15 10:52:34 +08:00
parent 9468493156
commit e82a3deb7e
24 changed files with 97 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/archs.go
+6 -2
View File
@@ -20,7 +20,6 @@ import (
"yunion.io/x/sqlchemy"
"yunion.io/x/onecloud/pkg/apis"
"yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/mcclient"
)
@@ -40,11 +39,16 @@ func (manager *SMultiArchResourceBaseManager) ListItemFilter(
query apis.MultiArchResourceBaseListInput,
) (*sqlchemy.SQuery, error) {
if len(query.OsArch) > 0 {
if query.OsArch == compute.OS_ARCH_X86 {
if query.OsArch == apis.OS_ARCH_X86 {
q = q.Filter(sqlchemy.OR(
sqlchemy.Startswith(q.Field("os_arch"), query.OsArch),
sqlchemy.IsNullOrEmpty(q.Field("os_arch")),
))
} else if query.OsArch == apis.OS_ARCH_ARM {
q = q.Filter(sqlchemy.OR(
sqlchemy.Startswith(q.Field("os_arch"), query.OsArch),
sqlchemy.Equals(q.Field("os_arch"), apis.OS_ARCH_AARCH64),
))
} else {
q = q.Startswith("os_arch", query.OsArch)
}