Martin Polednik has uploaded a new change for review.
Change subject: guestfs: rename virtsparsify to guestfs ......................................................................
guestfs: rename virtsparsify to guestfs
Virt-sparsify was implemented as a single functionality from libguestfs library, but in order to support more libguestfs functionality without needing module for each functionality it makes sense to name the module "guestfs" (without lib as the path itself is lib/vdsm/... -> lib/vdsm/guestfs.py)
Change-Id: Id2d965b74371db8e9112f47e8f31e5d24e9d4029 Signed-off-by: Martin Polednik mpolednik@redhat.com --- M debian/vdsm-python.install M lib/vdsm/Makefile.am R lib/vdsm/guestfs.py M vdsm.spec.in M vdsm/storage/image.py 5 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/33544/1
diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 1158db2..d98254b 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -35,5 +35,5 @@ ./usr/lib/python2.7/dist-packages/vdsm/tool/vdsm-id.py ./usr/lib/python2.7/dist-packages/vdsm/utils.py ./usr/lib/python2.7/dist-packages/vdsm/vdscli.py -./usr/lib/python2.7/dist-packages/vdsm/virtsparsify.py +./usr/lib/python2.7/dist-packages/vdsm/guestfs.py ./usr/lib/python2.7/dist-packages/vdsm/xmlrpc.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 4bebf28..377d17a 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -35,7 +35,7 @@ sslutils.py \ utils.py \ vdscli.py \ - virtsparsify.py \ + guestfs.py \ xmlrpc.py \ $(NULL)
diff --git a/lib/vdsm/virtsparsify.py b/lib/vdsm/guestfs.py similarity index 100% rename from lib/vdsm/virtsparsify.py rename to lib/vdsm/guestfs.py diff --git a/vdsm.spec.in b/vdsm.spec.in index cd1c0e4..dde6d31 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1228,7 +1228,7 @@ %{python_sitearch}/%{vdsm_name}/sslutils.py* %{python_sitearch}/%{vdsm_name}/utils.py* %{python_sitearch}/%{vdsm_name}/vdscli.py* -%{python_sitearch}/%{vdsm_name}/virtsparsify.py* +%{python_sitearch}/%{vdsm_name}/guestfs.py* %{python_sitearch}/%{vdsm_name}/xmlrpc.py* %{python_sitearch}/%{vdsm_name}/tool/__init__.py* %if 0%{?with_systemd} diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 9855a26..974ba66 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -26,7 +26,7 @@
import volume from vdsm import qemuimg -from vdsm import virtsparsify +from vdsm import guestfs from sdc import sdCache import sd import misc @@ -574,11 +574,11 @@ srcFormat = volume.fmt2str(srcVolume.getFormat()) dstFormat = volume.fmt2str(dstVolume.getFormat())
- virtsparsify.sparsify(srcVolume.getVolumePath(), - tmpVolume.getVolumePath(), - dstVolume.getVolumePath(), - src_format=srcFormat, - dst_format=dstFormat) + guestfs.sparsify(srcVolume.getVolumePath(), + tmpVolume.getVolumePath(), + dstVolume.getVolumePath(), + src_format=srcFormat, + dst_format=dstFormat) except Exception: self.log.exception('Unexpected error sparsifying %s', tmpVolUUID)
oVirt Jenkins CI Server has posted comments on this change.
Change subject: guestfs: rename virtsparsify to guestfs ......................................................................
Patch Set 1:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-fc20_created/407... : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_install-rpm-sanity-el6_created/424/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/11738/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/12682/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/12527/ : SUCCESS
vdsm-patches@lists.fedorahosted.org