[req-changes] Made changes in docs and added more properties to nodes

openwisp · Apr 28, 2023 · c31ced2 · c31ced2
1 parent 50fc81d
commit c31ced2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/README.rst b/README.rst
@@ -456,7 +456,7 @@ This additional and optional module provides the following features:
   - if OpenWISP Monitoring is enabled, the device checks are triggered (e.g.: ping)
 
 - if OpenWISP Monitoring is enabled, the system can automatically create topology
-  for the WiFi Mesh(es) present in the network using the monitoring data.
+  for the WiFi Mesh (802.11s) interfaces using the monitoring data provided by the agent.
   You can enable this by setting `OPENWISP_NETWORK_TOPOLOGY_WIFI_MESH_INTEGRATION
   <#openwisp_network_topology_wifi_mesh_integration>`_ to ``True``.
 
@@ -610,10 +610,12 @@ belong to the organizations the user manages.
 +--------------+---------------+
 
 When enabled, topologies will be automatically created for WiFi mesh(es) present on
-the network.
+When enabled, network topology objects will be automatically created and
+updated based on the WiFi mesh interfaces peer information supplied
+by the monitoring agent.
 
-**Note:** The topologies are created using the device monitoring data reported
-by OpenWISP Monitoring. Thus, it requires
+**Note:** The network topology objects are created using the device monitoring data
+collected by OpenWISP Monitoring. Thus, it requires
 `integration with OpenWISP Controller and OpenWISP Monitoring
 <#integration-with-openwisp-controller-and-openwisp-monitoring>`_ to be enabled
 on the Django project.

diff --git a/openwisp_network_topology/integrations/device/base/models.py b/openwisp_network_topology/integrations/device/base/models.py
@@ -297,8 +297,19 @@ def _create_netjsongraph(interface, device):
         Note: The "node" and "links" keys of the returned graph
         does not follow NetJSON specification.
         """
-        NODE_PROPERTIES = ['ht', 'vht', 'mfp', 'wmm', 'vendor']
-        LINK_PROPERTIES = ['auth', 'authorized', 'noise', 'signal']
+        NODE_PROPERTIES = [
+            'ht',
+            'vht',
+            'he',
+            'mfp',
+            'wmm',
+            'vendor',
+            'mesh_llid',
+            'mesh_plid',
+            'mesh_plink',
+            'mesh_non_peer_ps',
+        ]
+        LINK_PROPERTIES = ['auth', 'authorized', 'noise', 'signal', 'signal_avg']
         interface_mac = interface['mac'].upper()
         collected_nodes = {
             interface_mac: {

diff --git a/openwisp_network_topology/integrations/device/tests/__init__.py b/openwisp_network_topology/integrations/device/tests/__init__.py
@@ -212,6 +212,12 @@
                 'signal': -61,
                 'ssid': 'Test Mesh',
                 'tx_power': 17,
+                'mesh_llid': 19751,
+                'mesh_local_ps': 'ACTIVE',
+                'mesh_non_peer_ps': 'ACTIVE',
+                'mesh_peer_ps': 'ACTIVE',
+                'mesh_plid': 24413,
+                'mesh_plink': 'ESTAB',
             },
         }
     ],