X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance.robot;h=4dcd84e223371d5bdc8748918a6937db13f03d3e;hp=cb9abe5176f69373d342ee1f5523c620d57cd99f;hb=5aa9925436c3ca40e9af9d353245674f631d440d;hpb=c6c25b1bac6dab7a40fe7990f36a5c397d0d84b3

diff --git a/resources/libraries/robot/performance.robot b/resources/libraries/robot/performance.robot
index cb9abe5176..4dcd84e223 100644
--- a/resources/libraries/robot/performance.robot
+++ b/resources/libraries/robot/performance.robot
@@ -31,50 +31,65 @@
 | | [Documentation] | Setup performance rates as Suite Variables
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
-| | ... | - ${10Ge_linerate_pps_64B} - Maximum number of packet per second
-| | ... |                              for 10GE with 64B L2 Frame.
-| | ... | - ${10Ge_linerate_pps_68B} - Maximum number of packet per second
-| | ... |                              for 10GE with 68B L2 Frame.
-| | ... | - ${10Ge_linerate_pps_78B} - Maximum number of packet per second
-| | ... |                              for 10GE with 78B L2 Frame.
-| | ... | - ${10Ge_linerate_pps_1518B} - Maximum number of packet per second
-| | ... |                                for 10GE with 1518B L2 Frame.
-| | ... | - ${10Ge_linerate_pps_1522B} - Maximum number of packet per second
-| | ... |                                for 10GE with 1522B L2 Frame.
-| | ... | - ${10Ge_linerate_pps_9000B} - Maximum number of packet per second
-| | ... |                                for 10GE with 9000B L2 Frame.
-| | ... | - ${10Ge_linerate_pps_9004B} - Maximum number of packet per second
-| | ... |                                for 10GE with 9004B L2 Frame.
-| | ...
-| | ${10Ge_linerate_pps_64B}= | Set Variable | 14880952
-| | ${10Ge_linerate_pps_68B}= | Set Variable | 14204545
-| | ${10Ge_linerate_pps_78B}= | Set Variable | 12755102
-| | ${10Ge_linerate_pps_1518B}= | Set Variable | 812743
-| | ${10Ge_linerate_pps_1522B}= | Set Variable | 810635
-| | ${10Ge_linerate_pps_9000B}= | Set Variable | 138580
-| | ${10Ge_linerate_pps_9004B}= | Set Variable | 138519
-| | ${40Ge_linerate_pps_64B}= | Set Variable | 59523809
-| | ${40Ge_linerate_pps_68B}= | Set Variable | 56818181
-| | ${40Ge_linerate_pps_78B}= | Set Variable | 51020408
-| | ${40Ge_linerate_pps_1518B}= | Set Variable | 3250975
-| | ${40Ge_linerate_pps_1522B}= | Set Variable | 3242542
-| | ${40Ge_linerate_pps_9000B}= | Set Variable | 554323
-| | ${40Ge_linerate_pps_9004B}= | Set Variable | 554078
-
-| | Set Suite Variable | ${10Ge_linerate_pps_64B}
-| | Set Suite Variable | ${10Ge_linerate_pps_68B}
-| | Set Suite Variable | ${10Ge_linerate_pps_78B}
-| | Set Suite Variable | ${10Ge_linerate_pps_1518B}
-| | Set Suite Variable | ${10Ge_linerate_pps_1522B}
-| | Set Suite Variable | ${10Ge_linerate_pps_9000B}
-| | Set Suite Variable | ${10Ge_linerate_pps_9004B}
-| | Set Suite Variable | ${40Ge_linerate_pps_64B}
-| | Set Suite Variable | ${40Ge_linerate_pps_68B}
-| | Set Suite Variable | ${40Ge_linerate_pps_78B}
-| | Set Suite Variable | ${40Ge_linerate_pps_1518B}
-| | Set Suite Variable | ${40Ge_linerate_pps_1522B}
-| | Set Suite Variable | ${40Ge_linerate_pps_9000B}
-| | Set Suite Variable | ${40Ge_linerate_pps_9004B}
+| | ... | - 10Ge_linerate_pps_64B - Maximum number of packet per second
+| | ... |                           for 10GE with 64B L2 Frame.
+| | ... | - 10Ge_linerate_pps_68B - Maximum number of packet per second
+| | ... |                           for 10GE with 68B L2 Frame.
+| | ... | - 10Ge_linerate_pps_72B - Maximum number of packet per second
+| | ... |                           for 10GE with 72B L2 Frame.
+| | ... | - 10Ge_linerate_pps_78B - Maximum number of packet per second
+| | ... |                           for 10GE with 78B L2 Frame.
+| | ... | - 10Ge_linerate_pps_1518B - Maximum number of packet per second
+| | ... |                             for 10GE with 1518B L2 Frame.
+| | ... | - 10Ge_linerate_pps_1522B - Maximum number of packet per second
+| | ... |                             for 10GE with 1522B L2 Frame.
+| | ... | - 10Ge_linerate_pps_1526B - Maximum number of packet per second
+| | ... |                             for 10GE with 1526B L2 Frame.
+| | ... | - 10Ge_linerate_pps_9000B - Maximum number of packet per second
+| | ... |                             for 10GE with 9000B L2 Frame.
+| | ... | - 10Ge_linerate_pps_9004B - Maximum number of packet per second
+| | ... |                             for 10GE with 9004B L2 Frame.
+| | ... | - 10Ge_linerate_pps_9008B - Maximum number of packet per second
+| | ... |                             for 10GE with 9008B L2 Frame.
+| | ... | - 40Ge_linerate_pps_64B - Maximum number of packet per second
+| | ... |                           for 40GE with 64B L2 Frame.
+| | ... | - 40Ge_linerate_pps_68B - Maximum number of packet per second
+| | ... |                           for 40GE with 68B L2 Frame.
+| | ... | - 40Ge_linerate_pps_72B - Maximum number of packet per second
+| | ... |                           for 40GE with 72B L2 Frame.
+| | ... | - 40Ge_linerate_pps_78B - Maximum number of packet per second
+| | ... |                           for 40GE with 78B L2 Frame.
+| | ... | - 40Ge_linerate_pps_1518B - Maximum number of packet per second
+| | ... |                             for 40GE with 1518B L2 Frame.
+| | ... | - 40Ge_linerate_pps_1522B - Maximum number of packet per second
+| | ... |                             for 40GE with 1522B L2 Frame.
+| | ... | - 40Ge_linerate_pps_1526B - Maximum number of packet per second
+| | ... |                             for 40GE with 1526B L2 Frame.
+| | ... | - 40Ge_linerate_pps_9000B - Maximum number of packet per second
+| | ... |                             for 40GE with 9000B L2 Frame.
+| | ... | - 40Ge_linerate_pps_9004B - Maximum number of packet per second
+| | ... |                             for 40GE with 9004B L2 Frame.
+| | ... | - 40Ge_linerate_pps_9008B - Maximum number of packet per second
+| | ... |                             for 40GE with 9008B L2 Frame.
+| | ...
+| | Set Suite Variable | ${10Ge_linerate_pps_64B} | 14880952
+| | Set Suite Variable | ${10Ge_linerate_pps_68B} | 14204545
+| | Set Suite Variable | ${10Ge_linerate_pps_72B} | 13586956
+| | Set Suite Variable | ${10Ge_linerate_pps_78B} | 12755102
+| | Set Suite Variable | ${10Ge_linerate_pps_1518B} | 812743
+| | Set Suite Variable | ${10Ge_linerate_pps_1522B} | 810635
+| | Set Suite Variable | ${10Ge_linerate_pps_9000B} | 138580
+| | Set Suite Variable | ${10Ge_linerate_pps_9004B} | 138519
+| | Set Suite Variable | ${10Ge_linerate_pps_9008B} | 138458
+| | Set Suite Variable | ${40Ge_linerate_pps_64B} | 59523809
+| | Set Suite Variable | ${40Ge_linerate_pps_68B} | 56818181
+| | Set Suite Variable | ${40Ge_linerate_pps_72B} | 54347826
+| | Set Suite Variable | ${40Ge_linerate_pps_78B} | 51020408
+| | Set Suite Variable | ${40Ge_linerate_pps_1518B} | 3250975
+| | Set Suite Variable | ${40Ge_linerate_pps_1522B} | 3242542
+| | Set Suite Variable | ${40Ge_linerate_pps_9000B} | 554323
+| | Set Suite Variable | ${40Ge_linerate_pps_9004B} | 554078
+| | Set Suite Variable | ${40Ge_linerate_pps_9008B} | 553832
 
 | Setup performance global Variables
 | | [Documentation] | Setup performance global Variables
@@ -83,10 +98,8 @@
 | | ... | - ${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}
+| | Set Suite Variable | ${glob_loss_acceptance} | 0.5
+| | Set Suite Variable | ${glob_loss_acceptance_type} | percentage
 
 | 2-node circular Topology Variables Setup
 | | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
@@ -561,8 +574,10 @@
 | | ${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 | (${nr_streams}x ${rate_per_stream} pps)
+| | ...              | append=yes
+| | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
+| | ...              | append=yes
 
 | Display result of PDR search
 | | [Documentation] | Display result of PDR search in packet per seconds (total
@@ -587,8 +602,10 @@
 | | ${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 | (${nr_streams}x ${rate_per_stream} pps)
+| | ...              | append=yes
+| | Set Test Message | ${\n}FINAL_BANDWIDTH: ${bandwidth_total} Gbps (untagged)
+| | ...              | append=yes
 | | Set Test Message | ${\n}LOSS_ACCEPTANCE: ${loss_acceptance} ${loss_acceptance_type}
 | | ...              | append=yes