diff --git a/server/test/com/cloud/upgrade/Test2213To30DBUpgrade.java b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java similarity index 86% rename from server/test/com/cloud/upgrade/Test2213To30DBUpgrade.java rename to server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java index f65529f1f95..efd8c54e53b 100644 --- a/server/test/com/cloud/upgrade/Test2213To30DBUpgrade.java +++ b/server/test/com/cloud/upgrade/Test2214To30DBUpgrade.java @@ -29,13 +29,12 @@ import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; -import com.cloud.upgrade.dao.VersionDaoImpl; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.db.DbTestUtils; import com.cloud.utils.db.Transaction; -public class Test2213To30DBUpgrade extends TestCase { - private static final Logger s_logger = Logger.getLogger(Test2213To30DBUpgrade.class); +public class Test2214To30DBUpgrade extends TestCase { + private static final Logger s_logger = Logger.getLogger(Test2214To30DBUpgrade.class); @Override @Before @@ -49,16 +48,15 @@ public class Test2213To30DBUpgrade extends TestCase { } public void test2213to30Upgrade() throws SQLException { - s_logger.debug("Finding sample data from 2.2.13"); - DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.13/2.2.13_cloud_db_sample.sql", false, true); + s_logger.debug("Finding sample data from 2.2.14"); + DbTestUtils.executeScript("PreviousDatabaseSchema/2.2.14/advance_zone_2.2.14.sql", false, true); Connection conn; PreparedStatement pstmt; - VersionDaoImpl dao = ComponentLocator.inject(VersionDaoImpl.class); DatabaseUpgradeChecker checker = ComponentLocator.inject(DatabaseUpgradeChecker.class); - checker.upgrade("2.2.13", "3.0.0"); + checker.upgrade("2.2.14", "3.0.0"); conn = Transaction.getStandaloneConnection(); try { diff --git a/setup/db/db/schema-2214to30.sql b/setup/db/db/schema-2214to30.sql index 56178f103c2..9c1708ab1d9 100755 --- a/setup/db/db/schema-2214to30.sql +++ b/setup/db/db/schema-2214to30.sql @@ -242,7 +242,7 @@ UPDATE configuration SET description = '[''random'', ''firstfit'', ''userdispers --; --- Usage db upgrade from 2.2.13 to 3.0; +-- Usage db upgrade from 2.2.14 to 3.0; --; ALTER TABLE `cloud_usage`.`user_statistics` ADD COLUMN `agg_bytes_received` bigint unsigned NOT NULL default '0';