Change in vdsm[master]: v2v: move v2v module to /var/lib/
shavivi at redhat.com
shavivi at redhat.com
Thu Feb 4 11:35:16 UTC 2016
Shahar Havivi has uploaded a new change for review.
Change subject: v2v: move v2v module to /var/lib/
......................................................................
v2v: move v2v module to /var/lib/
Change-Id: I5becf47fb1f139bd246d8853f2c890aa90eb4c7a
Signed-off-by: Shahar Havivi <shaharh at redhat.com>
---
M debian/vdsm-python.install
M lib/vdsm/Makefile.am
R lib/vdsm/v2v.py
M tests/v2vTests.py
M vdsm.spec.in
M vdsm/Makefile.am
6 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/84/53084/1
diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index 9650d9d..52276f4 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -70,5 +70,6 @@
./usr/lib/python2.7/dist-packages/vdsm/udevadm.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/v2v.py
./usr/lib/python2.7/dist-packages/vdsm/virtsparsify.py
./usr/lib/python2.7/dist-packages/vdsm/xmlrpc.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index a1628ab..29635ad 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -57,6 +57,7 @@
taskset.py \
udevadm.py \
utils.py \
+ v2v.py \
vdscli.py \
virtsparsify.py \
xmlrpc.py \
@@ -90,6 +91,7 @@
install-data-local: \
install-data-sample-vdsm-conf
+ $(MKDIR_P) $(DESTDIR)$(vdsmrundir)/v2v
uninstall-local: \
uninstall-data-sample-vdsm-conf
diff --git a/vdsm/v2v.py b/lib/vdsm/v2v.py
similarity index 100%
rename from vdsm/v2v.py
rename to lib/vdsm/v2v.py
diff --git a/tests/v2vTests.py b/tests/v2vTests.py
index b3988c9..101e31c 100644
--- a/tests/v2vTests.py
+++ b/tests/v2vTests.py
@@ -28,7 +28,7 @@
import os
from testlib import namedTemporaryDir, permutations, expandPermutations
-import v2v
+from vdsm import v2v
from vdsm import libvirtconnection
from vdsm.password import ProtectedPassword
from vdsm.commands import execCmd
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 91cb235..b2d45f6 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -856,7 +856,6 @@
%{_datadir}/%{vdsm_name}/protocoldetector.py*
%{_datadir}/%{vdsm_name}/sitecustomize.py*
%{_datadir}/%{vdsm_name}/supervdsmServer
-%{_datadir}/%{vdsm_name}/v2v.py*
%{_datadir}/%{vdsm_name}/vdsm
%{_datadir}/%{vdsm_name}/vdsm-restore-net-config
%{_datadir}/%{vdsm_name}/vdsm-store-net-config
@@ -1158,6 +1157,7 @@
%{python_sitelib}/%{vdsm_name}/taskset.py*
%{python_sitelib}/%{vdsm_name}/udevadm.py*
%{python_sitelib}/%{vdsm_name}/utils.py*
+%{python_sitelib}/%{vdsm_name}/v2v.py*
%{python_sitelib}/%{vdsm_name}/vdscli.py*
%{python_sitelib}/%{vdsm_name}/virtsparsify.py*
%{python_sitelib}/%{vdsm_name}/xmlrpc.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index f9f8aac..47d21e9 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -38,7 +38,6 @@
parted_utils.py \
protocoldetector.py \
sitecustomize.py \
- v2v.py \
$(NULL)
dist_vdsmexec_SCRIPTS = \
@@ -143,7 +142,6 @@
$(MKDIR_P) $(DESTDIR)$(vdsmrundir)/sourceRoutes
$(MKDIR_P) $(DESTDIR)$(vdsmrundir)/trackedInterfaces
$(MKDIR_P) $(DESTDIR)$(vdsmrundir)/payload
- $(MKDIR_P) $(DESTDIR)$(vdsmrundir)/v2v
$(MKDIR_P) $(DESTDIR)$(vdsmlibdir)/netconfback
$(MKDIR_P) $(DESTDIR)$(vdsmlibdir)/persistence
$(MKDIR_P) $(DESTDIR)$(vdsmlibdir)/upgrade
--
To view, visit https://gerrit.ovirt.org/53084
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5becf47fb1f139bd246d8853f2c890aa90eb4c7a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Shahar Havivi <shavivi at redhat.com>
More information about the vdsm-patches
mailing list