Merge branch 'master' of ssh://git.onelab.eu/git/tests

diff --git a/system/LocalSubstrate.inria.py b/system/LocalSubstrate.inria.py
index 5c6d04f..2569d9a 100755 (executable)
--- a/system/LocalSubstrate.inria.py
+++ b/system/LocalSubstrate.inria.py
@@ -27,14 +27,14 @@ class OnelabSubstrate (Substrate):
       return [ ('vs64-1', 20),  # how many plcs max in this box
                ]  
 
-   # vplc01 to 15
+   # vplc01 to 40
    def vplc_ips (self):
       return [  ( 'vplc%02d'%i,                 # DNS name
                   'unused')                     # MAC address 
-                for i in range(1,21) ] 
+                for i in range(1,41) ] 
 
    def qemu_boxes_spec (self):
-      return [ # how many plcs max in this box
+      return [ # how many qemus max in this box
          ('kvm64-1', 3), # 4 cores, 4Gb
          ('kvm64-2', 3), # 4 cores, 4Gb
          ('kvm64-3', 2), # 2 cores, 4Gb

diff --git a/system/config_default.py b/system/config_default.py
index f50003f..04fd524 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -336,7 +336,7 @@ def sfa_slice_spec (options,index,rspec_style):
     print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail
     key=public_key
     slice_person_xml ='''<record email="%(mail)s" enabled="True" first_name="Fake" hrn="%(person_hrn)s" 
-last_name="Sfa" name="%(hrn)s" type="user">
+last_name="Sfa %(rspec_style)s" name="%(hrn)s" type="user">
 <keys>%(key)s</keys><role_ids>20</role_ids><role_ids>10</role_ids>
 <site_ids>1</site_ids><roles>pi</roles><roles>admin</roles><sites>%(prefix)s</sites></record>'''%locals()
 

diff --git a/system/macros.py b/system/macros.py
index 47ecd0d..56d77af 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -25,6 +25,15 @@ sequences['sfa'] = [
     'sfa_delete_user',
     ]
 
+sequences['sfa_create'] = [
+    'sfa_plcclean', 
+    'sfa_dbclean',
+    'sfa_import', 
+    'sfi_configure', 
+    'sfa_add_user', 
+    'sfa_add_slice',
+]
+
 sequences['sfa_restart'] = [
     'sfa_plcclean',
     'sfa_dbclean',