You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/06/25 16:54:30 UTC
[2/4] git commit: updated refs/heads/master-6-17-stable to 348f0ab
CLOUDSTACK-3155 [VMware] Deletion of zone should not be allowed if VMware DC is still associated with that zone.
Check if there exists any VMware DC already associated with this zone. Deny zone deletion if true.
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34bdd1e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34bdd1e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34bdd1e1
Branch: refs/heads/master-6-17-stable
Commit: 34bdd1e1b3e94d7afff3f9a5b865065a5157158f
Parents: 9deefc2
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Mon Jun 24 12:11:31 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Tue Jun 25 19:50:57 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/configuration/ConfigurationManagerImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34bdd1e1/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 9c5f135..59672ad 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1273,6 +1273,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
physicalNetworks.add(2, "there are physical networks in this zone");
tablesToCheck.add(physicalNetworks);
+ List<String> vmwareDcs = new ArrayList<String>();
+ vmwareDcs.add(0, "vmware_data_center_zone_map");
+ vmwareDcs.add(1, "zone_id");
+ vmwareDcs.add(2, "there are VMware datacenters associated with this zone. Remove VMware DC from this zone.");
+ tablesToCheck.add(vmwareDcs);
+
for (List<String> table : tablesToCheck) {
String tableName = table.get(0);
String column = table.get(1);