Fix: enable device-specific attributes regardless of lab devices

When we added device-specific attributes (eos.serialnumber), we
enabled them only when the device was used in lab topology, making it
impossible to use the same topology with other devices.

This fix enables device-specific attributes regardless of what devices
are used in the current incarnation of the lab topology, allowing you
to specify device-specific data in generic topologies.

Author: ipspace

netsim/augment/devices.py

@@ -295,6 +295,14 @@ def merge_daemons(topology: Box) -> None:
 
     devices[dname].daemon_parent = devices[dname].parent    # Save the parent for future use (it is removed when merging parent device data)
 
+"""
+Add device-specific attributes
+"""
+def add_device_attributes(topology: Box) -> None:
+  for dev_def in topology.defaults.devices.values():        # Iterate over all devices
+    if 'attributes' in dev_def:                             # ... and add device specific attributes to the data model
+      topology.defaults.attributes = topology.defaults.attributes + dev_def.attributes
+
 """
 Initial device setting augmentation:
 
@@ -312,6 +320,7 @@ def augment_device_settings(topology: Box) -> None:
       log.fatal(f'Internal error: definition of device {dname} is not a dictionary')
 
   merge_daemons(topology)
+  add_device_attributes(topology)
   process_device_inheritance(topology)
   build_module_support_lists(topology)
 

netsim/augment/nodes.py

@@ -300,9 +300,6 @@ def find_node_device(n: Box, topology: Box) -> bool:
   for group in dev_def.features.get('group',[]):
     groups.add_node_to_group(n.name,group,topology)
 
-  if 'attributes' in dev_def:                               # Add any device specific attributes to the data model
-    topology.defaults.attributes = topology.defaults.attributes + dev_def.attributes
-
   return True
 
 """