Mirrors
/
Reticulum
mirror of https://github.com/markqvist/Reticulum.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #629 from jacobeva/refactor-fix 

Fix RNodeMultiInterface to work with refactored interfaces
This commit is contained in:
markqvist 2024-12-07 22:32:27 +01:00 committed by GitHub
parent 0e5f4aa08a ee79c3a732
commit 8b08658b7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RNS/Interfaces/RNodeMultiInterface.py
View File

@ -197,14 +197,13 @@ class RNodeMultiInterface(Interface):
# Count how many interfaces are in the file # Count how many interfaces are in the file
for subinterface in c: for subinterface in c:
# if the retrieved entry is not a string, it must be a dictionary, which is what we want # if the retrieved entry is not a string, it must be a dictionary, which is what we want
if not isinstance(c[subinterface], str): if isinstance(c[subinterface], dict):
count += 1 count += 1
# Count how many interfaces are enabled to allow for appropriate matrix sizing # Count how many interfaces are enabled to allow for appropriate matrix sizing
for subinterface in c: for subinterface in c:
# if the retrieved entry is not a string, it must be a dictionary, which is what we want if isinstance(c[subinterface], dict):
if not isinstance(c[subinterface], str): subinterface_config = c[subinterface]
subinterface_config = self.config["interfaces"][name][subinterface]
if (("interface_enabled" in subinterface_config) and subinterface_config.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True): if (("interface_enabled" in subinterface_config) and subinterface_config.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True):
enabled_count += 1 enabled_count += 1
@ -213,9 +212,8 @@ class RNodeMultiInterface(Interface):
subint_index = 0 subint_index = 0
for subinterface in c: for subinterface in c:
# If the retrieved entry is not a string, it must be a dictionary, which is what we want if isinstance(c[subinterface], dict):
if not isinstance(c[subinterface], str): subinterface_config = c[subinterface]
subinterface_config = self.config["interfaces"][name][subinterface]
if (("interface_enabled" in subinterface_config) and subinterface_config.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True): if (("interface_enabled" in subinterface_config) and subinterface_config.as_bool("interface_enabled") == True) or (("enabled" in c) and c.as_bool("enabled") == True):
subint_config[subint_index][0] = subinterface subint_config[subint_index][0] = subinterface