[GitHub] nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 through 4.11.1 to 4.12

2018-04-13 Thread GitBox 
nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 
through 4.11.1 to 4.12
URL: https://github.com/apache/cloudstack/pull/2559#discussion_r181335341
 
 

 ##
 File path: 
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
 ##
 @@ -74,6 +77,30 @@ public void testCalculateUpgradePath490to4910() {
 
 }
 
+@Test
+public void testCalculateUpgradePath410to412() {
+
+final CloudStackVersion dbVersion = 
CloudStackVersion.parse("4.10.0.0");
+assertNotNull(dbVersion);
+
+final CloudStackVersion currentVersion = 
CloudStackVersion.parse("4.12.0.0");
+assertNotNull(currentVersion);
+
+final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, 
currentVersion);
+
+assertNotNull(upgrades);
+assertTrue(upgrades.length >= 1);
+assertTrue(upgrades[0] instanceof Upgrade41000to41100);
+assertTrue(upgrades[1] instanceof Upgrade41100to41110);
+assertTrue(upgrades[2] instanceof Upgrade41110to41200);
+
+assertTrue(Arrays.equals(new String[] { "4.11.0.0", "4.11.1.0"},
 
 Review comment:
   @DaanHoogland, you mean other tests to check upgrade path from 4.10 to 4.11? 
I just checked, no other tests handle this path.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 through 4.11.1 to 4.12

2018-04-11 Thread GitBox 
nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 
through 4.11.1 to 4.12
URL: https://github.com/apache/cloudstack/pull/2559#discussion_r180719535
 
 

 ##
 File path: 
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
 ##
 @@ -74,6 +77,30 @@ public void testCalculateUpgradePath490to4910() {
 
 }
 
+@Test
+public void testCalculateUpgradePath410to412() {
+
+final CloudStackVersion dbVersion = 
CloudStackVersion.parse("4.10.0.0");
+assertNotNull(dbVersion);
+
+final CloudStackVersion currentVersion = 
CloudStackVersion.parse("4.12.0.0");
+assertNotNull(currentVersion);
+
+final DatabaseUpgradeChecker checker = new DatabaseUpgradeChecker();
+final DbUpgrade[] upgrades = checker.calculateUpgradePath(dbVersion, 
currentVersion);
+
+assertNotNull(upgrades);
+assertTrue(upgrades.length >= 1);
+assertTrue(upgrades[0] instanceof Upgrade41000to41100);
+assertTrue(upgrades[1] instanceof Upgrade41100to41110);
+assertTrue(upgrades[2] instanceof Upgrade41110to41200);
+
+assertTrue(Arrays.equals(new String[] { "4.11.0.0", "4.11.1.0"},
 
 Review comment:
   @DaanHoogland, I think, Similarly we could add for upgrades[0] as well.
   
   assertTrue(Arrays.equals(new String[] { "4.10.0.0", "4.11.0.0"}, 
upgrades[0].getUpgradableVersionRange()));


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 through 4.11.1 to 4.12

2018-04-10 Thread GitBox 
nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 
through 4.11.1 to 4.12
URL: https://github.com/apache/cloudstack/pull/2559#discussion_r180502246
 
 

 ##
 File path: 
engine/schema/src/test/java/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java
 ##
 @@ -74,6 +75,28 @@ public void testCalculateUpgradePath490to4910() {
 
 }
 
+@Test
 
 Review comment:
   Would be great if you add similar one from 4.11.1 to 4.12.0 as well.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 through 4.11.1 to 4.12

2018-04-10 Thread GitBox 
nitin-maharana commented on a change in pull request #2559: Upgrade path 4.11 
through 4.11.1 to 4.12
URL: https://github.com/apache/cloudstack/pull/2559#discussion_r180500452
 
 

 ##
 File path: 
engine/schema/src/main/resources/META-INF/db/schema-41100to41110-cleanup.sql
 ##
 @@ -16,5 +16,5 @@
 -- under the License.
 
 --;
--- Schema upgrade cleanup from 4.11.0.0 to 4.12.0.0
+-- Schema upgrade from 4.11.0.0 to 4.11.1.0
 
 Review comment:
   @DaanHoogland, Thanks for the PR. I think it would be more meaningful if we 
add the word "cleanup" here.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services