Roy Golan has uploaded a new change for review. Change subject: WIP libosinfo - some changes for CpuArch ......................................................................
WIP libosinfo - some changes for CpuArch Change-Id: I31731e1699a6bfe7b74ac21e83e9f246bcd8f991 Signed-off-by: Roy Golan <[email protected]> --- A backend/manager/dbscripts/upgrade/03_01_1500_add_cpu_arch_column.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CpuArch.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java 5 files changed, 40 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/67/9067/1 diff --git a/backend/manager/dbscripts/upgrade/03_01_1500_add_cpu_arch_column.sql b/backend/manager/dbscripts/upgrade/03_01_1500_add_cpu_arch_column.sql new file mode 100644 index 0000000..2da9b5c --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_01_1500_add_cpu_arch_column.sql @@ -0,0 +1,3 @@ +/** +select add_db_column('vm_static', 'cpu_arch', Integer default 0) +**/ diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CpuArch.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CpuArch.java index f5c1950..91d87d7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CpuArch.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/CpuArch.java @@ -5,11 +5,12 @@ public enum CpuArch { - Unassigned(0), - i386(1), - i586(2), - i686(3), - X86_64(4); + UNASSIGNED(0), + ALL(1), + i386(2), + i586(3), + i686(4), + X86_64(5); private final int id; @@ -28,4 +29,26 @@ public int getId() { return id; } + + /** + * + * @return the {@link CpuArch} with that given id + */ + public static CpuArch forValue(int id) { + return map.get(id); + } + + /** + * + * @param value + * @return return a {@link CpuArch} member with the an equal name to {@link Value}, case insensitive. + */ + public static CpuArch forValue(String value) { + for (CpuArch arch : values()) { + if (arch.name().equalsIgnoreCase(value)) { + return arch; + } + } + return null; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java index 4b87bf0..f1208cf 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java @@ -1571,4 +1571,8 @@ public CpuArch getCpuArch() { return mVmStatic.getCpuArch(); } + + public void setCpuArch(CpuArch cpuArch) { + mVmStatic.setCpuArch(cpuArch); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java index 6d6562b..8bea592 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java @@ -47,7 +47,7 @@ private VmOsType mOs = VmOsType.Unassigned; - private CpuArch cpuArch; + private CpuArch cpuArch = CpuArch.ALL; @Column(name = "creation_date", nullable = false) private Date creationDate = new Date(0); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java index ecae5c4..a7c6cfb 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmOsType.java @@ -119,12 +119,12 @@ win98(1203, "win98"), winme(1204, "winme"), win2k(1205, "win2k"), - winxp(1206, "winxp"), + winxp(1206, "winxp"), winxp64(1207, "winxp64"), - win2k3(1208, "win2k3"), - win2k8(1209, "win2k8"), + win2k3(1208, "win2k3"), + win2k8(1209, "win2k8"), vista(1210, "vista"), - win7(1211, "win7"), + win7(1211, "win7"), ; -- To view, visit http://gerrit.ovirt.org/9067 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I31731e1699a6bfe7b74ac21e83e9f246bcd8f991 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
