branching

[tests.git] / system / config_main.py

diff --git a/system/config_main.py b/system/config_main.py
index de4a8a0..1346031 100644 (file)
--- a/system/config_main.py
+++ b/system/config_main.py
@@ -13,15 +13,16 @@ def nodes(options):
                              'model':'qemu/minhw', } ,
              'host_box': 'testbox1.one-lab.org',
              'owner' : 'pi',
+             'nodegroups' : 'mynodegroup',
              'network_fields': { 'method':'static',
                                  'type':'ipv4',
-                                 'ip':'xx-deferred-xxx',
-                                 'gateway':'xx-deferred-xxx',
-                                 'network':'xx-deferred-xxx',
-                                 'broadcast':'xx-deferred-xxx',
-                                 'netmask':'xx-deferred-xxx',
-                                 'dns1': 'xx-deferred-xxx',
-                                 'dns2': 'xx-deferred-xxx',
+                                 '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',
                                  },
              },
             {'name':'node2',
@@ -31,13 +32,13 @@ def nodes(options):
              'owner' : 'pi',
              'network_fields': { 'method':'static',
                                  'type':'ipv4',
-                                 'ip':'xx-deferred-xxx',
-                                 'gateway':'xx-deferred-xxx',
-                                 'network':'xx-deferred-xxx',
-                                 'broadcast':'xx-deferred-xxx',
-                                 'netmask':'xx-deferred-xxx',
-                                 'dns1': 'xx-deferred-xxx',
-                                 'dns2': 'xx-deferred-xxx',
+                                 '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',
                                  },
              },
             ]
@@ -144,14 +145,16 @@ def keys (options):
              ]
 
 def initscripts(options): 
-    initscripts= [ { 'initscript_fields' : { 'enabled' : True,
-                                             'name':'script1',
-                                             'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 1; date) > /tmp/initscript1.log \n ',
-                                             }},
-                   { 'initscript_fields' : { 'enabled' : True,
-                                             'name':'script2',
-                                             'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 2; date) > /tmp/initscript2.log \n ',
-                                             }},
+    initscripts= [ { 'initscript_fields' : 
+                     { 'enabled' : True,
+                       'name':'script1',
+                       'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 1; date) > /tmp/script1.stamp \n ',
+                       }},
+                   { 'initscript_fields' : 
+                     { 'enabled' : True,
+                       'name':'script2',
+                       'script' : '#! /bin/sh\n (echo Starting test initscript: Stage 2; date) > /tmp/script2.stamp \n ',
+                       }},
                    ]
     if options.small_test:
         return [initscripts[0]]
@@ -192,31 +195,33 @@ def slices (options):
 def all_slicenames (options):
     return [ slice['slice_fields']['name'] for slice in slices(options)]
 
-def tcp_param (options):
-    try:
-        return [{ 'tcp_fields' :  {'peer_name' : 'server',
-                                   'slice_name' :all_slicenames(options)[0],
-                                   'server_name': all_nodenames()[0]
-                                   },
-                  
-                  },
-                { 'tcp_fields':{'peer_name' : 'client',
-                                'slice_name' :all_slicenames()[1],
-                                'client_name': all_nodenames()[1],
-                                'peer_server' :  all_nodenames()[0],
-                                'server_port' : 22
-                                },
-                  },
-                
-                ]
-    except:
-        return None
-
+def tcp_tests (options):
+    all_tests = [ 
+        # local test
+        { 'server_node': 'node1',
+          'server_slice' : 'main_slicetest1',
+          'client_node' : 'node1',
+          'client_slice' : 'main_slicetest1',
+          'port' : 2000,
+          },
+        # remote test
+        { 'server_node': 'node1',
+          'server_slice' : 'main_slicetest1',
+          'client_node' : 'node2',
+          'client_slice' : 'main_slicetest1',
+          'port' : 4000,
+          },
+        ]
+    if options.small_test:
+        return [all_tests[0]]
+    else:
+        return all_tests
+             
 def plc (options) :
     return { 
         'name' : 'onetest',
         # as of yet, not sure we can handle foreign hosts, but this is required though
-        'hostname' : 'xx-deferred-xxx',
+        'hostname' : 'xxx-deferred-xxx',
         # set these two items to run within a vserver
         # 'vservername': '138.96.250.131'
         # 'vserverip': '138.96.250.131'
@@ -230,13 +235,13 @@ def plc (options) :
         'PLC_API_HOST' : 'test.one-lab.org',
         'PLC_WWW_HOST' : 'test.one-lab.org',
         'PLC_BOOT_HOST' : 'test.one-lab.org',
-        'PLC_NET_DNS1' : 'xx-deferred-xxx',
-        'PLC_NET_DNS2' : 'xx-deferred-xxx',
+        'PLC_NET_DNS1' : 'xxx-deferred-xxx',
+        'PLC_NET_DNS2' : 'xxx-deferred-xxx',
         'sites' : sites(options),
         'keys' : keys(options),
         'initscripts': initscripts(options),
         'slices' : slices(options),
-        'tcp_param' : tcp_param(options),
+        'tcp_test' : tcp_tests(options),
     }
 
 def config (plc_specs,options):