cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vijayendra...@apache.org
Subject [5/7] CLOUDSTACK-4645: There is no upgrade path from 4.1.1 to 4.2.0
Date Thu, 12 Sep 2013 01:20:11 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11670574/engine/schema/src/com/cloud/upgrade/dao/Upgrade411to420.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade411to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade411to420.java
new file mode 100755
index 0000000..7400664
--- /dev/null
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade411to420.java
@@ -0,0 +1,2954 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package com.cloud.upgrade.dao;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider;
+import org.apache.log4j.Logger;
+
+import com.cloud.deploy.DeploymentPlanner;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
+import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.vpc.NetworkACL;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+
+public class Upgrade411to420 implements DbUpgrade {
+    final static Logger s_logger = Logger.getLogger(Upgrade411to420.class);
+
+
+    @Override
+    public String[] getUpgradableVersionRange() {
+        return new String[] { "4.1.1", "4.2.0" };
+    }
+
+    @Override
+    public String getUpgradedVersion() {
+        return "4.2.0";
+    }
+
+    @Override
+    public boolean supportsRollingUpgrade() {
+        return false;
+    }
+
+    @Override
+    public File[] getPrepareScripts() {
+        String script = Script.findScript("", "db/schema-411to420.sql");
+        if (script == null) {
+            throw new CloudRuntimeException("Unable to find db/schema-411to420.sql");
+        }
+
+        return new File[] { new File(script) };
+    }
+
+    @Override
+    public void performDataMigration(Connection conn) {
+        movePrivateZoneToDedicatedResource(conn);
+        upgradeVmwareLabels(conn);
+        persistLegacyZones(conn);
+        persistVswitchConfiguration(conn);
+        createPlaceHolderNics(conn);
+        updateRemoteAccessVpn(conn);
+        updateSystemVmTemplates(conn);
+        updateCluster_details(conn);
+        updatePrimaryStore(conn);
+        addEgressFwRulesForSRXGuestNw(conn);
+        upgradeEIPNetworkOfferings(conn);
+        updateGlobalDeploymentPlanner(conn);
+        upgradeDefaultVpcOffering(conn);
+        upgradePhysicalNtwksWithInternalLbProvider(conn);
+        updateNetworkACLs(conn);
+        addHostDetailsIndex(conn);
+        updateNetworksForPrivateGateways(conn);
+        correctExternalNetworkDevicesSetup(conn);
+        removeFirewallServiceFromSharedNetworkOfferingWithSGService(conn);
+        fix22xKVMSnapshots(conn);
+        setKVMSnapshotFlag(conn);
+        addIndexForAlert(conn);
+        fixBaremetalForeignKeys(conn);
+        // storage refactor related migration
+        // TODO: add clean-up scripts to delete the deprecated table.
+        migrateSecondaryStorageToImageStore(conn);
+        migrateVolumeHostRef(conn);
+        migrateTemplateHostRef(conn);
+        migrateSnapshotStoreRef(conn);
+        migrateS3ToImageStore(conn);
+        migrateSwiftToImageStore(conn);
+        fixNiciraKeys(conn);
+        fixRouterKeys(conn);
+        updateConcurrentConnectionsInNetworkOfferings(conn);
+        migrateDatafromIsoIdInVolumesTable(conn);
+        setRAWformatForRBDVolumes(conn);
+        migrateVolumeOnSecondaryStorage(conn);
+        createFullCloneFlag(conn);
+    }
+
+    private void createFullCloneFlag(Connection conn) {
+        ResultSet rs = null;
+        PreparedStatement delete = null;
+        PreparedStatement query = null;
+        PreparedStatement update = null;
+        int numRows = 0;
+        try {
+            delete = conn.prepareStatement("delete from `cloud`.`configuration` where name='vmware.create.full.clone';");
+            delete.executeUpdate();
+            query = conn.prepareStatement("select count(*) from `cloud`.`data_center`");
+            rs = query.executeQuery();
+            if (rs.next()) {
+                numRows = rs.getInt(1);
+            }
+            if (numRows > 0) {
+                update = conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'false', 'If set to true, creates VMs as full clones on ESX hypervisor');");
+            } else {
+                update = conn.prepareStatement("insert into `cloud`.`configuration` (`category`, `instance`, `component`, `name`, `value`, `description`) VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'true', 'If set to true, creates VMs as full clones on ESX hypervisor');");
+            }
+            update.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to set global flag vmware.create.full.clone: ", e);
+        } finally {
+            if (update != null) {
+                try {
+                    update.close();
+                } catch (SQLException e) {
+
+                }
+            }
+            if (query != null) {
+                try {
+                    query.close();
+                } catch (SQLException e) {
+
+                }
+            }
+            if (delete != null) {
+                try {
+                    delete.close();
+                } catch (SQLException e) {
+
+                }
+            }
+        }
+    }
+
+    private void migrateVolumeOnSecondaryStorage(Connection conn) {
+        PreparedStatement sql = null;
+        try {
+            sql = conn.prepareStatement("update `cloud`.`volumes` set state='Uploaded' where state='UploadOp'");
+            sql.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to upgrade volume state: ", e);
+        } finally {
+            if (sql != null) {
+                try {
+                    sql.close();
+                } catch (SQLException e) {
+
+                }
+            }
+        }
+    }
+
+    private void persistVswitchConfiguration(Connection conn) {
+        PreparedStatement clustersQuery = null;
+        ResultSet clusters = null;
+        Long clusterId;
+        String clusterHypervisorType;
+        final String NEXUS_GLOBAL_CONFIG_PARAM_NAME = "vmware.use.nexus.vswitch";
+        final String DVS_GLOBAL_CONFIG_PARAM_NAME = "vmware.use.dvswitch";
+        final String VSWITCH_GLOBAL_CONFIG_PARAM_CATEGORY = "Network";
+        final String VMWARE_STANDARD_VSWITCH = "vmwaresvs";
+        final String NEXUS_1000V_DVSWITCH = "nexusdvs";
+        String paramValStr;
+        boolean readGlobalConfigParam = false;
+        boolean nexusEnabled = false;
+        String publicVswitchType = VMWARE_STANDARD_VSWITCH;
+        String guestVswitchType = VMWARE_STANDARD_VSWITCH;
+        String defaultPublicVswitchName = "vSwitch0";
+        String defaultGuestVswitchName = "vSwitch0";
+        String publicVswitchName = null;
+        String guestVswitchName = null;
+        Map<Long, List<Pair<String, String>>> detailsMap = new HashMap<Long, List<Pair<String, String>>>();
+        List<Pair<String, String>> detailsList;
+
+        try {
+            clustersQuery = conn.prepareStatement("select id, hypervisor_type from `cloud`.`cluster` where removed is NULL");
+            clusters = clustersQuery.executeQuery();
+            while(clusters.next()) {
+                clusterHypervisorType = clusters.getString("hypervisor_type");
+                clusterId = clusters.getLong("id");
+                if (clusterHypervisorType.equalsIgnoreCase("VMware")) {
+                    if (!readGlobalConfigParam) {
+                        paramValStr = getConfigurationParameter(conn, VSWITCH_GLOBAL_CONFIG_PARAM_CATEGORY, NEXUS_GLOBAL_CONFIG_PARAM_NAME);
+                        if(paramValStr.equalsIgnoreCase("true")) {
+                            nexusEnabled = true;
+                        }
+                    }
+                    // Set default values if cloud level setting is turned on for nexus 1000v.
+                    if (nexusEnabled) {
+                        publicVswitchType = NEXUS_1000V_DVSWITCH;
+                        guestVswitchType = NEXUS_1000V_DVSWITCH;
+                        defaultPublicVswitchName = "publicEthernetPortProfile";
+                        defaultGuestVswitchName = "guestEthernetPortProfile";
+                    }
+                    // Read zone level settings from zone wide traffic labels for guest traffic and public traffic
+                    guestVswitchName = getDefaultTrafficLabel(conn, TrafficType.Guest.toString());
+                    publicVswitchName = getDefaultTrafficLabel(conn, TrafficType.Public.toString());
+                    if (guestVswitchName == null) {
+                        guestVswitchName = defaultGuestVswitchName;
+                    }
+                    if (publicVswitchName == null) {
+                        publicVswitchName = defaultPublicVswitchName;
+                    }
+                    detailsList = new ArrayList<Pair<String, String>>();
+                    detailsList.add(new Pair<String, String>(ApiConstants.VSWITCH_TYPE_GUEST_TRAFFIC, guestVswitchType));
+                    detailsList.add(new Pair<String, String>(ApiConstants.VSWITCH_NAME_GUEST_TRAFFIC, guestVswitchName));
+                    detailsList.add(new Pair<String, String>(ApiConstants.VSWITCH_TYPE_PUBLIC_TRAFFIC, publicVswitchType));
+                    detailsList.add(new Pair<String, String>(ApiConstants.VSWITCH_NAME_PUBLIC_TRAFFIC, publicVswitchName));
+                    detailsMap.put(clusterId, detailsList);
+
+                    updateClusterDetails(conn, detailsMap);
+                    s_logger.debug("Persist vSwitch Configuration: Successfully persisted vswitch configuration for cluster " + clusterId);
+                } else {
+                    s_logger.debug("Persist vSwitch Configuration: Ignoring cluster " + clusterId + " with hypervisor type " + clusterHypervisorType);
+                    continue;
+                }
+            } // End cluster iteration
+
+            if (nexusEnabled) {
+                // If Nexus global parameter is true, then set DVS configuration parameter to true. TODOS: Document that this mandates that MS need to be restarted.
+                setConfigurationParameter(conn, VSWITCH_GLOBAL_CONFIG_PARAM_CATEGORY, DVS_GLOBAL_CONFIG_PARAM_NAME, "true");
+            }
+        } catch (SQLException e) {
+            String msg = "Unable to persist vswitch configuration of VMware clusters." + e.getMessage();
+            s_logger.error(msg);
+            throw new CloudRuntimeException(msg, e);
+        } finally {
+            try {
+                if (clusters != null) {
+                    clusters.close();
+                }
+                if (clustersQuery != null) {
+                    clustersQuery.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void updateClusterDetails(Connection conn, Map<Long, List<Pair<String, String>>> detailsMap) {
+        PreparedStatement clusterDetailsInsert = null;
+        // Insert cluster details into cloud.cluster_details table for existing VMware clusters
+        // Input parameter detailMap is a map of clusterId and list of key value pairs for that cluster
+        Long clusterId;
+        String key;
+        String val;
+        List<Pair<String, String>> keyValues;
+        try {
+            Iterator<Long> clusterIt = detailsMap.keySet().iterator();
+            while (clusterIt.hasNext()) {
+                clusterId = clusterIt.next();
+                keyValues = detailsMap.get(clusterId);
+                for (Pair<String, String> keyValuePair : keyValues) {
+                    clusterDetailsInsert = conn.prepareStatement("INSERT INTO `cloud`.`cluster_details` (cluster_id, name, value) VALUES (?, ?, ?)");
+                    key = keyValuePair.first();
+                    val = keyValuePair.second();
+                    clusterDetailsInsert.setLong(1, clusterId);
+                    clusterDetailsInsert.setString(2, key);
+                    clusterDetailsInsert.setString(3, val);
+                    clusterDetailsInsert.executeUpdate();
+                }
+                s_logger.debug("Inserted vswitch configuration details into cloud.cluster_details for cluster with id " + clusterId + ".");
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable insert cluster details into cloud.cluster_details table.", e);
+        } finally {
+            try {
+                if (clusterDetailsInsert != null) {
+                    clusterDetailsInsert.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private String getDefaultTrafficLabel(Connection conn, String trafficType) {
+        ResultSet rs = null;
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("select vmware_network_label from physical_network_traffic_types where vmware_network_label is not NULL and traffic_type='" + trafficType + "';");
+            rs = pstmt.executeQuery();
+
+            while (rs.next()) {
+                String label = rs.getString("vmware_network_label");
+                // Handle case of label specified as [vswitch_name,vlan_id]
+                return label.split(",")[0];
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable read default traffic label for " + trafficType + ". ", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+        return null;
+    }
+
+    private String getConfigurationParameter(Connection conn, String category, String paramName) {
+        ResultSet rs = null;
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("select value from `cloud`.`configuration` where category='" + category + "' and value is not NULL and name = '" + paramName + "';");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                return rs.getString("value");
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable read global configuration parameter " + paramName + ". ", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+        return "false";
+    }
+
+    private void setConfigurationParameter(Connection conn, String category, String paramName, String paramVal) {
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = '" + paramVal + "' WHERE name = '" + paramName + "';");
+            s_logger.debug("Updating global configuration parameter " + paramName + " with value " + paramVal + ". Update SQL statement is " + pstmt);
+            pstmt.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to set global configuration parameter " + paramName + " to " + paramVal + ". ", e);
+        } finally {
+            try {
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void movePrivateZoneToDedicatedResource(Connection conn) {
+
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        PreparedStatement pstmtUpdate = null;
+        PreparedStatement pstmt3 = null;
+        ResultSet rs3 = null;
+
+
+        try {
+
+            pstmt3 = conn.prepareStatement("SELECT distinct(`domain_id`) FROM `cloud`.`data_center` WHERE `domain_id` IS NOT NULL AND removed IS NULL");
+            rs3 = pstmt3.executeQuery();
+
+            while (rs3.next()) {
+                long domainId = rs3.getLong(1);
+                long affinityGroupId = 0;
+
+                // create or find an affinity group for this domain of type
+                // 'ExplicitDedication'
+                PreparedStatement pstmt2 = null;
+                ResultSet rs2 = null;
+                pstmt2 = conn
+                        .prepareStatement("SELECT affinity_group.id FROM `cloud`.`affinity_group` INNER JOIN `cloud`.`affinity_group_domain_map` ON affinity_group.id=affinity_group_domain_map.affinity_group_id WHERE affinity_group.type = 'ExplicitDedication' AND affinity_group.acl_type = 'Domain'  AND  (affinity_group_domain_map.domain_id = ?)");
+                pstmt2.setLong(1, domainId);
+                rs2 = pstmt2.executeQuery();
+                if (rs2.next()) {
+                    // group exists, use it
+                    affinityGroupId = rs2.getLong(1);
+                } else {
+                    // create new group
+                    rs2.close();
+                    pstmt2.close();
+
+                    pstmt2 = conn.prepareStatement("SELECT name FROM `cloud`.`domain` where id = ?");
+                    pstmt2.setLong(1, domainId);
+                    rs2 = pstmt2.executeQuery();
+                    String domainName = "";
+                    if (rs2.next()) {
+                        domainName = rs2.getString(1);
+                    }
+                    rs2.close();
+                    pstmt2.close();
+                    // create new domain level group for this domain
+                    String type = "ExplicitDedication";
+                    String uuid = UUID.randomUUID().toString();
+                    String groupName = "DedicatedGrp-domain-" + domainName;
+                    s_logger.debug("Adding AffinityGroup of type " + type + " for domain id " + domainId);
+
+                    String sql = "INSERT INTO `cloud`.`affinity_group` (`name`, `type`, `uuid`, `description`, `domain_id`, `account_id`, `acl_type`) VALUES (?, ?, ?, ?, 1, 1, 'Domain')";
+                    pstmtUpdate = conn.prepareStatement(sql);
+                    pstmtUpdate.setString(1, groupName);
+                    pstmtUpdate.setString(2, type);
+                    pstmtUpdate.setString(3, uuid);
+                    pstmtUpdate.setString(4, "dedicated resources group");
+                    pstmtUpdate.executeUpdate();
+                    pstmtUpdate.close();
+
+                    pstmt2 = conn
+                            .prepareStatement("SELECT affinity_group.id FROM `cloud`.`affinity_group` where uuid = ?");
+                    pstmt2.setString(1, uuid);
+                    rs2 = pstmt2.executeQuery();
+                    if (rs2.next()) {
+                        affinityGroupId = rs2.getLong(1);
+                    }
+
+                    // add the domain map
+                    String sqlMap = "INSERT INTO `cloud`.`affinity_group_domain_map` (`domain_id`, `affinity_group_id`) VALUES (?, ?)";
+                    pstmtUpdate = conn.prepareStatement(sqlMap);
+                    pstmtUpdate.setLong(1, domainId);
+                    pstmtUpdate.setLong(2, affinityGroupId);
+                    pstmtUpdate.executeUpdate();
+                    pstmtUpdate.close();
+
+                }
+
+                rs2.close();
+                pstmt2.close();
+
+                pstmt = conn.prepareStatement("SELECT `id` FROM `cloud`.`data_center` WHERE `domain_id` = ? AND removed IS NULL");
+                pstmt.setLong(1, domainId);
+                rs = pstmt.executeQuery();
+
+                while (rs.next()) {
+                    long zoneId = rs.getLong(1);
+                    dedicateZone(conn, zoneId, domainId, affinityGroupId);
+                }
+            }
+
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Exception while Moving private zone information to dedicated resources", e);
+        } finally {
+            if (pstmtUpdate != null) {
+                try {
+                    pstmtUpdate.close();
+                } catch (SQLException e) {
+                }
+            }
+            if (rs != null) {
+                try {
+                    rs.close();
+                } catch (SQLException e) {
+                }
+            }
+            if (pstmt != null) {
+                try {
+                    pstmt.close();
+                } catch (SQLException e) {
+                }
+            }
+            if (rs3 != null) {
+                try {
+                    rs3.close();
+                } catch (SQLException e) {
+                }
+            }
+            if (pstmt3 != null) {
+                try {
+                    pstmt3.close();
+                } catch (SQLException e) {
+                }
+            }
+
+        }
+    }
+
+    private void dedicateZone(Connection conn, long zoneId, long domainId, long affinityGroupId) {
+        PreparedStatement pstmtUpdate2 = null;
+        try {
+            // create the dedicated resources entry
+            String sql = "INSERT INTO `cloud`.`dedicated_resources` (`uuid`,`data_center_id`, `domain_id`, `affinity_group_id`) VALUES (?, ?, ?, ?)";
+            pstmtUpdate2 = conn.prepareStatement(sql);
+            pstmtUpdate2.setString(1, UUID.randomUUID().toString());
+            pstmtUpdate2.setLong(2, zoneId);
+            pstmtUpdate2.setLong(3, domainId);
+            pstmtUpdate2.setLong(4, affinityGroupId);
+            pstmtUpdate2.executeUpdate();
+            pstmtUpdate2.close();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Exception while saving zone to dedicated resources", e);
+        } finally {
+            if (pstmtUpdate2 != null) {
+                try {
+                    pstmtUpdate2.close();
+                } catch (SQLException e) {
+                }
+            }
+        }
+    }
+
+    private void fixBaremetalForeignKeys(Connection conn) {
+        List<String> keys = new ArrayList<String>();
+        keys.add("fk_external_dhcp_devices_nsp_id");
+        keys.add("fk_external_dhcp_devices_host_id");
+        keys.add("fk_external_dhcp_devices_pod_id");
+        keys.add("fk_external_dhcp_devices_physical_network_id");
+        DbUpgradeUtils.dropKeysIfExist(conn, "baremetal_dhcp_devices", keys, true);
+
+        keys.add("fk_external_pxe_devices_nsp_id");
+        keys.add("fk_external_pxe_devices_host_id");
+        keys.add("fk_external_pxe_devices_physical_network_id");
+        DbUpgradeUtils.dropKeysIfExist(conn, "baremetal_pxe_devices", keys, true);
+
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE");
+            pstmt.executeUpdate();
+            pstmt.close();
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE");
+            pstmt.executeUpdate();
+            pstmt.close();
+            pstmt.close();
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_dhcp_devices` ADD CONSTRAINT `fk_external_dhcp_devices_physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE");
+            pstmt.executeUpdate();
+            pstmt.close();
+            s_logger.debug("Added foreign keys for table baremetal_dhcp_devices");
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to add foreign keys to baremetal_dhcp_devices table", e);
+        }
+
+        try {
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_nsp_id` FOREIGN KEY (`nsp_id`) REFERENCES `physical_network_service_providers` (`id`) ON DELETE CASCADE");
+            pstmt.executeUpdate();
+            pstmt.close();
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE");
+            pstmt.executeUpdate();
+            pstmt.close();
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`baremetal_pxe_devices` ADD CONSTRAINT `fk_external_pxe_devices_physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE");
+            pstmt.executeUpdate();
+            pstmt.close();
+            s_logger.debug("Added foreign keys for table baremetal_pxe_devices");
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to add foreign keys to baremetal_pxe_devices table", e);
+        }
+    }
+
+    private void addIndexForAlert(Connection conn) {
+
+        //First drop if it exists. (Due to patches shipped to customers some will have the index and some wont.)
+        List<String> indexList = new ArrayList<String>();
+        s_logger.debug("Dropping index i_alert__last_sent if it exists");
+        indexList.add("last_sent"); // in 4.1, we created this index that is not in convention.
+        indexList.add("i_alert__last_sent");
+        DbUpgradeUtils.dropKeysIfExist(conn, "alert", indexList, false);
+
+        //Now add index.
+        PreparedStatement pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`alert` ADD INDEX `i_alert__last_sent`(`last_sent`)");
+            pstmt.executeUpdate();
+            s_logger.debug("Added index i_alert__last_sent for table alert");
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to add index i_alert__last_sent to alert table for the column last_sent", e);
+        } finally {
+            try {
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+
+    }
+
+    private void dropUploadTable(Connection conn) {
+
+        PreparedStatement pstmt0 = null;
+        PreparedStatement pstmt1 = null;
+        PreparedStatement pstmt2 = null;
+        PreparedStatement pstmt3 = null;
+
+        ResultSet rs0 = null;
+        ResultSet rs2 = null;
+
+        try {
+            // Read upload table - Templates
+            s_logger.debug("Populating template_store_ref table");
+            pstmt0 = conn.prepareStatement("SELECT url, created, type_id, host_id from upload where type=?");
+            pstmt0.setString(1, "TEMPLATE");
+            rs0 = pstmt0.executeQuery();
+            pstmt1 = conn.prepareStatement("UPDATE template_store_ref SET download_url=?, download_url_created=? where template_id=? and store_id=?");
+
+            //Update template_store_ref
+            while(rs0.next()){
+                pstmt1.setString(1, rs0.getString("url"));
+                pstmt1.setDate(2, rs0.getDate("created"));
+                pstmt1.setLong(3, rs0.getLong("type_id"));
+                pstmt1.setLong(4, rs0.getLong("host_id"));
+                pstmt1.executeUpdate();
+            }
+
+
+
+            // Read upload table - Volumes
+            s_logger.debug("Populating volume store ref table");
+            pstmt2 = conn.prepareStatement("SELECT url, created, type_id, host_id, install_path from upload where type=?");
+            pstmt2.setString(1, "VOLUME");
+            rs2 = pstmt2.executeQuery();
+
+            pstmt3 = conn.prepareStatement("INSERT IGNORE INTO volume_store_ref (volume_id, store_id, zone_id, created, state, download_url, download_url_created, install_path) VALUES (?,?,?,?,?,?,?,?)");
+            //insert into template_store_ref
+            while(rs2.next()){
+                pstmt3.setLong(1, rs2.getLong("type_id"));
+                pstmt3.setLong(2, rs2.getLong("host_id"));
+                pstmt3.setLong(3, 1l);// ???
+                pstmt3.setDate(4, rs2.getDate("created"));
+                pstmt3.setString(5, "Ready");
+                pstmt3.setString(6, rs2.getString("url"));
+                pstmt3.setDate(7, rs2.getDate("created"));
+                pstmt3.setString(8, rs2.getString("install_path"));
+                pstmt3.executeUpdate();
+            }
+
+
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable add date into template/volume store ref from upload table.", e);
+        } finally {
+            try {
+                if (pstmt0 != null) {
+                    pstmt0.close();
+                }
+                if (pstmt1 != null) {
+                    pstmt1.close();
+                }
+                if (pstmt2 != null) {
+                    pstmt2.close();
+                }
+                if (pstmt3 != null) {
+                    pstmt3.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+
+    }
+
+
+    private void updateSystemVmTemplates(Connection conn) {
+        // TODO: system vm template migration after storage refactoring
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        s_logger.debug("Updating System Vm template IDs");
+        try{
+            //Get all hypervisors in use
+            Set<HypervisorType> hypervisorsListInUse = new HashSet<HypervisorType>();
+            try {
+                pstmt = conn.prepareStatement("select distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
+                rs = pstmt.executeQuery();
+                while(rs.next()){
+                    switch (HypervisorType.getType(rs.getString(1))) {
+                    case XenServer: hypervisorsListInUse.add(HypervisorType.XenServer);
+                    break;
+                    case KVM:       hypervisorsListInUse.add(HypervisorType.KVM);
+                    break;
+                    case VMware:    hypervisorsListInUse.add(HypervisorType.VMware);
+                    break;
+                    case Hyperv:    hypervisorsListInUse.add(HypervisorType.Hyperv);
+                    break;
+                    case LXC:       hypervisorsListInUse.add(HypervisorType.LXC);
+                    break;
+                    }
+                }
+            } catch (SQLException e) {
+                throw new CloudRuntimeException("Error while listing hypervisors in use", e);
+            }
+
+            Map<HypervisorType, String> NewTemplateNameList = new HashMap<HypervisorType, String>(){
+                {   put(HypervisorType.XenServer, "systemvm-xenserver-4.2");
+                put(HypervisorType.VMware, "systemvm-vmware-4.2");
+                put(HypervisorType.KVM, "systemvm-kvm-4.2");
+                put(HypervisorType.LXC, "systemvm-lxc-4.2");
+                put(HypervisorType.Hyperv, "systemvm-hyperv-4.2");
+                }
+            };
+
+            Map<HypervisorType, String> routerTemplateConfigurationNames = new HashMap<HypervisorType, String>(){
+                {   put(HypervisorType.XenServer, "router.template.xen");
+                put(HypervisorType.VMware, "router.template.vmware");
+                put(HypervisorType.KVM, "router.template.kvm");
+                put(HypervisorType.LXC, "router.template.lxc");
+                put(HypervisorType.Hyperv, "router.template.hyperv");
+                }
+            };
+
+            Map<HypervisorType, String> newTemplateUrl = new HashMap<HypervisorType, String>(){
+                {   put(HypervisorType.XenServer, "http://download.cloud.com/templates/4.2/systemvmtemplate-2013-07-12-master-xen.vhd.bz2");
+                put(HypervisorType.VMware, "http://download.cloud.com/templates/4.2/systemvmtemplate-4.2-vh7.ova");
+                put(HypervisorType.KVM, "http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-kvm.qcow2.bz2");
+                put(HypervisorType.LXC, "http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2");
+                put(HypervisorType.Hyperv, "http://download.cloud.com/templates/4.2/systemvmtemplate-2013-06-12-master-xen.vhd.bz2");
+                }
+            };
+
+            Map<HypervisorType, String> newTemplateChecksum = new HashMap<HypervisorType, String>(){
+                {   put(HypervisorType.XenServer, "fb1b6e032a160d86f2c28feb5add6d83");
+                put(HypervisorType.VMware, "8fde62b1089e5844a9cd3b9b953f9596");
+                put(HypervisorType.KVM, "6cea42b2633841648040becb588bd8f0");
+                put(HypervisorType.LXC, "2755de1f9ef2ce4d6f2bee2efbb4da92");
+                put(HypervisorType.Hyperv, "fb1b6e032a160d86f2c28feb5add6d83");
+                }
+            };
+
+            for (Map.Entry<HypervisorType, String> hypervisorAndTemplateName : NewTemplateNameList.entrySet()){
+                s_logger.debug("Updating " + hypervisorAndTemplateName.getKey() + " System Vms");
+                try {
+                    //Get 4.2.0 system Vm template Id for corresponding hypervisor
+                    pstmt = conn.prepareStatement("select id from `cloud`.`vm_template` where name = ? and removed is null order by id desc limit 1");
+                    pstmt.setString(1, hypervisorAndTemplateName.getValue());
+                    rs = pstmt.executeQuery();
+                    if(rs.next()){
+                        long templateId = rs.getLong(1);
+                        rs.close();
+                        pstmt.close();
+                        // Mark the old system templates as removed
+                        pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET removed = now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null");
+                        pstmt.setString(1, hypervisorAndTemplateName.getKey().toString());
+                        pstmt.executeUpdate();
+                        pstmt.close();
+                        // change template type to SYSTEM
+                        pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id = ?");
+                        pstmt.setLong(1, templateId);
+                        pstmt.executeUpdate();
+                        pstmt.close();
+                        // update templete ID of system Vms
+                        pstmt = conn.prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ?");
+                        pstmt.setLong(1, templateId);
+                        pstmt.setString(2, hypervisorAndTemplateName.getKey().toString());
+                        pstmt.executeUpdate();
+                        pstmt.close();
+                        // Change value of global configuration parameter router.template.* for the corresponding hypervisor
+                        pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = ?");
+                        pstmt.setString(1, hypervisorAndTemplateName.getValue());
+                        pstmt.setString(2, routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
+                        pstmt.executeUpdate();
+                        pstmt.close();
+                    } else {
+                        if (hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())){
+                            // throw new CloudRuntimeException("4.2.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot upgrade system Vms");
+                        } else {
+                            s_logger.warn("4.2.0 " + hypervisorAndTemplateName.getKey() + " SystemVm template not found. " + hypervisorAndTemplateName.getKey() + " hypervisor is not used, so not failing upgrade");
+                            // Update the latest template URLs for corresponding hypervisor
+                            pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null order by id desc limit 1");
+                            pstmt.setString(1, newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
+                            pstmt.setString(2, newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
+                            pstmt.setString(3, hypervisorAndTemplateName.getKey().toString());
+                            pstmt.executeUpdate();
+                            pstmt.close();
+                        }
+                    }
+                } catch (SQLException e) {
+                    throw new CloudRuntimeException("Error while updating "+ hypervisorAndTemplateName.getKey() +" systemVm template", e);
+                }
+            }
+            try {
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` set dynamically_scalable = 1 where name = ? and type = 'SYSTEM'");
+                pstmt.setString(1, NewTemplateNameList.get(HypervisorType.VMware));
+                pstmt.executeUpdate();
+                pstmt.close();
+            } catch (SQLException e) {
+                throw new CloudRuntimeException("Error while updating dynamically_scalable flag to 1 for SYSTEM template systemvm-vmware-4.2");
+            }
+            s_logger.debug("Updating System Vm Template IDs Complete");
+        }
+        finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+        /*
+        pstmt = null;
+        try {
+            pstmt = conn.prepareStatement("update vm_template set image_data_store_id = 1 where type = 'SYSTEM' or type = 'BUILTIN'");
+            pstmt.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to upgrade vm template data store uuid: " + e.toString());
+        } finally {
+            if (pstmt != null) {
+                try {
+                    pstmt.close();
+                } catch (SQLException e) {
+                }
+            }
+        }
+         */
+    }
+
+    //KVM snapshot flag: only turn on if Customers is using snapshot;
+    private void setKVMSnapshotFlag(Connection conn) {
+        s_logger.debug("Verify and set the KVM snapshot flag if snapshot was used. ");
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            int numRows = 0;
+            pstmt = conn.prepareStatement("select count(*) from `cloud`.`snapshots` where hypervisor_type = 'KVM'");
+            rs = pstmt.executeQuery();
+            if(rs.next()){
+                numRows = rs.getInt(1);
+            }
+            rs.close();
+            pstmt.close();
+            if (numRows > 0){
+                //Add the configuration flag
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name = 'kvm.snapshot.enabled'");
+                pstmt.setString(1, "true");
+                pstmt.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to read the snapshot table for KVM upgrade. ", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+        s_logger.debug("Done set KVM snapshot flag. ");
+    }
+
+    private void updatePrimaryStore(Connection conn) {
+        PreparedStatement sql = null;
+        PreparedStatement sql2 = null;
+        try {
+            sql = conn.prepareStatement("update storage_pool set storage_provider_name = ? , scope = ? where pool_type = 'Filesystem' or pool_type = 'LVM'");
+            sql.setString(1, DataStoreProvider.DEFAULT_PRIMARY);
+            sql.setString(2, "HOST");
+            sql.executeUpdate();
+
+            sql2 = conn.prepareStatement("update storage_pool set storage_provider_name = ? , scope = ? where pool_type != 'Filesystem' and pool_type != 'LVM'");
+            sql2.setString(1, DataStoreProvider.DEFAULT_PRIMARY);
+            sql2.setString(2, "CLUSTER");
+            sql2.executeUpdate();
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to upgrade vm template data store uuid: " + e.toString());
+        } finally {
+            if (sql != null) {
+                try {
+                    sql.close();
+                } catch (SQLException e) {
+                }
+            }
+
+            if (sql2 != null) {
+                try {
+                    sql2.close();
+                } catch (SQLException e) {
+                }
+            }
+        }
+    }
+
+    //update the cluster_details table with default overcommit ratios.
+    private void updateCluster_details(Connection conn) {
+        PreparedStatement pstmt = null;
+        PreparedStatement pstmt1 = null;
+        PreparedStatement pstmt2 =null;
+        PreparedStatement pstmt3 = null;
+        ResultSet rs1 = null;
+        ResultSet rscpu_global = null;
+        ResultSet rsmem_global = null;
+        try {
+            pstmt = conn.prepareStatement("select id, hypervisor_type from `cloud`.`cluster`");
+            pstmt1=conn.prepareStatement("INSERT INTO `cloud`.`cluster_details` (cluster_id, name, value)  VALUES(?, 'cpuOvercommitRatio', ?)");
+            pstmt2=conn.prepareStatement("INSERT INTO `cloud`.`cluster_details` (cluster_id, name, value)  VALUES(?, 'memoryOvercommitRatio', ?)");
+            pstmt3=conn.prepareStatement("select value from `cloud`.`configuration` where name=?");
+            pstmt3.setString(1,"cpu.overprovisioning.factor");
+            rscpu_global = pstmt3.executeQuery();
+            String global_cpu_overprovisioning_factor = "1";
+            if (rscpu_global.next())
+                global_cpu_overprovisioning_factor = rscpu_global.getString(1);
+            pstmt3.setString(1,"mem.overprovisioning.factor");
+            rsmem_global = pstmt3.executeQuery();
+            String global_mem_overprovisioning_factor = "1";
+            if (rsmem_global.next())
+                global_mem_overprovisioning_factor = rsmem_global.getString(1);
+            rs1 = pstmt.executeQuery();
+
+            while (rs1.next()) {
+                long id = rs1.getLong(1);
+                String hypervisor_type = rs1.getString(2);
+                if (hypervisor_type.equalsIgnoreCase(HypervisorType.VMware.toString())) {
+                    pstmt1.setLong(1,id);
+                    pstmt1.setString(2,global_cpu_overprovisioning_factor);
+                    pstmt1.execute();
+                    pstmt2.setLong(1,id);
+                    pstmt2.setString(2,global_mem_overprovisioning_factor);
+                    pstmt2.execute();
+                }else {
+                    //update cluster_details table with the default overcommit ratios.
+                    pstmt1.setLong(1,id);
+                    pstmt1.setString(2,"1");
+                    pstmt1.execute();
+                    pstmt2.setLong(1,id);
+                    pstmt2.setString(2,"1");
+                    pstmt2.execute();
+                }
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to update cluster_details with default overcommit ratios.", e);
+        } finally {
+            try {
+                if (rs1 != null) {
+                    rs1.close();
+                }
+                if (rsmem_global != null) {
+                    rsmem_global.close();
+                }
+                if (rscpu_global != null) {
+                    rscpu_global.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+                if (pstmt2 != null) {
+                    pstmt2.close();
+                }
+                if (pstmt3 != null) {
+                    pstmt3.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+
+    @Override
+    public File[] getCleanupScripts() {
+        String script = Script.findScript("", "db/schema-411to420-cleanup.sql");
+        if (script == null) {
+            throw new CloudRuntimeException("Unable to find db/schema-411to420-cleanup.sql");
+        }
+
+        return new File[] { new File(script) };
+    }
+
+    private String getNewLabel(ResultSet rs, String oldParamValue) {
+        int separatorIndex;
+        String oldGuestLabel;
+        String newGuestLabel = oldParamValue;
+        try {
+            // No need to iterate because the global param setting applies to all physical networks irrespective of traffic type
+            if (rs.next()) {
+                oldGuestLabel = rs.getString("vmware_network_label");
+                // guestLabel is in format [[<VSWITCHNAME>],VLANID]
+                separatorIndex = oldGuestLabel.indexOf(",");
+                if(separatorIndex > -1) {
+                    newGuestLabel += oldGuestLabel.substring(separatorIndex);
+                }
+            }
+        } catch (SQLException e) {
+            s_logger.error(new CloudRuntimeException("Failed to read vmware_network_label : " + e));
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+        return newGuestLabel;
+    }
+
+    private void upgradeVmwareLabels(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rsParams = null;
+        ResultSet rsLabel = null;
+        String newLabel;
+        String trafficType = null;
+        String trafficTypeVswitchParam;
+        String trafficTypeVswitchParamValue;
+
+        try {
+            // update the existing vmware traffic labels
+            pstmt = conn.prepareStatement("select name,value from `cloud`.`configuration` where category='Hidden' and value is not NULL and name REGEXP 'vmware*.vswitch';");
+            rsParams = pstmt.executeQuery();
+            while (rsParams.next()) {
+                trafficTypeVswitchParam = rsParams.getString("name");
+                trafficTypeVswitchParamValue = rsParams.getString("value");
+                // When upgraded from 4.0 to 4.1 update physical network traffic label with trafficTypeVswitchParam
+                if (trafficTypeVswitchParam.equals("vmware.private.vswitch")) {
+                    trafficType = "Management"; //TODO(sateesh): Ignore storage traffic, as required physical network already implemented, anything else tobe done?
+                } else if (trafficTypeVswitchParam.equals("vmware.public.vswitch")) {
+                    trafficType = "Public";
+                } else if (trafficTypeVswitchParam.equals("vmware.guest.vswitch")) {
+                    trafficType = "Guest";
+                }
+                pstmt = conn.prepareStatement("select physical_network_id, traffic_type, vmware_network_label from physical_network_traffic_types where vmware_network_label is not NULL and traffic_type='" + trafficType + "';");
+                rsLabel = pstmt.executeQuery();
+                newLabel = getNewLabel(rsLabel, trafficTypeVswitchParamValue);
+                pstmt = conn.prepareStatement("update physical_network_traffic_types set vmware_network_label = " + newLabel + " where traffic_type = '" + trafficType + "' and vmware_network_label is not NULL;");
+                s_logger.debug("Updating vmware label for " + trafficType + " traffic. Update SQL statement is " + pstmt);
+                pstmt.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to set vmware traffic labels ", e);
+        } finally {
+            try {
+                if (rsParams != null) {
+                    rsParams.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void persistLegacyZones(Connection conn) {
+        List<Long> listOfLegacyZones = new ArrayList<Long>();
+        PreparedStatement pstmt = null;
+        PreparedStatement clustersQuery = null;
+        PreparedStatement clusterDetailsQuery = null;
+        ResultSet rs = null;
+        ResultSet clusters = null;
+        ResultSet clusterDetails = null;
+        ResultSet dcInfo = null;
+        Long vmwareDcId = 1L;
+        Long zoneId;
+        Long clusterId;
+        boolean legacyZone;
+        boolean ignoreZone;
+        Long count;
+        String dcOfPreviousCluster = null;
+        String dcOfCurrentCluster = null;
+        String[] tokens;
+        String url;
+        String user = "";
+        String password = "";
+        String vc = "";
+        String dcName = "";
+        String guid;
+        String key;
+        String value;
+
+        try {
+            pstmt = conn.prepareStatement("select id from `cloud`.`data_center` where removed is NULL");
+            rs = pstmt.executeQuery();
+
+            while (rs.next()) {
+                zoneId = rs.getLong("id");
+                clustersQuery = conn.prepareStatement("select id from `cloud`.`cluster` where removed is NULL AND data_center_id=? AND hypervisor_type='VMware'");
+                clustersQuery.setLong(1, zoneId);
+                legacyZone = false;
+                ignoreZone = true;
+                count = 0L;
+                // Legacy zone term is meant only for VMware
+                // Legacy zone is a zone with atleast 2 clusters & with multiple DCs or VCs
+                clusters = clustersQuery.executeQuery();
+                if (!clusters.next()) {
+                    continue; // Ignore the zone without any clusters
+                } else {
+                    dcOfPreviousCluster = null;
+                    dcOfCurrentCluster = null;
+                    do {
+                        clusterId = clusters.getLong("id");
+                        ignoreZone = false;
+                        clusterDetailsQuery = conn.prepareStatement("select value from `cloud`.`cluster_details` where name='url' and cluster_id=?");
+                        clusterDetailsQuery.setLong(1, clusterId);
+                        clusterDetails = clusterDetailsQuery.executeQuery();
+                        clusterDetails.next();
+                        url = clusterDetails.getString("value");
+                        tokens = url.split("/"); // url format - http://vcenter/dc/cluster
+                        vc = tokens[2];
+                        dcName = tokens[3];
+                        dcOfPreviousCluster = dcOfCurrentCluster;
+                        dcOfCurrentCluster = dcName + "@" + vc;
+                        if (count > 0) {
+                            if (!dcOfPreviousCluster.equalsIgnoreCase(dcOfCurrentCluster)) {
+                                legacyZone = true;
+                                s_logger.debug("Marking the zone " + zoneId + " as legacy zone.");
+                            }
+                        }
+                        count++;
+                    } while (clusters.next());
+
+                    // Ignore the zone without even one VMware cluster.
+                    if (ignoreZone) {
+                        continue;
+                    }
+                }
+                if (legacyZone) {
+                    listOfLegacyZones.add(zoneId);
+                } else {
+                    // Associate DC with the zone.
+                    assert(clusterDetails != null) : "Couldn't retrieve details of cluster!";
+                    s_logger.debug("Discovered non-legacy zone " + zoneId + ". Processing the zone to associate with VMware datacenter.");
+
+                    clusterDetailsQuery = conn.prepareStatement("select name, value from `cloud`.`cluster_details` where cluster_id=?");
+                    clusterDetailsQuery.setLong(1, clusterId);
+                    clusterDetails = clusterDetailsQuery.executeQuery();
+                    while (clusterDetails.next()) {
+                        key = clusterDetails.getString(1);
+                        value = clusterDetails.getString(2);
+                        if (key.equalsIgnoreCase("username")) {
+                            user = value;
+                        } else if (key.equalsIgnoreCase("password")) {
+                            password = value;
+                        }
+                    }
+                    guid = dcName + "@" + vc;
+
+                    pstmt = conn.prepareStatement("INSERT INTO `cloud`.`vmware_data_center` (uuid, name, guid, vcenter_host, username, password) values(?, ?, ?, ?, ?, ?)");
+                    pstmt.setString(1, UUID.randomUUID().toString());
+                    pstmt.setString(2, dcName);
+                    pstmt.setString(3, guid);
+                    pstmt.setString(4, vc);
+                    pstmt.setString(5, user);
+                    pstmt.setString(6, password);
+                    pstmt.executeUpdate();
+
+                    pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`vmware_data_center` where guid=?");
+                    pstmt.setString(1, guid);
+                    dcInfo = pstmt.executeQuery();
+                    if(dcInfo.next()) {
+                        vmwareDcId = dcInfo.getLong("id");
+                    }
+
+                    pstmt = conn.prepareStatement("INSERT INTO `cloud`.`vmware_data_center_zone_map` (zone_id, vmware_data_center_id) values(?, ?)");
+                    pstmt.setLong(1, zoneId);
+                    pstmt.setLong(2, vmwareDcId);
+                    pstmt.executeUpdate();
+                }
+            }
+            updateLegacyZones(conn, listOfLegacyZones);
+        } catch (SQLException e) {
+            String msg = "Unable to discover legacy zones." + e.getMessage();
+            s_logger.error(msg);
+            throw new CloudRuntimeException(msg, e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+                if (dcInfo != null) {
+                    dcInfo.close();
+                }
+                if (clusters != null) {
+                    clusters.close();
+                }
+                if (clusterDetails != null) {
+                    clusterDetails.close();
+                }
+                if (clustersQuery != null) {
+                    clustersQuery.close();
+                }
+                if (clusterDetailsQuery != null) {
+                    clusterDetailsQuery.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void updateLegacyZones(Connection conn, List<Long> zones) {
+        PreparedStatement legacyZonesQuery = null;
+        //Insert legacy zones into table for legacy zones.
+        try {
+            legacyZonesQuery = conn.prepareStatement("INSERT INTO `cloud`.`legacy_zones` (zone_id) VALUES (?)");
+            for(Long zoneId : zones) {
+                legacyZonesQuery.setLong(1, zoneId);
+                legacyZonesQuery.executeUpdate();
+                s_logger.debug("Inserted zone " + zoneId + " into cloud.legacyzones table");
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable add zones to cloud.legacyzones table.", e);
+        } finally {
+            try {
+                if (legacyZonesQuery != null) {
+                    legacyZonesQuery.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void createPlaceHolderNics(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn.prepareStatement("SELECT network_id, gateway, ip4_address FROM `cloud`.`nics` WHERE reserver_name IN ('DirectNetworkGuru','DirectPodBasedNetworkGuru') and vm_type='DomainRouter' AND removed IS null");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                Long networkId = rs.getLong(1);
+                String gateway = rs.getString(2);
+                String ip = rs.getString(3);
+                String uuid = UUID.randomUUID().toString();
+                //Insert placeholder nic for each Domain router nic in Shared network
+                pstmt = conn.prepareStatement("INSERT INTO `cloud`.`nics` (uuid, ip4_address, gateway, network_id, state, strategy, vm_type, default_nic, created) VALUES (?, ?, ?, ?, 'Reserved', 'PlaceHolder', 'DomainRouter', 0, now())");
+                pstmt.setString(1, uuid);
+                pstmt.setString(2, ip);
+                pstmt.setString(3, gateway);
+                pstmt.setLong(4, networkId);
+                pstmt.executeUpdate();
+                s_logger.debug("Created placeholder nic for the ipAddress " + ip + " and network " + networkId);
+
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to create placeholder nics", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+
+    private void updateRemoteAccessVpn(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn.prepareStatement("SELECT vpn_server_addr_id FROM `cloud`.`remote_access_vpn`");
+            rs = pstmt.executeQuery();
+            long id=1;
+            while (rs.next()) {
+                String uuid = UUID.randomUUID().toString();
+                Long ipId = rs.getLong(1);
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`remote_access_vpn` set uuid=?, id=? where vpn_server_addr_id=?");
+                pstmt.setString(1, uuid);
+                pstmt.setLong(2, id);
+                pstmt.setLong(3, ipId);
+                pstmt.executeUpdate();
+                id++;
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to update id/uuid of remote_access_vpn table", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void addEgressFwRulesForSRXGuestNw(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        ResultSet rsId = null;
+        ResultSet rsNw = null;
+        try {
+            pstmt = conn.prepareStatement("select network_id FROM `cloud`.`ntwk_service_map` where service='Firewall' and provider='JuniperSRX' ");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                long netId = rs.getLong(1);
+                //checking for Isolated OR Virtual
+                pstmt = conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? ");
+                pstmt.setLong(1, netId);
+                s_logger.debug("Getting account_id, domain_id from networks table: " + pstmt);
+                rsNw = pstmt.executeQuery();
+
+                if(rsNw.next()) {
+                    long accountId = rsNw.getLong(1);
+                    long domainId = rsNw.getLong(2);
+
+                    //Add new rule for the existing networks
+                    s_logger.debug("Adding default egress firewall rule for network " + netId);
+                    pstmt = conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created,  traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')");
+                    pstmt.setString(1, UUID.randomUUID().toString());
+                    pstmt.setLong(2, accountId);
+                    pstmt.setLong(3, domainId);
+                    pstmt.setLong(4, netId);
+                    pstmt.setString(5, UUID.randomUUID().toString());
+                    s_logger.debug("Inserting default egress firewall rule " + pstmt);
+                    pstmt.executeUpdate();
+
+                    pstmt = conn.prepareStatement("select id from firewall_rules where protocol='all' and network_id=?");
+                    pstmt.setLong(1, netId);
+                    rsId = pstmt.executeQuery();
+
+                    long firewallRuleId;
+                    if(rsId.next()) {
+                        firewallRuleId = rsId.getLong(1);
+                        pstmt = conn.prepareStatement("insert into firewall_rules_cidrs (firewall_rule_id,source_cidr) values (?, '0.0.0.0/0')");
+                        pstmt.setLong(1, firewallRuleId);
+                        s_logger.debug("Inserting rule for cidr 0.0.0.0/0 for the new Firewall rule id=" + firewallRuleId + " with statement " + pstmt);
+                        pstmt.executeUpdate();
+                    }
+                }
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to set egress firewall rules ", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void upgradeEIPNetworkOfferings(Connection conn) {
+
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn.prepareStatement("select id, elastic_ip_service from `cloud`.`network_offerings` where traffic_type='Guest'");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                long id = rs.getLong(1);
+                // check if elastic IP service is enabled for network offering
+                if (rs.getLong(2) != 0) {
+                    //update network offering with eip_associate_public_ip set to true
+                    pstmt = conn.prepareStatement("UPDATE `cloud`.`network_offerings` set eip_associate_public_ip=? where id=?");
+                    pstmt.setBoolean(1, true);
+                    pstmt.setLong(2, id);
+                    pstmt.executeUpdate();
+                }
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to set elastic_ip_service for network offerings with EIP service enabled.", e);
+        }
+    }
+
+    private void updateNetworkACLs(Connection conn) {
+        //Fetch all VPC Tiers
+        //For each tier create a network ACL and move all the acl_items to network_acl_item table
+        // If there are no acl_items for a tier, associate it with default ACL
+
+        s_logger.debug("Updating network ACLs");
+
+        PreparedStatement pstmt = null;
+        PreparedStatement pstmtDelete = null;
+        ResultSet rs = null;
+        ResultSet rsAcls = null;
+        ResultSet rsCidr = null;
+
+        //1,2 are default acl Ids, start acl Ids from 3
+        long nextAclId = 3;
+
+        try {
+            //Get all VPC tiers
+            pstmt = conn.prepareStatement("SELECT id, vpc_id, uuid FROM `cloud`.`networks` where vpc_id is not null and removed is null");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                Long networkId = rs.getLong(1);
+                s_logger.debug("Updating network ACLs for network: "+networkId);
+                Long vpcId = rs.getLong(2);
+                String tierUuid = rs.getString(3);
+                pstmt = conn.prepareStatement("SELECT id, uuid, start_port, end_port, state, protocol, icmp_code, icmp_type, created, traffic_type FROM `cloud`.`firewall_rules` where network_id = ? and purpose = 'NetworkACL'");
+                pstmt.setLong(1, networkId);
+                rsAcls = pstmt.executeQuery();
+                boolean hasAcls = false;
+                Long aclId = null;
+                int number = 1;
+                while(rsAcls.next()){
+                    if(!hasAcls){
+                        hasAcls = true;
+                        aclId = nextAclId++;
+                        //create ACL for the tier
+                        s_logger.debug("Creating network ACL for tier: "+tierUuid);
+                        pstmt = conn.prepareStatement("INSERT INTO `cloud`.`network_acl` (id, uuid, vpc_id, description, name) values (?, UUID(), ? , ?, ?)");
+                        pstmt.setLong(1, aclId);
+                        pstmt.setLong(2, vpcId);
+                        pstmt.setString(3, "ACL for tier " + tierUuid);
+                        pstmt.setString(4, "tier_" + tierUuid);
+                        pstmt.executeUpdate();
+                    }
+
+                    Long fwRuleId = rsAcls.getLong(1);
+                    String cidr = null;
+                    //get cidr from firewall_rules_cidrs
+                    pstmt = conn.prepareStatement("SELECT id, source_cidr FROM `cloud`.`firewall_rules_cidrs` where firewall_rule_id = ?");
+                    pstmt.setLong(1, fwRuleId);
+                    rsCidr = pstmt.executeQuery();
+                    while(rsCidr.next()){
+                        Long cidrId = rsCidr.getLong(1);
+                        String sourceCidr = rsCidr.getString(2);
+                        if(cidr == null){
+                            cidr = sourceCidr;
+                        } else {
+                            cidr += ","+sourceCidr;
+                        }
+                        //Delete cidr entry
+                        pstmtDelete = conn.prepareStatement("DELETE FROM `cloud`.`firewall_rules_cidrs` where id = ?");
+                        pstmtDelete.setLong(1, cidrId);
+                        pstmtDelete.executeUpdate();
+                    }
+
+
+                    String aclItemUuid = rsAcls.getString(2);
+                    //Move acl to network_acl_item table
+                    s_logger.debug("Moving firewall rule: "+aclItemUuid);
+                    pstmt = conn.prepareStatement("INSERT INTO `cloud`.`network_acl_item` (uuid, acl_id, start_port, end_port, state, protocol, icmp_code, icmp_type, created, traffic_type, cidr, number, action) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
+                    //uuid
+                    pstmt.setString(1, aclItemUuid);
+                    //aclId
+                    pstmt.setLong(2, aclId);
+                    //Start port
+                    Integer startPort = rsAcls.getInt(3);
+                    if(rsAcls.wasNull()){
+                        pstmt.setNull(3, Types.INTEGER);
+                    } else {
+                        pstmt.setLong(3, startPort);
+                    }
+                    //End port
+                    Integer endPort = rsAcls.getInt(4);
+                    if(rsAcls.wasNull()){
+                        pstmt.setNull(4, Types.INTEGER);
+                    } else {
+                        pstmt.setLong(4, endPort);
+                    }
+                    //State
+                    String state = rsAcls.getString(5);
+                    pstmt.setString(5, state);
+                    //protocol
+                    String protocol = rsAcls.getString(6);
+                    pstmt.setString(6, protocol);
+                    //icmp_code
+                    Integer icmpCode = rsAcls.getInt(7);
+                    if(rsAcls.wasNull()){
+                        pstmt.setNull(7, Types.INTEGER);
+                    } else {
+                        pstmt.setLong(7, icmpCode);
+                    }
+
+                    //icmp_type
+                    Integer icmpType = rsAcls.getInt(8);
+                    if(rsAcls.wasNull()){
+                        pstmt.setNull(8, Types.INTEGER);
+                    } else {
+                        pstmt.setLong(8, icmpType);
+                    }
+
+                    //created
+                    Date created = rsAcls.getDate(9);
+                    pstmt.setDate(9, created);
+                    //traffic type
+                    String trafficType = rsAcls.getString(10);
+                    pstmt.setString(10, trafficType);
+
+                    //cidr
+                    pstmt.setString(11, cidr);
+                    //number
+                    pstmt.setInt(12, number++);
+                    //action
+                    pstmt.setString(13, "Allow");
+                    pstmt.executeUpdate();
+
+                    //Delete firewall rule
+                    pstmtDelete = conn.prepareStatement("DELETE FROM `cloud`.`firewall_rules` where id = ?");
+                    pstmtDelete.setLong(1, fwRuleId);
+                    pstmtDelete.executeUpdate();
+                }
+                if(!hasAcls){
+                    //no network ACls for this network.
+                    // Assign default Deny ACL
+                    aclId = NetworkACL.DEFAULT_DENY;
+                }
+                //Assign acl to network
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`networks` set network_acl_id=? where id=?");
+                pstmt.setLong(1, aclId);
+                pstmt.setLong(2, networkId);
+                pstmt.executeUpdate();
+            }
+            s_logger.debug("Done updating network ACLs ");
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to move network acls from firewall rules table to network_acl_item table", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (rsAcls != null) {
+                    rsAcls.close();
+                }
+                if (rsCidr != null) {
+                    rsCidr.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void updateGlobalDeploymentPlanner(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn
+                    .prepareStatement("select value from `cloud`.`configuration` where name = 'vm.allocation.algorithm'");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                String globalValue = rs.getString(1);
+                String plannerName = "FirstFitPlanner";
+
+                if (globalValue != null) {
+                    if (globalValue.equals(DeploymentPlanner.AllocationAlgorithm.random.toString())) {
+                        plannerName = "FirstFitPlanner";
+                    } else if (globalValue.equals(DeploymentPlanner.AllocationAlgorithm.firstfit.toString())) {
+                        plannerName = "FirstFitPlanner";
+                    } else if (globalValue.equals(DeploymentPlanner.AllocationAlgorithm.userconcentratedpod_firstfit
+                            .toString())) {
+                        plannerName = "UserConcentratedPodPlanner";
+                    } else if (globalValue.equals(DeploymentPlanner.AllocationAlgorithm.userconcentratedpod_random
+                            .toString())) {
+                        plannerName = "UserConcentratedPodPlanner";
+                    } else if (globalValue.equals(DeploymentPlanner.AllocationAlgorithm.userdispersing.toString())) {
+                        plannerName = "UserDispersingPlanner";
+                    }
+                }
+                // update vm.deployment.planner global config
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`configuration` set value=? where name = 'vm.deployment.planner'");
+                pstmt.setString(1, plannerName);
+                pstmt.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to set vm.deployment.planner global config", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+
+    private void upgradeDefaultVpcOffering(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn.prepareStatement("select distinct map.vpc_offering_id from `cloud`.`vpc_offering_service_map` map, `cloud`.`vpc_offerings` off where off.id=map.vpc_offering_id AND service='Lb'");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                long id = rs.getLong(1);
+                //Add internal LB vm as a supported provider for the load balancer service
+                pstmt = conn.prepareStatement("INSERT INTO `cloud`.`vpc_offering_service_map` (vpc_offering_id, service, provider) VALUES (?,?,?)");
+                pstmt.setLong(1, id);
+                pstmt.setString(2, "Lb");
+                pstmt.setString(3, "InternalLbVm");
+                pstmt.executeUpdate();
+            }
+
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable update the default VPC offering with the internal lb service", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void upgradePhysicalNtwksWithInternalLbProvider(Connection conn) {
+
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network` where removed is null");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                long pNtwkId = rs.getLong(1);
+                String uuid = UUID.randomUUID().toString();
+                //Add internal LB VM to the list of physical network service providers
+                pstmt = conn.prepareStatement("INSERT INTO `cloud`.`physical_network_service_providers` " +
+                        "(uuid, physical_network_id, provider_name, state, load_balance_service_provided, destination_physical_network_id)" +
+                        " VALUES (?, ?, 'InternalLbVm', 'Enabled', 1, 0)");
+                pstmt.setString(1, uuid);
+                pstmt.setLong(2, pNtwkId);
+                pstmt.executeUpdate();
+
+                //Add internal lb vm to the list of physical network elements
+                PreparedStatement pstmt1 = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network_service_providers`" +
+                        " WHERE physical_network_id=? AND provider_name='InternalLbVm'");
+                pstmt1.setLong(1, pNtwkId);
+                ResultSet rs1 = pstmt1.executeQuery();
+                while (rs1.next()) {
+                    long providerId = rs1.getLong(1);
+                    uuid = UUID.randomUUID().toString();
+                    pstmt1 = conn.prepareStatement("INSERT INTO `cloud`.`virtual_router_providers` (nsp_id, uuid, type, enabled) VALUES (?, ?, 'InternalLbVm', 1)");
+                    pstmt1.setLong(1, providerId);
+                    pstmt1.setString(2, uuid);
+                    pstmt1.executeUpdate();
+                }
+            }
+
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to update existing physical networks with internal lb provider", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void addHostDetailsIndex(Connection conn) {
+        s_logger.debug("Checking if host_details index exists, if not we will add it");
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        try {
+            pstmt = conn.prepareStatement("SHOW INDEX FROM `cloud`.`host_details` where KEY_NAME = 'fk_host_details__host_id'");
+            rs = pstmt.executeQuery();
+            if (rs.next()) {
+                s_logger.debug("Index already exists on host_details - not adding new one");
+            } else {
+                // add the index
+                PreparedStatement pstmtUpdate = conn.prepareStatement("ALTER IGNORE TABLE `cloud`.`host_details` ADD INDEX `fk_host_details__host_id` (`host_id`)");
+                pstmtUpdate.executeUpdate();
+                s_logger.debug("Index did not exist on host_details -  added new one");
+                pstmtUpdate.close();
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to check/update the host_details index ", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+
+    private void updateNetworksForPrivateGateways(Connection conn) {
+
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            //1) get all non removed gateways
+            pstmt = conn.prepareStatement("SELECT network_id, vpc_id FROM `cloud`.`vpc_gateways` WHERE type='Private' AND removed IS null");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                Long networkId = rs.getLong(1);
+                Long vpcId = rs.getLong(2);
+                //2) Update networks with vpc_id if its set to NULL
+                pstmt = conn.prepareStatement("UPDATE `cloud`.`networks` set vpc_id=? where id=? and vpc_id is NULL and removed is NULL");
+                pstmt.setLong(1, vpcId);
+                pstmt.setLong(2, networkId);
+                pstmt.executeUpdate();
+
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Failed to update private networks with VPC id.", e);
+        }
+    }
+
+    private void removeFirewallServiceFromSharedNetworkOfferingWithSGService(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+
+        try {
+            pstmt = conn.prepareStatement("select id from `cloud`.`network_offerings` where unique_name='DefaultSharedNetworkOfferingWithSGService'");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                long id = rs.getLong(1);
+                // remove Firewall service for SG shared network offering
+                pstmt = conn.prepareStatement("DELETE from `cloud`.`ntwk_offering_service_map` where network_offering_id=? and service='Firewall'");
+                pstmt.setLong(1, id);
+                pstmt.executeUpdate();
+            }
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to remove Firewall service for SG shared network offering.", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    private void fix22xKVMSnapshots(Connection conn) {
+        PreparedStatement pstmt = null;
+        ResultSet rs = null;
+        s_logger.debug("Updating KVM snapshots");
+        try {
+            pstmt = conn.prepareStatement("select id, backup_snap_id from `cloud`.`snapshots` where hypervisor_type='KVM' and removed is null and backup_snap_id is not null");
+            rs = pstmt.executeQuery();
+            while (rs.next()) {
+                long id = rs.getLong(1);
+                String backUpPath = rs.getString(2);
+                // Update Backup Path. Remove anything before /snapshots/
+                // e.g 22x Path /mnt/0f14da63-7033-3ca5-bdbe-fa62f4e2f38a/snapshots/1/2/6/i-2-6-VM_ROOT-6_20121219072022
+                // Above path should change to /snapshots/1/2/6/i-2-6-VM_ROOT-6_20121219072022
+                int index = backUpPath.indexOf("snapshots"+File.separator);
+                if (index > 1){
+                    String correctedPath = backUpPath.substring(index);
+                    s_logger.debug("Updating Snapshot with id: "+id+" original backup path: "+backUpPath+ " updated backup path: "+correctedPath);
+                    pstmt = conn.prepareStatement("UPDATE `cloud`.`snapshots` set backup_snap_id=? where id = ?");
+                    pstmt.setString(1, correctedPath);
+                    pstmt.setLong(2, id);
+                    pstmt.executeUpdate();
+                }
+            }
+            s_logger.debug("Done updating KVM snapshots");
+        } catch (SQLException e) {
+            throw new CloudRuntimeException("Unable to update backup id for KVM snapshots", e);
+        } finally {
+            try {
+                if (rs != null) {
+                    rs.close();
+                }
+
+                if (pstmt != null) {
+                    pstmt.close();
+                }
+            } catch (SQLException e) {
+            }
+        }
+    }
+
+    // Corrects upgrade for deployment with F5 and SRX devices (pre 3.0) to network offering &
+    // network service provider paradigm
+    private void correctExternalNetworkDevicesSetup(Connection conn) {
+        PreparedStatement zoneSearchStmt = null, pNetworkStmt = null, f5DevicesStmt = null, srxDevicesStmt = null;
+        ResultSet zoneResults = null, pNetworksResults = null, f5DevicesResult = null, srxDevicesResult = null;
+
+        try {
+            zoneSearchStmt = conn.prepareStatement("SELECT id, networktype FROM `cloud`.`data_center`");
+            zoneResults = zoneSearchStmt.executeQuery();
+            while (zoneResults.next()) {
+                long zoneId = zoneResults.getLong(1);
+                String networkType = zoneResults.getString(2);
+
+                if (!com.cloud.dc.DataCenter.NetworkType.Advanced.toString().equalsIgnoreCase(networkType)) {
+                    continue;
+                }
+
+                pNetworkStmt = conn.prepareStatement("SELECT id FROM `cloud`.`physical_network` where data_center_id=?");
+                pNetworkStmt.setLong(1, zoneId);
+                pNetworksResults = pNetworkStmt.executeQuery();
+                while (pNetworksResults.next()) {
+                    long physicalNetworkId = pNetworksResults.getLong(1);
+                    PreparedStatement fetchF5NspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId
+                            + " and provider_name = 'F5BigIp'");
+                    ResultSet rsF5NSP = fetchF5NspStmt.executeQuery();
+                    boolean hasF5Nsp = rsF5NSP.next();
+                    fetchF5NspStmt.close();
+
+                    // if there is no 'F5BigIP' physical network service provider added into physical network then
+                    // add 'F5BigIP' as network service provider and add the entry in 'external_load_balancer_devices'
+                    if (!hasF5Nsp) {
+                        f5DevicesStmt = conn.prepareStatement("SELECT id FROM host WHERE data_center_id=? AND type = 'ExternalLoadBalancer' AND removed IS NULL");
+                        f5DevicesStmt.setLong(1, zoneId);
+                        f5DevicesResult = f5DevicesStmt.executeQuery();
+                        // add F5BigIP provider and provider instance to physical network if there are any external load
+                        // balancers added in the zone
+                        while (f5DevicesResult.next()) {
+                            long f5HostId = f5DevicesResult.getLong(1);;
+                            addF5ServiceProvider(conn, physicalNetworkId, zoneId);
+                            addF5LoadBalancer(conn, f5HostId, physicalNetworkId);
+                        }
+                    }
+
+                    PreparedStatement fetchSRXNspStmt = conn.prepareStatement("SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId
+                            + " and provider_name = 'JuniperSRX'");
+                    ResultSet rsSRXNSP = fetchSRXNspStmt.executeQuery();
+                    boolean hasSrxNsp = rsSRXNSP.next();
+                    fetchSRXNspStmt.close();
+
+                    // if there is no 'JuniperSRX' physical network service provider added into physical network then
+                    // add 'JuniperSRX' as network service provider and add the entry in 'external_firewall_devices'
+                    if (!hasSrxNsp) {
+                        srxDevicesStmt = conn.prepareStatement("SELECT id FROM host WHERE data_center_id=? AND type = 'ExternalFirewall' AND removed IS NULL");
+                        srxDevicesStmt.setLong(1, zoneId);
+                        srxDevicesResult = srxDevicesStmt.executeQuery();
+                        // add JuniperSRX provider and provider instance to physical network if there are any external
+                        // firewall instances added in to the zone
+                        while (srxDevicesResult.next()) {
+                            long srxHostId = srxDevicesResult.getLong(1);
+                            // add SRX provider and provider instance to physical network
+                            addSrxServiceProvider(conn, physicalNetworkId, zoneId);
+                            addSrxFirewall(conn, srxHostId, physicalNetworkId);
+                        }
+                    }
+                }
+            }
+
+            // not the network service provider has been provisioned in to physical network, mark all guest network
+            // to be using network offering 'Isolated with external providers'
+            fixZoneUsingExternalDevices(conn);
+
+            if (zoneResults != null) {
+                try {
+                    zoneResults.close();
+                } catch (SQLException e) {
+                }
+            }
+
+            if (zoneSearchStmt != null) {
+                try {
+                    zoneSearchStmt.close();
+                } catch (SQLException e) {
+                }
+            }
+        } catch (SQLException e) {
+ 

<TRUNCATED>

Mime
View raw message