Updated Branches: refs/heads/4.2 f025db958 -> 913a0050e
CLOUDSTACK-4065: db upgrade - when insert placeHolder nic for Shared networks, always mark this nic as non-default explicitly Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/913a0050 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/913a0050 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/913a0050 Branch: refs/heads/4.2 Commit: 913a0050e4f73a698d7228cd38be5d30124c4379 Parents: f025db9 Author: Alena Prokharchyk <[email protected]> Authored: Mon Aug 5 09:00:54 2013 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon Aug 5 09:17:29 2013 -0700 ---------------------------------------------------------------------- .../com/cloud/upgrade/dao/Upgrade410to420.java | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/913a0050/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java index 2e5fbcb..5537a49 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -17,16 +17,6 @@ package com.cloud.upgrade.dao; -import com.cloud.deploy.DeploymentPlanner; -import com.cloud.storage.Upload; -import com.cloud.storage.UploadVO; -import com.cloud.utils.DateUtil; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -import com.cloud.hypervisor.Hypervisor.HypervisorType; - -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; -import org.apache.log4j.Logger; import java.io.File; import java.sql.Connection; import java.sql.Date; @@ -35,13 +25,21 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.Set; +import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.Map; -import java.util.HashMap; +import java.util.Set; +import java.util.UUID; + +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.vpc.NetworkACL; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; public class Upgrade410to420 implements DbUpgrade { final static Logger s_logger = Logger.getLogger(Upgrade410to420.class); @@ -756,13 +754,13 @@ public class Upgrade410to420 implements DbUpgrade { 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) VALUES (?, ?, ?, ?, 'Reserved', 'PlaceHolder', 'DomainRouter')"); + 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); + s_logger.debug("Created placeholder nic for the ipAddress " + ip + " and network " + networkId); } } catch (SQLException e) {
