CLOUDSTACK-8422: Fixed unable to delete zone from CCP

this closes #202

Author: anshulgangwar

server/src/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -954,7 +954,11 @@ protected void checkIfPodIsDeletable(long podId) {
 
             String selectSql = "SELECT * FROM `" + dbName + "`.`" + tableName + "` WHERE " + column + " = ?";
 
-            if (tableName.equals("host") || tableName.equals("cluster") || tableName.equals("volumes") || tableName.equals("vm_instance")) {
+            if(tableName.equals("vm_instance")) {
+                selectSql += " AND state != '" + VirtualMachine.State.Expunging.toString() + "' AND removed IS NULL";
+            }
+
+            if (tableName.equals("host") || tableName.equals("cluster") || tableName.equals("volumes")) {
                 selectSql += " and removed IS NULL";
             }
 
@@ -1426,7 +1430,7 @@ protected void checkIfZoneIsDeletable(long zoneId) {
             }
 
             if (tableName.equals("vm_instance")) {
-                selectSql += " AND state != '" + VirtualMachine.State.Expunging.toString() + "'";
+                selectSql += " AND state != '" + VirtualMachine.State.Expunging.toString() + "' AND removed IS NULL";
             }
 
             TransactionLegacy txn = TransactionLegacy.currentTxn();