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

Merge pull request #5453 from rainzm/fix/format_5433

Browse Source 
fix: Resolve format issues caused by pr#5443
This commit is contained in:
yunion-ci-robot
2020-03-11 17:26:01 +08:00
committed by GitHub
parent f7be83aa23 6dda9d8a3f
commit 0a4171bd6a
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/hostschedtag.go
+1 -1
View File
@@ -25,4 +25,4 @@ type HostschedtagDetails struct {
type HostschedtagListInput struct {
SchedtagJointsListInput
HostFilterListInput
}
}
pkg/compute/models/hostjoints.go
+3 -3
View File
@@ -16,10 +16,10 @@ package models
import (
"context"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
@@ -43,7 +43,7 @@ func NewHostJointsManager(hostIdFieldName string, dt interface{}, tableName stri
slave,
),
SHostResourceBaseManager: SHostResourceBaseManager{
hostIdFieldName:hostIdFieldName,
hostIdFieldName: hostIdFieldName,
},
}
}
pkg/compute/models/hostnetworks.go
+5 -5
View File
@@ -16,10 +16,10 @@ package models
import (
"context"
"yunion.io/x/pkg/errors"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -57,11 +57,11 @@ type SHostnetwork struct {
// 宿主机ID
BaremetalId string `width:"36" charset:"ascii" nullable:"false" list:"admin"`
// 网络ID
NetworkId string `width:"36" charset:"ascii" nullable:"false" list:"admin"`
NetworkId string `width:"36" charset:"ascii" nullable:"false" list:"admin"`
// IP地址
IpAddr string `width:"16" charset:"ascii" list:"admin"`
IpAddr string `width:"16" charset:"ascii" list:"admin"`
// MAC地址
MacAddr string `width:"18" charset:"ascii" list:"admin"`
MacAddr string `width:"18" charset:"ascii" list:"admin"`
}
func (manager *SHostnetworkManager) GetMasterFieldName() string {
@@ -260,4 +260,4 @@ func (manager *SHostnetworkManager) OrderByExtraFields(
}
return q, nil
}
}
pkg/compute/models/hostschedtags.go
+3 -3
View File
@@ -16,11 +16,11 @@ package models
import (
"context"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
@@ -165,4 +165,4 @@ func (manager *SHostschedtagManager) OrderByExtraFields(
}
return q, nil
}
}
pkg/compute/models/hoststorages.go
+1 -1
View File
@@ -368,4 +368,4 @@ func (manager *SHoststorageManager) OrderByExtraFields(
}
return q, nil
}
}
pkg/compute/models/hostwires.go
+2 -2
View File
@@ -16,10 +16,10 @@ package models
import (
"context"
"yunion.io/x/pkg/errors"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -253,4 +253,4 @@ func (manager *SHostwireManager) OrderByExtraFields(
}
return q, nil
}
}
pkg/compute/models/schedtagjoint.go
+3 -3
View File
@@ -17,13 +17,13 @@ package models
import (
"context"
"fmt"
"yunion.io/x/pkg/errors"
"yunion.io/x/sqlchemy"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/reflectutils"
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
"yunion.io/x/onecloud/pkg/apis"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -259,4 +259,4 @@ func (manager *SSchedtagJointsManager) OrderByExtraFields(
}
return q, nil
}
}