diff --git a/ui/createpool.ui b/ui/createpool.ui index d5f9507e..5f3972fd 100644 --- a/ui/createpool.ui +++ b/ui/createpool.ui @@ -1,7 +1,7 @@ - + - + 350 False @@ -219,7 +219,7 @@ 0 - 5 + 6 1 1 @@ -260,7 +260,7 @@ 1 - 4 + 5 1 1 @@ -320,7 +320,7 @@ 0 - 3 + 4 1 1 @@ -336,7 +336,7 @@ 0 - 4 + 5 1 1 @@ -389,7 +389,7 @@ 2 - 3 + 4 1 1 @@ -408,7 +408,7 @@ 1 - 3 + 4 1 1 @@ -453,11 +453,41 @@ 1 - 5 + 6 1 1 + + + True + False + 1 + _Source Name: + True + + + 0 + 3 + 1 + 1 + + + + + True + 25 + + + 1 + 3 + 1 + 1 + + + + + diff --git a/virtManager/createpool.py b/virtManager/createpool.py index 17daf2a6..abc35fba 100644 --- a/virtManager/createpool.py +++ b/virtManager/createpool.py @@ -255,6 +255,7 @@ class vmmCreatePool(vmmGObjectUI): src = self._pool.supports_property("source_path") src_b = src and not self.conn.is_remote() + src_name = self._pool.type == StoragePool.TYPE_GLUSTER tgt = self._pool.supports_property("target_path") tgt_b = tgt and not self.conn.is_remote() host = self._pool.supports_property("host") @@ -274,6 +275,7 @@ class vmmCreatePool(vmmGObjectUI): show_row("pool-format", fmt) show_row("pool-build", buildsens) show_row("pool-iqn", iqn) + show_row("pool-source-name", src_name) if tgt: self.widget("pool-target-path").get_child().set_text( @@ -283,6 +285,10 @@ class vmmCreatePool(vmmGObjectUI): self.widget("pool-source-button").set_sensitive(src_b) self.widget("pool-build").set_active(builddef) + if src_name: + self.widget("pool-source-name").get_child().set_text( + self._pool.source_name) + self.widget("pool-format").set_active(-1) if fmt: self.populate_pool_format(self._pool.list_formats("formats")) @@ -323,6 +329,12 @@ class vmmCreatePool(vmmGObjectUI): return host.get_text().strip() return None + def get_config_source_name(self): + name = self.widget("pool-source-name") + if name.get_sensitive(): + return name.get_text().strip() + return None + def get_config_format(self): return uiutil.get_list_selection(self.widget("pool-format"), 0) @@ -476,6 +488,7 @@ class vmmCreatePool(vmmGObjectUI): source = self.get_config_source_path() fmt = self.get_config_format() iqn = self.get_config_iqn() + source_name = self.get_config_source_name() if not self._validate_page_name(self.get_pool_to_validate()): return @@ -490,6 +503,8 @@ class vmmCreatePool(vmmGObjectUI): self._pool.format = fmt if iqn: self._pool.iqn = iqn + if source_name: + self._pool.source_name = source_name self._pool.validate() except ValueError, e: