swap add and remove gateways in hostPool.go

network/gateway/hostPool.go

@@ -314,14 +314,6 @@ func (h *HostPool) updateConns() error {
 		return errors.Errorf("Unable to convert new NDF to set: %+v", err)
 	}
 
-	// Handle removing Gateways
-	for gwId := range h.ndfMap {
-		if _, ok := newMap[gwId]; !ok {
-			// If GwId in ndfMap is not in newMap, remove the Gateway
-			h.removeGateway(gwId.DeepCopy())
-		}
-	}
-
 	// Handle adding Gateways
 	for gwId, ndfIdx := range newMap {
 		if _, ok := h.ndfMap[gwId]; !ok {
@@ -330,6 +322,14 @@ func (h *HostPool) updateConns() error {
 		}
 	}
 
+	// Handle removing Gateways
+	for gwId := range h.ndfMap {
+		if _, ok := newMap[gwId]; !ok {
+			// If GwId in ndfMap is not in newMap, remove the Gateway
+			h.removeGateway(gwId.DeepCopy())
+		}
+	}
+
 	// Update the internal NDF set
 	h.ndfMap = newMap
 	return nil