[PATCH master 3/5] Export: saving data to ovf file

[Agata Murawska]

Signed-off-by: Agata Murawska <agatamuraw...@google.com>
---
 lib/ovf.py |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/lib/ovf.py b/lib/ovf.py
index 69dfdbd..98de5c9 100644
--- a/lib/ovf.py
+++ b/lib/ovf.py
@@ -513,6 +513,8 @@ def SubElementText(parent, tag, text, attrib={}, **extra):
   """This is just a wrapper on ET.SubElement that always has text content.
 
   """
+  if text is None:
+    return None
   elem = ET.SubElement(parent, tag, attrib=attrib, **extra)
   elem.text = str(text)
   return elem
@@ -571,7 +573,7 @@ class OVFWriter(object):
         "ovf:fileRef": file_id,
         "ovf:format": DISK_FORMAT.get(disk["format"], disk["format"]),
       }
-      if disk.get("compression"):
+      if "compression" in disk:
         file_attribs["ovf:compression"] = disk["compression"]
       ET.SubElement(references, "File", attrib=file_attribs)
       ET.SubElement(disk_section, "Disk", attrib=disk_attribs)
@@ -634,18 +636,12 @@ class OVFWriter(object):
     """
     ganeti_section = ET.SubElement(self.tree, "gnt:GanetiSection")
 
-    if ganeti.get("version"):
-      SubElementText(ganeti_section, "gnt:Version", ganeti["version"])
-
-    if ganeti.get("disk_template"):
-      SubElementText(ganeti_section, "gnt:DiskTemplate",
-        ganeti["disk_template"])
-
-    if ganeti.get("auto_balance"):
-      SubElementText(ganeti_section, "gnt:AutoBalance", ganeti["auto_balance"])
-
-    if ganeti.get("tags"):
-      SubElementText(ganeti_section, "gnt:Tags", ganeti["tags"])
+    SubElementText(ganeti_section, "gnt:Version", ganeti.get("version"))
+    SubElementText(ganeti_section, "gnt:DiskTemplate",
+      ganeti.get("disk_template"))
+    SubElementText(ganeti_section, "gnt:AutoBalance",
+      ganeti.get("auto_balance"))
+    SubElementText(ganeti_section, "gnt:Tags", ganeti.get("tags"))
 
     osys = ET.SubElement(ganeti_section, "gnt:OperatingSystem")
     self._SaveNameAndParams(osys, ganeti["os"])
-- 
1.7.3.1