diff --git a/tests/data/cli/compare/virt-xml-build-disk-domain.xml b/tests/data/cli/compare/virt-xml-build-disk-domain.xml index 1a08b20e..6d9f7160 100644 --- a/tests/data/cli/compare/virt-xml-build-disk-domain.xml +++ b/tests/data/cli/compare/virt-xml-build-disk-domain.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/data/cli/compare/virt-xml-build-pool-logical-disk.xml b/tests/data/cli/compare/virt-xml-build-pool-logical-disk.xml index 055a8f04..49c9bd4a 100644 --- a/tests/data/cli/compare/virt-xml-build-pool-logical-disk.xml +++ b/tests/data/cli/compare/virt-xml-build-pool-logical-disk.xml @@ -1,5 +1,5 @@ - + diff --git a/tests/data/testdriver/testdriver.xml b/tests/data/testdriver/testdriver.xml index 7c94e698..04476b22 100644 --- a/tests/data/testdriver/testdriver.xml +++ b/tests/data/testdriver/testdriver.xml @@ -294,26 +294,19 @@ Foo bar baz & yeah boii < > yeahfoo - - - - - - - - + - + @@ -2171,35 +2164,6 @@ ba - - pool-sheepdog - 581381f8-a13f-4f7c-89b5-9c9b71c64834 - 107374182400 - 53687091200 - 53687091200 - - - mysheeppool - - - - vol_sheepdog - sheep/vol_sheepdog - 1024 - 0 - - sheepdog:vol_sheepdog - - - 0600 - -1 - -1 - - - - - - pool-gluster 7b83ef6d-28da-44f1-841f-2011320f13b0 diff --git a/virtManager/object/storagepool.py b/virtManager/object/storagepool.py index 563526bb..1b4da515 100644 --- a/virtManager/object/storagepool.py +++ b/virtManager/object/storagepool.py @@ -32,7 +32,6 @@ POOL_TYPE_DESCS = { StoragePool.TYPE_MPATH: _("Multipath Device Enumerator"), StoragePool.TYPE_GLUSTER: _("Gluster Filesystem"), StoragePool.TYPE_RBD: _("RADOS Block Device/Ceph"), - StoragePool.TYPE_SHEEPDOG: _("Sheepdog Filesystem"), StoragePool.TYPE_ZFS: _("ZFS Pool"), } @@ -128,7 +127,6 @@ class vmmStoragePool(vmmLibvirtObject): ] if not clone: supported.extend([ - StoragePool.TYPE_SHEEPDOG, StoragePool.TYPE_ZFS, ]) return pool_type in supported diff --git a/virtinst/storage.py b/virtinst/storage.py index 509f5cb0..3c5d39bb 100644 --- a/virtinst/storage.py +++ b/virtinst/storage.py @@ -82,7 +82,6 @@ class StoragePool(_StorageObject): TYPE_MPATH = "mpath" TYPE_GLUSTER = "gluster" TYPE_RBD = "rbd" - TYPE_SHEEPDOG = "sheepdog" TYPE_ZFS = "zfs" @staticmethod @@ -311,7 +310,7 @@ class StoragePool(_StorageObject): def supports_source_name(self): return self.type in [self.TYPE_LOGICAL, self.TYPE_GLUSTER, - self.TYPE_RBD, self.TYPE_SHEEPDOG, self.TYPE_ZFS] + self.TYPE_RBD, self.TYPE_ZFS] def supports_source_path(self): @@ -323,7 +322,7 @@ class StoragePool(_StorageObject): def supports_hosts(self): return self.type in [ self.TYPE_NETFS, self.TYPE_ISCSI, self.TYPE_GLUSTER, - self.TYPE_RBD, self.TYPE_SHEEPDOG] + self.TYPE_RBD] def supports_format(self): return self.type in [self.TYPE_FS, self.TYPE_NETFS, self.TYPE_DISK] @@ -340,8 +339,7 @@ class StoragePool(_StorageObject): return StorageVolume.TYPE_BLOCK if (self.type == StoragePool.TYPE_GLUSTER or self.type == StoragePool.TYPE_RBD or - self.type == StoragePool.TYPE_ISCSI or - self.type == StoragePool.TYPE_SHEEPDOG): + self.type == StoragePool.TYPE_ISCSI): return StorageVolume.TYPE_NETWORK return StorageVolume.TYPE_FILE