knows about the new plcapi interface about ipaddresses and routes

[tests.git] / system / LocalSubstrate.inria.py

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 97772f0..74e8a0d 100755 (executable)
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -23,10 +23,15 @@ class OnelabSubstrate (Substrate):
       return [ 'liquid', 'reed', 'velvet', ]
 
    # the vs-capable box for PLCs
-   def plc_boxes_spec (self):
+   def plc_vs_boxes_spec (self):
       return [ ('vs64-1', 35),  # how many plcs max in this box
                ]  
 
+   # the lxc-capable box for PLCs
+   def plc_lxc_boxes_spec (self):
+      return [ ('lxc64-1', 35),  # how many plcs max in this box
+               ]  
+
    # vplc01 to 40
    def vplc_ips (self):
       return [  ( 'vplc%02d'%i,                 # DNS name
@@ -54,12 +59,15 @@ class OnelabSubstrate (Substrate):
       return 'pl.sophia.inria.fr'
 
    def network_settings (self):
-      return { 'interface_fields:gateway':'138.96.112.250',
-               'interface_fields:network':'138.96.112.0',
-               'interface_fields:broadcast':'138.96.119.255',
-               'interface_fields:netmask':'255.255.248.0',
-               'interface_fields:dns1': '138.96.112.1',
-               'interface_fields:dns2': '138.96.112.2',
+      return { 'interface_fields:gateway':      '138.96.112.250',
+               'route_fields:next_hop':         '138.96.112.250',
+               'interface_fields:network':      '138.96.112.0',
+               'interface_fields:broadcast':    '138.96.119.255',
+               'interface_fields:netmask':      '255.255.248.0',
+               'interface_fields:dns1':         '138.96.112.1',
+               'interface_fields:dns2':         '138.96.112.2',
+               'node_fields_nint:dns':          '138.96.112.1,138.96.112.2',
+               'ipaddress_fields:netmask':      '255.255.248.0',
                }
 
 # the hostname for the testmaster - in case we'd like to run this remotely