X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plnet.py;h=84b0791102046c1b719f5b312626669452702233;hb=96f5dad22708ec95d4dacbf6f477c32a785b0b7c;hp=5b0c667256a1a70c52b438f734d7ae086770411f;hpb=0603f3a71d3d109372b116ab2e443d283203f719;p=pyplnet.git

diff --git a/plnet.py b/plnet.py
index 5b0c667..84b0791 100755
--- a/plnet.py
+++ b/plnet.py
@@ -37,6 +37,24 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
     gateway = None
     networks = data['networks']
     failedToGetSettings = False
+
+    # NOTE: GetInterfaces/NodeNetworks does not necessarily order the interfaces
+    # returned.  Because 'interface'is decremented as each interface is processed,
+    # by the time is_primary=True (primary) interface is reached, the device
+    # "eth%s" % interface, is not eth0.  But, something like eth-4, or eth-12.
+    # This code sorts the interfaces, placing is_primary=True interfaces first.  
+    # There is a lot of room for improvement to how this
+    # script handles interfaces and how it chooses the primary interface.
+    def compare_by (fieldname):
+        def compare_two_dicts (a, b):
+            return cmp(a[fieldname], b[fieldname])
+        return compare_two_dicts
+
+    # NOTE: by sorting on 'is_primary' and then reversing (since False is sorted
+    # before True) all 'is_primary' interfaces are at the beginning of the list.
+    networks.sort( compare_by('is_primary') )
+    networks.reverse()
+
     for network in networks:
     	logger.verbose('net:InitInterfaces interface %d: %s'%(interface,network))
     	logger.verbose('net:InitInterfaces macs = %s' % macs)
@@ -116,6 +134,13 @@ def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
                 settingname = setting[name_key].upper()
                 if settingname in ('IFNAME','ALIAS','CFGOPTIONS','DRIVER'):
                     inter[settingname]=setting['value']
+                # wireless settings
+                elif settingname in \
+                        [  "MODE", "ESSID", "NW", "FREQ", "CHANNEL", "SENS", "RATE",
+                           "KEY", "KEY1", "KEY2", "KEY3", "KEY4", "SECURITYMODE", 
+                           "IWCONFIG", "IWPRIV" ] :
+                    inter [settingname] = setting['value']
+                    inter ['TYPE']='Wireless'
                 else:
                     logger.log("net:InitInterfaces WARNING: ignored setting named %s"%setting[name_key])