storage: remove default_cb usage

tests/storage-xml/pool-logical-volclone.xml

@@ -12,5 +12,6 @@
       <owner>10736</owner>
       <group>10736</group>
     </permissions>
+    <format type="raw"/>
   </target>
 </volume>

tests/storage.py

@@ -41,7 +41,6 @@ def createPool(conn, ptype, poolname=None, fmt=None, target_path=None,
     if iqn and pool_inst.supports_property("iqn"):
         pool_inst.iqn = iqn
 
-    pool_inst.validate()
     return poolCompare(pool_inst)
 
 
@@ -51,6 +50,7 @@ def removePool(poolobj):
 
 
 def poolCompare(pool_inst):
+    pool_inst.validate()
     filename = os.path.join(basepath, pool_inst.name + ".xml")
     out_expect = pool_inst.get_xml()
 

virtManager/createpool.py

@@ -277,14 +277,15 @@ class vmmCreatePool(vmmGObjectUI):
 
         if tgt:
             self.widget("pool-target-path").get_child().set_text(
-                self._pool.target_path)
+                self._pool.default_target_path())
 
         self.widget("pool-target-button").set_sensitive(tgt_b)
         self.widget("pool-source-button").set_sensitive(src_b)
         self.widget("pool-build").set_active(builddef)
 
         if src_name:
-            self.widget("pool-source-name").set_text(self._pool.source_name)
+            self.widget("pool-source-name").set_text(
+                    self._pool.default_source_name())
 
         self.widget("pool-format").set_active(-1)
         if fmt:

virtinst/storage.py

@@ -303,7 +303,7 @@ class StoragePool(_StorageObject):
             raise ValueError(_("Name '%s' already in use by another pool." %
                                 name))
 
-    def _get_default_target_path(self):
+    def default_target_path(self):
         if not self.supports_property("target_path"):
             return None
         if (self.type == self.TYPE_DIR or
@@ -338,7 +338,7 @@ class StoragePool(_StorageObject):
         return setattr(self, self._type_to_source_prop(), val)
     source_path = property(_get_source, _set_source)
 
-    def _default_source_name(self):
+    def default_source_name(self):
         srcname = None
 
         if not self.supports_property("source_name"):
@@ -359,11 +359,6 @@ class StoragePool(_StorageObject):
 
         return srcname
 
-    def _default_format_cb(self):
-        if not self.supports_property("format"):
-            return None
-        return "auto"
-
 
     ##############
     # Properties #
@@ -390,18 +385,15 @@ class StoragePool(_StorageObject):
     allocation = XMLProperty("./allocation", is_int=True)
     available = XMLProperty("./available", is_int=True)
 
-    format = XMLProperty("./source/format/@type",
-                         default_cb=_default_format_cb)
+    format = XMLProperty("./source/format/@type")
     iqn = XMLProperty("./source/initiator/iqn/@name")
-    source_name = XMLProperty("./source/name",
-                              default_cb=_default_source_name)
+    source_name = XMLProperty("./source/name")
 
     auth_type = XMLProperty("./source/auth/@type")
     auth_username = XMLProperty("./source/auth/@username")
     auth_secret_uuid = XMLProperty("./source/auth/secret/@uuid")
 
-    target_path = XMLProperty("./target/path",
-                              default_cb=_get_default_target_path)
+    target_path = XMLProperty("./target/path")
 
     hosts = XMLChildProperty(_Host, relative_xpath="./source")
 
@@ -462,11 +454,19 @@ class StoragePool(_StorageObject):
             return StorageVolume.TYPE_NETWORK
         return StorageVolume.TYPE_FILE
 
+
     ##################
     # Build routines #
     ##################
 
     def validate(self):
+        if not self.target_path:
+            self.target_path = self.default_target_path()
+        if not self.source_name:
+            self.source_name = self.default_source_name()
+        if not self.format and self.supports_property("format"):
+            self.format = "auto"
+
         if self.supports_property("hosts") and not self.hosts:
             raise RuntimeError(_("Hostname is required"))
         if (self.supports_property("source_path") and
@@ -641,11 +641,6 @@ class StorageVolume(_StorageObject):
             raise ValueError(_("Name '%s' already in use by another volume." %
                                 name))
 
-    def _default_format(self):
-        if self.file_type == self.TYPE_FILE:
-            return "raw"
-        return None
-
     def _get_vol_type(self):
         if self.type:
             if self.type == "file":
@@ -672,18 +667,12 @@ class StorageVolume(_StorageObject):
     key = XMLProperty("./key")
     capacity = XMLProperty("./capacity", is_int=True)
     allocation = XMLProperty("./allocation", is_int=True)
-    format = XMLProperty("./target/format/@type", default_cb=_default_format)
+    format = XMLProperty("./target/format/@type")
     target_path = XMLProperty("./target/path")
     backing_store = XMLProperty("./backingStore/path")
     backing_format = XMLProperty("./backingStore/format/@type")
-
-    def _lazy_refcounts_default_cb(self):
-        if self.format != "qcow2":
-            return False
-        return self.conn.check_support(
-            self.conn.SUPPORT_CONN_QCOW2_LAZY_REFCOUNTS)
-    lazy_refcounts = XMLProperty("./target/features/lazy_refcounts",
-        is_bool=True, default_cb=_lazy_refcounts_default_cb)
+    lazy_refcounts = XMLProperty(
+            "./target/features/lazy_refcounts", is_bool=True)
 
 
     def _detect_backing_store_format(self):
@@ -743,6 +732,12 @@ class StorageVolume(_StorageObject):
     ##################
 
     def validate(self):
+        if not self.format and self.file_type == self.TYPE_FILE:
+            self.format = "raw"
+        if self._prop_is_unset("lazy_refcounts") and self.format == "qcow2":
+            self.lazy_refcounts = self.conn.check_support(
+                self.conn.SUPPORT_CONN_QCOW2_LAZY_REFCOUNTS)
+
         if self._pool_xml.type == StoragePool.TYPE_LOGICAL:
             if self.allocation != self.capacity:
                 logging.warning(_("Sparse logical volumes are not supported, "