Change in vdsm[master]: rpc: moving module to lib/vdsm

piotr.kliczewski at gmail.com piotr.kliczewski at gmail.com
Tue Feb 9 12:42:20 UTC 2016


Piotr Kliczewski has uploaded a new change for review.

Change subject: rpc: moving module to lib/vdsm
......................................................................

rpc: moving module to lib/vdsm


Change-Id: Ie2b083e72f83ad7f92f0636443eb620e92dd6cff
Signed-off-by: pkliczewski <piotr.kliczewski at gmail.com>
---
M configure.ac
M lib/vdsm/Makefile.am
R lib/vdsm/rpc/Bridge.py
R lib/vdsm/rpc/Makefile.am
R lib/vdsm/rpc/__init__.py
R lib/vdsm/rpc/bindingjsonrpc.py
R lib/vdsm/rpc/bindingxmlrpc.py
M tests/bridgeTests.py
M tests/integration/jsonRpcHelper.py
M tests/schemaValidationTest.py
M vdsm/Makefile.am
11 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/53289/1

diff --git a/configure.ac b/configure.ac
index 1e6509a..de5f96a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,6 +357,7 @@
 	lib/vdsm/infra/zombiereaper/Makefile
 	lib/vdsm/network/Makefile
 	lib/vdsm/network/configurators/Makefile
+	lib/vdsm/rpc/Makefile
 	lib/vdsm/tc/Makefile
 	tests/Makefile
 	tests/cpuinfo/Makefile
@@ -368,7 +369,6 @@
 	vdsm-tool/Makefile
 	vdsm/Makefile
 	vdsm/gluster/Makefile
-	vdsm/rpc/Makefile
 	vdsm/sos/Makefile
 	vdsm/storage/Makefile
 	vdsm/storage/imageRepository/Makefile
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index a1628ab..1bc6a48 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -19,7 +19,7 @@
 #
 include $(top_srcdir)/build-aux/Makefile.subs
 
-SUBDIRS=netinfo netlink tool infra profiling tc network
+SUBDIRS=netinfo netlink tool infra profiling rpc tc network
 
 dist_vdsmpylib_PYTHON = \
 	__init__.py \
diff --git a/vdsm/rpc/Bridge.py b/lib/vdsm/rpc/Bridge.py
similarity index 100%
rename from vdsm/rpc/Bridge.py
rename to lib/vdsm/rpc/Bridge.py
diff --git a/vdsm/rpc/Makefile.am b/lib/vdsm/rpc/Makefile.am
similarity index 100%
rename from vdsm/rpc/Makefile.am
rename to lib/vdsm/rpc/Makefile.am
diff --git a/vdsm/rpc/__init__.py b/lib/vdsm/rpc/__init__.py
similarity index 100%
rename from vdsm/rpc/__init__.py
rename to lib/vdsm/rpc/__init__.py
diff --git a/vdsm/rpc/bindingjsonrpc.py b/lib/vdsm/rpc/bindingjsonrpc.py
similarity index 100%
rename from vdsm/rpc/bindingjsonrpc.py
rename to lib/vdsm/rpc/bindingjsonrpc.py
diff --git a/vdsm/rpc/bindingxmlrpc.py b/lib/vdsm/rpc/bindingxmlrpc.py
similarity index 100%
rename from vdsm/rpc/bindingxmlrpc.py
rename to lib/vdsm/rpc/bindingxmlrpc.py
diff --git a/tests/bridgeTests.py b/tests/bridgeTests.py
index bf73a74..347b581 100644
--- a/tests/bridgeTests.py
+++ b/tests/bridgeTests.py
@@ -21,7 +21,7 @@
 import imp
 
 from vdsm.exception import GeneralException
-from rpc.Bridge import DynamicBridge
+from vdsm.rpc.Bridge import DynamicBridge
 from yajsonrpc import JsonRpcError
 
 from monkeypatch import MonkeyPatch
diff --git a/tests/integration/jsonRpcHelper.py b/tests/integration/jsonRpcHelper.py
index 0ccde5f..f902748 100644
--- a/tests/integration/jsonRpcHelper.py
+++ b/tests/integration/jsonRpcHelper.py
@@ -25,7 +25,7 @@
 from xmlrpclib import Transport, dumps, Fault
 from contextlib import contextmanager
 from itertools import product
-from rpc.bindingxmlrpc import BindingXMLRPC, XmlDetector
+from vdsm.rpc.bindingxmlrpc import BindingXMLRPC, XmlDetector
 from yajsonrpc.betterAsyncore import Reactor
 from yajsonrpc.stompreactor import StompDetector, StompRpcClient
 from yajsonrpc.stomp import (
@@ -34,8 +34,8 @@
 )
 from yajsonrpc import Notification
 from protocoldetector import MultiProtocolAcceptor
-from rpc.bindingjsonrpc import BindingJsonRpc
 from vdsm.config import config
+from vdsm.rpc.bindingjsonrpc import BindingJsonRpc
 from vdsm import schedule
 from vdsm import utils
 
diff --git a/tests/schemaValidationTest.py b/tests/schemaValidationTest.py
index 601aa5a..1480064 100644
--- a/tests/schemaValidationTest.py
+++ b/tests/schemaValidationTest.py
@@ -27,7 +27,7 @@
 except ImportError:
     _glusterEnabled = False
 
-from rpc import Bridge
+from vdsm.rpc import Bridge
 from testlib import VdsmTestCase as TestCaseBase
 
 
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index f9f8aac..d8161ae 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -18,7 +18,7 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
-SUBDIRS = gluster rpc sos storage virt
+SUBDIRS = gluster sos storage virt
 
 include $(top_srcdir)/build-aux/Makefile.subs
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2b083e72f83ad7f92f0636443eb620e92dd6cff
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski at gmail.com>


More information about the vdsm-patches mailing list