Maor Lipchuk has uploaded a new change for review.
Change subject: core: Fix typo
......................................................................
core: Fix typo
change Compatilibily to Compatibility
Change-Id: I4a1e956d453d35b4cd5968df6ef5e6de7de975d2
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/ClusterUtils.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
6 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/15357/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
index 6f9157d..79218e3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java
@@ -249,7 +249,7 @@
vm.setVmtName(t.getName());
}
getVm().setVmtGuid(VmTemplateHandler.BlankVmTemplateId);
- String vmMeta = ovfManager.ExportVm(vm, AllVmImages,
ClusterUtils.getCompatilibilyVersion(vm));
+ String vmMeta = ovfManager.ExportVm(vm, AllVmImages,
ClusterUtils.getCompatibilityVersion(vm));
List<Guid> imageGroupIds = new ArrayList<Guid>();
for(Disk disk : vm.getDiskMap().values()) {
if(disk.getDiskStorageType() == DiskStorageType.IMAGE) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
index 1b5a4c6..ddc6c4f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/OvfDataUpdater.java
@@ -266,7 +266,7 @@
}
protected String generateVmTemplateMetadata(VmTemplate template,
List<DiskImage> allTemplateImages) {
- return ovfManager.ExportTemplate(template, allTemplateImages,
ClusterUtils.getCompatilibilyVersion(template));
+ return ovfManager.ExportTemplate(template, allTemplateImages,
ClusterUtils.getCompatibilityVersion(template));
}
/**
@@ -318,7 +318,7 @@
}
protected String generateVmMetadata(VM vm, ArrayList<DiskImage>
AllVmImages) {
- return ovfManager.ExportVm(vm, AllVmImages,
ClusterUtils.getCompatilibilyVersion(vm));
+ return ovfManager.ExportVm(vm, AllVmImages,
ClusterUtils.getCompatibilityVersion(vm));
}
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
index 984d4dc..96479a3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java
@@ -262,7 +262,7 @@
}
}
- String newOvf = ovfManager.ExportVm(vmSnapshot,
snapshotImages, ClusterUtils.getCompatilibilyVersion(vmSnapshot));
+ String newOvf = ovfManager.ExportVm(vmSnapshot,
snapshotImages, ClusterUtils.getCompatibilityVersion(vmSnapshot));
snap.setVmConfiguration(newOvf);
}
} catch (OvfReaderException e) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
index 7a644f9..589da1b 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java
@@ -186,7 +186,7 @@
for (DiskImage image : images) {
image.setStorageIds(null);
}
- return new OvfManager().ExportVm(vm, images,
ClusterUtils.getCompatilibilyVersion(vm));
+ return new OvfManager().ExportVm(vm, images,
ClusterUtils.getCompatibilityVersion(vm));
}
/**
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/ClusterUtils.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/ClusterUtils.java
index 91f6b5c..c36b70f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/ClusterUtils.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/ClusterUtils.java
@@ -57,11 +57,11 @@
.getVdsDao();
}
- public static Version getCompatilibilyVersion(VM vm) {
- return getCompatilibilyVersion(vm.getStaticData());
+ public static Version getCompatibilityVersion(VM vm) {
+ return getCompatibilityVersion(vm.getStaticData());
}
- public static Version getCompatilibilyVersion(VmBase vmBase) {
+ public static Version getCompatibilityVersion(VmBase vmBase) {
return vmBase.getVdsGroupId() != null ?
getInstance().getVdsGroupDao().get(vmBase.getVdsGroupId()).getcompatibility_version()
: Version.v3_0;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
index 5c3ca39..3985aa9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
@@ -254,7 +254,7 @@
}
private static void addSoundCard(VmBase vmBase) {
- addSoundCard(vmBase, ClusterUtils.getCompatilibilyVersion(vmBase));
+ addSoundCard(vmBase, ClusterUtils.getCompatibilityVersion(vmBase));
}
private static void addSoundCard(VmBase vmBase, Version
vdsGroupCompatibilityVersion) {
--
To view, visit http://gerrit.ovirt.org/15357
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a1e956d453d35b4cd5968df6ef5e6de7de975d2
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
