From 64dc5219f7b2c0cec7907cb40313ea9ead385ef0 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Mon, 23 Nov 2020 20:20:35 +0800
Subject: [PATCH 1/2] feat(cloudcommon): db: jointbase: add list:"user" for
 RowId

---
 pkg/cloudcommon/db/jointbase.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cloudcommon/db/jointbase.go b/pkg/cloudcommon/db/jointbase.go
index ed69d7841b..7d8d063d15 100644
--- a/pkg/cloudcommon/db/jointbase.go
+++ b/pkg/cloudcommon/db/jointbase.go
@@ -34,7 +34,7 @@ import (
 type SJointResourceBase struct {
 	SResourceBase
 
-	RowId int64 `primary:"true" auto_increment:"true"`
+	RowId int64 `primary:"true" auto_increment:"true" list:"user"`
 }
 
 type SJointResourceBaseManager struct {

From 9beb3706ed79629789008ac931ed9a033be41bb4 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <zhouyousong@yunionyun.com>
Date: Tue, 24 Nov 2020 21:48:46 +0800
Subject: [PATCH 2/2] fix(vpcagent): models: guestnetworks: accomodate
 change_ipaddr

change_ipaddr does detach, then attach of network.  It's not solely an
update of ipaddr, but a combination of deletion then creation.
---
 pkg/vpcagent/models/modelset.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/vpcagent/models/modelset.go b/pkg/vpcagent/models/modelset.go
index 78d49b9974..163bf45879 100644
--- a/pkg/vpcagent/models/modelset.go
+++ b/pkg/vpcagent/models/modelset.go
@@ -15,6 +15,8 @@
 package models
 
 import (
+	"fmt"
+
 	"yunion.io/x/log"
 
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
@@ -33,7 +35,7 @@ type (
 	SecurityGroupRules map[string]*SecurityGroupRule
 	Elasticips         map[string]*Elasticip
 
-	Guestnetworks  map[string]*Guestnetwork  // key: guestId/ifname
+	Guestnetworks  map[string]*Guestnetwork  // key: rowId
 	Guestsecgroups map[string]*Guestsecgroup // key: guestId/secgroupId
 
 	DnsRecords map[string]*DnsRecord
@@ -332,7 +334,8 @@ func (set Guestnetworks) NewModel() db.IModel {
 
 func (set Guestnetworks) AddModel(i db.IModel) {
 	m := i.(*Guestnetwork)
-	set[m.GuestId+"/"+m.Ifname] = m
+	k := fmt.Sprintf("%d", m.RowId)
+	set[k] = m
 }
 
 func (set Guestnetworks) Copy() apihelper.IModelSet {