opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1898 from swordqiu/hotfix/qj-networkinterfacenetwork-nil-virtual-object

Browse Source 
fix: networkinterfacenetwork set nil virtual object
This commit is contained in:
yunion-ci-robot
2019-07-25 14:22:08 +08:00
committed by GitHub
parent 90d6adff23 2a0179b8e0
commit e508a0e3c6
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/networkinterfacenetwork.go
+4 -4
View File
@@ -4,15 +4,15 @@ import (
"context"
"fmt"
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/compare"
"yunion.io/x/pkg/util/netutils"
"yunion.io/x/jsonutils"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/compare"
)
type SNetworkinterfacenetworkManager struct {
@@ -33,7 +33,7 @@ func init() {
NetworkManager,
),
}
GuestnetworkManager.SetVirtualObject(GuestnetworkManager)
NetworkinterfacenetworkManager.SetVirtualObject(NetworkinterfacenetworkManager)
})
}
pkg/compute/models/networkinterfaces.go
+4 -3
View File
@@ -19,14 +19,15 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/compare"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/db/lockman"
"yunion.io/x/onecloud/pkg/cloudprovider"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/compare"
"yunion.io/x/sqlchemy"
)
type SNetworkInterfaceManager struct {