Skip to content

[TestCOPP] Add test configuration parameter for number of TX packets #208

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 4 commits into from
Jul 12, 2017
Merged

[TestCOPP] Add test configuration parameter for number of TX packets #208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc41a9e
[TestCOPP] Add test configuration parameter for number of TX packets
Jul 6, 2017
1967d21
[TestCOPP] Add test configuration parameter for number of TX packets
Jul 7, 2017
eeb2c9a
[TestCOPP] Add test configuration parameter for number of TX packets
Jul 7, 2017
22888e5
[TestCOPP] Add test configuration parameter for number of TX packets
Jul 10, 2017
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
20 changes: 10 additions & 10 deletions ansible/roles/test/files/ptftests/copp_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ptf --test-dir saitests copp_tests --qlen=100000 --platform nn -t "verbose=True" --device-socket 0-3@tcp://127.0.0.1:10900 --device-socket 1-3@tcp://10.3.147.47:10900
# ptf --test-dir saitests copp_tests --qlen=100000 --platform nn -t "verbose=True;pkt_tx_count=100000" --device-socket 0-3@tcp://127.0.0.1:10900 --device-socket 1-3@tcp://10.3.147.47:10900
#
# copp_test.${name_test}
#
Expand Down Expand Up @@ -31,15 +31,15 @@ class ControlPlaneBaseTest(BaseTest):
PPS_LIMIT_MIN = PPS_LIMIT * 0.9
PPS_LIMIT_MAX = PPS_LIMIT * 1.1
NO_POLICER_LIMIT = PPS_LIMIT * 1.4
PKT_TX_COUNT = 100000
Copy link
Copy Markdown
Contributor

@marian-pritsak marian-pritsak Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leave as default value?

PKT_RX_LIMIT = PKT_TX_COUNT * 0.90
TASK_TIMEOUT = 300 # Wait up to 5 minutes for tasks to complete

def __init__(self):
BaseTest.__init__(self)
self.log_fp = open('/tmp/copp.log', 'a')
test_params = testutils.test_params_get()
self.verbose = 'verbose' in test_params and test_params['verbose']
self.pkt_tx_count = 'pkt_tx_count' in test_params and test_params['pkt_tx_count']
Copy link
Copy Markdown
Contributor

@oleksandrivantsiv oleksandrivantsiv Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test_params is dictionary. Probably will be better:
test_params.get("pkt_tx_count", self.PKT_TX_COUNT)
Where self.PKT_TX_COUNT is default value

Copy link
Copy Markdown
Contributor

@pavel-shirshov pavel-shirshov Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self.pkt_tx_count would be False if it's not in test_params.
Also I'd avoid save values with different types in one variable. (False or 100000)

self.pkt_rx_limit = self.pkt_tx_count * 0.90
self.timeout_thr = None

self.myip = {}
Expand Down Expand Up @@ -148,8 +148,8 @@ def check_constraints(self, total_rcv_pkt_cnt, time_delta_ms, rx_pps):

def one_port_test(self, port_number):
packet = self.contruct_packet(port_number)
total_rcv_pkt_cnt, time_delta, time_delta_ms, tx_pps, rx_pps = self.copp_test(str(packet), self.PKT_TX_COUNT, (0, port_number), (1, port_number))
self.printStats(self.PKT_TX_COUNT, total_rcv_pkt_cnt, time_delta, tx_pps, rx_pps)
total_rcv_pkt_cnt, time_delta, time_delta_ms, tx_pps, rx_pps = self.copp_test(str(packet), self.pkt_tx_count, (0, port_number), (1, port_number))
self.printStats(self.pkt_tx_count, total_rcv_pkt_cnt, time_delta, tx_pps, rx_pps)
self.check_constraints(total_rcv_pkt_cnt, time_delta_ms, rx_pps)

return
Expand Down Expand Up @@ -178,11 +178,11 @@ def check_constraints(self, total_rcv_pkt_cnt, time_delta_ms, rx_pps):
self.log("")
self.log("Checking constraints (NoPolicy):")
self.log("rx_pps (%d) > NO_POLICER_LIMIT (%d): %s" % (int(rx_pps), int(self.NO_POLICER_LIMIT), str(rx_pps > self.NO_POLICER_LIMIT)))
self.log("total_rcv_pkt_cnt (%d) > PKT_RX_LIMIT (%d): %s" % \
(int(total_rcv_pkt_cnt), int(self.PKT_RX_LIMIT), str(total_rcv_pkt_cnt > self.PKT_RX_LIMIT)))
self.log("total_rcv_pkt_cnt (%d) > pkt_rx_limit (%d): %s" % \
(int(total_rcv_pkt_cnt), int(self.pkt_rx_limit), str(total_rcv_pkt_cnt > self.pkt_rx_limit)))

assert(rx_pps > self.NO_POLICER_LIMIT)
assert(total_rcv_pkt_cnt > self.PKT_RX_LIMIT)
assert(total_rcv_pkt_cnt > self.pkt_rx_limit)

class PolicyTest(ControlPlaneBaseTest):
def __init__(self):
Expand Down Expand Up @@ -370,8 +370,8 @@ def one_port_test(self, port_number):
if port[0] == 0:
continue
packet = self.contruct_packet(port[1])
total_rcv_pkt_cnt, time_delta, time_delta_ms, tx_pps, rx_pps = self.copp_test(str(packet), self.PKT_TX_COUNT, (0, port_number), (1, port_number))
self.printStats(self.PKT_TX_COUNT, total_rcv_pkt_cnt, time_delta, tx_pps, rx_pps)
total_rcv_pkt_cnt, time_delta, time_delta_ms, tx_pps, rx_pps = self.copp_test(str(packet), self.pkt_tx_count, (0, port_number), (1, port_number))
self.printStats(self.pkt_tx_count, total_rcv_pkt_cnt, time_delta, tx_pps, rx_pps)
self.check_constraints(total_rcv_pkt_cnt, time_delta_ms, rx_pps)

return
Expand Down
4 changes: 4 additions & 0 deletions ansible/roles/test/tasks/copp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
- fail: msg="Please set ptf_host variable"
when: ptf_host is not defined

- fail: msg="Please set pkt_tx_count variable"
Copy link
Copy Markdown
Contributor

@marian-pritsak marian-pritsak Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can have previous constant as a default number of packets. This way test will be backward compatible

Copy link
Copy Markdown
Contributor

@pavel-shirshov pavel-shirshov Jul 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

when: pkt_tx_count is not defined

- name: Ensure LLDP Daemon stopped
become: yes
supervisorctl: state=stopped name={{ item }}
Expand Down Expand Up @@ -37,6 +40,7 @@
ptf_qlen: 100000
ptf_test_params:
- verbose=False
- pkt_tx_count={{ pkt_tx_count }}
ptf_extra_options: --device-socket 0-3@tcp://127.0.0.1:10900 --device-socket 1-3@tcp://{{ ansible_eth0['ipv4']['address'] }}:10900
with_items:
- ARPTest
Expand Down