From 28dbca0e498f3859aabcb400bdca8c926a594700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Lowas-Rzechonek?= Date: Tue, 26 Nov 2019 15:54:01 +0100 Subject: mesh: Inform application about model subscriptions --- test/test-join | 13 +++++++++++++ test/test-mesh | 25 ++++++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) (limited to 'test') diff --git a/test/test-join b/test/test-join index fb7b0d640..6dfb2e8c3 100644 --- a/test/test-join +++ b/test/test-join @@ -327,6 +327,19 @@ class Model(): print('Model publication period ', end='') print(self.pub_period, end='') print(' ms') + if 'Subscriptions' in config: + self.print_subscriptions(config.get('Subscriptions')) + + def print_subscriptions(self, subscriptions): + print('Model subscriptions ', end='') + for sub in subscriptions: + if isinstance(sub, int): + print('%04x' % sub, end=' ') + + if isinstance(sub, list): + label = uuid.UUID(bytes=b''.join(sub)) + print(label, end=' ') + print() class OnOffServer(Model): def __init__(self, model_id): diff --git a/test/test-mesh b/test/test-mesh index c67bb65fb..5777fcebc 100755 --- a/test/test-mesh +++ b/test/test-mesh @@ -128,6 +128,7 @@ import dbus.exceptions from threading import Timer import time +import uuid try: from gi.repository import GLib @@ -628,17 +629,19 @@ class Model(): print('Model publication period ', end='') print(self.pub_period, end='') print(' ms') - - def print_bindings(self): - print(set_cyan('Model'), set_cyan('%03x' % self.model_id), - set_cyan('is bound to: ')) - - if len(self.bindings) == 0: - print(set_cyan('** None **')) - return - - for b in self.bindings: - print(set_green('%03x' % b) + ' ') + if 'Subscriptions' in config: + print('Model subscriptions ', end='') + self.print_subscriptions(config.get('Subscriptions')) + print() + + def print_subscriptions(self, subscriptions): + for sub in subscriptions: + if isinstance(sub, int): + print('%04x' % sub, end=' ') + + if isinstance(sub, list): + label = uuid.UUID(bytes=b''.join(sub)) + print(label, end=' ') ######################## # On Off Server Model -- cgit v1.2.1