X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FLocalSubstrate.inria.py;h=615683581c233d94fca99e5498ca024efd7780aa;hb=918c366f2eb3000be34363266da0936aca75d0a1;hp=5c6d04f6aa179c9e2db2eb37c6107ffde3926fa3;hpb=b291a3052adc96c14b86f916c0107d5dfcf5d952;p=tests.git

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 5c6d04f..6156835 100755
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -1,6 +1,7 @@
-#!/usr/bin/python -u
+#!/usr/bin/python3 -u
+# -*- python3 -*-
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 2010 INRIA 
+# Copyright (C) 2015 INRIA 
 #
 # this is only an example file
 # the actual file is installed in your testmaster box as /root/LocalTestResources.py
@@ -18,35 +19,32 @@ class OnelabSubstrate (Substrate):
    def test_box_spec (self):
       return 'testmaster'
 
-   # the build boxes we use 
-   def build_boxes_spec (self):
-      return [ 'liquid', 'reed', 'velvet', ]
+   # the experimental lxc-based build box
+   def build_lxc_boxes_spec (self):
+      return [ 'buzzcocks' ]
 
-   # the vs-capable box for PLCs
-   def plc_boxes_spec (self):
-      return [ ('vs64-1', 20),  # how many plcs max in this box
-               ]  
+   # the lxc-capable box for PLCs
+   def plc_lxc_boxes_spec (self):
+      # we now use the same box as for builds
+      return [ ('buzzcocks', 20), ]  
 
-   # vplc01 to 15
+   def qemu_boxes_spec (self):
+      # ditto, a single big box now is enough
+      return [ ('boxtops', 64), ]
+
+   
+   # may use vplc01 to 25 - out of the existing 30
+   # keep 5 upper addresses for more persistent instances
    def vplc_ips (self):
-      return [  ( 'vplc%02d'%i,                 # DNS name
+      return [  ( 'vplc{:02d}'.format(i),       # DNS name
                   'unused')                     # MAC address 
-                for i in range(1,21) ] 
-
-   def qemu_boxes_spec (self):
-      return [ # how many plcs max in this box
-         ('kvm64-1', 3), # 4 cores, 4Gb
-         ('kvm64-2', 3), # 4 cores, 4Gb
-         ('kvm64-3', 2), # 2 cores, 4Gb
-         ('kvm64-4', 3), # 4 cores, 8Gb
-         ('kvm64-5', 2), # 2 cores, 4Gb
-         ('kvm64-6', 2), # 2 cores, 4Gb
-         ]
+                for i in range(1,26) ] 
 
-   # the nodes pool has a MAC address as user-data (3rd elt in tuple)
+   # vnode01 to 20
+   # the nodes IP pool has a MAC address as user-data (3rd elt in tuple)
    def vnode_ips (self):
-      return [ ( 'vnode%02d'%i,                 # DNS name               
-                 '02:34:56:00:00:%02d'%i)       # MAC address
+      return [ ( 'vnode{:02d}'.format(i),            # DNS name               
+                 '02:34:56:00:00:{:02d}'.format(i))  # MAC address
                for i in range(1,21) ] 
    
    # local network settings
@@ -54,15 +52,18 @@ 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
+# the hostname for the testmaster that orchestrates the whole business
    def testmaster (self): 
       return 'testmaster'