openstack
/
senlin
Code Issues Proposed changes

Merge "Remove the temporary flag "rpc_use_object" in config.py"

This commit is contained in:
Jenkins 2017-01-02 02:05:39 +00:00 committed by Gerrit Code Review
parent bce7f61402 0521fe6e67
commit 158791dde8
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
senlin/common/config.py
View File

@ -86,11 +86,6 @@ engine_opts = [
default=False,
help=_('Flag to indicate whether to enforce unique names for '
'Senlin objects belonging to the same project.')),
cfg.BoolOpt('rpc_use_object',
default=True,
help=_("!!!Temporary!!! This is a temporary flag indicating "
"whether senlin RPC will use the versionedobjects "
"based parameter passing")),
]
cfg.CONF.register_opts(engine_opts)

5
senlin/engine/service.py
View File

@ -123,10 +123,7 @@ class EngineService(service.Service):
target = oslo_messaging.Target(version=consts.RPC_API_VERSION,
server=self.host,
topic=self.topic)
if CONF.rpc_use_object:
serializer = obj_base.VersionedObjectSerializer()
else:
serializer = None
serializer = obj_base.VersionedObjectSerializer()
self._rpc_server = rpc_messaging.get_rpc_server(
target, self, serializer=serializer)
self._rpc_server.start()

5
senlin/rpc/client.py
View File

@ -31,10 +31,7 @@ class EngineClient(object):
"""
def __init__(self):
if cfg.CONF.rpc_use_object:
serializer = object_base.VersionedObjectSerializer()
else:
serializer = None
serializer = object_base.VersionedObjectSerializer()
self._client = messaging.get_rpc_client(consts.ENGINE_TOPIC,
cfg.CONF.host,
serializer=serializer)

8
senlin/tests/unit/engine/test_engine_startstop.py
View File

@ -75,12 +75,8 @@ class EngineBasicTest(base.SenlinTestCase):
server=self.eng.host,
topic=self.eng.topic)
if cfg.CONF.rpc_use_object:
self.get_rpc.assert_called_once_with(mock_target, self.eng,
serializer=mock.ANY)
else:
self.get_rpc.assert_called_once_with(mock_target, self.eng,
serializer=None)
self.get_rpc.assert_called_once_with(mock_target, self.eng,
serializer=mock.ANY)
self.assertEqual(self.fake_rpc_server, self.eng._rpc_server)
self.fake_rpc_server.start.assert_called_once_with()