Change in vdsm[master]: move alignmentScan.py to lib

ybronhei at redhat.com ybronhei at redhat.com
Fri Feb 19 15:30:08 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: move alignmentScan.py to lib
......................................................................

move alignmentScan.py to lib

Change-Id: Ib0537393da342507c9e64e9d71656cfc69bbe15e
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/alignmentScan.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/clientIF.py
7 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/53758/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index d75662d..35ee322 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -1,6 +1,7 @@
 ./etc/vdsm/vdsm.conf
 ./usr/bin/vdsm-tool
 ./usr/lib/python2.7/dist-packages/vdsm/__init__.py
+./usr/lib/python2.7/dist-packages/vdsm/alignmentScan.py
 ./usr/lib/python2.7/dist-packages/vdsm/cmdutils.py
 ./usr/lib/python2.7/dist-packages/vdsm/compat.py
 ./usr/lib/python2.7/dist-packages/vdsm/concurrent.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index ec6fc06..7ebf3da 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -34,7 +34,6 @@
 ./usr/libexec/vdsm/wait_for_ipv4s
 ./usr/share/man/man8/vdsmd.8
 ./usr/share/vdsm/API.py
-./usr/share/vdsm/alignmentScan.py
 ./usr/share/vdsm/blkid.py
 ./usr/share/vdsm/caps.py
 ./usr/share/vdsm/clientIF.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 29635ad..74f89de 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -23,6 +23,7 @@
 
 dist_vdsmpylib_PYTHON = \
 	__init__.py \
+	alignmentScan.py \
 	cmdutils.py \
 	compat.py \
 	commands.py \
diff --git a/vdsm/alignmentScan.py b/lib/vdsm/alignmentScan.py
similarity index 100%
rename from vdsm/alignmentScan.py
rename to lib/vdsm/alignmentScan.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 3b04a92..bf2b891 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -843,7 +843,6 @@
 %dir %{_datadir}/%{vdsm_name}/virt
 %dir %{_datadir}/%{vdsm_name}/virt/vmdevices
 %dir %{_datadir}/%{vdsm_name}/rpc
-%{_datadir}/%{vdsm_name}/alignmentScan.py*
 %{_datadir}/%{vdsm_name}/blkid.py*
 %{_datadir}/%{vdsm_name}/caps.py*
 %{_datadir}/%{vdsm_name}/clientIF.py*
@@ -1082,6 +1081,7 @@
 %dir %{python_sitelib}/%{vdsm_name}/profiling
 %dir %{python_sitelib}/%{vdsm_name}/tc
 %{python_sitelib}/%{vdsm_name}/__init__.py*
+%{python_sitelib}/%{vdsm_name}/alignmentScan.py*
 %{python_sitelib}/%{vdsm_name}/cmdutils.py*
 %{python_sitelib}/%{vdsm_name}/compat.py*
 %{python_sitelib}/%{vdsm_name}/commands.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 76f385d..a61c749 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -23,7 +23,6 @@
 include $(top_srcdir)/build-aux/Makefile.subs
 
 dist_vdsm_PYTHON = \
-	alignmentScan.py \
 	API.py \
 	blkid.py \
 	caps.py \
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 0d1e235..7f15eb0 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -32,12 +32,12 @@
 from yajsonrpc.betterAsyncore import Reactor
 from yajsonrpc.stompreactor import StompClient, StompRpcServer
 from yajsonrpc import Notification, JsonRpcBindingsError
-import alignmentScan
 from vdsm.config import config
 from momIF import MomClient
 from vdsm.define import doneCode, errCode
 from vdsm.sslcompat import sslutils
 import libvirt
+from vdsm import alignmentScan
 from vdsm import libvirtconnection
 from vdsm import concurrent
 from vdsm import utils


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0537393da342507c9e64e9d71656cfc69bbe15e
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