[Engine-patches] Change in ovirt-engine[master]: core: add import/export support

[ofrenkel]

Omer Frenkel has uploaded a new change for review.

Change subject: core: add import/export support
......................................................................

core: add import/export support

Change-Id: I7e99c737cceb022b8cbd6f026d21181dab3c1f7a
Signed-off-by: Omer Frenkel <ofren...@redhat.com>
---
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
4 files changed, 31 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/15592/1

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 a32fbf7..7872e7b 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
@@ -6,6 +6,7 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.businessentities.DiskImage;
+import org.ovirt.engine.core.common.businessentities.TemplateType;
 import org.ovirt.engine.core.common.businessentities.UsbPolicy;
 import org.ovirt.engine.core.common.businessentities.VmOsType;
 import org.ovirt.engine.core.common.businessentities.VmTemplate;
@@ -162,6 +163,11 @@
         if (node != null) {
             _vmTemplate.setDisabled(Boolean.parseBoolean(node.InnerText));
         }
+
+        node = content.SelectSingleNode("TemplateType");
+        if (node != null) {
+            _vmTemplate.setTemplateType(TemplateType.valueOf(node.InnerText));
+        }
     }
 
     @Override
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 dc7b7e4..3b1a45a 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
@@ -36,6 +36,9 @@
         _writer.WriteStartElement("IsDisabled");
         _writer.WriteRaw(String.valueOf(_vmTemplate.isDisabled()));
         _writer.WriteEndElement();
+        _writer.WriteStartElement("TemplateType");
+        _writer.WriteRaw(_vmTemplate.getTemplateType().name());
+        _writer.WriteEndElement();
     }
 
     @Override
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 7d24b5f..ce2dd65 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
@@ -158,6 +158,18 @@
                 _vm.setVmtName(node.InnerText);
             }
         }
+        node = content.SelectSingleNode("InstanceTypeId");
+        if (node != null) {
+            if (StringUtils.isNotEmpty(node.InnerText)) {
+                _vm.setInstanceTypeId(new Guid(node.InnerText));
+            }
+        }
+        node = content.SelectSingleNode("ImageTypeId");
+        if (node != null) {
+            if (StringUtils.isNotEmpty(node.InnerText)) {
+                _vm.setImageTypeId(new Guid(node.InnerText));
+            }
+        }
         node = content.SelectSingleNode("IsInitilized");
         if (node != null) {
             
_vm.getStaticData().setInitialized(Boolean.parseBoolean(node.InnerText));
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 54caed0..3a9a861 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
@@ -38,6 +38,16 @@
         _writer.WriteStartElement("TemplateName");
         _writer.WriteRaw(_vm.getVmtName());
         _writer.WriteEndElement();
+        if (_vm.getInstanceTypeId() != null ) {
+            _writer.WriteStartElement("InstanceTypeId");
+            _writer.WriteRaw(_vm.getInstanceTypeId().toString());
+            _writer.WriteEndElement();
+        }
+        if (_vm.getImageTypeId() != null ) {
+            _writer.WriteStartElement("ImageTypeId");
+            _writer.WriteRaw(_vm.getImageTypeId().toString());
+            _writer.WriteEndElement();
+        }
         _writer.WriteStartElement("IsInitilized");
         _writer.WriteRaw(String.valueOf(_vm.getStaticData().isInitialized()));
         _writer.WriteEndElement();


-- 
To view, visit http://gerrit.ovirt.org/15592
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e99c737cceb022b8cbd6f026d21181dab3c1f7a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Omer Frenkel <ofren...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches