diff --git a/src/sakia/data/connectors/bma.py b/src/sakia/data/connectors/bma.py index 819cbf317682fa82160b542d9c6a82d0fddee069..25e8ec205d51584af986985f53382a07732db7c9 100644 --- a/src/sakia/data/connectors/bma.py +++ b/src/sakia/data/connectors/bma.py @@ -183,6 +183,8 @@ class BmaConnector: for i in range(0, int(nb_verification)+1): node = next(nodes_generator) endpoints = filter_endpoints(request, [node]) + if not endpoints: + continue endpoint = random.choice(endpoints) self._logger.debug( "Requesting {0} on endpoint {1}".format(str(request.__name__), str(endpoint))) diff --git a/src/sakia/data/connectors/node.py b/src/sakia/data/connectors/node.py index 034d49d09c22fe430bccbcb4dccf3a1d7ccca913..fcb2b47547055b6a83f373ab2f9ffc990a96b7af 100644 --- a/src/sakia/data/connectors/node.py +++ b/src/sakia/data/connectors/node.py @@ -364,6 +364,7 @@ class NodeConnector(QObject): def change_state_and_emit(self, new_state): if self.node.state != new_state: + self._logger.debug("Changing state {0} > {1}".format(self.node.state, new_state)) self.node.last_state_change = time.time() self.node.state = new_state self.changed.emit() diff --git a/src/sakia/gui/navigation/network/table_model.py b/src/sakia/gui/navigation/network/table_model.py index 82d4287f6ec73129b9ef26ec10dc6a5949cd4d24..d0606fe43ffdaf3df4c21796f555a1a5757022d2 100644 --- a/src/sakia/gui/navigation/network/table_model.py +++ b/src/sakia/gui/navigation/network/table_model.py @@ -214,6 +214,12 @@ class NetworkTableModel(QAbstractTableModel): addresses.append(e.ipv4) ports.append(str(e.port)) elif isinstance(e, WS2PEndpoint): + addresses.append(e.server + " [" + e.ws2pid + "]") + ports.append(str(e.port)) + elif isinstance(e, UnknownEndpoint): + addresses.append(" ".join(e.properties)) + ports.append("-") + else: addresses.append(e.server) ports.append(str(e.port)) diff --git a/src/sakia/gui/navigation/network/view.py b/src/sakia/gui/navigation/network/view.py index 14d999534f9e259402753cf52950b726c2e21628..8726ddb945d6ba42430bc9c9f2d8030efa8fecdb 100644 --- a/src/sakia/gui/navigation/network/view.py +++ b/src/sakia/gui/navigation/network/view.py @@ -25,7 +25,7 @@ class NetworkView(QWidget, Ui_NetworkWidget): :param PyQt5.QtCore.QAbstractTableModel model: the model of the table view """ self.table_network.setModel(model) - self.table_network.sortByColumn(2, Qt.DescendingOrder) + self.table_network.sortByColumn(3, Qt.DescendingOrder) self.table_network.setItemDelegate(NetworkDelegate()) self.table_network.resizeColumnsToContents() self.table_network.resizeRowsToContents()