From 2a0179b8e049b626cae46f66f8f5faf46a03c21d Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Thu, 25 Jul 2019 00:16:25 +0800 Subject: [PATCH] fix: networkinterfacenetwork set nil virtual object --- pkg/compute/models/networkinterfacenetwork.go | 8 ++++---- pkg/compute/models/networkinterfaces.go | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/compute/models/networkinterfacenetwork.go b/pkg/compute/models/networkinterfacenetwork.go index bea082298b..6dbad43269 100644 --- a/pkg/compute/models/networkinterfacenetwork.go +++ b/pkg/compute/models/networkinterfacenetwork.go @@ -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) }) } diff --git a/pkg/compute/models/networkinterfaces.go b/pkg/compute/models/networkinterfaces.go index 4f35aaef01..3e727cf9d4 100644 --- a/pkg/compute/models/networkinterfaces.go +++ b/pkg/compute/models/networkinterfaces.go @@ -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 {