mesh: Fix test-join to include mandatory VendorModels property 05/221705/1
authorMichał Lowas-Rzechonek <michal.lowas-rzechonek@silvair.com>
Tue, 26 Nov 2019 14:53:59 +0000 (15:53 +0100)
committerAbhay Agarwal <ay.agarwal@samsung.com>
Tue, 7 Jan 2020 05:12:13 +0000 (10:42 +0530)
Change-Id: I61cb48d751a7049ca17c0b85a74a8dd693f8ab5f
Signed-off-by: Abhay Agarwal <ay.agarwal@samsung.com>
test/test-join

index cdf92a2..079f711 100644 (file)
@@ -232,11 +232,25 @@ class Element(dbus.service.Object):
                                ids.append(id)
                return ids
 
+       def _get_v_models(self):
+               ids = []
+               for model in self.models:
+                       id = model.get_id()
+                       v = model.get_vendor()
+                       if v != VENDOR_ID_NONE:
+                               vendor_id = (v, id)
+                               ids.append(vendor_id)
+               return ids
+
        def get_properties(self):
+               vendor_models = self._get_v_models()
+               sig_models = self._get_sig_models()
+
                return {
                        MESH_ELEMENT_IFACE: {
                        'Index': dbus.Byte(self.index),
-                       'Models': dbus.Array(self._get_sig_models(), 'q')
+                       'Models': dbus.Array(sig_models, 'q'),
+                       'VendorModels': dbus.Array(vendor_models, '(qq)'),
                        }
                }