From 43b4a8f181c088cc589775331e0970e87685434b Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Tue, 30 Jun 2020 11:56:17 -0700 Subject: [PATCH] test/test-mesh: Add options to "Models" property This adds options dictionary to "Models" property to stay in sync with mesh-api changes. Change-Id: I10efee164915dcf1867fb939c4a0fd10558e37dd Signed-off-by: anuj.bhumiya --- test/test-mesh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/test/test-mesh b/test/test-mesh index bbedb6a..ef8d556 100755 --- a/test/test-mesh +++ b/test/test-mesh @@ -428,32 +428,35 @@ class Element(dbus.service.Object): dbus.service.Object.__init__(self, bus, self.path) def _get_sig_models(self): - ids = [] + mods = [] for model in self.models: + opts = [] id = model.get_id() vendor = model.get_vendor() if vendor == VENDOR_ID_NONE: - ids.append(id) - return ids + mod = (id, opts) + mods.append(mod) + return mods def _get_v_models(self): - ids = [] + mods = [] for model in self.models: + opts = [] id = model.get_id() v = model.get_vendor() if v != VENDOR_ID_NONE: - vendor_id = (v, id) - ids.append(vendor_id) - return ids + mod = (v, id, opts) + mods.append(mod) + return mods def get_properties(self): vendor_models = self._get_v_models() sig_models = self._get_sig_models() props = {'Index' : dbus.Byte(self.index)} - props['Models'] = dbus.Array(sig_models, signature='q') + props['Models'] = dbus.Array(sig_models, signature='(qa{sv})') props['VendorModels'] = dbus.Array(vendor_models, - signature='(qq)') + signature='(qqa{sv})') #print(props) return { MESH_ELEMENT_IFACE: props } -- 2.7.4