Updated upgrade paths (#3972)

* Updated upgrade paths

* Added license info

Co-authored-by: dahn <daan.hoogland@shapeblue.com>

Author: Spaceman1984

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

@@ -67,7 +67,7 @@
 import com.cloud.upgrade.dao.Upgrade41120to41200;
 import com.cloud.upgrade.dao.Upgrade41200to41300;
 import com.cloud.upgrade.dao.Upgrade41300to41310;
-import com.cloud.upgrade.dao.Upgrade41300to41400;
+import com.cloud.upgrade.dao.Upgrade41310to41400;
 import com.cloud.upgrade.dao.Upgrade420to421;
 import com.cloud.upgrade.dao.Upgrade421to430;
 import com.cloud.upgrade.dao.Upgrade430to440;
@@ -189,12 +189,8 @@ public DatabaseUpgradeChecker() {
                 .next("4.11.2.0", new Upgrade41120to41130())
                 .next("4.11.3.0", new Upgrade41120to41200())
                 .next("4.12.0.0", new Upgrade41200to41300())
-<<<<<<< HEAD
-                .next("4.13.0.0", new Upgrade41300to41400())
-                .next("4.13.1.0", new Upgrade41300to41400())
-=======
                 .next("4.13.0.0", new Upgrade41300to41310())
->>>>>>> 4.13
+                .next("4.13.1.0", new Upgrade41310to41400())
                 .build();
     }
 

…oud/upgrade/dao/Upgrade41300to41400.java …oud/upgrade/dao/Upgrade41310to41400.javaengine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java renamed to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java renamed to engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java

@@ -32,13 +32,13 @@
 import com.cloud.hypervisor.Hypervisor;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-public class Upgrade41300to41400 implements DbUpgrade {
+public class Upgrade41310to41400 implements DbUpgrade {
 
-    final static Logger LOG = Logger.getLogger(Upgrade41300to41400.class);
+    final static Logger LOG = Logger.getLogger(Upgrade41310to41400.class);
 
     @Override
     public String[] getUpgradableVersionRange() {
-        return new String[] {"4.13.0.0", "4.14.0.0"};
+        return new String[] {"4.13.1.0", "4.14.0.0"};
     }
 
     @Override
@@ -53,7 +53,7 @@ public boolean supportsRollingUpgrade() {
 
     @Override
     public InputStream[] getPrepareScripts() {
-        final String scriptFile = "META-INF/db/schema-41300to41400.sql";
+        final String scriptFile = "META-INF/db/schema-41310to41400.sql";
         final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
         if (script == null) {
             throw new CloudRuntimeException("Unable to find " + scriptFile);
@@ -237,7 +237,7 @@ private void updateSystemVmTemplates(final Connection conn) {
 
     @Override
     public InputStream[] getCleanupScripts() {
-        final String scriptFile = "META-INF/db/schema-41300to41400-cleanup.sql";
+        final String scriptFile = "META-INF/db/schema-41310to41400-cleanup.sql";
         final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
         if (script == null) {
             throw new CloudRuntimeException("Unable to find " + scriptFile);

…A-INF/db/schema-41300to41400-cleanup.sql …A-INF/db/schema-41310to41400-cleanup.sqlengine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-41310to41400-cleanup.sql

@@ -16,7 +16,7 @@
 -- under the License.
 
 --;
--- Schema upgrade cleanup from 4.13.0.0 to 4.14.0.0
+-- Schema upgrade cleanup from 4.13.1.0 to 4.14.0.0
 --;
 
 DELETE FROM `cloud`.`configuration` WHERE name = 'host.maintenance.retries';

…rces/META-INF/db/schema-41300to41400.sql …rces/META-INF/db/schema-41310to41400.sqlengine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql renamed to engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql

@@ -16,7 +16,7 @@
 -- under the License.
 
 --;
--- Schema upgrade from 4.13.0.0 to 4.14.0.0
+-- Schema upgrade from 4.13.1.0 to 4.14.0.0
 --;
 
 -- KVM: enable storage data motion on KVM hypervisor_capabilities