cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: updated refs/heads/master to 2cacbea
Date Wed, 31 Jul 2013 20:34:10 GMT
Updated Branches:
  refs/heads/master 6007da198 -> 2cacbeac2


CLOUDSTACK-3974: 410-420 db upgrade - exclude is_inline field from the query when insert the
entry for the F5 load balancer as this field was dropped as a part of 40-41 upgrade


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

Branch: refs/heads/master
Commit: 2cacbeac2c60435bb0e94af296d4a5301af36f40
Parents: 6007da1
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Wed Jul 31 13:32:28 2013 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Wed Jul 31 13:33:52 2013 -0700

----------------------------------------------------------------------
 engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2cacbeac/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 e589946..b3fbdaf 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
@@ -1337,7 +1337,7 @@ public class Upgrade410to420 implements DbUpgrade {
         try{
             s_logger.debug("Adding F5 Big IP load balancer with host id " + hostId + " in
to physical network" + physicalNetworkId);
             String insertF5 = "INSERT INTO `cloud`.`external_load_balancer_devices` (physical_network_id,
host_id, provider_name, " +
-                    "device_name, capacity, is_dedicated, device_state, allocation_state,
is_inline, is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+                    "device_name, capacity, is_dedicated, device_state, allocation_state,
is_managed, uuid) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
             pstmtUpdate = conn.prepareStatement(insertF5);
             pstmtUpdate.setLong(1, physicalNetworkId);
             pstmtUpdate.setLong(2, hostId);
@@ -1348,8 +1348,7 @@ public class Upgrade410to420 implements DbUpgrade {
             pstmtUpdate.setString(7, "Enabled");
             pstmtUpdate.setString(8, "Shared");
             pstmtUpdate.setBoolean(9, false);
-            pstmtUpdate.setBoolean(10, false);
-            pstmtUpdate.setString(11, UUID.randomUUID().toString());
+            pstmtUpdate.setString(10, UUID.randomUUID().toString());
             pstmtUpdate.executeUpdate();
         }catch (SQLException e) {
             throw new CloudRuntimeException("Exception while adding F5 load balancer device"
,  e);


Mime
View raw message