two wifi nodes with a mix of static & dhcp

diff --git a/system/config_wifilab.py b/system/config_wifilab.py
index 2ebb5d4..03656f5 100644 (file)
--- a/system/config_wifilab.py
+++ b/system/config_wifilab.py
@@ -18,17 +18,45 @@ def nodes():
                                   'ip':'138.96.250.162',
                                   },
               'extra_interfaces' : [ { 'network_fields' : 
-                                       { 'method' : 'dhcp',
+                                       { 'method' : 'static',
                                          'type' : 'ipv4',
-                                         'ip' : '138.96.250.212' },
+                                         'mac' : '00:1c:bf:51:2b:fd',
+                                         'ip' : '138.96.250.212',
+                                         'network' : '138.96.0.0',
+                                         'dns1': '138.96.0.10',
+                                         'dns2': '138.96.0.11',
+                                         'broadcast' : '138.96.255.255',
+                                         'netmask' : '255.255.0.0',
+                                         'gateway' : '138.96.248.250',
+                                         },
                                        'attributes' : 
-                                       { 'hwaddr' : '00:1c:bf:51:2b:fd',
-                                         'essid' : 'guest-inria-sophia',
+                                       { 'essid' : 'guest-inria-sophia',
                                          'ifname' : 'wlan0',
                                          },
                                        },
                                      ],
               },
+             {'node_fields': {'hostname': 'wlab17.inria.fr',
+                              'model':'Dell Latitude 830'},
+              'owner' : 'pi',
+              'nodegroups' : 'wifi',
+              'network_fields': { 'method':'dhcp',
+                                  'type' : 'ipv4',
+                                  'ip':'138.96.250.177',
+                                  },
+              'extra_interfaces' : [ { 'network_fields' : 
+                                       { 'method' : 'dhcp',
+                                         'type' : 'ipv4',
+                                         'mac' : '00:1c:bf:51:3c:19',
+                                         'ip' : '138.96.250.207',
+                                         },
+                                       'attributes' : 
+                                       { 'essid' : 'guest-inria-sophia',
+                                         'ifname' : 'wlan0',
+                                         },
+                                       },
+                                     ],
+              }
              ]
 
 def all_nodenames ():