Change in vdsm[master]: move parted_utils to lib

ybronhei at redhat.com ybronhei at redhat.com
Tue Feb 23 11:52:40 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: move parted_utils to lib
......................................................................

move parted_utils to lib

Change-Id: I07e2a7aa70bdd7ad1f3bfca9b83c192545d24693
Signed-off-by: Yaniv Bronhaim <ybronhei at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/parted_utils.py
M tests/parted_utils_tests.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/supervdsmServer
8 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/53897/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index c7e99af..d3ad2af 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -42,6 +42,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/netlink/monitor.py
 ./usr/lib/python2.7/dist-packages/vdsm/netlink/route.py
 ./usr/lib/python2.7/dist-packages/vdsm/panic.py
+./usr/lib/python2.7/dist-packages/vdsm/parted_utils.py
 ./usr/lib/python2.7/dist-packages/vdsm/password.py
 ./usr/lib/python2.7/dist-packages/vdsm/ppc64HardwareInfo.py
 ./usr/lib/python2.7/dist-packages/vdsm/profiling/__init__.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 6b5926e..aab7844 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -69,7 +69,6 @@
 ./usr/share/vdsm/network/tc/qdisc.py
 ./usr/share/vdsm/network/utils.py
 ./usr/share/vdsm/numaUtils.py
-./usr/share/vdsm/parted_utils.py
 ./usr/share/vdsm/protocoldetector.py
 ./usr/share/vdsm/rpc/__init__.py
 ./usr/share/vdsm/rpc/bindingjsonrpc.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 72607b1..8b578ba 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -48,6 +48,7 @@
 	m2cutils.py \
 	netconfpersistence.py \
 	panic.py \
+	parted_utils.py \
 	password.py \
 	ppc64HardwareInfo.py \
 	pthread.py \
diff --git a/vdsm/parted_utils.py b/lib/vdsm/parted_utils.py
similarity index 100%
rename from vdsm/parted_utils.py
rename to lib/vdsm/parted_utils.py
diff --git a/tests/parted_utils_tests.py b/tests/parted_utils_tests.py
index bd9d4b6..f113404 100644
--- a/tests/parted_utils_tests.py
+++ b/tests/parted_utils_tests.py
@@ -29,7 +29,7 @@
 from vdsm import commands
 
 try:
-    import parted_utils as putils
+    from vdsm import parted_utils as putils
 except Exception:
     raise SkipTest("unable to import pyparted modules.")
 
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 2f60cbf..939b2bb 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -849,7 +849,6 @@
 %{_datadir}/%{vdsm_name}/API.py*
 %{_datadir}/%{vdsm_name}/hooking.py*
 %{_datadir}/%{vdsm_name}/mk_sysprep_floppy
-%{_datadir}/%{vdsm_name}/parted_utils.py*
 %{_datadir}/%{vdsm_name}/mkimage.py*
 %{_datadir}/%{vdsm_name}/numaUtils.py*
 %{_datadir}/%{vdsm_name}/protocoldetector.py*
@@ -1139,6 +1138,7 @@
 %{python_sitelib}/%{vdsm_name}/network/utils.py*
 %{python_sitelib}/%{vdsm_name}/password.py*
 %{python_sitelib}/%{vdsm_name}/panic.py*
+%{python_sitelib}/%{vdsm_name}/parted_utils.py
 %{python_sitelib}/%{vdsm_name}/ppc64HardwareInfo.py*
 %{python_sitelib}/%{vdsm_name}/profiling/__init__.py*
 %{python_sitelib}/%{vdsm_name}/profiling/cpu.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index a292f56..cde02e2 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -31,7 +31,6 @@
 	mkimage.py \
 	momIF.py \
 	numaUtils.py \
-	parted_utils.py \
 	protocoldetector.py \
 	sitecustomize.py \
 	$(NULL)
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index a829b98..46850b6 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -63,7 +63,7 @@
 from vdsm import utils
 from vdsm import sysctl
 from vdsm.supervdsm import _SuperVdsmManager
-from parted_utils import getDevicePartedInfo as _getDevicePartedInfo
+from vdsm.parted_utils import getDevicePartedInfo as _getDevicePartedInfo
 
 from vdsm.network import sourceroutethread
 


-- 
To view, visit https://gerrit.ovirt.org/53897
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07e2a7aa70bdd7ad1f3bfca9b83c192545d24693
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei at redhat.com>


More information about the vdsm-patches mailing list