Francesco Romani has uploaded a new change for review.

Change subject: xmlrpc: remove useless 'serverPort' attribute ......................................................................

xmlrpc: remove useless 'serverPort' attribute

The BindingXMLRPC class used to have one 'serverPort' attribute, which was used only on the migration path.

Since commit 3be9ad1f278 was merged some time ago, this attribute is unused and could be removed.

This patch does that.

Change-Id: I120754b2c934da3393e5ea4323225c14e25b2087 Signed-off-by: Francesco Romani fromani@redhat.com --- M tests/jsonRpcHelper.py M vdsm/clientIF.py M vdsm/rpc/BindingXMLRPC.py 3 files changed, 5 insertions(+), 7 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/35271/1

diff --git a/tests/jsonRpcHelper.py b/tests/jsonRpcHelper.py index 066eaeb..5ab8abe 100644 --- a/tests/jsonRpcHelper.py +++ b/tests/jsonRpcHelper.py @@ -64,8 +64,7 @@ acceptor = MultiProtocolAcceptor("127.0.0.1", 0, sslctx) cif = FakeClientIf()

- _, port = acceptor._socket.getsockname() - xml_binding = BindingXMLRPC(cif, cif.log, port) + xml_binding = BindingXMLRPC(cif, cif.log) xml_binding.start() xmlDetector = XmlDetector(xml_binding) acceptor.add_detector(xmlDetector) diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index b7a7ef8..a17fd20 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -106,7 +106,7 @@ host = config.get('addresses', 'management_ip') port = config.get('addresses', 'management_port') self._createAcceptor(host, port) - self._prepareXMLRPCBinding(port) + self._prepareXMLRPCBinding() self._prepareJSONRPCBinding() except: self.log.error('failed to init clientIF, ' @@ -171,7 +171,7 @@ protocol=protocol) return sslctx

- def _prepareXMLRPCBinding(self, port): + def _prepareXMLRPCBinding(self): if config.getboolean('vars', 'xmlrpc_enable'): try: from rpc.BindingXMLRPC import BindingXMLRPC @@ -180,7 +180,7 @@ self.log.error('Unable to load the xmlrpc server module. ' 'Please make sure it is installed.') else: - xml_binding = BindingXMLRPC(self, self.log, port) + xml_binding = BindingXMLRPC(self, self.log) self.bindings['xmlrpc'] = xml_binding xml_detector = XmlDetector(xml_binding) self._acceptor.add_detector(xml_detector) diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py index 0164691..ec223e8 100644 --- a/vdsm/rpc/BindingXMLRPC.py +++ b/vdsm/rpc/BindingXMLRPC.py @@ -43,10 +43,9 @@

class BindingXMLRPC(object): - def __init__(self, cif, log, port): + def __init__(self, cif, log): self.cif = cif self.log = log - self.serverPort = port

self._enabled = False self.server = self._createXMLRPCServer()