Updated Branches: refs/heads/4.0 62526a715 -> 7120ce071
Fixed version number in upgrade script comment (replaced 3.0.3 with 3.0.2) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7120ce07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7120ce07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7120ce07 Branch: refs/heads/4.0 Commit: 7120ce071779d529d2ae10244d4c029722e616f5 Parents: 62526a7 Author: Alena Prokharchyk <[email protected]> Authored: Mon Aug 13 16:50:06 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Mon Aug 13 16:50:06 2012 -0700 ---------------------------------------------------------------------- .../api/commands/MarkDefaultZoneForAccountCmd.java | 2 +- .../upgrade/AdvanceZone223To224UpgradeTest.java | 15 ++++----------- setup/db/db/schema-302to40-cleanup.sql | 2 +- setup/db/db/schema-302to40.sql | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7120ce07/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java b/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java index e0ec2ac..7f06926 100644 --- a/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java +++ b/api/src/com/cloud/api/commands/MarkDefaultZoneForAccountCmd.java @@ -31,7 +31,7 @@ import com.cloud.api.response.AccountResponse; import com.cloud.api.ServerApiException; import com.cloud.api.BaseCmd; -@Implementation(description="Marks a default zone for this account", responseObject=AccountResponse.class, since="3.0.3") +@Implementation(description="Marks a default zone for this account", responseObject=AccountResponse.class, since="4.0") public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(MarkDefaultZoneForAccountCmd.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7120ce07/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java ---------------------------------------------------------------------- diff --git a/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java b/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java index 9a6318c..a039499 100644 --- a/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java +++ b/server/test/com/cloud/upgrade/AdvanceZone223To224UpgradeTest.java @@ -16,8 +16,6 @@ // under the License. package com.cloud.upgrade; -import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.SQLException; import junit.framework.TestCase; @@ -30,7 +28,7 @@ import com.cloud.upgrade.dao.VersionDaoImpl; import com.cloud.utils.component.ComponentLocator; public class AdvanceZone223To224UpgradeTest extends TestCase { - private static final Logger s_logger = Logger.getLogger(AdvanceZone217To224UpgradeTest.class); + private static final Logger s_logger = Logger.getLogger(AdvanceZone223To224UpgradeTest.class); @Override @Before @@ -43,20 +41,15 @@ public class AdvanceZone223To224UpgradeTest extends TestCase { public void tearDown() throws Exception { } - public void test217to22Upgrade() throws SQLException { - s_logger.debug("Finding sample data from 2.2.14"); -// DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.14/dave-sample.sql", false, true); - - Connection conn; - PreparedStatement pstmt; + public void test223to224Upgrade() throws SQLException { VersionDaoImpl dao = ComponentLocator.inject(VersionDaoImpl.class); DatabaseUpgradeChecker checker = ComponentLocator.inject(DatabaseUpgradeChecker.class); String version = dao.getCurrentVersion(); - assert version.equals("2.2.14") : "Version returned is not 2.2.14 but " + version; + assert version.equals("2.2.3") : "Version returned is not 2.2.3 but " + version; - checker.upgrade("2.2.14", "3.0.3"); + checker.upgrade("2.2.3", "2.2.4"); } } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7120ce07/setup/db/db/schema-302to40-cleanup.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-302to40-cleanup.sql b/setup/db/db/schema-302to40-cleanup.sql index 84dc64f..4d89a07 100644 --- a/setup/db/db/schema-302to40-cleanup.sql +++ b/setup/db/db/schema-302to40-cleanup.sql @@ -16,7 +16,7 @@ -- under the License. --; --- Schema cleanup from 3.0.3 to 4.0.0; +-- Schema cleanup from 3.0.2 to 4.0.0; --; ALTER TABLE `cloud`.`domain_router` DROP COLUMN network_id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7120ce07/setup/db/db/schema-302to40.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-302to40.sql b/setup/db/db/schema-302to40.sql index bd8073b..79ae83f 100644 --- a/setup/db/db/schema-302to40.sql +++ b/setup/db/db/schema-302to40.sql @@ -16,7 +16,7 @@ -- under the License. --; --- Schema upgrade from 3.0.3 to 4.0.0; +-- Schema upgrade from 3.0.2 to 4.0.0; --;
