From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 29 Jun 2012 07:57:30 +0000 (+0200)
Subject: tweak check_tcp again
X-Git-Tag: tests-5.1-7~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a7835abe1142a166b9a4cf7e49dd8313883acfbd;p=tests.git

tweak check_tcp again
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 525f1a0..fe0ec2e 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1180,8 +1180,13 @@ class TestPlc:
                 break
 
             # idem for the client side
-            c_test_sliver = self.locate_sliver_obj_cross (spec['server_node'],spec['client_slice'],other_plcs)
-            if not c_test_sliver.run_tcp_client(s_test_sliver.test_node.name(),port):
+            c_test_sliver = self.locate_sliver_obj_cross (spec['client_node'],spec['client_slice'],other_plcs)
+            # use nodename from locatesd sliver, unless 'client_connect' is set
+            if 'client_connect' in spec:
+                destination = spec['client_connect']
+            else:
+                destination=s_test_sliver.test_node.name()
+            if not c_test_sliver.run_tcp_client(destination,port):
                 overall=False
         return overall
 
diff --git a/system/config_default.py b/system/config_default.py
index e364976..d14f414 100644
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -415,6 +415,14 @@ def tcp_specs (options,index):
     # 
     slice1='%s_sl1'%login_base(1)
     slice2='%s_sl2'%login_base(1)
+    slice3='%s_sl3'%login_base(2)
+    slice4='%s_sl4'%login_base(2)
+# bind on 0.0.0.0 and try to reach this on localhost
+# not expected to work
+    same_node_same_slice_lo =   { 'server_node': 'node1', 'server_slice': slice1,
+                                  'client_node': 'node1', 'client_slice': slice1,
+                                  'client_connect' : 'localhost',
+                                  'port': 10000}
     same_node_same_slice =      { 'server_node': 'node1', 'server_slice': slice1,
                                   'client_node': 'node1', 'client_slice': slice1,
                                   'port': 10001}
@@ -423,13 +431,16 @@ def tcp_specs (options,index):
                                   'client_node': 'node1', 'client_slice': slice2,
                                   'port': 10002}
     two_nodes_same_slice =      { 'server_node': 'node1', 'server_slice': slice1,
-                                  'client_node': 'node2', 'client_slice': slice1,
+                                  'client_node': 'node2', 'client_slice': slice3,
                                   'port': 10003}
     two_nodes_2_slices =        { 'server_node': 'node1', 'server_slice': slice1,
-                                  'client_node': 'node2', 'client_slice': slice2,
+                                  'client_node': 'node2', 'client_slice': slice4,
                                   'port': 10004}
-#    specs = [ same_node_same_slice, same_node_2_slices ]
-    specs = [ same_node_same_slice ]
+    specs = []
+#    specs += [ same_node_same_slice_lo ]
+    specs += [ same_node_same_slice ]
+# worth another try
+    specs += [ same_node_2_slices ]
     if options.size >1 :
         specs += [ two_nodes_same_slice, two_nodes_2_slices ]
     return specs