oops

[tests.git] / system / config_1vnodes.py

diff --git a/system/config_1vnodes.py b/system/config_1vnodes.py
index a9efc1a..f47ff89 100644 (file)
--- a/system/config_1vnodes.py
+++ b/system/config_1vnodes.py
@@ -1,35 +1,46 @@
 # map all nodes onto the avail. pool
 
+import utils
 from TestMapper import TestMapper
-from TestPool import TestPool
+from TestPool import TestPoolIP
+
+onelab_nodes_ip_pool = [ 
+    ( 'vnode%02d.inria.fr'%i, 
+      '138.96.255.%d'%(220+i), 
+      '02:34:56:00:00:%02d'%i) for i in range(1,10) ]
 
-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) ]
 site_dict = {
-    'network_fields:gateway':'138.96.248.250',
-    'network_fields:network':'138.96.0.0',
-    'network_fields:broadcast':'138.96.255.255',
-    'network_fields:netmask':'255.255.0.0',
-    'network_fields:dns1': '138.96.0.10',
-    'network_fields:dns2': '138.96.0.11',
+    'interface_fields:gateway':'138.96.248.250',
+    'interface_fields:network':'138.96.0.0',
+    'interface_fields:broadcast':'138.96.255.255',
+    'interface_fields:netmask':'255.255.0.0',
+    'interface_fields:dns1': '138.96.0.10',
+    'interface_fields:dns2': '138.96.0.11',
 }
 
 def config (plcs, options):
     
-    test_pool = TestPool (onelab_plcs_pool,options)
+    ip_pool = TestPoolIP (onelab_nodes_ip_pool,options)
     test_mapper = TestMapper (plcs, options)
 
     all_nodenames = test_mapper.node_names()
     maps = []
     for nodename in all_nodenames:
-        (hostname,ip,mac) = test_pool.next_free()
+        if options.ips_node:
+            ip_or_hostname=options.ips_node.pop()
+            (hostname,ip,mac)=ip_pool.locate_entry(ip_or_hostname)
+        else:
+            (hostname,ip,mac) = ip_pool.next_free()
+        utils.header('Attaching node %s to %s (%s)'%(nodename,hostname,ip))
         node_dict= {'node_fields:hostname':hostname,
-                    'network_fields:ip':ip,
-                    'network_fields:mac':mac}        
+                    'interface_fields:ip':ip, 
+                    'interface_fields:mac':mac,
+                    }
+    
         node_dict.update(site_dict)
         maps.append ( ( nodename, node_dict) )
 
-    plc_map = [ ( '*' , { 'PLC_NET_DNS1' : site_dict [ 'network_fields:dns1' ],
-                        'PLC_NET_DNS2' : site_dict [ 'network_fields:dns2' ], } ) ]
+    plc_map = [ ( '*' , { 'PLC_NET_DNS1' : site_dict [ 'interface_fields:dns1' ],
+                        'PLC_NET_DNS2' : site_dict [ 'interface_fields:dns2' ], } ) ]
 
     return test_mapper.map ({'node': maps, 'plc' : plc_map } )