Fix: device-specific attributes like ios.debug can be global

When a device-specific is defined as a global attribute, it has to be
applied to every device in the lab topology (similar to what we're
doing with the propagated module settings).

This fix implements the simple merge-from-global behavior. I had to
change the parameters of the 'augment_node_device_data' function
because it needs access to topology data.

Author: ipspace

netsim/augment/nodes.py

@@ -419,7 +419,8 @@ def augment_node_system_data(topology: Box) -> None:
 augment_node_device_data: copy attributes that happen to be node attributes from device defaults into node data
 """
 
-def augment_node_device_data(n: Box, defaults: Box) -> None:
+def augment_node_device_data(n: Box, topology: Box) -> None:
+  defaults = topology.defaults
   node_attr = defaults.attributes.get('node',[])
   dev_data  = devices.get_consolidated_device_data(n,defaults)
 
@@ -432,6 +433,9 @@ def augment_node_device_data(n: Box, defaults: Box) -> None:
       if not k in n:
         n[k] = defaults.devices[n.device].node[k]
 
+  if n.device in topology:                        # Do we have global device-specific settings?
+    n[n.device] = topology[n.device] + n[n.device]
+
   if dev_data.get('daemon',False):                # Special handling of daemons
     n._daemon = True                              # First, set the daemon flag so we don't have to look up the device data
     n._daemon_parent = dev_data.daemon_parent     # Next, remember the parent device -- we need that in template search paths
@@ -485,7 +489,7 @@ def transform(topology: Box, defaults: Box, pools: Box) -> None:
       log.fatal(f"Internal error: node does not have a name {n}",'nodes')
       return
 
-    augment_node_device_data(n,defaults)
+    augment_node_device_data(n,topology)
 
     n.af = {}                                                 # Nodes must have AF attribute