From 1b2878d69948bbdb98101bbac6701e714d09b42c Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 23 Mar 2021 20:07:44 +0800 Subject: [PATCH] vpcagent: models: annotate guest with guestnetworks --- pkg/vpcagent/models/models.go | 1 + pkg/vpcagent/models/modelset.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/pkg/vpcagent/models/models.go b/pkg/vpcagent/models/models.go index 4224443005..6011fde0bb 100644 --- a/pkg/vpcagent/models/models.go +++ b/pkg/vpcagent/models/models.go @@ -107,6 +107,7 @@ type Guest struct { Host *Host `json:"-"` AdminSecurityGroup *SecurityGroup `json:"-"` SecurityGroups SecurityGroups `json:"-"` + Guestnetworks Guestnetworks `json:"-"` } func (el *Guest) Copy() *Guest { diff --git a/pkg/vpcagent/models/modelset.go b/pkg/vpcagent/models/modelset.go index d3b3d39171..2bc38c7012 100644 --- a/pkg/vpcagent/models/modelset.go +++ b/pkg/vpcagent/models/modelset.go @@ -401,6 +401,11 @@ func (set Guestnetworks) joinGuests(subEntries Guests) bool { continue } gn.Guest = g + if g.Guestnetworks == nil { + g.Guestnetworks = Guestnetworks{} + } + rowIdStr := fmt.Sprintf("%d", gn.RowId) + g.Guestnetworks[rowIdStr] = gn } return true }