linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename host argument to client

Browse Source 
from connectto to host

Change-Id: I4835148b9b7e4675ba70e588998eadc0889735c2
Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/21289
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2019-09-23 17:46:31 +02:00
parent 3ef0d49461
commit d187b3240b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
secop/client/baseclient.py
View File

@@ -203,7 +203,7 @@ class Client(object):
devport, baudrate=baudrate, timeout=1) devport, baudrate=baudrate, timeout=1)
self.connection.callbacks = [] self.connection.callbacks = []
elif 'testing' not in opts: elif 'testing' not in opts:
host = opts.pop('connectto', 'localhost') host = opts.pop('host', 'localhost')
port = int(opts.pop('port', 10767)) port = int(opts.pop('port', 10767))
self.contactPoint = "tcp://%s:%d" % (host, port) self.contactPoint = "tcp://%s:%d" % (host, port)
self.connection = TCPConnection(host, port) self.connection = TCPConnection(host, port)

2
secop/gui/mainwindow.py
View File

@@ -150,7 +150,7 @@ class MainWindow(QMainWindow):
if ':' in host: if ':' in host:
host, port = host.split(':', 1) host, port = host.split(':', 1)
port = int(port) port = int(port)
node = QSECNode({'connectto': host, 'port': port}, parent=self) node = QSECNode({'host': host, 'port': port}, parent=self)
host = '%s:%d' % (host, port) host = '%s:%d' % (host, port)
host = '%s (%s)' % (node.equipmentId, host) host = '%s (%s)' % (node.equipmentId, host)