Merge branch 'NET-1440' into NET-1440-batchpeerupdate

logic/nodes.go

@@ -301,6 +301,13 @@ func DeleteNodeByID(node *models.Node) error {
 	if err = DeleteMetrics(node.ID.String()); err != nil {
 		logger.Log(1, "unable to remove metrics from DB for node", node.ID.String(), err.Error())
 	}
+	//recycle ip address
+	if node.Address.IP != nil {
+		ReleaseV4IpForNetwork(node.Network, node.Address.IP)
+	}
+	if node.Address6.IP != nil {
+		ReleaseV6IpForNetwork(node.Network, node.Address6.IP)
+	}
 	return nil
 }
 

logic/zombie.go

@@ -135,8 +135,6 @@ func ManageZombies(ctx context.Context, peerUpdate chan *models.Node) {
 					}
 				}
 			}
-			//reset the ip pool
-			SetIpPool()
 		}
 	}
 }