This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.11 by this push:
new a3e5664 schema: add 4.11.2 to 4.11.3 systemvmtemplate upgrade path
(#3381)
a3e5664 is described below
commit a3e5664b5335ae198dae1203d9a24664845a06b3
Author: Rohit Yadav <[email protected]>
AuthorDate: Fri Jun 7 23:03:05 2019 +0530
schema: add 4.11.2 to 4.11.3 systemvmtemplate upgrade path (#3381)
Add 4.11.2 to 4.11.3 systemvmtemplate upgrade path
Signed-off-by: Rohit Yadav <[email protected]>
---
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 123 +++++++-------
.../com/cloud/upgrade/dao/Upgrade41110to41120.java | 177 ---------------------
...e41110to41120.java => Upgrade41120to41130.java} | 66 ++++----
3 files changed, 89 insertions(+), 277 deletions(-)
diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
index ddf1b79..92c0534 100644
--- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
+++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
@@ -70,6 +70,7 @@ import com.cloud.upgrade.dao.Upgrade4930to41000;
import com.cloud.upgrade.dao.Upgrade41000to41100;
import com.cloud.upgrade.dao.Upgrade41100to41110;
import com.cloud.upgrade.dao.Upgrade41110to41120;
+import com.cloud.upgrade.dao.Upgrade41120to41130;
import com.cloud.upgrade.dao.UpgradeSnapshot217to224;
import com.cloud.upgrade.dao.UpgradeSnapshot223to224;
import com.cloud.upgrade.dao.VersionDao;
@@ -122,7 +123,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(),
new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(),
- new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.1.8"),
new DbUpgrade[] {new Upgrade218to22(), new Upgrade221to222(), new
UpgradeSnapshot217to224(), new Upgrade222to224(), new
Upgrade218to224DomainVlans(),
@@ -140,7 +141,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(),
new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.1"),
new DbUpgrade[] {new Upgrade221to222(), new
UpgradeSnapshot223to224(), new Upgrade222to224(), new Upgrade224to225(), new
Upgrade225to226(), new Upgrade227to228(),
@@ -148,7 +149,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.2"),
new DbUpgrade[] {new Upgrade222to224(), new
UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228(), new Upgrade228to229(),
@@ -156,7 +157,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(),
new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.3"),
new DbUpgrade[] {new Upgrade222to224(), new
UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228(), new Upgrade228to229(),
@@ -164,7 +165,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(),
new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.4"),
new DbUpgrade[] {new Upgrade224to225(), new Upgrade225to226(), new
Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new
Upgrade2210to2211(),
@@ -172,7 +173,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(),
new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.5"),
new DbUpgrade[] {new Upgrade225to226(), new Upgrade227to228(), new
Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new
Upgrade2211to2212(),
@@ -180,7 +181,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(),
new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(),
- new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.6"),
new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(), new
Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(),
@@ -188,7 +189,7 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.7"),
new DbUpgrade[] {new Upgrade227to228(), new Upgrade228to229(), new
Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212(), new
Upgrade2212to2213(),
@@ -196,230 +197,230 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.8"),
new DbUpgrade[] {new Upgrade228to229(), new Upgrade229to2210(),
new Upgrade2210to2211(), new Upgrade2211to2212(), new Upgrade2212to2213(), new
Upgrade2213to2214(),
new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420(), new Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.9"),
new DbUpgrade[] {new Upgrade229to2210(), new Upgrade2210to2211(),
new Upgrade2211to2212(), new Upgrade2212to2213(), new Upgrade2213to2214(), new
Upgrade2214to30(),
new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(),
new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.10"),
new DbUpgrade[] {new Upgrade2210to2211(), new Upgrade2211to2212(),
new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new
Upgrade30to301(),
new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(),
new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.12"),
new DbUpgrade[] {new Upgrade2212to2213(), new Upgrade2213to2214(),
new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(),
new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(),
new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.13"),
new DbUpgrade[] {new Upgrade2213to2214(), new Upgrade2214to30(),
new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(),
new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(),
new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(),
- new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.14"),
new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420(),
new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.0"),
new DbUpgrade[] {new Upgrade30to301(), new Upgrade301to302(), new
Upgrade302to40(), new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.1"),
new DbUpgrade[] {new Upgrade301to302(), new Upgrade302to40(), new
Upgrade40to41(), new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(),
new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.2"),
new DbUpgrade[] {new Upgrade302to40(), new Upgrade40to41(), new
Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(),
new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.0.0"),
new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.0.1"),
new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.0.2"),
new DbUpgrade[] {new Upgrade40to41(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.1.0"),
new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(),
new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.1.1"),
new DbUpgrade[] {new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(),
new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(),
new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.2.0"),
new DbUpgrade[] {new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(),
new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(),
new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(),
- new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.2.1"),
new DbUpgrade[] {new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(),
new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.3.0"),
new DbUpgrade[] {new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.3.1"),
new DbUpgrade[] {new Upgrade431to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.3.2"),
new DbUpgrade[] {new Upgrade432to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.4.0"),
new DbUpgrade[] {new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(),
new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.4.1"),
new DbUpgrade[] {new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(),
new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.4.2"),
new DbUpgrade[] {new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.4.3"),
new DbUpgrade[] {new Upgrade443to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.4.4"),
new DbUpgrade[] {new Upgrade444to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.5.0"),
new DbUpgrade[] {new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(),
new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.5.1"),
new DbUpgrade[] {new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(),
new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(),
- new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.5.2"),
new DbUpgrade[] {new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.5.3"),
new DbUpgrade[] {new Upgrade453to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.6.0"),
new DbUpgrade[] {new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.6.1"),
new DbUpgrade[] {new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.6.2"),
new DbUpgrade[] {new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.7.0"),
new DbUpgrade[] {new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.7.1"),
new DbUpgrade[] {new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.7.2"),
new DbUpgrade[] {new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(),
- new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.8.0"),
new DbUpgrade[] {new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(),
- new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.8.1"),
new DbUpgrade[] {new Upgrade481to490(), new Upgrade490to4910(),
new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.8.2.0"),
new DbUpgrade[] {new Upgrade481to490(), new Upgrade490to4910(),
new Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.9.0"),
new DbUpgrade[] {new Upgrade490to4910(), new Upgrade4910to4920(),
new Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.9.1.0"),
- new DbUpgrade[] {new Upgrade4910to4920(), new Upgrade4920to4930(),
new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(),
new Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade4910to4920(), new Upgrade4920to4930(),
new Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(),
new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.9.2.0"),
- new DbUpgrade[] {new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.9.3.0"),
- new DbUpgrade[] {new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.9.3.1"),
- new DbUpgrade[] {new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.10.0.0"),
- new DbUpgrade[] {new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.11.0.0"),
- new DbUpgrade[] {new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("4.11.1.0"),
- new DbUpgrade[] {new Upgrade41110to41120()});
+ new DbUpgrade[] {new Upgrade41110to41120(), new
Upgrade41120to41130()});
//CP Upgrades
_upgradeMap.put(CloudStackVersion.parse("3.0.3"),
@@ -427,45 +428,45 @@ public class DatabaseUpgradeChecker implements
SystemIntegrityChecker {
new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(), new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(),
new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(),
new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(), new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(),
- new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade41100to41110(), new Upgrade41110to41120(), new
Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.4"),
new DbUpgrade[] {new Upgrade304to305(), new Upgrade305to306(), new
Upgrade306to307(), new Upgrade307to410(), new Upgrade410to420(), new
Upgrade420to421(),
new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(), new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(),
new Upgrade452to460(), new Upgrade460to461(), new
Upgrade461to470(), new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(),
- new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade490to4910(), new Upgrade4910to4920(), new
Upgrade4920to4930(), new Upgrade4930to41000(), new Upgrade41000to41100(), new
Upgrade41100to41110(), new Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.5"),
new DbUpgrade[] {new Upgrade305to306(), new Upgrade306to307(), new
Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(),
new Upgrade430to440(), new Upgrade440to441(), new
Upgrade441to442(), new Upgrade442to450(), new Upgrade450to451(), new
Upgrade451to452(), new Upgrade452to460(),
new Upgrade460to461(), new Upgrade461to470(), new
Upgrade470to471(), new Upgrade471to480(), new Upgrade480to481(), new
Upgrade481to490(), new Upgrade490to4910(),
- new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120()});
+ new Upgrade4910to4920(), new Upgrade4920to4930(), new
Upgrade4930to41000(), new Upgrade41000to41100(), new Upgrade41100to41110(), new
Upgrade41110to41120(), new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.6"),
new DbUpgrade[] {new Upgrade306to307(), new Upgrade307to410(), new
Upgrade410to420(), new Upgrade420to421(), new Upgrade421to430(), new
Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(),
new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("3.0.7"),
new DbUpgrade[] {new Upgrade307to410(), new Upgrade410to420(), new
Upgrade420to421(), new Upgrade421to430(), new Upgrade430to440(), new
Upgrade440to441(),
new Upgrade441to442(), new Upgrade442to450(), new
Upgrade450to451(), new Upgrade451to452(), new Upgrade452to460(), new
Upgrade460to461(), new Upgrade461to470(),
new Upgrade470to471(), new Upgrade471to480(), new
Upgrade480to481(), new Upgrade481to490(), new Upgrade490to4910(), new
Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.15"),
new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to303(), new Upgrade303to304(), new
Upgrade304to305(),
new Upgrade305to306(), new Upgrade306to307(), new
Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(),
new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
_upgradeMap.put(CloudStackVersion.parse("2.2.16"),
new DbUpgrade[] {new Upgrade2214to30(), new Upgrade30to301(), new
Upgrade301to302(), new Upgrade302to303(), new Upgrade303to304(), new
Upgrade304to305(),
new Upgrade305to306(), new Upgrade306to307(), new
Upgrade307to410(), new Upgrade410to420(), new Upgrade420to421(), new
Upgrade421to430(), new Upgrade430to440(),
new Upgrade440to441(), new Upgrade441to442(), new
Upgrade442to450(), new Upgrade450to451(), new Upgrade451to452(), new
Upgrade452to460(), new Upgrade460to461(),
new Upgrade461to470(), new Upgrade470to471(), new
Upgrade471to480(), new Upgrade480to481(), new Upgrade481to490(), new
Upgrade490to4910(), new Upgrade4910to4920(),
- new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120()});
+ new Upgrade4920to4930(), new Upgrade4930to41000(), new
Upgrade41000to41100(), new Upgrade41100to41110(), new Upgrade41110to41120(),
new Upgrade41120to41130()});
final List<CloudStackVersion> sortedVersions =
newArrayList(_upgradeMap.keySet());
sort(sortedVersions);
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
index d4bdc13..f7782ce 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
@@ -19,17 +19,9 @@ package com.cloud.upgrade.dao;
import java.io.InputStream;
import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
import org.apache.log4j.Logger;
-import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.exception.CloudRuntimeException;
public class Upgrade41110to41120 implements DbUpgrade {
@@ -63,175 +55,6 @@ public class Upgrade41110to41120 implements DbUpgrade {
@Override
public void performDataMigration(Connection conn) {
- updateSystemVmTemplates(conn);
- }
-
- @SuppressWarnings("serial")
- private void updateSystemVmTemplates(final Connection conn) {
- LOG.debug("Updating System Vm template IDs");
- final Set<Hypervisor.HypervisorType> hypervisorsListInUse = new
HashSet<Hypervisor.HypervisorType>();
- try (PreparedStatement pstmt = conn.prepareStatement("select
distinct(hypervisor_type) from `cloud`.`cluster` where removed is null");
ResultSet rs = pstmt.executeQuery()) {
- while (rs.next()) {
- switch (Hypervisor.HypervisorType.getType(rs.getString(1))) {
- case XenServer:
-
hypervisorsListInUse.add(Hypervisor.HypervisorType.XenServer);
- break;
- case KVM:
-
hypervisorsListInUse.add(Hypervisor.HypervisorType.KVM);
- break;
- case VMware:
-
hypervisorsListInUse.add(Hypervisor.HypervisorType.VMware);
- break;
- case Hyperv:
-
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
- break;
- case LXC:
-
hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
- break;
- case Ovm3:
-
hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
- break;
- default:
- break;
- }
- }
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates: Exception caught while getting
hypervisor types from clusters: " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:Exception
while getting hypervisor types from clusters", e);
- }
-
- final Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new
HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11.2");
- put(Hypervisor.HypervisorType.VMware,
"systemvm-vmware-4.11.2");
- put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.11.2");
- put(Hypervisor.HypervisorType.Hyperv,
"systemvm-hyperv-4.11.2");
- put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11.2");
- put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11.2");
- }
- };
-
- final Map<Hypervisor.HypervisorType, String>
routerTemplateConfigurationNames = new HashMap<Hypervisor.HypervisorType,
String>() {
- {
- put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
- put(Hypervisor.HypervisorType.VMware,
"router.template.vmware");
- put(Hypervisor.HypervisorType.XenServer,
"router.template.xenserver");
- put(Hypervisor.HypervisorType.Hyperv,
"router.template.hyperv");
- put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
- put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
- }
- };
-
- final Map<Hypervisor.HypervisorType, String> newTemplateUrl = new
HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-kvm.qcow2.bz2";);
- put(Hypervisor.HypervisorType.VMware,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-vmware.ova";);
- put(Hypervisor.HypervisorType.XenServer,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-xen.vhd.bz2";);
- put(Hypervisor.HypervisorType.Hyperv,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-hyperv.vhd.zip";);
- put(Hypervisor.HypervisorType.LXC,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-kvm.qcow2.bz2";);
- put(Hypervisor.HypervisorType.Ovm3,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-ovm.raw.bz2";);
- }
- };
-
- final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new
HashMap<Hypervisor.HypervisorType, String>() {
- {
- put(Hypervisor.HypervisorType.KVM,
"6d12cc764cd7d64112d8c35d70923eb1");
- put(Hypervisor.HypervisorType.XenServer,
"6e8b3ae84ca8145736d1d7d3f7546e65");
- put(Hypervisor.HypervisorType.VMware,
"e981f8cb951688efd93481913198c9cc");
- put(Hypervisor.HypervisorType.Hyperv,
"e9032635ffba021371780307162551b9");
- put(Hypervisor.HypervisorType.LXC,
"6d12cc764cd7d64112d8c35d70923eb1");
- put(Hypervisor.HypervisorType.Ovm3,
"c4a91f8e52e4531a1c2a9a17c530d5fe");
- }
- };
-
- for (final Map.Entry<Hypervisor.HypervisorType, String>
hypervisorAndTemplateName : NewTemplateNameList.entrySet()) {
- LOG.debug("Updating " + hypervisorAndTemplateName.getKey() + "
System Vms");
- try (PreparedStatement pstmt = conn.prepareStatement("select id
from `cloud`.`vm_template` where name = ? and removed is null order by id desc
limit 1")) {
- // Get 4.11 systemvm template id for corresponding hypervisor
- long templateId = -1;
- pstmt.setString(1, hypervisorAndTemplateName.getValue());
- try (ResultSet rs = pstmt.executeQuery()) {
- if (rs.next()) {
- templateId = rs.getLong(1);
- }
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates: Exception caught while
getting ids of templates: " + e.getMessage());
- throw new CloudRuntimeException("updateSystemVmTemplates:
Exception caught while getting ids of templates", e);
- }
-
- // change template type to SYSTEM
- if (templateId != -1) {
- try (PreparedStatement templ_type_pstmt =
conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM' where id
= ?");) {
- templ_type_pstmt.setLong(1, templateId);
- templ_type_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while
updating template with id " + templateId + " to be marked as 'system': " +
e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while updating
template with id " + templateId + " to be marked as 'system'", e);
- }
- // update template ID of system Vms
- try (PreparedStatement update_templ_id_pstmt = conn
- .prepareStatement("update `cloud`.`vm_instance`
set vm_template_id = ? where type <> 'User' and hypervisor_type = ? and removed
is NULL");) {
- update_templ_id_pstmt.setLong(1, templateId);
- update_templ_id_pstmt.setString(2,
hypervisorAndTemplateName.getKey().toString());
- update_templ_id_pstmt.executeUpdate();
- } catch (final Exception e) {
- LOG.error("updateSystemVmTemplates:Exception while
setting template for " + hypervisorAndTemplateName.getKey().toString() + " to "
+ templateId
- + ": " + e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while setting template
for " + hypervisorAndTemplateName.getKey().toString() + " to "
- + templateId, e);
- }
-
- // Change value of global configuration parameter
- // router.template.* for the corresponding hypervisor
- try (PreparedStatement update_pstmt =
conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name
= ?");) {
- update_pstmt.setString(1,
hypervisorAndTemplateName.getValue());
- update_pstmt.setString(2,
routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()));
- update_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while
setting " +
routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to
"
- + hypervisorAndTemplateName.getValue() + ": "
+ e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while setting "
- +
routerTemplateConfigurationNames.get(hypervisorAndTemplateName.getKey()) + " to
" + hypervisorAndTemplateName.getValue(), e);
- }
-
- // Change value of global configuration parameter
- // minreq.sysvmtemplate.version for the ACS version
- try (PreparedStatement update_pstmt =
conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name
= ?");) {
- update_pstmt.setString(1, "4.11.2");
- update_pstmt.setString(2,
"minreq.sysvmtemplate.version");
- update_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while
setting 'minreq.sysvmtemplate.version' to 4.11.2: " + e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while setting
'minreq.sysvmtemplate.version' to 4.11.2", e);
- }
- } else {
- if
(hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())) {
- throw new CloudRuntimeException(getUpgradedVersion() +
hypervisorAndTemplateName.getKey() + " SystemVm template not found. Cannot
upgrade system Vms");
- } else {
- LOG.warn(getUpgradedVersion() +
hypervisorAndTemplateName.getKey() + " SystemVm template not found. " +
hypervisorAndTemplateName.getKey()
- + " hypervisor is not used, so not failing
upgrade");
- // Update the latest template URLs for corresponding
- // hypervisor
- try (PreparedStatement update_templ_url_pstmt = conn
- .prepareStatement("UPDATE
`cloud`.`vm_template` SET url = ? , checksum = ? WHERE hypervisor_type = ? AND
type = 'SYSTEM' AND removed is null order by id desc limit 1");) {
- update_templ_url_pstmt.setString(1,
newTemplateUrl.get(hypervisorAndTemplateName.getKey()));
- update_templ_url_pstmt.setString(2,
newTemplateChecksum.get(hypervisorAndTemplateName.getKey()));
- update_templ_url_pstmt.setString(3,
hypervisorAndTemplateName.getKey().toString());
- update_templ_url_pstmt.executeUpdate();
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while
updating 'url' and 'checksum' for hypervisor type "
- +
hypervisorAndTemplateName.getKey().toString() + ": " + e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while updating 'url'
and 'checksum' for hypervisor type "
- +
hypervisorAndTemplateName.getKey().toString(), e);
- }
- }
- }
- } catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while getting ids
of templates: " + e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while getting ids of
templates", e);
- }
- }
- LOG.debug("Updating System Vm Template IDs Complete");
}
@Override
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41120to41130.java
similarity index 85%
copy from engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
copy to engine/schema/src/com/cloud/upgrade/dao/Upgrade41120to41130.java
index d4bdc13..c2750d3 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade41120to41130.java
@@ -32,17 +32,17 @@ import org.apache.log4j.Logger;
import com.cloud.hypervisor.Hypervisor;
import com.cloud.utils.exception.CloudRuntimeException;
-public class Upgrade41110to41120 implements DbUpgrade {
- final static Logger LOG = Logger.getLogger(Upgrade41110to41120.class);
+public class Upgrade41120to41130 implements DbUpgrade {
+ final static Logger LOG = Logger.getLogger(Upgrade41120to41130.class);
@Override
public String[] getUpgradableVersionRange() {
- return new String[]{"4.11.1.0", "4.11.2.0"};
+ return new String[]{"4.11.2.0", "4.11.3.0"};
}
@Override
public String getUpgradedVersion() {
- return "4.11.2.0";
+ return "4.11.3.0";
}
@Override
@@ -52,13 +52,7 @@ public class Upgrade41110to41120 implements DbUpgrade {
@Override
public InputStream[] getPrepareScripts() {
- final String scriptFile = "META-INF/db/schema-41110to41120.sql";
- final InputStream script =
Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
- if (script == null) {
- throw new CloudRuntimeException("Unable to find " + scriptFile);
- }
-
- return new InputStream[] {script};
+ return new InputStream[] {};
}
@Override
@@ -102,12 +96,12 @@ public class Upgrade41110to41120 implements DbUpgrade {
final Map<Hypervisor.HypervisorType, String> NewTemplateNameList = new
HashMap<Hypervisor.HypervisorType, String>() {
{
- put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11.2");
- put(Hypervisor.HypervisorType.VMware,
"systemvm-vmware-4.11.2");
- put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.11.2");
- put(Hypervisor.HypervisorType.Hyperv,
"systemvm-hyperv-4.11.2");
- put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11.2");
- put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11.2");
+ put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.11.3");
+ put(Hypervisor.HypervisorType.VMware,
"systemvm-vmware-4.11.3");
+ put(Hypervisor.HypervisorType.XenServer,
"systemvm-xenserver-4.11.3");
+ put(Hypervisor.HypervisorType.Hyperv,
"systemvm-hyperv-4.11.3");
+ put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.11.3");
+ put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.11.3");
}
};
@@ -124,23 +118,23 @@ public class Upgrade41110to41120 implements DbUpgrade {
final Map<Hypervisor.HypervisorType, String> newTemplateUrl = new
HashMap<Hypervisor.HypervisorType, String>() {
{
- put(Hypervisor.HypervisorType.KVM,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-kvm.qcow2.bz2";);
- put(Hypervisor.HypervisorType.VMware,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-vmware.ova";);
- put(Hypervisor.HypervisorType.XenServer,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-xen.vhd.bz2";);
- put(Hypervisor.HypervisorType.Hyperv,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-hyperv.vhd.zip";);
- put(Hypervisor.HypervisorType.LXC,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-kvm.qcow2.bz2";);
- put(Hypervisor.HypervisorType.Ovm3,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.2-ovm.raw.bz2";);
+ put(Hypervisor.HypervisorType.KVM,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2";);
+ put(Hypervisor.HypervisorType.VMware,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-vmware.ova";);
+ put(Hypervisor.HypervisorType.XenServer,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-xen.vhd.bz2";);
+ put(Hypervisor.HypervisorType.Hyperv,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-hyperv.vhd.zip";);
+ put(Hypervisor.HypervisorType.LXC,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-kvm.qcow2.bz2";);
+ put(Hypervisor.HypervisorType.Ovm3,
"https://download.cloudstack.org/systemvm/4.11/systemvmtemplate-4.11.3-ovm.raw.bz2";);
}
};
final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new
HashMap<Hypervisor.HypervisorType, String>() {
{
- put(Hypervisor.HypervisorType.KVM,
"6d12cc764cd7d64112d8c35d70923eb1");
- put(Hypervisor.HypervisorType.XenServer,
"6e8b3ae84ca8145736d1d7d3f7546e65");
- put(Hypervisor.HypervisorType.VMware,
"e981f8cb951688efd93481913198c9cc");
- put(Hypervisor.HypervisorType.Hyperv,
"e9032635ffba021371780307162551b9");
- put(Hypervisor.HypervisorType.LXC,
"6d12cc764cd7d64112d8c35d70923eb1");
- put(Hypervisor.HypervisorType.Ovm3,
"c4a91f8e52e4531a1c2a9a17c530d5fe");
+ put(Hypervisor.HypervisorType.KVM,
"15ec268d0939a8fa0be1bc79f397a167");
+ put(Hypervisor.HypervisorType.XenServer,
"ae96f35fb746524edc4ebc9856719d71");
+ put(Hypervisor.HypervisorType.VMware,
"f50c82139430afce7e4e46d3a585abbd");
+ put(Hypervisor.HypervisorType.Hyperv,
"abf411f6cdd9139716b5d8172ab903a6");
+ put(Hypervisor.HypervisorType.LXC,
"15ec268d0939a8fa0be1bc79f397a167");
+ put(Hypervisor.HypervisorType.Ovm3,
"c71f143a477f4c7a0d5e8c82ccb00220");
}
};
@@ -197,12 +191,12 @@ public class Upgrade41110to41120 implements DbUpgrade {
// Change value of global configuration parameter
// minreq.sysvmtemplate.version for the ACS version
try (PreparedStatement update_pstmt =
conn.prepareStatement("UPDATE `cloud`.`configuration` SET value = ? WHERE name
= ?");) {
- update_pstmt.setString(1, "4.11.2");
+ update_pstmt.setString(1, "4.11.3");
update_pstmt.setString(2,
"minreq.sysvmtemplate.version");
update_pstmt.executeUpdate();
} catch (final SQLException e) {
- LOG.error("updateSystemVmTemplates:Exception while
setting 'minreq.sysvmtemplate.version' to 4.11.2: " + e.getMessage());
- throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while setting
'minreq.sysvmtemplate.version' to 4.11.2", e);
+ LOG.error("updateSystemVmTemplates:Exception while
setting 'minreq.sysvmtemplate.version' to 4.11.3: " + e.getMessage());
+ throw new
CloudRuntimeException("updateSystemVmTemplates:Exception while setting
'minreq.sysvmtemplate.version' to 4.11.3", e);
}
} else {
if
(hypervisorsListInUse.contains(hypervisorAndTemplateName.getKey())) {
@@ -236,12 +230,6 @@ public class Upgrade41110to41120 implements DbUpgrade {
@Override
public InputStream[] getCleanupScripts() {
- final String scriptFile =
"META-INF/db/schema-41110to41120-cleanup.sql";
- final InputStream script =
Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile);
- if (script == null) {
- throw new CloudRuntimeException("Unable to find " + scriptFile);
- }
-
- return new InputStream[] {script};
+ return new InputStream[] {};
}
}
