Merge pull request #1352 from ioito/hotfix/qx-network-sync

avoid duplicate network name
This commit is contained in:
yunion-ci-robot
2019-06-24 12:31:50 +08:00
committed by GitHub
-3
View File
@@ -564,15 +564,12 @@ func (self *SNetwork) SyncWithCloudNetwork(ctx context.Context, userCred mcclien
vpc := self.GetWire().getVpc()
diff, err := db.UpdateWithLock(ctx, self, func() error {
extNet.Refresh()
self.Name = extNet.GetName()
self.Status = extNet.GetStatus()
self.GuestIpStart = extNet.GetIpStart()
self.GuestIpEnd = extNet.GetIpEnd()
self.GuestIpMask = extNet.GetIpMask()
self.GuestGateway = extNet.GetGateway()
self.ServerType = extNet.GetServerType()
// self.IsPublic = extNet.GetIsPublic()
// self.PublicScope = string(extNet.GetPublicScope())
self.AllocTimoutSeconds = extNet.GetAllocTimeoutSeconds()