Support net.* attributes

Allow named groupings of net attributes.

confluent_server/confluent/config/attributes.py

@@ -301,10 +301,17 @@ node = {
     },
     # TODO: extend to support 'net.0.switch' for multi-nic support
     'net.switch': {
-        'description': 'An ethernet switch the node is connected to.'
+        'description': 'An ethernet switch the node is connected to.  Note '
+                       'that net.* attributes may be indexed by interface. '
+                       'For example instead of using net.switch, it is '
+                       'possible to use net.eth0.switch and net.eth1.switch '
+                       'or net.0.switch and net.1.switch to define multiple '
+                       'sets of net connectivity associated with each other.'
     },
     'net.switchport': {
-        'description': 'The port on the switch that corresponds to this node.'
+        'description': 'The port on the switch that corresponds to this node. '
+                       'See information on net.switch for more on the '
+                       'flexibility of net.* attributes.'
     },
 #    'id.modelnumber': {
 #        'description': 'The manufacturer dictated  model number for the node',

confluent_server/confluent/config/configmanager.py

@@ -228,6 +228,12 @@ def attribute_is_invalid(attrname, attrval):
         # No type checking or name checking is provided for custom,
         # it's not possible
         return False
+    if attrname.startswith('net.'):
+        # For net.* attribtues, split on the dots and put back together
+        # longer term we might want a generic approach, but
+        # right now it's just net. attributes
+        netattrparts = attrname.split('.')
+        attrname = netattrparts[0] + '.' + netattrparts[-1]
     if attrname not in allattributes.node:
         # Otherwise, it must be in the allattributes key list
         return True

confluent_server/confluent/discovery/core.py

@@ -601,8 +601,8 @@ def newnodes(added, deleting, configmanager):
     configmanager.remove_watcher(attribwatcher)
     allnodes = configmanager.list_nodes()
     attribwatcher = configmanager.watch_attributes(
-        allnodes, ('discovery.policy', 'net.switch',
-                   'hardwaremanagement.manager', 'net.switchport', 'id.uuid',
+        allnodes, ('discovery.policy', 'net*.switch',
+                   'hardwaremanagement.manager', 'net*.switchport', 'id.uuid',
                    'pubkeys.tls_hardwaremanager'), _recheck_nodes)
     if nodeaddhandler:
         needaddhandled = True
@@ -640,8 +640,8 @@ def start_detection():
     cfg = cfm.ConfigManager(None)
     allnodes = cfg.list_nodes()
     attribwatcher = cfg.watch_attributes(
-        allnodes, ('discovery.policy', 'net.switch',
-                   'hardwaremanagement.manager', 'net.switchport', 'id.uuid',
+        allnodes, ('discovery.policy', 'net*.switch',
+                   'hardwaremanagement.manager', 'net*.switchport', 'id.uuid',
                    'pubkeys.tls_hardwaremanager'), _recheck_nodes)
     cfg.watch_nodecollection(newnodes)
     eventlet.spawn_n(slp.snoop, safe_detected)