From 3caffc7855d702f91a027f2fd9385f43ad992b95 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 10 Jul 2012 14:32:52 -0700 Subject: [PATCH] VPC: CS-15345 - fixed regression in ipRelease happening as a part of cleanupNetworkResources method --- api/src/com/cloud/network/rules/FirewallRule.java | 1 - server/src/com/cloud/network/NetworkManagerImpl.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/com/cloud/network/rules/FirewallRule.java b/api/src/com/cloud/network/rules/FirewallRule.java index 2b57f96a9f1..2fa5b0183f8 100644 --- a/api/src/com/cloud/network/rules/FirewallRule.java +++ b/api/src/com/cloud/network/rules/FirewallRule.java @@ -15,7 +15,6 @@ package com.cloud.network.rules; import java.util.List; import com.cloud.acl.ControlledEntity; -import com.cloud.network.rules.FirewallRule.TrafficType; public interface FirewallRule extends ControlledEntity { enum Purpose { diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index d53a946f8e3..e01ca33ce56 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -6040,9 +6040,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag //release all ip addresses List ipsToRelease = _ipAddressDao.listByAssociatedNetwork(networkId, null); for (IPAddressVO ipToRelease : ipsToRelease) { - if (ipToRelease.getVpcId() != null) { + if (ipToRelease.getVpcId() == null) { IPAddressVO ip = markIpAsUnavailable(ipToRelease.getId()); assert (ip != null) : "Unable to mark the ip address id=" + ipToRelease.getId() + " as unavailable."; + } else { + unassignIPFromVpcNetwork(ipToRelease.getId()); } }