cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sate...@apache.org
Subject [39/50] [abbrv] git commit: updated refs/heads/vmware-storage-motion to 202b103
Date Fri, 24 May 2013 16:28:54 GMT
Cloudstack-2548: Failed to delete public IP range

Public IP range deletion after it is dedicated fails with IP range being
used for DHCP offers.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47a562a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47a562a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47a562a2

Branch: refs/heads/vmware-storage-motion
Commit: 47a562a2c043c32fdf1f3108552cfce170b8b27e
Parents: 09c6030
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Tue May 21 12:21:01 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri May 24 14:28:46 2013 +0530

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java    |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47a562a2/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 47c5482..214e292 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3071,9 +3071,16 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                     }
                 }
 
+            } else {
+                // when there is no dhcp support in the network.
+                if (!deletePublicIPRange(vlanDbId)) {
+                    return false;
+                }
+                _vlanDao.expunge(vlanDbId);
+                return  true;
             }
         }
-       throw new InvalidParameterValueException("One of the ips in the range is used to provide
Dhcp service to this subnet. cannot delete this range as ");
+        return false;
     }
 
 


Mime
View raw message