X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Fconfig_default.py;h=0a3c9be8cfcf8f07d79539c7485197417c4e29d8;hb=c9b1f49bcd36492664afbd091f0468b144aa7e85;hp=fca0d68f70728ccac493b73d2462c14960182298;hpb=7f4a9320fef10c7d6417ce3c9438b718f7649745;p=tests.git
diff --git a/system/config_default.py b/system/config_default.py
index fca0d68..0a3c9be 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -20,26 +20,47 @@ def login_base (index):
else: return 'site%s'%chr(index+94)
def sfa_root (index):
- # pla, plb, ...
- return 'pl%s'%chr(index+96)
+ # use plt (planetlab test) instead of pl
+ # otherwise a triangular test ends up with 'plc'
+ # plta, pltb, ...
+ return 'plt%s'%chr(index+96)
def nodes(options,index):
return [{'name':'node%d'%index,
- 'node_fields': {'hostname': 'deferred-nodename%d'%index,
- 'model':'qemu/minhw', } ,
+ 'node_fields': {'hostname': 'deferred-nodename%d'%index,
+ 'model':'qemu/minhw', } ,
'host_box': 'deferred-node-hostbox-%d'%index,
'owner' : 'pi',
'nodegroups' : 'mynodegroup',
- 'interface_fields': { 'method':'static',
- 'type':'ipv4',
- 'ip':'xxx-deferred-xxx',
- 'gateway':'xxx-deferred-xxx',
- 'network':'xxx-deferred-xxx',
- 'broadcast':'xxx-deferred-xxx',
- 'netmask':'xxx-deferred-xxx',
- 'dns1': 'xxx-deferred-xxx',
- 'dns2': 'xxx-deferred-xxx',
- },
+ 'interface_fields': { 'method':'static',
+ 'type':'ipv4',
+ 'ip':'xxx-deferred-xxx',
+ 'gateway':'xxx-deferred-xxx',
+ 'network':'xxx-deferred-xxx',
+ 'broadcast':'xxx-deferred-xxx',
+ 'netmask':'xxx-deferred-xxx',
+ 'dns1': 'xxx-deferred-xxx',
+ 'dns2': 'xxx-deferred-xxx',
+ },
+ # how to deal with the new plcapi way of modeling interfaces
+ # last_updated - ip_address_ids - is_primary - hostname
+ # method 'static' or 'dhcp' - mac - interface_tag_ids
+ # if_name - ifname (accessor) - bwlimit
+ # xxx remains to deal with dns1 dns2 and gateway
+ # this gets appended to node_fields with the new interface
+ 'node_fields_nint' : { 'dns':'xxx-deferred-xxx',
+ },
+ 'interface_fields_nint' : { 'is_primary' : True,
+ 'method' : 'static',
+ },
+ # last_updated - netmask - ip_addr - type (e.g., 'ipv4')
+ 'ipaddress_fields' : { 'type' : 'ipv4',
+ 'ip_addr' : 'xxx-deferred-xxx',
+ 'netmask' : 'xxx-deferred-xxx',
+ } ,
+ 'route_fields' : { 'subnet' : '0.0.0.0/0',
+ 'next_hop' : 'xxx-deferred-xxx',
+ },
}]
def all_nodenames (options,index):
@@ -142,14 +163,52 @@ BO+VyPNWF+kDNI8mSUwi7jLW6liMdhNOmDaSX0+0X8CHtK898xM=
-----END RSA PRIVATE KEY-----
"""
+### another keypair for the SFA user
+public_key2="""ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQLvh5LkrjyLIr9UJznTJHMnqjdqzRdc9ekVmI9bx/5X4flnGtPBsr6bK/CPXmWjS2Vw0QOxi1NM45qkQJZXxroS0aehCCrvJRHgp/LOZykWCyNKqVopq9w0kH4jw1KFGIuwWROpOcMq2d/kAwyr6RV/W66KNVqu2XDiNOPJLcuZCuKrH++q3fPyP2zHSJ/irew7vwqIXbDSnVvvyRXYgc9KlR57L4BWthXcUofHlje8wKq7nWBQIUslYtJDryJg5tBvJIFfCFGmWZy0WJlGJd+yppI5jRvt9c6n9HyJKN22lUBTaTaDFvo+Xu5GEazLKG/v8h/o5WpxrrE6Y3TKeX user@test.onelab.eu
+"""
+
+private_key2="""
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA0C74eS5K48iyK/VCc50yRzJ6o3as0XXPXpFZiPW8f+V+H5Zx
+rTwbK+myvwj15lo0tlcNEDsYtTTOOapECWV8a6EtGnoQgq7yUR4KfyzmcpFgsjSq
+laKavcNJB+I8NShRiLsFkTqTnDKtnf5AMMq+kVf1uuijVartlw4jTjyS3LmQriqx
+/vqt3z8j9sx0if4q3sO78KiF2w0p1b78kV2IHPSpUeey+AVrYV3FKHx5Y3vMCqu5
+1gUCFLJWLSQ68iYObQbySBXwhRplmctFiZRiXfsqaSOY0b7fXOp/R8iSjdtpVAU2
+k2gxb6Pl7uRhGsyyhv7/If6OVqca6xOmN0ynlwIDAQABAoIBADZnwAmzPmEO5vkz
+7DzYnPYcTA6CCiHnPt1A8Pwo9C0cZXyNzYFvTs6IEW15QwIDGvl4AHL4brmUZjyN
+saAfBIgAJBBiTARLAgqO5kFcE5FnSrTnrJjUWMo0ydYkmoVt1vj7nzXX8BGG8PZ0
+JoRZx7mmGhLRjzXpKJQsXq+ohtzlrSoOzkx9jKqCOerhsZGBAIMl/w+gfePWoU6q
+Q/NPHM0ckgvzNRs7x+AMcCtIn+xZIBzbLTKpoEI3dIvMf46ghAG5mTc08OJjqHaS
+faTUyp828teAVLtWxAAv2JKcplEnjsDNU8KOGIFkUkwLNTTvwc0pCVYwyDKVxtl3
+Hv76T5ECgYEA6wiun6IHfY5a4Wcn+vrUsrt3atikiBMiXvZk7ZmU5HKc72+c4mVh
+frmwF8F355ncI3w63/3CKfP+X4yvsHoR+ps27t2hMMfGco7j3bMDHHpo9n04/1ZX
+pYP2RlPz4EKAhD2Wi0sgTsxchwrL42qkuolmzT4TWN32xjF2ZwhCDh8CgYEA4sEf
+VY+jVrMNHoHG/v1UN8nBzF5g6PwHtoo4GrFd4pMb9wo6LX4ib4FGRQfSjZ4kQ0KB
+Qxrl7xLw4GlYKnYqAqgZ1peb7JN7k5Yq1Drqi61ZZxvdQ2BbO7dx22Bb3VwsKA97
+DUcWUdKLVw2gU7beMYYBNMliw/E5Gx12Mqvnx4kCgYEAyQSf9cArD+PVLrt/olUt
+3cAgnq2z6v4Sg43RPLYCdnDgcJjRYYC8JhrC1U6PMvKRKXhzEmiCzEb25Nn62cFN
+5z0heqLr3kC/JfO4SEF3A8BeTZNEUH6Ub+exluzuxHucV34lZ/VVKI/5Azbksxje
+0vv5hMj22ybcjR542h5iAJkCgYAsFw8HrPk+l2wanXNbC1j/y/whx8wiITdCuBd2
+oTw3HRGX9GYhiGAbvFA0hfPb038LkPffW3CQDufFStZ40ycSAyua/Tm1Q2wI428K
+ezY12IwEr3dTbX3v25iI5nCWVyDC3Ve42jStzjmHwL+G54zGpl6/q9THcrT+37im
+26QiuQKBgQCTUDGKLqQ+QM8dAl6IZpz+oExdDCWwCNjTMH83tz1Rwoc+npW7z2ZC
+D/FseVOmS9MqJkgCap5pr4m1Qj5YciZNteIHdkIbD1yDoPaW1NvlOnxzVBQXK3HD
+rUck4dxa0t30wUFK0XVQjNEArXqvU23EB8Z7bQQMRx0yhd4pF5k29Q==
+-----END RSA PRIVATE KEY-----
+"""
+
def keys (options,index):
return [ {'name': 'key1',
'private' : private_key,
'key_fields' : {'key_type':'ssh',
- 'key': public_key}}
+ 'key': public_key}},
+ {'name': 'key2',
+ 'private' : private_key2,
+ 'key_fields' : {'key_type':'ssh',
+ 'key': public_key2}}
+
]
-
############################## initscripts
initscript_by_name="""#!/bin/bash
command=$1; shift
@@ -274,7 +333,7 @@ def plc (options,index) :
'PLC_MAIL_ENABLED':'false',
'PLC_MAIL_SUPPORT_ADDRESS' : 'thierry.parmentelat@inria.fr',
'PLC_DB_HOST' : 'deferred-myplc-hostname',
- 'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
+# 'PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
'PLC_API_HOST' : 'deferred-myplc-hostname',
'PLC_WWW_HOST' : 'deferred-myplc-hostname',
'PLC_BOOT_HOST' : 'deferred-myplc-hostname',
@@ -293,6 +352,7 @@ def plc (options,index) :
'leases' : leases (options, index),
}
+# NOTE: SFA currently has SFA_AGGREGATE_API_VERSION=2 baked into the code
def sfa (options,index) :
return {
# the default is to use AMs in the various aggregates.xml
@@ -304,38 +364,40 @@ def sfa (options,index) :
'SFA_REGISTRY_HOST' : 'deferred-myplc-hostname',
'SFA_AGGREGATE_HOST': 'deferred-myplc-hostname',
'SFA_SM_HOST': 'deferred-myplc-hostname',
+ 'SFA_PLC_URL' : 'deferred-myplc-api-url',
'SFA_PLC_USER' : 'root@test.onelab.eu',
'SFA_PLC_PASSWORD' : 'test++',
- 'SFA_PLC_DB_HOST':'deferred-myplc-hostname',
- 'SFA_PLC_DB_USER' : 'pgsqluser',
- 'SFA_PLC_DB_PASSWORD' : 'mnbvcxzlkjhgfdsapoiuytrewq',
- 'SFA_PLC_URL' : 'deferred-myplc-api-url',
- 'SFA_API_DEBUG': True,
+# use -c sfadebug to increment this one
+ 'SFA_API_LOGLEVEL': 1,
# details of the slices to create
- 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspecmode)
- for rspecmode in ['pl','pg']],
+ 'sfa_slice_specs' : [ sfa_slice_spec(options,index,rspec_style)
+ for rspec_style in options.rspec_styles ]
}
# subindex is 0 (pl slice) or 1 (pg slice)
-def sfa_slice_spec (options,index,rspecmode):
+def sfa_slice_spec (options,index,rspec_style):
the_login_base=login_base(index)
piuser='fake-pi%d'%index
- regularuser='sfauser%d%s'%(index,rspecmode)
- slicename='slsfa%d%s'%(index,rspecmode)
+ regularuser='sfauser%d%s'%(index,rspec_style)
+ slicename='slsfa%d%s'%(index,rspec_style)
prefix='%s.%s'%(sfa_root(index),the_login_base)
hrn=prefix+'.'+slicename
- person_hrn=prefix+'.'+regularuser
- researcher=prefix+'.'+piuser
- slice_add_xml = '''
-%s'''%(hrn, researcher)
-
+ user_hrn=prefix+'.'+regularuser
+ pi_hrn=prefix+'.'+piuser
+ key=public_key2
mail="%s@%s"%(regularuser,domain)
- print 'in sfa_slice_spec','slicename',slicename,'hrn',hrn,'mail',mail
- key=public_key
- slice_person_xml ='''
-%(key)s2010
-1piadmin%(prefix)s'''%locals()
+ person_record_xml =\
+'''
+%(key)s
+user
+tech
+'''%locals()
+ slice_record_xml =\
+'''
+%s
+'''%(hrn, user_hrn)
+
return { 'slice_fields': {'name':'%s_%s'%(the_login_base,slicename),
'url':'http://foo%d@foo.com'%index,
@@ -346,13 +408,13 @@ last_name="Sfa" name="%(hrn)s" type="user">
'piuser' : piuser,
'regularuser':regularuser,
'domain':domain,
- 'usernames' : [ (regularuser,'key1') ],
+ 'usernames' : [ (regularuser,'key2') ],
'nodenames' : all_nodenames(options,index),
'sitename' : the_login_base,
'slicename' : slicename,
- 'slice_add_xml' : slice_add_xml,
- 'slice_person_xml' : slice_person_xml,
- 'rspecmode':rspecmode,
+ 'slice_record' : slice_record_xml,
+ 'person_record' : person_record_xml,
+ 'rspec_style':rspec_style,
}