nodenetwork sequels

[tests.git] / system / config_1vnodes.py

diff --git a/system/config_1vnodes.py b/system/config_1vnodes.py
index a516e96..4fdb5d3 100644 (file)
--- a/system/config_1vnodes.py
+++ b/system/config_1vnodes.py
@@ -4,7 +4,7 @@ from TestMapper import TestMapper
 from TestPool import TestPool
 
 onelab_plcs_pool = [ 
-    ( 'vnode%02d.inria.fr'%i, '138.96.250.22%d'%i, 'ab:cd:ef:00:01:%02d'%i) for i in range(1,10) ]
+    ( 'vnode%02d.inria.fr'%i, '138.96.250.22%d'%i, '02:34:56:00:00:%02d'%i) for i in range(1,10) ]
 site_dict = {
     'network_fields:gateway':'138.96.248.250',
     'network_fields:network':'138.96.0.0',
@@ -22,16 +22,15 @@ def config (plcs, options):
     all_nodenames = test_mapper.node_names()
     maps = []
     for nodename in all_nodenames:
-        if len(options.ips) != 0:
-            ip=options.ips[0]
-            options.ips=options.ips[1:]
+        if len(options.node_ips) != 0:
+            ip=options.node_ips[0]
+            options.node_ips=options.node_ips[1:]
             (hostname,ip,mac)=test_pool.locate(ip)
         else:
             (hostname,ip,mac) = test_pool.next_free()
         node_dict= {'node_fields:hostname':hostname,
                     'network_fields:ip':ip, 
-                    # xxx do not et mac as for some reason the qeu nodes don't know about their mac any more
-                    #'network_fields:mac':mac,
+                    'network_fields:mac':mac,
                     }
     
         node_dict.update(site_dict)