Change in vdsm[master]: jsonrpc: renaming for pep8 compliance
piotr.kliczewski at gmail.com
piotr.kliczewski at gmail.com
Tue May 19 13:39:34 UTC 2015
Piotr Kliczewski has uploaded a new change for review.
Change subject: jsonrpc: renaming for pep8 compliance
......................................................................
jsonrpc: renaming for pep8 compliance
Following renaming is done in this patch:
- stompReactor module
- BindingJsonRpc module
Change-Id: If96815423630cb43b58411e6c3e46afead4dfda2
Signed-off-by: pkliczewski <piotr.kliczewski at gmail.com>
---
M debian/vdsm-yajsonrpc.install
M debian/vdsm.install
M lib/yajsonrpc/Makefile.am
M lib/yajsonrpc/__init__.py
R lib/yajsonrpc/stompreactor.py
M tests/jsonRpcHelper.py
M vdsm.spec.in
M vdsm/clientIF.py
M vdsm/rpc/Makefile.am
R vdsm/rpc/bindingjsonrpc.py
10 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/20/41120/1
diff --git a/debian/vdsm-yajsonrpc.install b/debian/vdsm-yajsonrpc.install
index c422397..40c3adc 100644
--- a/debian/vdsm-yajsonrpc.install
+++ b/debian/vdsm-yajsonrpc.install
@@ -1,4 +1,4 @@
./usr/lib/python2.7/dist-packages/yajsonrpc/__init__.py
./usr/lib/python2.7/dist-packages/yajsonrpc/betterAsyncore.py
./usr/lib/python2.7/dist-packages/yajsonrpc/stomp.py
-./usr/lib/python2.7/dist-packages/yajsonrpc/stompReactor.py
+./usr/lib/python2.7/dist-packages/yajsonrpc/stompreactor.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index c947e5c..e4ce020 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -82,7 +82,7 @@
./usr/share/vdsm/protocoldetector.py
./usr/share/vdsm/respawn
./usr/share/vdsm/rpc/__init__.py
-./usr/share/vdsm/rpc/BindingJsonRpc.py
+./usr/share/vdsm/rpc/bindingjsonrpc.py
./usr/share/vdsm/rpc/BindingXMLRPC.py
./usr/share/vdsm/rpc/Bridge.py
./usr/share/vdsm/rpc/process-schema.py
diff --git a/lib/yajsonrpc/Makefile.am b/lib/yajsonrpc/Makefile.am
index 9a563a5..e79ec15 100644
--- a/lib/yajsonrpc/Makefile.am
+++ b/lib/yajsonrpc/Makefile.am
@@ -23,7 +23,7 @@
dist_yajsonrpc_PYTHON = \
__init__.py \
betterAsyncore.py \
- stompReactor.py \
+ stompreactor.py \
stomp.py \
$(NULL)
diff --git a/lib/yajsonrpc/__init__.py b/lib/yajsonrpc/__init__.py
index 0402158..03d88f0 100644
--- a/lib/yajsonrpc/__init__.py
+++ b/lib/yajsonrpc/__init__.py
@@ -23,7 +23,7 @@
from vdsm.password import protect_passwords, unprotect_passwords
from vdsm.utils import traceback
-__all__ = ["betterAsyncore", "stompReactor", "stomp"]
+__all__ = ["betterAsyncore", "stompreactor", "stomp"]
_STATE_INCOMING = 1
_STATE_OUTGOING = 2
diff --git a/lib/yajsonrpc/stompReactor.py b/lib/yajsonrpc/stompreactor.py
similarity index 100%
rename from lib/yajsonrpc/stompReactor.py
rename to lib/yajsonrpc/stompreactor.py
diff --git a/tests/jsonRpcHelper.py b/tests/jsonRpcHelper.py
index b3eb1fd..32c21fc 100644
--- a/tests/jsonRpcHelper.py
+++ b/tests/jsonRpcHelper.py
@@ -27,10 +27,10 @@
from itertools import product
from M2Crypto import SSL
from rpc.BindingXMLRPC import BindingXMLRPC, XmlDetector
-from yajsonrpc.stompReactor import StompDetector
+from yajsonrpc.stompreactor import StompDetector
from protocoldetector import MultiProtocolAcceptor
from yajsonrpc import JsonRpcClient
-from rpc.BindingJsonRpc import BindingJsonRpc
+from rpc.bindingjsonrpc import BindingJsonRpc
from sslhelper import DEAFAULT_SSL_CONTEXT
PERMUTATIONS = tuple(product((True, False), ("xml", "stomp")))
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 362a6ed..ac26faa 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1613,7 +1613,7 @@
%files jsonrpc
%doc %{vdsm_name}/rpc/vdsm-api.html
%{_datadir}/%{vdsm_name}/rpc/__init__.py*
-%{_datadir}/%{vdsm_name}/rpc/BindingJsonRpc.py*
+%{_datadir}/%{vdsm_name}/rpc/bindingjsonrpc.py*
%{_datadir}/%{vdsm_name}/rpc/Bridge.py*
%{_datadir}/%{vdsm_name}/rpc/vdsmapi-schema.json
%{python_sitelib}/vdsmapi.py*
@@ -1626,7 +1626,7 @@
%dir %{python_sitelib}/yajsonrpc
%{python_sitelib}/yajsonrpc/betterAsyncore.py*
%{python_sitelib}/yajsonrpc/stomp.py*
-%{python_sitelib}/yajsonrpc/stompReactor.py*
+%{python_sitelib}/yajsonrpc/stompreactor.py*
%files infra
%{python_sitelib}/%{vdsm_name}/infra/eventfd/__init__.py*
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index b3b944e..93a01a9 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -201,8 +201,8 @@
if config.getboolean('vars', 'jsonrpc_enable'):
try:
from rpc import Bridge
- from rpc.BindingJsonRpc import BindingJsonRpc
- from yajsonrpc.stompReactor import StompDetector
+ from rpc.bindingjsonrpc import BindingJsonRpc
+ from yajsonrpc.stompreactor import StompDetector
except ImportError:
self.log.warn('Unable to load the json rpc server module. '
'Please make sure it is installed.')
diff --git a/vdsm/rpc/Makefile.am b/vdsm/rpc/Makefile.am
index 6b10dc1..d090144 100644
--- a/vdsm/rpc/Makefile.am
+++ b/vdsm/rpc/Makefile.am
@@ -10,7 +10,7 @@
dist_vdsmrpc_PYTHON = \
__init__.py \
- BindingJsonRpc.py \
+ bindingjsonrpc.py \
BindingXMLRPC.py \
Bridge.py \
$(NULL)
diff --git a/vdsm/rpc/BindingJsonRpc.py b/vdsm/rpc/bindingjsonrpc.py
similarity index 97%
rename from vdsm/rpc/BindingJsonRpc.py
rename to vdsm/rpc/bindingjsonrpc.py
index eae0e7d..9d07d9f 100644
--- a/vdsm/rpc/BindingJsonRpc.py
+++ b/vdsm/rpc/bindingjsonrpc.py
@@ -17,7 +17,7 @@
import logging
from yajsonrpc import JsonRpcServer
-from yajsonrpc.stompReactor import StompReactor
+from yajsonrpc.stompreactor import StompReactor
def _simpleThreadFactory(func):
--
To view, visit https://gerrit.ovirt.org/41120
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If96815423630cb43b58411e6c3e46afead4dfda2
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