Skip to content

Improve vxlan decap test. Make a test after vxlan removal #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pavel-shirshov merged 3 commits into from
May 16, 2019
Merged

Improve vxlan decap test. Make a test after vxlan removal #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a6d57d
Improve vxlan decap test. Make a test after vxlan removal
pavel-shirshov May 16, 2019
f1760fe
Increase timeout time for vxlan-decap test
pavel-shirshov May 16, 2019
70fcd07
Use docker exec to run redis-cli
pavel-shirshov May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/roles/test/files/ptftests/vxlan-decap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ def checkRegularRegularVLANtoLAG(self, acc_port, pc_ports, dst_ip, test):

for i in xrange(self.nr):
testutils.send_packet(self, acc_port, packet)
nr_rcvd = testutils.count_matched_packets_all_ports(self, exp_packet, pc_ports, timeout=0.1)
nr_rcvd = testutils.count_matched_packets_all_ports(self, exp_packet, pc_ports, timeout=0.2)
rv = rv and (nr_rcvd == self.nr)
return rv

Expand Down Expand Up @@ -257,7 +257,7 @@ def checkRegularRegularLAGtoVLAN(self, acc_port, net_port, test):

for i in xrange(self.nr):
testutils.send_packet(self, net_port, packet)
nr_rcvd = testutils.count_matched_packets(self, exp_packet, acc_port, timeout=0.1)
nr_rcvd = testutils.count_matched_packets(self, exp_packet, acc_port, timeout=0.2)
rv = rv and (nr_rcvd == self.nr)
return rv

Expand Down Expand Up @@ -291,7 +291,7 @@ def checkVxlan(self, acc_port, net_port, test):
)
for i in xrange(self.nr):
testutils.send_packet(self, net_port, packet)
nr_rcvd = testutils.count_matched_packets(self, inpacket, acc_port, timeout=0.1)
nr_rcvd = testutils.count_matched_packets(self, inpacket, acc_port, timeout=0.2)
rv = rv and (nr_rcvd == self.nr)
return rv

Expand Down
25 changes: 23 additions & 2 deletions ansible/roles/test/tasks/vxlan-decap.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

- include: ptf_runner.yml
vars:
ptf_test_name: Vxlan decap test
ptf_test_name: Vxlan decap test - No vxlan configuration
ptf_test_dir: ptftests
ptf_test_path: vxlan-decap.Vxlan
ptf_platform: remote
Expand All @@ -61,7 +61,7 @@

- include: ptf_runner.yml
vars:
ptf_test_name: Vxlan decap test
ptf_test_name: Vxlan decap test - vxlan configuration applied
ptf_test_dir: ptftests
ptf_test_path: vxlan-decap.Vxlan
ptf_platform: remote
Expand All @@ -71,3 +71,24 @@
- vxlan_enabled=True
- config_file='/tmp/vxlan_decap.json'
- count=1

- name: Remove vxlan tunnel map configuration for {{ item }}
shell: docker exec -i database redis-cli -n 4 -c DEL "VXLAN_TUNNEL_MAP|tunnel{{ item }}|map1"
with_items: minigraph_vlans

- name: Remove vxlan tunnel configuration for {{ item }}
shell: docker exec -i database redis-cli -n 4 -c DEL "VXLAN_TUNNEL|tunnel{{ item }}"
with_items: minigraph_vlans

- include: ptf_runner.yml
vars:
ptf_test_name: Vxlan decap test - vxlan configuration removed
ptf_test_dir: ptftests
ptf_test_path: vxlan-decap.Vxlan
ptf_platform: remote
ptf_platform_dir: ptftests
ptf_qlen: 1000
ptf_test_params:
- vxlan_enabled=False
- config_file='/tmp/vxlan_decap.json'
- repetitions=1