From f94e16167519c74707ec8b606da3f7b97c749c66 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 13 May 2016 09:57:03 +0200 Subject: Find PDR using binary search - JIRA: CSIT-72 - modify libraries for PDR search evaluation - write robot framework keywords for PDR search - write Performance Test Cases using PDR Change-Id: Id06a2a7f78fe8626c221afe4178c5c30cc599762 Signed-off-by: Peter Mikus --- resources/libraries/python/DropRateSearch.py | 43 ++++ resources/libraries/python/TrafficGenerator.py | 61 ++++- resources/libraries/robot/performance.robot | 296 ++++++++++++++++++++++++- 3 files changed, 390 insertions(+), 10 deletions(-) (limited to 'resources') diff --git a/resources/libraries/python/DropRateSearch.py b/resources/libraries/python/DropRateSearch.py index 8f8e371add..1f8e5618fe 100644 --- a/resources/libraries/python/DropRateSearch.py +++ b/resources/libraries/python/DropRateSearch.py @@ -135,6 +135,49 @@ class DropRateSearch(object): self._rate_max = float(max_rate) self._rate_min = float(min_rate) + def set_loss_acceptance(self, loss_acceptance): + """Set loss acceptance treshold for PDR search. + + :param loss_acceptance: Loss acceptance treshold for PDR search. + :type loss_acceptance: str + :return: nothing + """ + if float(loss_acceptance) < 0: + raise ValueError("Loss acceptance must be higher or equal 0") + else: + self._loss_acceptance = float(loss_acceptance) + + def get_loss_acceptance(self): + """Return configured loss acceptance treshold. + + :return: Loss acceptance treshold. + :rtype: float + """ + return self._loss_acceptance + + def set_loss_acceptance_type_percentage(self): + """Set loss acceptance treshold type to percentage. + + :return: nothing + """ + self._loss_acceptance_type = LossAcceptanceType.PERCENTAGE + + def set_loss_acceptance_type_frames(self): + """Set loss acceptance treshold type to frames. + + :return: nothing + """ + self._loss_acceptance_type = LossAcceptanceType.FRAMES + + def loss_acceptance_type_is_percentage(self): + """Return true if loss acceptance treshold type is percentage, + false otherwise. + + :return: True if loss acceptance treshold type is percentage. + :rtype: boolean + """ + return self._loss_acceptance_type == LossAcceptanceType.PERCENTAGE + def set_search_linear_step(self, step_rate): """Set step size for linear search. diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index 3969891cf9..5dab8b98d5 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -46,11 +46,16 @@ class TGDropRateSearchImpl(DropRateSearch): tg_instance.trex_stl_start_remote_exec(self.get_duration(), unit_rate, frame_size, traffic_type, False) - - # TODO: getters for tg_instance and loss_acceptance_type - logger.trace("comparing: {} < {} ".format(tg_instance._loss, - loss_acceptance)) - if float(tg_instance._loss) > float(loss_acceptance): + loss = tg_instance.get_loss() + sent = tg_instance.get_sent() + if self.loss_acceptance_type_is_percentage(): + loss = (float(loss) / float(sent)) * 100 + + # TODO: getters for tg_instance + logger.trace("comparing: {} < {} {}".format(loss, + loss_acceptance, + loss_acceptance_type)) + if float(loss) > float(loss_acceptance): return False else: return True @@ -73,6 +78,30 @@ class TrafficGenerator(object): # T-REX interface order mapping self._ifaces_reordered = 0 + def get_loss(self): + """Return number of lost packets. + + :return: Number of lost packets. + :rtype: str + """ + return self._loss + + def get_sent(self): + """Return number of sent packets. + + :return: Number of sent packets. + :rtype: str + """ + return self._sent + + def get_received(self): + """Return number of received packets. + + :return: Number of received packets. + :rtype: str + """ + return self._received + #pylint: disable=too-many-arguments, too-many-locals def initialize_traffic_generator(self, tg_node, tg_if1, tg_if2, dut1_node, dut1_if1, dut1_if2, @@ -361,7 +390,7 @@ class TrafficGenerator(object): return self._result def no_traffic_loss_occurred(self): - """Fail is loss occurred in traffic run. + """Fail if loss occurred in traffic run. :return: nothing """ @@ -369,3 +398,23 @@ class TrafficGenerator(object): raise Exception('The traffic generation has not been issued') if self._loss != '0': raise Exception('Traffic loss occurred: {0}'.format(self._loss)) + + def partial_traffic_loss_accepted(self, loss_acceptance, + loss_acceptance_type): + """Fail if loss is higher then accepted in traffic run. + + :return: nothing + """ + if self._loss is None: + raise Exception('The traffic generation has not been issued') + + if loss_acceptance_type == 'percentage': + loss = (float(self._loss) / float(self._sent)) * 100 + elif loss_acceptance_type == 'frames': + loss = float(self._loss) + else: + raise Exception('Loss acceptance type not supported') + + if loss > float(loss_acceptance): + raise Exception("Traffic loss {} above loss acceptance: {}".format( + loss, loss_acceptance)) diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot index 5c8af8ede2..6c99e1d5aa 100644 --- a/resources/libraries/robot/performance.robot +++ b/resources/libraries/robot/performance.robot @@ -61,6 +61,18 @@ | | Set Suite Variable | ${10Ge_linerate_pps_9000B} | | Set Suite Variable | ${10Ge_linerate_pps_9004B} +| Setup performance global Variables +| | [Documentation] | Setup performance global Variables +| | ... +| | ... | _NOTE:_ This KW sets following suite variables: +| | ... | - ${glob_loss_acceptance} - Loss acceptance treshold +| | ... | - ${glob_loss_acceptance_type} - Loss acceptance treshold type +| | ... +| | ${glob_loss_acceptance}= | Set Variable | 0.5 +| | ${glob_loss_acceptance_type}= | Set Variable | percentage +| | Set Suite Variable | ${glob_loss_acceptance} +| | Set Suite Variable | ${glob_loss_acceptance_type} + | 3-node circular Topology Variables Setup | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | | ... | ${nodes['TG']} @@ -183,6 +195,7 @@ | | Setup default startup configuration of VPP on all DUTs | | Update All Interface Data On All Nodes | ${nodes} | | Setup performance rate Variables +| | Setup performance global Variables | | 3-node circular Topology Variables Setup | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} | | ... | ${dut1} | ${dut1_if1} | ${dut1_if2} @@ -194,6 +207,7 @@ | | Setup default startup configuration of VPP on all DUTs | | Update All Interface Data On All Nodes | ${nodes} | | Setup performance rate Variables +| | Setup performance global Variables | | 3-node circular Topology Variables Setup with DUT interface model | | ... | ${nic_model} | | Initialize traffic generator | ${tg} | ${tg_if1} | ${tg_if2} @@ -205,7 +219,24 @@ | | Teardown traffic generator | ${tg} | Find NDR using linear search and pps -| | [Documentation] | Find throughput by using RFC2544 linear search +| | [Documentation] | Find throughput by using RFC2544 linear search with +| | ... | non drop rate +| | ... +| | ... | *Arguments:* +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${start_rate} - Initial start rate [pps]. Type: float +| | ... | - ${step_rate} - Step of linear search [pps]. Type: float +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${min_rate} - Lower limit of search [pps]. Type: float +| | ... | - ${max_rate} - Upper limit of search [pps]. Type: float +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Find NDR using linear search and pps \| 64 \| 5000000 \| \ +| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate} | | ... | ${topology_type} | ${min_rate} | ${max_rate} | | ${duration}= | Set Variable | 10 @@ -221,8 +252,69 @@ | | ... | ${framesize} | ${topology_type} | | ... | fail_on_loss=${False} +| Find PDR using linear search and pps +| | [Documentation] | Find throughput by using RFC2544 linear search with +| | ... | partial drop rate, with PDR threshold 0.5%. +| | ... +| | ... | *Arguments:* +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${start_rate} - Initial start rate [pps]. Type: float +| | ... | - ${step_rate} - Step of linear search [pps]. Type: float +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${min_rate} - Lower limit of search [pps]. Type: float +| | ... | - ${max_rate} - Upper limit of search [pps]. Type: float +| | ... | - ${loss_acceptance} - Accepted loss during search. Type: float +| | ... | - ${loss_acceptance_type} - Percentage or frames. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Find PDR using linear search and pps \| 64 \| 5000000 \ +| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 0.5 \| percentage +| | [Arguments] | ${framesize} | ${start_rate} | ${step_rate} +| | ... | ${topology_type} | ${min_rate} | ${max_rate} +| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames' +| | ${duration}= | Set Variable | 10 +| | Set Duration | ${duration} +| | Set Search Rate Boundaries | ${max_rate} | ${min_rate} +| | Set Search Linear Step | ${step_rate} +| | Set Search Frame Size | ${framesize} +| | Set Search Rate Type pps +| | Set Loss Acceptance | ${loss_acceptance} +| | Run Keyword If | '${loss_acceptance_type}' == 'percentage' +| | ... | Set Loss Acceptance Type Percentage +| | Linear Search | ${start_rate} | ${topology_type} +| | ${rate_per_stream}= | Verify Search Result +| | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2 +| | ... | ${loss_acceptance} | ${loss_acceptance_type} +| | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps +| | ... | ${framesize} | ${topology_type} +| | ... | ${loss_acceptance} +| | ... | ${loss_acceptance_type} +| | ... | fail_on_loss=${False} + | Find NDR using binary search and pps -| | [Documentation] | Find throughput by using RFC2544 binary search +| | [Documentation] | Find throughput by using RFC2544 binary search with +| | ... | non drop rate +| | ... +| | ... | *Arguments:* +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${binary_min} - Lower boundary of search [pps]. Type: float +| | ... | - ${binary_max} - Upper boundary of search [pps]. Type: float +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${min_rate} - Lower limit of search [pps]. Type: float +| | ... | - ${max_rate} - Upper limit of search [pps]. Type: float +| | ... | - ${threshold} - Threshold to stop search [pps]. Type: integer +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Find NDR using binary search and pps \| 64 \| 6000000 \ +| | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000 | | [Arguments] | ${framesize} | ${binary_min} | ${binary_max} | | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold} | | ${duration}= | Set Variable | 10 @@ -238,9 +330,71 @@ | | ... | ${framesize} | ${topology_type} | | ... | fail_on_loss=${False} +| Find PDR using binary search and pps +| | [Documentation] | Find throughput by using RFC2544 binary search with +| | ... | partial drop rate, with PDR threshold 0.5%. +| | ... +| | ... | *Arguments:* +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${binary_min} - Lower boundary of search [pps]. Type: float +| | ... | - ${binary_max} - Upper boundary of search [pps]. Type: float +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${min_rate} - Lower limit of search [pps]. Type: float +| | ... | - ${max_rate} - Upper limit of search [pps]. Type: float +| | ... | - ${threshold} - Threshold to stop search [pps]. Type: integer +| | ... | - ${loss_acceptance} - Accepted loss during search. Type: float +| | ... | - ${loss_acceptance_type} - Percentage or frames. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Find PDR using binary search and pps \| 64 \| 6000000 \ +| | ... | \| 12000000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 50000 \| 0.5 \ +| | ... | \| percentage +| | [Arguments] | ${framesize} | ${binary_min} | ${binary_max} +| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold} +| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames' +| | ${duration}= | Set Variable | 10 +| | Set Duration | ${duration} +| | Set Search Rate Boundaries | ${max_rate} | ${min_rate} +| | Set Search Frame Size | ${framesize} +| | Set Search Rate Type pps +| | Set Loss Acceptance | ${loss_acceptance} +| | Run Keyword If | '${loss_acceptance_type}' == 'percentage' +| | ... | Set Loss Acceptance Type Percentage +| | Set Binary Convergence Threshold | ${threshold} +| | Binary Search | ${binary_min} | ${binary_max} | ${topology_type} +| | ${rate_per_stream}= | Verify Search Result +| | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2 +| | ... | ${loss_acceptance} | ${loss_acceptance_type} +| | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps +| | ... | ${framesize} | ${topology_type} +| | ... | ${loss_acceptance} +| | ... | ${loss_acceptance_type} +| | ... | fail_on_loss=${False} + | Find NDR using combined search and pps | | [Documentation] | Find throughput by using RFC2544 combined search -| | ... | (linear + binary) +| | ... | (linear + binary) with non drop rate +| | ... +| | ... | *Arguments:* +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${start_rate} - Initial start rate [pps]. Type: float +| | ... | - ${step_rate} - Step of linear search [pps]. Type: float +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${min_rate} - Lower limit of search [pps]. Type: float +| | ... | - ${max_rate} - Upper limit of search [pps]. Type: float +| | ... | - ${threshold} - Threshold to stop search [pps]. Type: integer +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Find NDR using combined search and pps \| 64 \| 5000000 \ +| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000 | | [Arguments] | ${framesize} | ${start_rate} | ${step_rate} | | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold} | | ${duration}= | Set Variable | 10 @@ -257,9 +411,68 @@ | | ... | ${framesize} | ${topology_type} | | ... | fail_on_loss=${False} +| Find PDR using combined search and pps +| | [Documentation] | Find throughput by using RFC2544 combined search +| | ... | (linear + binary) with partial drop rate, with PDR +| | ... | threshold 0.5%. +| | ... +| | ... | *Arguments:* +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${start_rate} - Initial start rate [pps]. Type: float +| | ... | - ${step_rate} - Step of linear search [pps]. Type: float +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${min_rate} - Lower limit of search [pps]. Type: float +| | ... | - ${max_rate} - Upper limit of search [pps]. Type: float +| | ... | - ${threshold} - Threshold to stop search [pps]. Type: integer +| | ... | - ${loss_acceptance} - Accepted loss during search. Type: float +| | ... | - ${loss_acceptance_type} - Percentage or frames. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Find PDR using combined search and pps \| 64 \| 5000000 \ +| | ... | \| 100000 \| 3-node-IPv4 \| 100000 \| 14880952 \| 5000 \| 0.5 \ +| | ... | \| percentage +| | [Arguments] | ${framesize} | ${start_rate} | ${step_rate} +| | ... | ${topology_type} | ${min_rate} | ${max_rate} | ${threshold} +| | ... | ${loss_acceptance}=0 | ${loss_acceptance_type}='frames' +| | ${duration}= | Set Variable | 10 +| | Set Duration | ${duration} +| | Set Search Rate Boundaries | ${max_rate} | ${min_rate} +| | Set Search Linear Step | ${step_rate} +| | Set Search Frame Size | ${framesize} +| | Set Search Rate Type pps +| | Set Loss Acceptance | ${loss_acceptance} +| | Run Keyword If | '${loss_acceptance_type}' == 'percentage' +| | ... | Set Loss Acceptance Type Percentage +| | Set Binary Convergence Threshold | ${threshold} +| | Combined Search | ${start_rate} | ${topology_type} +| | ${rate_per_stream}= | Verify Search Result +| | Display result of PDR search | ${rate_per_stream} | ${framesize} | 2 +| | ... | ${loss_acceptance} | ${loss_acceptance_type} +| | Traffic should pass with partial loss | ${duration} | ${rate_per_stream}pps +| | ... | ${framesize} | ${topology_type} +| | ... | ${loss_acceptance} +| | ... | ${loss_acceptance_type} +| | ... | fail_on_loss=${False} + | Display result of NDR search | | [Documentation] | Display result of NDR search in packet per seconds (total -| | ... | and per stream) and Gbps +| | ... | and per stream) and Gbps. +| | ... +| | ... | *Arguments:* +| | ... | - ${rate_per_stream} - Measured rate per stream [pps]. Type: string +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${nr_streams} - Total number of streams. Type: integer +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Display result of NDR search \| 4400000 \| 64 \| 2 | | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams} | | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams} | | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9) @@ -267,7 +480,51 @@ | | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes | | Set Test Message | FINAL_BANDWIDTH: ${bandwidth_total} Gbps | append=yes +| Display result of PDR search +| | [Documentation] | Display result of PDR search in packet per seconds (total +| | ... | and per stream) and Gbps. +| | ... +| | ... | *Arguments:* +| | ... | - ${rate_per_stream} - Measured rate per stream [pps]. Type: string +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${nr_streams} - Total number of streams. Type: integer +| | ... | - ${loss_acceptance} - Accepted loss during search. Type: float +| | ... | - ${loss_acceptance_type} - Percentage or frames. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Display result of PDR search \| 4400000 \| 64 \| 2 \| 0.5 \ +| | ... | \| percentage +| | [Arguments] | ${rate_per_stream} | ${framesize} | ${nr_streams} +| | ... | ${loss_acceptance} | ${loss_acceptance_type} +| | ${rate_total}= | Evaluate | ${rate_per_stream}*${nr_streams} +| | ${bandwidth_total}= | Evaluate | ${rate_total}*(${framesize}+20)*8/(10**9) +| | Set Test Message | FINAL_RATE: ${rate_total} pps +| | Set Test Message | (${nr_streams}x ${rate_per_stream} pps) | append=yes +| | Set Test Message | FINAL_BANDWIDTH: ${bandwidth_total} Gbps | append=yes +| | Set Test Message | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type} +| | ... | append=yes + | Traffic should pass with no loss +| | [Documentation] | Send traffic at specified rate. No packet loss is +| | ... | accepted at loss evaluation. +| | ... +| | ... | *Arguments:* +| | ... | - ${duration} - Duration of traffic run [s]. Type: integer +| | ... | - ${rate} - Rate for sending packets. Type: string +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${topology_type} - Topology type. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Traffic should pass with no loss \| 10 \| 4.0mpps \| 64 \ +| | ... | \| 3-node-IPv4 | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type} | | ... | ${fail_on_loss}=${True} | | Clear and show runtime counters with running traffic | ${duration} @@ -278,6 +535,37 @@ | | Show statistics on all DUTs | | Run Keyword If | ${fail_on_loss} | No traffic loss occurred +| Traffic should pass with partial loss +| | [Documentation] | Send traffic at specified rate. Partial packet loss is +| | ... | accepted within loss acceptance value. +| | ... +| | ... | *Arguments:* +| | ... | - ${duration} - Duration of traffic run [s]. Type: integer +| | ... | - ${rate} - Rate for sending packets. Type: string +| | ... | - ${framesize} - L2 Frame Size [B]. Type: integer +| | ... | - ${topology_type} - Topology type. Type: string +| | ... | - ${loss_acceptance} - Accepted loss during search. Type: float +| | ... | - ${loss_acceptance_type} - Percentage or frames. Type: string +| | ... +| | ... | *Return:* +| | ... | - No value returned +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Traffic should pass with partial loss \| 10 \| 4.0mpps \| 64 \ +| | ... | \| 3-node-IPv4 \| 0.5 \| percentage +| | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type} +| | ... | ${loss_acceptance} | ${loss_acceptance_type} +| | ... | ${fail_on_loss}=${True} +| | Clear and show runtime counters with running traffic | ${duration} +| | ... | ${rate} | ${framesize} | ${topology_type} +| | Clear all counters on all DUTs +| | Send traffic on tg | ${duration} | ${rate} | ${framesize} +| | ... | ${topology_type} | warmup_time=0 +| | Show statistics on all DUTs +| | Run Keyword If | ${fail_on_loss} | Partial traffic loss accepted +| | ... | ${loss_acceptance} | ${loss_acceptance_type} + | Clear and show runtime counters with running traffic | | [Arguments] | ${duration} | ${rate} | ${framesize} | ${topology_type} | | Send traffic on tg | -1 | ${rate} | ${framesize} -- cgit 1.2.3-korg