From 63f1e0e5ec1c0843970dee4dfdbc78995f4f2c14 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Sun, 28 Jul 2013 12:22:17 +0900 Subject: [PATCH] Removes a redundant version_is_compatible function Two defined in _drivers.common and _utils. Removed the one in _drivers.common Change-Id: I613c2d9288a1bf333dd89c8844bd8467e8b34c42 --- oslo/messaging/_drivers/common.py | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py index 9fd169cb0..268a26a51 100644 --- a/oslo/messaging/_drivers/common.py +++ b/oslo/messaging/_drivers/common.py @@ -26,6 +26,7 @@ from oslo.config import cfg from oslo import messaging import six +from oslo.messaging import _utils as utils from oslo.messaging.openstack.common import importutils from oslo.messaging.openstack.common import jsonutils @@ -454,21 +455,6 @@ def client_exceptions(*exceptions): return outer -def version_is_compatible(imp_version, version): - """Determine whether versions are compatible. - - :param imp_version: The version implemented - :param version: The version requested by an incoming message. - """ - version_parts = version.split('.') - imp_version_parts = imp_version.split('.') - if int(version_parts[0]) != int(imp_version_parts[0]): # Major - return False - if int(version_parts[1]) > int(imp_version_parts[1]): # Minor - return False - return True - - def serialize_msg(raw_msg): # NOTE(russellb) See the docstring for _RPC_ENVELOPE_VERSION for more # information about this format. @@ -514,7 +500,8 @@ def deserialize_msg(msg): # At this point we think we have the message envelope # format we were expecting. (#1.a above) - if not version_is_compatible(_RPC_ENVELOPE_VERSION, msg[_VERSION_KEY]): + if not utils.version_is_compatible(_RPC_ENVELOPE_VERSION, + msg[_VERSION_KEY]): raise UnsupportedRpcEnvelopeVersion(version=msg[_VERSION_KEY]) raw_msg = jsonutils.loads(msg[_MESSAGE_KEY])