Piotr Kliczewski has uploaded a new change for review. Change subject: m2c: rename m2c modules ......................................................................
m2c: rename m2c modules In preparation for configurable usage ssl or m2crypto modules we need to distinguish modules which use m2c. Change-Id: I3fa842cb7a1ac0b2593df6f6fe67eee118a50616 Reviewed-on: https://gerrit.ovirt.org/44493 Signed-off-by: pkliczewski <[email protected]> --- M debian/vdsm-python.install M lib/vdsm/Makefile.am M lib/vdsm/jsonrpcvdscli.py R lib/vdsm/m2cutils.py M lib/vdsm/vdscli.py M lib/yajsonrpc/betterAsyncore.py M lib/yajsonrpc/stompreactor.py M tests/Makefile.am M tests/integration/Makefile.am M tests/integration/jsonRpcHelper.py R tests/integration/m2chelper.py M tests/protocoldetectorTests.py M tests/sslTests.py M tests/stompTests.py M tests/vdscliTests.py M vdsm.spec.in M vdsm/clientIF.py M vdsm/kaxmlrpclib.py M vdsm/protocoldetector.py M vdsm/virt/migration.py 20 files changed, 38 insertions(+), 37 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/47711/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 3770ce7..8ecb62f 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -12,6 +12,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/ipwrapper.py ./usr/lib/python2.7/dist-packages/vdsm/jsonrpcvdscli.py ./usr/lib/python2.7/dist-packages/vdsm/libvirtconnection.py +./usr/lib/python2.7/dist-packages/vdsm/m2cutils.py ./usr/lib/python2.7/dist-packages/vdsm/netconfpersistence.py ./usr/lib/python2.7/dist-packages/vdsm/netinfo.py ./usr/lib/python2.7/dist-packages/vdsm/netlink/__init__.py @@ -29,7 +30,6 @@ ./usr/lib/python2.7/dist-packages/vdsm/qemuimg.py ./usr/lib/python2.7/dist-packages/vdsm/response.py ./usr/lib/python2.7/dist-packages/vdsm/schedule.py -./usr/lib/python2.7/dist-packages/vdsm/sslutils.py ./usr/lib/python2.7/dist-packages/vdsm/supervdsm.py ./usr/lib/python2.7/dist-packages/vdsm/taskset.py ./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index c9986bf..cf383b9 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -32,6 +32,7 @@ ipwrapper.py \ jsonrpcvdscli.py \ libvirtconnection.py \ + m2cutils.py \ netconfpersistence.py \ netinfo.py \ password.py \ @@ -39,7 +40,6 @@ qemuimg.py \ response.py \ schedule.py \ - sslutils.py \ sysctl.py \ taskset.py \ udevadm.py \ diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py index eeab1df..1687b6f 100644 --- a/lib/vdsm/jsonrpcvdscli.py +++ b/lib/vdsm/jsonrpcvdscli.py @@ -22,7 +22,7 @@ from uuid import uuid4 import socket -from . import sslutils +from . import m2cutils from yajsonrpc import stompreactor from yajsonrpc import \ JsonRpcRequest, \ @@ -95,7 +95,7 @@ useSSL = config.getboolean('vars', 'ssl') if useSSL: - sslctx = sslutils.create_ssl_context() + sslctx = m2cutils.create_ssl_context() else: sslctx = None diff --git a/lib/vdsm/sslutils.py b/lib/vdsm/m2cutils.py similarity index 100% rename from lib/vdsm/sslutils.py rename to lib/vdsm/m2cutils.py diff --git a/lib/vdsm/vdscli.py b/lib/vdsm/vdscli.py index e0c7a13..a78a67a 100644 --- a/lib/vdsm/vdscli.py +++ b/lib/vdsm/vdscli.py @@ -26,7 +26,7 @@ import re import sys from xml.parsers.expat import ExpatError -from . import sslutils +from . import m2cutils _USE_SSL = False @@ -60,7 +60,7 @@ self.timeout = kwargs['timeout'] del kwargs['timeout'] else: - self.timeout = sslutils.SOCKET_DEFAULT_TIMEOUT + self.timeout = m2cutils.SOCKET_DEFAULT_TIMEOUT xmlrpclib.Transport.__init__(self, *args, **kwargs) @@ -107,8 +107,8 @@ def connect(hostPort=None, useSSL=None, tsPath=None, - TransportClass=sslutils.VerifyingSafeTransport, - timeout=sslutils.SOCKET_DEFAULT_TIMEOUT): + TransportClass=m2cutils.VerifyingSafeTransport, + timeout=m2cutils.SOCKET_DEFAULT_TIMEOUT): hostPort = cannonizeHostPort(hostPort) if useSSL is None: diff --git a/lib/yajsonrpc/betterAsyncore.py b/lib/yajsonrpc/betterAsyncore.py index 3d43ffb..6edfdd2 100644 --- a/lib/yajsonrpc/betterAsyncore.py +++ b/lib/yajsonrpc/betterAsyncore.py @@ -22,7 +22,7 @@ import socket from errno import EWOULDBLOCK -from vdsm.sslutils import SSL +from vdsm.m2cutils import SSL from vdsm.infra.eventfd import EventFD diff --git a/lib/yajsonrpc/stompreactor.py b/lib/yajsonrpc/stompreactor.py index 57237c9..66a096d 100644 --- a/lib/yajsonrpc/stompreactor.py +++ b/lib/yajsonrpc/stompreactor.py @@ -23,7 +23,7 @@ from vdsm import utils from vdsm.config import config from vdsm.compat import json -from vdsm.sslutils import SSLSocket +from vdsm.m2cutils import SSLSocket from . import JsonRpcClient, JsonRpcServer from . import stomp from .betterAsyncore import Dispatcher, Reactor diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e52a08..1b33ef8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -94,7 +94,6 @@ schemaValidationTest.py \ securableTests.py \ sourceroutingTests.py \ - sslhelper.py \ sslTests.py \ stompTests.py \ storageMailboxTests.py \ diff --git a/tests/integration/Makefile.am b/tests/integration/Makefile.am index 9de3a3c..525ddd8 100644 --- a/tests/integration/Makefile.am +++ b/tests/integration/Makefile.am @@ -24,4 +24,5 @@ __init__.py \ jsonRpcHelper.py \ jsonRpcTests.py \ + m2chelper.py \ $(NULL) diff --git a/tests/integration/jsonRpcHelper.py b/tests/integration/jsonRpcHelper.py index b456bff..65ec5e3 100644 --- a/tests/integration/jsonRpcHelper.py +++ b/tests/integration/jsonRpcHelper.py @@ -37,7 +37,7 @@ from protocoldetector import MultiProtocolAcceptor from rpc.bindingjsonrpc import BindingJsonRpc from vdsm import utils -from sslhelper import DEAFAULT_SSL_CONTEXT +from m2chelper import DEAFAULT_SSL_CONTEXT PERMUTATIONS = tuple(product((True, False), ("xml", "stomp"))) diff --git a/tests/sslhelper.py b/tests/integration/m2chelper.py similarity index 90% rename from tests/sslhelper.py rename to tests/integration/m2chelper.py index 05e657c..77a2767 100644 --- a/tests/sslhelper.py +++ b/tests/integration/m2chelper.py @@ -19,9 +19,9 @@ # import os -from vdsm.sslutils import SSLContext +from vdsm.m2cutils import SSLContext -CERT_DIR = os.path.abspath(os.path.dirname(__file__)) +CERT_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') CRT_FILE = os.path.join(CERT_DIR, "server.crt") KEY_FILE = os.path.join(CERT_DIR, "server.key") OTHER_CRT_FILE = os.path.join(CERT_DIR, "other.crt") diff --git a/tests/protocoldetectorTests.py b/tests/protocoldetectorTests.py index 695bd76..f90eb43 100644 --- a/tests/protocoldetectorTests.py +++ b/tests/protocoldetectorTests.py @@ -26,9 +26,9 @@ from contextlib import contextmanager from yajsonrpc.betterAsyncore import Reactor -from vdsm import sslutils +from vdsm import m2cutils from protocoldetector import MultiProtocolAcceptor -from sslhelper import KEY_FILE, CRT_FILE +from integration.m2chelper import KEY_FILE, CRT_FILE from testlib import VdsmTestCase, expandPermutations, permutations @@ -97,7 +97,7 @@ GRACETIME = 0.5 CONCURRENCY = 5 PERMUTATIONS = ((False,), (True,)) - SSLCTX = sslutils.SSLContext(CRT_FILE, KEY_FILE, ca_cert=CRT_FILE) + SSLCTX = m2cutils.SSLContext(CRT_FILE, KEY_FILE, ca_cert=CRT_FILE) BUFSIZE = 512 def setUp(self): diff --git a/tests/sslTests.py b/tests/sslTests.py index fde917d..b40f263 100644 --- a/tests/sslTests.py +++ b/tests/sslTests.py @@ -32,10 +32,11 @@ from contextlib import contextmanager, closing from M2Crypto import SSL -from sslhelper import KEY_FILE, CRT_FILE, OTHER_KEY_FILE, OTHER_CRT_FILE +from integration.m2chelper import KEY_FILE, \ + CRT_FILE, OTHER_KEY_FILE, OTHER_CRT_FILE from testlib import VdsmTestCase as TestCaseBase -from vdsm.sslutils import SSLServerSocket -from vdsm.sslutils import VerifyingSafeTransport +from vdsm.m2cutils import SSLServerSocket +from vdsm.m2cutils import VerifyingSafeTransport HOST = '127.0.0.1' diff --git a/tests/stompTests.py b/tests/stompTests.py index 1342391..3b38c95 100644 --- a/tests/stompTests.py +++ b/tests/stompTests.py @@ -26,7 +26,7 @@ dummyTextGenerator from integration.jsonRpcHelper import constructAcceptor -from sslhelper import DEAFAULT_SSL_CONTEXT +from integration.m2chelper import DEAFAULT_SSL_CONTEXT from yajsonrpc.stompreactor import StandAloneRpcClient from vdsm.utils import running diff --git a/tests/vdscliTests.py b/tests/vdscliTests.py index 7a80163..ba2cf36 100644 --- a/tests/vdscliTests.py +++ b/tests/vdscliTests.py @@ -30,7 +30,7 @@ from testlib import VdsmTestCase as TestCaseBase from testValidation import ValidateRunningAsRoot -from vdsm import sslutils +from vdsm import m2cutils from vdsm import vdscli HOST = '127.0.0.1' @@ -51,7 +51,7 @@ if useSSL: KEY_FILE = os.path.join(path, 'keys/vdsmkey.pem') CRT_FILE = os.path.join(path, 'certs/vdsmcert.pem') - self.server.socket = sslutils.SSLServerSocket( + self.server.socket = m2cutils.SSLServerSocket( raw=self.server.socket, keyfile=KEY_FILE, certfile=CRT_FILE, @@ -74,7 +74,7 @@ @contextmanager def setupclient(useSSL, tsPath, - timeout=sslutils.SOCKET_DEFAULT_TIMEOUT): + timeout=m2cutils.SOCKET_DEFAULT_TIMEOUT): server = TestServer(useSSL, tsPath) server.start() hostPort = '0:' + str(server.port) diff --git a/vdsm.spec.in b/vdsm.spec.in index 95702c6..e6880d0 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1053,6 +1053,7 @@ %{python_sitelib}/%{vdsm_name}/ipwrapper.py* %{python_sitelib}/%{vdsm_name}/jsonrpcvdscli.py* %{python_sitelib}/%{vdsm_name}/libvirtconnection.py* +%{python_sitelib}/%{vdsm_name}/m2cutils.py* %{python_sitelib}/%{vdsm_name}/netinfo.py* %{python_sitelib}/%{vdsm_name}/netlink/__init__.py* %{python_sitelib}/%{vdsm_name}/netlink/addr.py* @@ -1070,7 +1071,6 @@ %{python_sitelib}/%{vdsm_name}/response.py* %{python_sitelib}/%{vdsm_name}/netconfpersistence.py* %{python_sitelib}/%{vdsm_name}/schedule.py* -%{python_sitelib}/%{vdsm_name}/sslutils.py* %{python_sitelib}/%{vdsm_name}/sysctl.py* %{python_sitelib}/%{vdsm_name}/taskset.py* %{python_sitelib}/%{vdsm_name}/udevadm.py* diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 7b9c490..69d7061 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -37,7 +37,7 @@ from vdsm.compat import pickle from vdsm.define import doneCode, errCode import libvirt -from vdsm import sslutils +from vdsm import m2cutils from vdsm import libvirtconnection from vdsm import constants from vdsm import utils @@ -193,7 +193,7 @@ return cls._instance def _createAcceptor(self, host, port): - sslctx = sslutils.create_ssl_context() + sslctx = m2cutils.create_ssl_context() self._reactor = Reactor() self._acceptor = MultiProtocolAcceptor(self._reactor, host, @@ -205,7 +205,7 @@ broker_port = config.getint('addresses', 'broker_port') request_queues = config.get('addresses', 'request_queues') - sslctx = sslutils.create_ssl_context() + sslctx = m2cutils.create_ssl_context() sock = socket.socket() sock.connect((broker_address, broker_port)) if sslctx: diff --git a/vdsm/kaxmlrpclib.py b/vdsm/kaxmlrpclib.py index 6374726..b38031e 100644 --- a/vdsm/kaxmlrpclib.py +++ b/vdsm/kaxmlrpclib.py @@ -110,7 +110,7 @@ ################### # the same, for ssl -from vdsm import sslutils +from vdsm import m2cutils import ssl @@ -122,7 +122,7 @@ SslServerProxy = SslServer -class TcpkeepSafeTransport(sslutils.VerifyingSafeTransport): +class TcpkeepSafeTransport(m2cutils.VerifyingSafeTransport): def make_connection(self, host): chost, self._extra_headers, x509 = self.get_host_info(host) @@ -139,17 +139,17 @@ cert_reqs=self.cert_reqs) -class TcpkeepHTTPSConnection(sslutils.VerifyingHTTPSConnection): +class TcpkeepHTTPSConnection(m2cutils.VerifyingHTTPSConnection): def __init__(self, host, port=None, key_file=None, cert_file=None, strict=None, timeout=CONNECTTIMEOUT, ca_certs=None, cert_reqs=ssl.CERT_REQUIRED): - sslutils.VerifyingHTTPSConnection.__init__( + m2cutils.VerifyingHTTPSConnection.__init__( self, host, port=port, key_file=key_file, cert_file=cert_file, strict=strict, timeout=timeout, ca_certs=ca_certs, cert_reqs=cert_reqs) def connect(self): - sslutils.VerifyingHTTPSConnection.connect(self) + m2cutils.VerifyingHTTPSConnection.connect(self) # after TCP_KEEPIDLE seconds of silence, TCP_KEEPCNT probes would be # sent, TCP_KEEPINTVL seconds apart of each other. If all of them fail, @@ -160,5 +160,5 @@ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, KEEPCNT) -class TcpkeepHTTPS(sslutils.VerifyingHTTPS): +class TcpkeepHTTPS(m2cutils.VerifyingHTTPS): _connection_class = TcpkeepHTTPSConnection diff --git a/vdsm/protocoldetector.py b/vdsm/protocoldetector.py index bf4daa2..6d01a1c 100644 --- a/vdsm/protocoldetector.py +++ b/vdsm/protocoldetector.py @@ -24,7 +24,7 @@ import vdsm.infra.filecontrol as filecontrol from vdsm.utils import monotonic_time -from vdsm.sslutils import SSLHandshakeDispatcher +from vdsm.m2cutils import SSLHandshakeDispatcher def _create_socket(host, port): diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index a3e5027..32caccb 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -28,7 +28,7 @@ from vdsm import utils from vdsm import vdscli from vdsm import jsonrpcvdscli -from vdsm import sslutils +from vdsm import m2cutils from vdsm.compat import pickle from vdsm.config import config from vdsm.define import NORMAL, Mbytes @@ -125,7 +125,7 @@ return self.status def _createClient(self, port): - sslctx = sslutils.create_ssl_context() + sslctx = m2cutils.create_ssl_context() client_socket = utils.create_connected_socket( self.remoteHost, int(port), sslctx) return self._vm.cif.createStompClient(client_socket) -- To view, visit https://gerrit.ovirt.org/47711 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3fa842cb7a1ac0b2593df6f6fe67eee118a50616 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.6 Gerrit-Owner: Piotr Kliczewski <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
