vpcagent: fend off non-onecloud-vpc guest nics

yunionio · Apr 26, 2020 · 16ced39 · 16ced39
1 parent c7d5c76
commit 16ced39
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkg/vpcagent/models/modelset.go b/pkg/vpcagent/models/modelset.go
@@ -216,9 +216,11 @@ func (set Guestnetworks) joinGuests(subEntries Guests) bool {
 		gId := gn.GuestId
 		g, ok := subEntries[gId]
 		if !ok {
-			log.Warningf("guestnetwork %d(%s,%s) guest id %s not found",
-				gn.Index, gn.NetworkId, gn.IpAddr, gId)
-			correct = false
+			if gn.Network != nil && gn.Network.Vpc != nil {
+				log.Warningf("guestnetwork %d(net:%s,ip:%s) guest id %s not found",
+					gn.RowId, gn.NetworkId, gn.IpAddr, gId)
+				correct = false
+			}
 			continue
 		}
 		gn.Guest = g