more consistently rename plc_spec['hostname'] into plc_spec['host_box']

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index d58fdb9..75c60b1 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -92,11 +92,15 @@ def all_usernames (options):
     return [ user['name'] for user in users(options)]
 
 def sites (options,index):
+    latitude= -90 + (index*10)
+    longitude= -180 + (index*20)
     return [ {'site_fields' : {'name':'main site for plc number %d'%index,
                                'login_base':login_base(index),
                                'abbreviated_name':'PlanetTest%d'%index,
                                'max_slices':100,
                                'url':'http://test.onelab.eu',
+                               'latitude':float(latitude),
+                               'longitude':float(longitude),
                                },
               'address_fields' : {'line1':'route des lucioles',
                                   'city':'sophia',
@@ -256,9 +260,10 @@ def leases (options, index):
 
 def plc (options,index) :
     return { 
+        'index' : index,
         'name' : 'onetest%d'%index,
         # as of yet, not sure we can handle foreign hosts, but this is required though
-        'hostname' : 'deferred-myplc-hostbox-%d'%index,
+        'host_box' : 'deferred-myplc-hostbox-%d'%index,
         # set these two items to run within a vserver
         'vservername': 'deferred-vservername',
         'vserverip': 'deferred-vserverip',