Change in vdsm[master]: moving protocoldetector under lib

ybronhei at redhat.com ybronhei at redhat.com
Mon Feb 29 10:07:59 UTC 2016


Yaniv Bronhaim has uploaded a new change for review.

Change subject: moving protocoldetector under lib
......................................................................

moving protocoldetector under lib

Change-Id: Ifc63b5a23278a2b05897662848e625fcdd9ee0bb
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/protocoldetector.py
M tests/integration/jsonRpcHelper.py
M tests/protocoldetectorTests.py
M vdsm.spec.in
M vdsm/Makefile.am
M vdsm/clientIF.py
9 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/54150/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index d75662d..5a464b5 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -45,6 +45,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/profiling/errors.py
 ./usr/lib/python2.7/dist-packages/vdsm/profiling/memory.py
 ./usr/lib/python2.7/dist-packages/vdsm/profiling/profile.py
+./usr/lib/python2.7/dist-packages/vdsm/protocoldetector.py
 ./usr/lib/python2.7/dist-packages/vdsm/pthread.py
 ./usr/lib/python2.7/dist-packages/vdsm/qemuimg.py
 ./usr/lib/python2.7/dist-packages/vdsm/response.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index ec6fc06..2cbd273 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -74,7 +74,6 @@
 ./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
 ./usr/share/vdsm/rpc/bindingxmlrpc.py
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 29635ad..4d894e7 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -46,6 +46,7 @@
 	panic.py \
 	password.py \
 	ppc64HardwareInfo.py \
+	protocoldetector.py \
 	pthread.py \
 	qemuimg.py \
 	response.py \
diff --git a/vdsm/protocoldetector.py b/lib/vdsm/protocoldetector.py
similarity index 99%
rename from vdsm/protocoldetector.py
rename to lib/vdsm/protocoldetector.py
index 0ac4d40..e7cf343 100644
--- a/vdsm/protocoldetector.py
+++ b/lib/vdsm/protocoldetector.py
@@ -18,6 +18,8 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
+from __future__ import absolute_import
+
 import logging
 import socket
 
diff --git a/tests/integration/jsonRpcHelper.py b/tests/integration/jsonRpcHelper.py
index 0ccde5f..3e1272f 100644
--- a/tests/integration/jsonRpcHelper.py
+++ b/tests/integration/jsonRpcHelper.py
@@ -33,9 +33,9 @@
     LEGACY_SUBSCRIPTION_ID_RESPONSE
 )
 from yajsonrpc import Notification
-from protocoldetector import MultiProtocolAcceptor
 from rpc.bindingjsonrpc import BindingJsonRpc
 from vdsm.config import config
+from vdsm.protocoldetector import MultiProtocolAcceptor
 from vdsm import schedule
 from vdsm import utils
 
diff --git a/tests/protocoldetectorTests.py b/tests/protocoldetectorTests.py
index 8946ef8..c0c1369 100644
--- a/tests/protocoldetectorTests.py
+++ b/tests/protocoldetectorTests.py
@@ -27,7 +27,7 @@
 
 from yajsonrpc.betterAsyncore import Reactor
 from vdsm.config import config
-from protocoldetector import MultiProtocolAcceptor
+from vdsm.protocoldetector import MultiProtocolAcceptor
 from testlib import VdsmTestCase, expandPermutations, permutations
 
 if config.get('vars', 'ssl_implementation') == 'm2c':
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d626a25..feef3a4 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -855,7 +855,6 @@
 %{_datadir}/%{vdsm_name}/parted_utils.py*
 %{_datadir}/%{vdsm_name}/mkimage.py*
 %{_datadir}/%{vdsm_name}/numaUtils.py*
-%{_datadir}/%{vdsm_name}/protocoldetector.py*
 %{_datadir}/%{vdsm_name}/sitecustomize.py*
 %{_datadir}/%{vdsm_name}/supervdsmServer
 %{_datadir}/%{vdsm_name}/vdsm
@@ -1151,6 +1150,7 @@
 %{python_sitelib}/%{vdsm_name}/tc/cls.py*
 %{python_sitelib}/%{vdsm_name}/tc/filter.py*
 %{python_sitelib}/%{vdsm_name}/tc/qdisc.py*
+%{python_sitelib}/%{vdsm_name}/protocoldetector.py*
 %{python_sitelib}/%{vdsm_name}/pthread.py*
 %{python_sitelib}/%{vdsm_name}/qemuimg.py*
 %{python_sitelib}/%{vdsm_name}/response.py*
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 76f385d..2c3d5e9 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -36,7 +36,6 @@
 	momIF.py \
 	numaUtils.py \
 	parted_utils.py \
-	protocoldetector.py \
 	sitecustomize.py \
 	$(NULL)
 
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 7a7ec48..8ad130f 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -36,6 +36,7 @@
 from vdsm.config import config
 from momIF import MomClient
 from vdsm.define import doneCode, errCode
+from vdsm.protocoldetector import MultiProtocolAcceptor
 from vdsm.sslcompat import sslutils
 import libvirt
 from vdsm import libvirtconnection
@@ -44,7 +45,6 @@
 from vdsm import supervdsm
 import caps
 import blkid
-from protocoldetector import MultiProtocolAcceptor
 
 from virt import migration
 from virt import recovery


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

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