summaryrefslogtreecommitdiff
path: root/validation
diff options
context:
space:
mode:
authorJean-Philippe NOEL2013-05-28 11:00:46 +0200
committerJean-Philippe NOEL2013-05-29 13:30:32 +0200
commit736618ba46e6f8eb9c235d0240fd3ad77b7b6bb5 (patch)
tree441dc211bd359d0ed8e540bfd6cf59f5d4f32c25 /validation
parent06dfb3bbdac630e1c85f60911af3e93b05c6f117 (diff)
validation/validlib: send real bidir traffic instead of down only, closes #4002
Diffstat (limited to 'validation')
-rw-r--r--validation/validlib/ixia.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/validation/validlib/ixia.py b/validation/validlib/ixia.py
index 4abae10f31..5d5023ff64 100644
--- a/validation/validlib/ixia.py
+++ b/validation/validlib/ixia.py
@@ -61,13 +61,16 @@ def get_map_add(master_port, slave_port, direction, test_type, stas_nb):
for i in range(0, slaves_ports_number):
current_slave_port = (slave_port[0], slave_port[1], slave_port[2] + i)
if direction == "up":
- (tx, rx) = (current_slave_port, master_port)
+ couples = [(current_slave_port, master_port)]
+ elif (direction == "bi" and test_type != "mesh"):
+ couples = [(master_port, current_slave_port),
+ (current_slave_port, master_port)]
else:
- (tx, rx) = (master_port, current_slave_port)
- result.append(get_map_add_aux(tx, rx))
- result = "\n".join(result)
+ couples = [(master_port, current_slave_port)]
+ for (tx, rx) in couples:
+ result.append(get_map_add_aux(tx, rx))
- return result
+ return "\n".join(result)
def parse_port(port):
result = re.search("^([1-8])\.([1-8])\.([1-8])$", port).groups()
@@ -902,7 +905,8 @@ if __name__ == "__main__":
assert "map add 1 4 2 1 4 1" == get_map_add("1.4.1", "1.4.2", "up", "tput", 2)
assert "map add 1 4 1 1 4 2" == get_map_add("1.4.1", "1.4.2", "down", "tput", 1)
- assert "map add 1 4 1 1 4 2" == get_map_add("1.4.1", "1.4.2", "bi", "tput", 1)
+ assert "map add 1 4 1 1 4 2\n" \
+ "map add 1 4 2 1 4 1" == get_map_add("1.4.1", "1.4.2", "bi", "tput", 1)
assert "map add 1 4 1 1 4 2" == get_map_add("1.4.1", "1.4.2", "bi", "mesh", 1)
assert "map add 1 4 1 1 4 2" == get_map_add("1.4.1", "1.4.2", "down", "mesh", 1)
@@ -912,6 +916,8 @@ if __name__ == "__main__":
"map add 1 4 3 1 4 1" == get_map_add("1.4.1", "1.4.2", "up", "mesh", 2)
assert "map add 1 4 1 1 4 2\n" \
"map add 1 4 1 1 4 3" == get_map_add("1.4.1", "1.4.2", "down", "mesh", 2)
+ assert "map add 1 4 1 1 4 2\n" \
+ "map add 1 4 1 1 4 3" == get_map_add("1.4.1", "1.4.2", "bi", "mesh", 2)
assert (1, 2, 3) == parse_port("1.2.3")