Arik Hadas has uploaded a new change for review.
Change subject: core: move constant strings in ovf to OvfProperties
......................................................................
core: move constant strings in ovf to OvfProperties
Most of the Strings which are part of the OVF files appear explicitly
in both the reader and writer classes. It is wrong because they have to
be the same in both places. So in this patch I move many Strings like
that to the OvfProperties class as constants and the OVF readers and
writers now reference those constants.
Change-Id: Idc40102b107d510e04f10f45f0b7e4838fd4c706
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
7 files changed, 130 insertions(+), 89 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/25679/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java
index c8321e6..a461095 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfProperties.java
@@ -22,4 +22,45 @@
final static String AUTO_STARTUP = "AutoStartup";
final static String PRIORITY = "Priority";
+ final static String SSO_METHOD = "SsoMethod";
+ final static String DELETE_PROTECTED = "DeleteProtected";
+ final static String IS_SMARTCARD_ENABLED = "IsSmartcardEnabled";
+ final static String TUNNEL_MIGRATION = "TunnelMigration";
+ final static String VNC_KEYBOARD_LAYOUT = "VncKeyboardLayout";
+ final static String MIN_ALLOCATED_MEMORY = "MinAllocatedMem";
+ final static String IS_STATELESS = "IsStateless";
+ final static String IS_RUN_AND_PAUSE = "IsRunAndPause";
+ final static String CREATED_BY_USER_ID = "CreatedByUserId";
+ final static String MIGRATION_DOWNTIME = "MigrationDowntime";
+ final static String ORIGIN = "Origin";
+ final static String VM_TYPE = "VmType";
+ final static String KERNEL_PARAMS = "kernel_params";
+ final static String KERNEL_URL = "kernel_url";
+ final static String INITRD_URL = "initrd_url";
+ final static String DEFAULT_BOOT_SEQUENCE = "default_boot_sequence";
+ final static String TIMEZONE = "TimeZone";
+ final static String EXPORT_DATE = "ExportDate";
+ final static String CREATION_DATE = "CreationDate";
+ final static String DOMAIN = "Domain";
+ final static String DESCRIPTION = "Description";
+ final static String GENERATION = "Generation";
+ final static String NAME = "Name";
+ final static String TEMPLATE_ID = "TemplateId";
+ final static String TEMPLATE_NAME = "TemplateName";
+ final static String INSTANCE_TYPE_ID = "InstanceTypeId";
+ final static String IMAGE_TYPE_ID = "ImageTypeId";
+ final static String IS_INITIALIZED = "IsInitilized";
+ final static String APPLICATIONS_LIST = "app_list";
+ final static String QUOTA_ID = "quota_id";
+ final static String VM_DEFAULT_DISPLAY_TYPE = "DefaultDisplayType";
+ final static String TEMPLATE_DEFAULT_DISPLAY_TYPE = "default_display_type";
+ final static String TRUSTED_SERVICE = "TrustedService";
+ final static String ORIGINAL_TEMPLATE_ID = "OriginalTemplateId";
+ final static String ORIGINAL_TEMPLATE_NAME = "OriginalTemplateName";
+ final static String USE_LATEST_VERSION = "UseLatestVersion";
+ final static String IS_DISABLED = "IsDisabled";
+ final static String TEMPLATE_TYPE = "TemplateType";
+ final static String BASE_TEMPLATE_ID = "BaseTemplateId";
+ final static String TEMPLATE_VERSION_NUMBER = "TemplateVersionNumber";
+ final static String TEMPLATE_VERSION_NAME = "TemplateVersionName";
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
index e839566..7278ba0 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
@@ -323,17 +323,17 @@
// set ovf version to the ovf object
vmBase.setOvfVersion(getVersion());
- node = content.SelectSingleNode("Description");
+ node = content.SelectSingleNode(OvfProperties.DESCRIPTION);
if (node != null) {
vmBase.setDescription(node.innerText);
}
- node = content.SelectSingleNode("Domain");
+ node = content.SelectSingleNode(OvfProperties.DOMAIN);
if (node != null) {
vmBase.getVmInit().setDomain(node.innerText);
}
- node = content.SelectSingleNode("CreationDate");
+ node = content.SelectSingleNode(OvfProperties.CREATION_DATE);
if (node != null) {
Date creationDate =
OvfParser.UtcDateStringToLocaDate(node.innerText);
if (creationDate != null) {
@@ -341,7 +341,7 @@
}
}
- node = content.SelectSingleNode("ExportDate");
+ node = content.SelectSingleNode(OvfProperties.EXPORT_DATE);
if (node != null) {
Date exportDate =
OvfParser.UtcDateStringToLocaDate(node.innerText);
if (exportDate != null) {
@@ -349,42 +349,42 @@
}
}
- node = content.SelectSingleNode("TimeZone");
+ node = content.SelectSingleNode(OvfProperties.TIMEZONE);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
vmBase.setTimeZone(node.innerText);
}
}
- node = content.SelectSingleNode("default_boot_sequence");
+ node = content.SelectSingleNode(OvfProperties.DEFAULT_BOOT_SEQUENCE);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setDefaultBootSequence(BootSequence.forValue(Integer.parseInt(node.innerText)));
}
}
- node = content.SelectSingleNode("initrd_url");
+ node = content.SelectSingleNode(OvfProperties.INITRD_URL);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setInitrdUrl(node.innerText);
}
}
- node = content.SelectSingleNode("kernel_url");
+ node = content.SelectSingleNode(OvfProperties.KERNEL_URL);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setKernelUrl(node.innerText);
}
}
- node = content.SelectSingleNode("kernel_params");
+ node = content.SelectSingleNode(OvfProperties.KERNEL_PARAMS);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setKernelParams(node.innerText);
}
}
- node = content.SelectSingleNode("Generation");
+ node = content.SelectSingleNode(OvfProperties.GENERATION);
if (node != null) {
vmBase.setDbGeneration(Long.parseLong(node.innerText));
} else {
@@ -425,84 +425,84 @@
}
}
- node = content.SelectSingleNode("Origin");
+ node = content.SelectSingleNode(OvfProperties.ORIGIN);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setOrigin(OriginType.forValue(Integer.parseInt(node.innerText)));
}
}
- node = content.SelectSingleNode("VmType");
+ node = content.SelectSingleNode(OvfProperties.VM_TYPE);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setVmType(VmType.forValue(Integer.parseInt(node.innerText)));
}
}
- node = content.SelectSingleNode("IsSmartcardEnabled");
+ node = content.SelectSingleNode(OvfProperties.IS_SMARTCARD_ENABLED);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setSmartcardEnabled(Boolean.parseBoolean(node.innerText));
}
}
- node = content.SelectSingleNode("DeleteProtected");
+ node = content.SelectSingleNode(OvfProperties.DELETE_PROTECTED);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setDeleteProtected(Boolean.parseBoolean(node.innerText));
}
}
- node = content.SelectSingleNode("SsoMethod");
+ node = content.SelectSingleNode(OvfProperties.SSO_METHOD);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setSsoMethod(SsoMethod.fromString(node.innerText));
}
}
- node = content.SelectSingleNode("TunnelMigration");
+ node = content.SelectSingleNode(OvfProperties.TUNNEL_MIGRATION);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setTunnelMigration(Boolean.parseBoolean(node.innerText));
}
}
- node = content.SelectSingleNode("VncKeyboardLayout");
+ node = content.SelectSingleNode(OvfProperties.VNC_KEYBOARD_LAYOUT);
if (node != null) {
if (!StringUtils.isEmpty(node.innerText)) {
vmBase.setVncKeyboardLayout(node.innerText);
}
}
- node = content.SelectSingleNode("MinAllocatedMem");
+ node = content.SelectSingleNode(OvfProperties.MIN_ALLOCATED_MEMORY);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
vmBase.setMinAllocatedMem(Integer.parseInt(node.innerText));
}
}
- node = content.SelectSingleNode("IsStateless");
+ node = content.SelectSingleNode(OvfProperties.IS_STATELESS);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
vmBase.setStateless(Boolean.parseBoolean(node.innerText));
}
}
- node = content.SelectSingleNode("IsRunAndPause");
+ node = content.SelectSingleNode(OvfProperties.IS_RUN_AND_PAUSE);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
vmBase.setRunAndPause(Boolean.parseBoolean(node.innerText));
}
}
- node = content.SelectSingleNode("CreatedByUserId");
+ node = content.SelectSingleNode(OvfProperties.CREATED_BY_USER_ID);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
vmBase.setCreatedByUserId(Guid.createGuidFromString(node.innerText));
}
}
- node = content.SelectSingleNode("MigrationDowntime");
+ node = content.SelectSingleNode(OvfProperties.MIGRATION_DOWNTIME);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
vmBase.setMigrationDowntime(Integer.parseInt(node.innerText));
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
index 48033f3..d5f3162 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java
@@ -170,34 +170,34 @@
@Override
protected void readGeneralData(XmlNode content) {
// General Vm
- XmlNode node = content.SelectSingleNode("Name");
+ XmlNode node = content.SelectSingleNode(OvfProperties.NAME);
if (node != null) {
_vmTemplate.setName(node.innerText);
name = _vmTemplate.getName();
}
- node = content.SelectSingleNode("TemplateId");
+ node = content.SelectSingleNode(OvfProperties.TEMPLATE_ID);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
_vmTemplate.setId(new Guid(node.innerText));
}
}
- node = content.SelectSingleNode("IsDisabled");
+ node = content.SelectSingleNode(OvfProperties.IS_DISABLED);
if (node != null) {
_vmTemplate.setDisabled(Boolean.parseBoolean(node.innerText));
}
- node = content.SelectSingleNode("TrustedService");
+ node = content.SelectSingleNode(OvfProperties.TRUSTED_SERVICE);
if (node != null) {
_vmTemplate.setTrustedService(Boolean.parseBoolean(node.innerText));
}
- node = content.SelectSingleNode("TemplateType");
+ node = content.SelectSingleNode(OvfProperties.TEMPLATE_TYPE);
if (node != null) {
_vmTemplate.setTemplateType(VmEntityType.valueOf(node.innerText));
}
- node = content.SelectSingleNode("BaseTemplateId");
+ node = content.SelectSingleNode(OvfProperties.BASE_TEMPLATE_ID);
if (node != null) {
_vmTemplate.setBaseTemplateId(Guid.createGuidFromString(node.innerText));
} else {
@@ -205,12 +205,12 @@
_vmTemplate.setBaseTemplateId(_vmTemplate.getId());
}
- node = content.SelectSingleNode("TemplateVersionNumber");
+ node = content.SelectSingleNode(OvfProperties.TEMPLATE_VERSION_NUMBER);
if (node != null) {
_vmTemplate.setTemplateVersionNumber(Integer.parseInt(node.innerText));
}
- node = content.SelectSingleNode("TemplateVersionName");
+ node = content.SelectSingleNode(OvfProperties.TEMPLATE_NAME);
if (node != null) {
_vmTemplate.setTemplateVersionName(node.innerText);
}
@@ -218,6 +218,6 @@
@Override
protected String getDefaultDisplayTypeStringRepresentation() {
- return "default_display_type";
+ return OvfProperties.TEMPLATE_DEFAULT_DISPLAY_TYPE;
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
index b698343..8d4f2d3 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateWriter.java
@@ -25,34 +25,34 @@
@Override
protected void writeGeneralData() {
super.writeGeneralData();
- _writer.WriteStartElement("Name");
+ _writer.WriteStartElement(OvfProperties.NAME);
_writer.WriteRaw(_vmTemplate.getName());
_writer.WriteEndElement();
- _writer.WriteStartElement("TemplateId");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_ID);
_writer.WriteRaw(_vmTemplate.getId().toString());
_writer.WriteEndElement();
- _writer.WriteStartElement("Origin");
+ _writer.WriteStartElement(OvfProperties.ORIGIN);
_writer.WriteRaw(_vmTemplate.getOrigin() == null ? "" :
String.valueOf(_vmTemplate.getOrigin().getValue()));
_writer.WriteEndElement();
- _writer.WriteStartElement("default_display_type");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_DEFAULT_DISPLAY_TYPE);
_writer.WriteRaw(String.valueOf(_vmTemplate.getDefaultDisplayType().getValue()));
_writer.WriteEndElement();
- _writer.WriteStartElement("IsDisabled");
+ _writer.WriteStartElement(OvfProperties.IS_DISABLED);
_writer.WriteRaw(String.valueOf(_vmTemplate.isDisabled()));
_writer.WriteEndElement();
- _writer.WriteStartElement("TrustedService");
+ _writer.WriteStartElement(OvfProperties.TRUSTED_SERVICE);
_writer.WriteRaw(String.valueOf(_vmTemplate.isTrustedService()));
_writer.WriteEndElement();
- _writer.WriteStartElement("TemplateType");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_TYPE);
_writer.WriteRaw(_vmTemplate.getTemplateType().name());
_writer.WriteEndElement();
- _writer.WriteStartElement("BaseTemplateId");
+ _writer.WriteStartElement(OvfProperties.BASE_TEMPLATE_ID);
_writer.WriteRaw(_vmTemplate.getBaseTemplateId().toString());
_writer.WriteEndElement();
- _writer.WriteStartElement("TemplateVersionNumber");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_VERSION_NUMBER);
_writer.WriteRaw(String.valueOf(_vmTemplate.getTemplateVersionNumber()));
_writer.WriteEndElement();
- _writer.WriteStartElement("TemplateVersionName");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_VERSION_NAME);
_writer.WriteRaw(_vmTemplate.getTemplateVersionName());
_writer.WriteEndElement();
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
index 8282fa9..0b140a1 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java
@@ -205,40 +205,40 @@
@Override
protected void readGeneralData(XmlNode content) {
// General Vm
- XmlNode node = content.SelectSingleNode("Name");
+ XmlNode node = content.SelectSingleNode(OvfProperties.NAME);
if (node != null) {
_vm.getStaticData().setName(node.innerText);
name = _vm.getStaticData().getName();
}
- node = content.SelectSingleNode("TemplateId");
+ node = content.SelectSingleNode(OvfProperties.TEMPLATE_ID);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
_vm.getStaticData().setVmtGuid(new Guid(node.innerText));
}
}
- node = content.SelectSingleNode("TemplateName");
+ node = content.SelectSingleNode(OvfProperties.TEMPLATE_NAME);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
_vm.setVmtName(node.innerText);
}
}
- node = content.SelectSingleNode("InstanceTypeId");
+ node = content.SelectSingleNode(OvfProperties.INSTANCE_TYPE_ID);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
_vm.setInstanceTypeId(new Guid(node.innerText));
}
}
- node = content.SelectSingleNode("ImageTypeId");
+ node = content.SelectSingleNode(OvfProperties.IMAGE_TYPE_ID);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
_vm.setImageTypeId(new Guid(node.innerText));
}
}
- node = content.SelectSingleNode("IsInitilized");
+ node = content.SelectSingleNode(OvfProperties.IS_INITIALIZED);
if (node != null) {
_vm.getStaticData().setInitialized(Boolean.parseBoolean(node.innerText));
}
- node = content.SelectSingleNode("quota_id");
+ node = content.SelectSingleNode(OvfProperties.QUOTA_ID);
if (node != null) {
Guid quotaId = new Guid(node.innerText);
if (!Guid.Empty.equals(quotaId)) {
@@ -259,7 +259,7 @@
}
}
- node = content.SelectSingleNode("app_list");
+ node = content.SelectSingleNode(OvfProperties.APPLICATIONS_LIST);
if (node != null) {
if (StringUtils.isNotEmpty(node.innerText)) {
_vm.setAppList(node.innerText);
@@ -279,22 +279,22 @@
_vm.setAppList(_images.get(0).getAppList());
}
}
- node = content.SelectSingleNode("TrustedService");
+ node = content.SelectSingleNode(OvfProperties.TRUSTED_SERVICE);
if (node != null) {
_vm.setTrustedService(Boolean.parseBoolean(node.innerText));
}
- node = content.SelectSingleNode("OriginalTemplateId");
+ node = content.SelectSingleNode(OvfProperties.ORIGINAL_TEMPLATE_ID);
if (node != null) {
_vm.getStaticData().setOriginalTemplateGuid(new
Guid(node.innerText));
}
- node = content.SelectSingleNode("OriginalTemplateName");
+ node = content.SelectSingleNode(OvfProperties.ORIGINAL_TEMPLATE_NAME);
if (node != null) {
_vm.getStaticData().setOriginalTemplateName(node.innerText);
}
- node = content.SelectSingleNode("UseLatestVersion");
+ node = content.SelectSingleNode(OvfProperties.USE_LATEST_VERSION);
if (node != null) {
_vm.setUseLatestVersion(Boolean.parseBoolean(node.innerText));
}
@@ -302,7 +302,7 @@
@Override
protected String getDefaultDisplayTypeStringRepresentation() {
- return "DefaultDisplayType";
+ return OvfProperties.VM_DEFAULT_DISPLAY_TYPE;
}
// function returns the index of the image that has no parent
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
index 1a2a0b5..97bd737 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmWriter.java
@@ -32,61 +32,61 @@
@Override
protected void writeGeneralData() {
super.writeGeneralData();
- _writer.WriteStartElement("Name");
+ _writer.WriteStartElement(OvfProperties.NAME);
_writer.WriteRaw(_vm.getStaticData().getName());
_writer.WriteEndElement();
- _writer.WriteStartElement("TemplateId");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_ID);
_writer.WriteRaw(_vm.getStaticData().getVmtGuid().toString());
_writer.WriteEndElement();
- _writer.WriteStartElement("TemplateName");
+ _writer.WriteStartElement(OvfProperties.TEMPLATE_NAME);
_writer.WriteRaw(_vm.getVmtName());
_writer.WriteEndElement();
if (_vm.getInstanceTypeId() != null ) {
- _writer.WriteStartElement("InstanceTypeId");
+ _writer.WriteStartElement(OvfProperties.INSTANCE_TYPE_ID);
_writer.WriteRaw(_vm.getInstanceTypeId().toString());
_writer.WriteEndElement();
}
if (_vm.getImageTypeId() != null ) {
- _writer.WriteStartElement("ImageTypeId");
+ _writer.WriteStartElement(OvfProperties.IMAGE_TYPE_ID);
_writer.WriteRaw(_vm.getImageTypeId().toString());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("IsInitilized");
+ _writer.WriteStartElement(OvfProperties.IS_INITIALIZED);
_writer.WriteRaw(String.valueOf(_vm.getStaticData().isInitialized()));
_writer.WriteEndElement();
- _writer.WriteStartElement("Origin");
+ _writer.WriteStartElement(OvfProperties.ORIGIN);
_writer.WriteRaw(String.valueOf(_vm.getOrigin().getValue()));
_writer.WriteEndElement();
if (!StringUtils.isBlank(_vm.getAppList())) {
- _writer.WriteStartElement("app_list");
+ _writer.WriteStartElement(OvfProperties.APPLICATIONS_LIST);
_writer.WriteRaw(_vm.getAppList());
_writer.WriteEndElement();
}
if (_vm.getQuotaId() != null) {
- _writer.WriteStartElement("quota_id");
+ _writer.WriteStartElement(OvfProperties.QUOTA_ID);
_writer.WriteRaw(_vm.getQuotaId().toString());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("DefaultDisplayType");
+ _writer.WriteStartElement(OvfProperties.VM_DEFAULT_DISPLAY_TYPE);
_writer.WriteRaw(String.valueOf(_vm.getDefaultDisplayType().getValue()));
_writer.WriteEndElement();
- _writer.WriteStartElement("TrustedService");
+ _writer.WriteStartElement(OvfProperties.TRUSTED_SERVICE);
_writer.WriteRaw(String.valueOf(_vm.isTrustedService()));
_writer.WriteEndElement();
if (_vm.getStaticData().getOriginalTemplateGuid() != null) {
- _writer.WriteStartElement("OriginalTemplateId");
+ _writer.WriteStartElement(OvfProperties.ORIGINAL_TEMPLATE_ID);
_writer.WriteRaw(_vm.getStaticData().getOriginalTemplateGuid().toString());
_writer.WriteEndElement();
}
if (_vm.getStaticData().getOriginalTemplateName() != null) {
- _writer.WriteStartElement("OriginalTemplateName");
+ _writer.WriteStartElement(OvfProperties.ORIGINAL_TEMPLATE_NAME);
_writer.WriteRaw(_vm.getStaticData().getOriginalTemplateName());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("UseLatestVersion");
+ _writer.WriteStartElement(OvfProperties.USE_LATEST_VERSION);
_writer.WriteRaw(String.valueOf(_vm.isUseLatestVersion()));
_writer.WriteEndElement();
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
index 90dcbf1..9bcae25 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
@@ -233,91 +233,91 @@
}
protected void writeGeneralData() {
- _writer.WriteStartElement("Description");
+ _writer.WriteStartElement(OvfProperties.DESCRIPTION);
_writer.WriteRaw(vmBase.getDescription());
_writer.WriteEndElement();
if (!vmInitEnabled() && vmBase.getVmInit() != null &&
vmBase.getVmInit().getDomain() != null) {
- _writer.WriteStartElement("Domain");
+ _writer.WriteStartElement(OvfProperties.DOMAIN);
_writer.WriteRaw(vmBase.getVmInit().getDomain());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("CreationDate");
+ _writer.WriteStartElement(OvfProperties.CREATION_DATE);
_writer.WriteRaw(OvfParser.LocalDateToUtcDateString(vmBase.getCreationDate()));
_writer.WriteEndElement();
- _writer.WriteStartElement("ExportDate");
+ _writer.WriteStartElement(OvfProperties.EXPORT_DATE);
_writer.WriteRaw(OvfParser.LocalDateToUtcDateString(new Date()));
_writer.WriteEndElement();
- _writer.WriteStartElement("DeleteProtected");
+ _writer.WriteStartElement(OvfProperties.DELETE_PROTECTED);
_writer.WriteRaw(String.valueOf(vmBase.isDeleteProtected()));
_writer.WriteEndElement();
if (vmBase.getSsoMethod() != null) {
- _writer.WriteStartElement("SsoMethod");
+ _writer.WriteStartElement(OvfProperties.SSO_METHOD);
_writer.WriteRaw(vmBase.getSsoMethod().toString());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("IsSmartcardEnabled");
+ _writer.WriteStartElement(OvfProperties.IS_SMARTCARD_ENABLED);
_writer.WriteRaw(String.valueOf(vmBase.isSmartcardEnabled()));
_writer.WriteEndElement();
- _writer.WriteStartElement("TimeZone");
+ _writer.WriteStartElement(OvfProperties.TIMEZONE);
_writer.WriteRaw(vmBase.getTimeZone());
_writer.WriteEndElement();
- _writer.WriteStartElement("default_boot_sequence");
+ _writer.WriteStartElement(OvfProperties.DEFAULT_BOOT_SEQUENCE);
_writer.WriteRaw(String.valueOf(vmBase.getDefaultBootSequence().getValue()));
_writer.WriteEndElement();
if (!StringUtils.isBlank(vmBase.getInitrdUrl())) {
- _writer.WriteStartElement("initrd_url");
+ _writer.WriteStartElement(OvfProperties.INITRD_URL);
_writer.WriteRaw(vmBase.getInitrdUrl());
_writer.WriteEndElement();
}
if (!StringUtils.isBlank(vmBase.getKernelUrl())) {
- _writer.WriteStartElement("kernel_url");
+ _writer.WriteStartElement(OvfProperties.KERNEL_URL);
_writer.WriteRaw(vmBase.getKernelUrl());
_writer.WriteEndElement();
}
if (!StringUtils.isBlank(vmBase.getKernelParams())) {
- _writer.WriteStartElement("kernel_params");
+ _writer.WriteStartElement(OvfProperties.KERNEL_PARAMS);
_writer.WriteRaw(vmBase.getKernelParams());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("Generation");
+ _writer.WriteStartElement(OvfProperties.GENERATION);
_writer.WriteRaw(String.valueOf(vmBase.getDbGeneration()));
_writer.WriteEndElement();
- _writer.WriteStartElement("VmType");
+ _writer.WriteStartElement(OvfProperties.VM_TYPE);
_writer.WriteRaw(String.valueOf(vmBase.getVmType().getValue()));
_writer.WriteEndElement();
if (vmBase.getTunnelMigration() != null) {
- _writer.WriteStartElement("TunnelMigration");
+ _writer.WriteStartElement(OvfProperties.TUNNEL_MIGRATION);
_writer.WriteRaw(String.valueOf(vmBase.getTunnelMigration()));
_writer.WriteEndElement();
}
if (vmBase.getVncKeyboardLayout() != null) {
- _writer.WriteStartElement("VncKeyboardLayout");
+ _writer.WriteStartElement(OvfProperties.VNC_KEYBOARD_LAYOUT);
_writer.WriteRaw(vmBase.getVncKeyboardLayout());
_writer.WriteEndElement();
}
- _writer.WriteStartElement("MinAllocatedMem");
+ _writer.WriteStartElement(OvfProperties.MIN_ALLOCATED_MEMORY);
_writer.WriteRaw(String.valueOf(vmBase.getMinAllocatedMem()));
_writer.WriteEndElement();
- _writer.WriteStartElement("IsStateless");
+ _writer.WriteStartElement(OvfProperties.IS_STATELESS);
_writer.WriteRaw(String.valueOf(vmBase.isStateless()));
_writer.WriteEndElement();
- _writer.WriteStartElement("IsRunAndPause");
+ _writer.WriteStartElement(OvfProperties.IS_RUN_AND_PAUSE);
_writer.WriteRaw(String.valueOf(vmBase.isRunAndPause()));
_writer.WriteEndElement();
@@ -330,13 +330,13 @@
_writer.WriteEndElement();
if (vmBase.getCreatedByUserId() != null) {
- _writer.WriteStartElement("CreatedByUserId");
+ _writer.WriteStartElement(OvfProperties.CREATED_BY_USER_ID);
_writer.WriteRaw(String.valueOf(vmBase.getCreatedByUserId()));
_writer.WriteEndElement();
}
if (vmBase.getMigrationDowntime() != null) {
- _writer.WriteStartElement("MigrationDowntime");
+ _writer.WriteStartElement(OvfProperties.MIGRATION_DOWNTIME);
_writer.WriteRaw(String.valueOf(vmBase.getMigrationDowntime()));
_writer.WriteEndElement();
}
--
To view, visit http://gerrit.ovirt.org/25679
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc40102b107d510e04f10f45f0b7e4838fd4c706
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
