Fix TP pbit verification test.
The s-tag from the BNG also should carry the same pbit as the c-tag.
Otherwise the RG could receive pbit 0 instead of any other intended pbit
because the pbit from the s-tag is copied (possibly) by BAL to c-tag and
since the pbit on the s-tag default to 0 if not filled at BNG, it could
corrupt RGs pbit on the c-tag.
Change-Id: Icf4ee4d438d35bee4dc133b8a6503cd21222c1c7
diff --git a/libraries/utils.robot b/libraries/utils.robot
index c332041..bd03aa3 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -1360,14 +1360,17 @@
[Documentation] Generates upstream traffic using Mausezahn tool
... with each pbit and validates reception at other end using tcpdump
[Arguments] ${target_ip} ${target_iface} ${src_iface}
- ... ${packet_count} ${packet_type} ${vlan} ${tcpdump_filter}
+ ... ${packet_count} ${packet_type} ${c_vlan} ${s_vlan} ${direction} ${tcpdump_filter}
... ${dst_ip} ${dst_user} ${dst_pass} ${dst_container_type} ${dst_container_name}
... ${src_ip} ${src_user} ${src_pass} ${src_container_type} ${src_container_name}
FOR ${pbit} IN RANGE 8
Execute Remote Command sudo pkill mausezahn
... ${src_ip} ${src_user} ${src_pass} ${src_container_type} ${src_container_name}
${var1}= Set Variable sudo mausezahn ${src_iface} -B ${target_ip} -c ${packet_count}
- ${var2}= Set Variable -t ${packet_type} "dp=80, flags=rst, p=aa:aa:aa" -Q ${pbit}:${vlan}
+ ${var2}= Run Keyword If "${direction}"=="downstream"
+ ... Set Variable -t ${packet_type} "dp=80, flags=rst, p=aa:aa:aa" -Q ${pbit}:${s_vlan},${pbit}:${c_vlan}
+ ... ELSE
+ ... Set Variable -t ${packet_type} "dp=80, flags=rst, p=aa:aa:aa" -Q ${pbit}:${c_vlan}
${cmd}= Set Variable ${var1} ${var2}
Start Remote Command ${cmd} ${src_ip} ${src_user} ${src_pass}
... ${src_container_type} ${src_container_name}