Fix pbit verification test.
For reasons still unknown the, current scheme of sending packets
from musezahn were not reaching the peer end. Changed the mausezahn
options a bit and verified that it works manually and now submitting
a robot patch for the same.
This patch also is reverting an earlier hack to not send traffic on
all pbits as this is fixed in latest BAL release.
Change-Id: Ieba59e57ef02cd1200b636b1f1a46cfd7375339b
diff --git a/libraries/utils.robot b/libraries/utils.robot
index e8e66fe..c41e8eb 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -1292,14 +1292,14 @@
[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} ${target_port} ${vlan} ${tcpdump_filter}
+ ... ${packet_count} ${packet_type} ${vlan} ${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} -d 100m
- ${var2}= Set Variable -t ${packet_type} "dp=${target_port}" -p 1472 -Q ${pbit}:${vlan}
+ ${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}
${cmd}= Set Variable ${var1} ${var2}
Start Remote Command ${cmd} ${src_ip} ${src_user} ${src_pass}
... ${src_container_type} ${src_container_name}
@@ -1309,11 +1309,8 @@
... timeout=30 seconds
Execute Remote Command sudo pkill mausezahn
... ${src_ip} ${src_user} ${src_pass} ${src_container_type} ${src_container_name}
- # VOL-3262: I'm seeing untagged downstream traffic at RG for pbit 0. According to Girish this is
- # incorrect behavior. Simplify the following check when VOL-3262 is resolved.
- Run Keyword If ${pbit}==0 and "${tcpdump_filter}"=="udp"
- ... Should Match Regexp ${output} \\.${target_port}: UDP,
- ... ELSE Should Match Regexp ${output} , p ${pbit},.*\\.${target_port}: UDP,
+ Run Keyword If "${tcpdump_filter}"=="tcp"
+ ... Should Match Regexp , p ${pbit},
END
Determine Number Of ONU
diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index fcbcc33..0db4600 100644
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -569,8 +569,7 @@
[Documentation] Assuming that test1 was executed where all the ONUs are authenticated/DHCP/pingable
... Prerequisite tools : Tcpdump and Mausezahn traffic generator on both RG and DHCP/BNG VMs
... Install jq tool to read json file, where test suite is being running
- ... Make sure 9999 port is enabled or forwarded for both upsteam and downstream direction
- ... This test sends UDP packets on port 9999 with pbits between 0 and 7 and validates that
+ ... This test sends TCP packets with pbits between 0 and 7 and validates that
... the pbits are preserved by the PON.
[Tags] dataplaneDt TechProfileDt VOL-3291
[Setup] Start Logging TechProfileDt
@@ -599,7 +598,7 @@
Log Upstream test
Run Keyword If ${has_dataplane} Create traffic with each pbit and capture at other end
... ${dst['dp_iface_ip_qinq']} ${dst['dp_iface_name']} ${src_iface_name}
- ... 0 udp 9999 ${src['c_tag']} vlan
+ ... 0 tcp ${src['c_tag']} vlan
... ${bng_ip} ${bng_user} ${bng_pass} ${dst['container_type']} ${dst['container_name']}
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
Log Downstream test
@@ -609,7 +608,7 @@
Should Be Equal As Integers ${rc} 0 Could not get RG's IP address
Run Keyword If ${has_dataplane} Create traffic with each pbit and capture at other end
... ${rg_ip} ${src_iface_name} ${dst['dp_iface_name']}.${src['s_tag']}
- ... 0 udp 9999 ${src['c_tag']} udp
+ ... 0 tcp ${src['c_tag']} tcp
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
... ${bng_ip} ${bng_user} ${bng_pass} ${dst['container_type']} ${dst['container_name']}
END
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 98dffe9..52acdb3 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -621,8 +621,7 @@
[Documentation] Assuming that test1 was executed where all the ONUs are authenticated/DHCP/pingable
... Prerequisite tools : Tcpdump and Mausezahn traffic generator on both RG and DHCP/BNG VMs
... Install jq tool to read json file, where test suite is being running
- ... Make sure 9999 port is enabled or forwarded for both upsteam and downstream direction
- ... This test sends UDP packets on port 9999 with pbits between 0 and 7 and validates that
+ ... This test sends TCP packets with pbits between 0 and 7 and validates that
... the pbits are preserved by the PON.
[Tags] dataplane TechProfile VOL-2054
[Setup] Start Logging TechProfile
@@ -649,7 +648,7 @@
Log Upstream test
Run Keyword If ${has_dataplane} Create traffic with each pbit and capture at other end
... ${dst['dp_iface_ip_qinq']} ${dst['dp_iface_name']} ${src['dp_iface_name']}
- ... 0 udp 9999 0 vlan
+ ... 0 tcp 0 vlan
... ${bng_ip} ${bng_user} ${bng_pass} ${dst['container_type']} ${dst['container_name']}
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
Log Downstream test
@@ -659,7 +658,7 @@
Should Be Equal As Integers ${rc} 0 Could not get RG's IP address
Run Keyword If ${has_dataplane} Create traffic with each pbit and capture at other end
... ${rg_ip} ${src['dp_iface_name']} ${dst['dp_iface_name']}.${src['s_tag']}
- ... 0 udp 9999 ${src['c_tag']} udp
+ ... 0 tcp ${src['c_tag']} tcp
... ${src['ip']} ${src['user']} ${src['pass']} ${src['container_type']} ${src['container_name']}
... ${bng_ip} ${bng_user} ${bng_pass} ${dst['container_type']} ${dst['container_name']}
END