diff options
-rw-r--r-- | resources/tools/presentation/input_data_parser.py | 17 | ||||
-rw-r--r-- | resources/tools/presentation/specifications/report/elements.yaml | 12 |
2 files changed, 19 insertions, 10 deletions
diff --git a/resources/tools/presentation/input_data_parser.py b/resources/tools/presentation/input_data_parser.py index 8747f938a9..461d7b423d 100644 --- a/resources/tools/presentation/input_data_parser.py +++ b/resources/tools/presentation/input_data_parser.py @@ -477,7 +477,8 @@ class ExecutionChecker(ResultVisitor): return u"Test Failed." def _process_lat(in_str_1, in_str_2): - """Extract min, avg, max values from latency string. + """Extract P50, P90 and P99 latencies or min, avg, max values from + latency string. :param in_str_1: Latency string for one direction produced by robot framework. @@ -498,13 +499,13 @@ class ExecutionChecker(ResultVisitor): try: hdr_lat_1 = hdrh.histogram.HdrHistogram.decode(in_list_1[3]) except hdrh.codec.HdrLengthException: - return None + hdr_lat_1 = None in_list_2[3] += u"=" * (len(in_list_2[3]) % 4) try: hdr_lat_2 = hdrh.histogram.HdrHistogram.decode(in_list_2[3]) except hdrh.codec.HdrLengthException: - return None + hdr_lat_2 = None if hdr_lat_1 and hdr_lat_2: hdr_lat = ( @@ -515,9 +516,17 @@ class ExecutionChecker(ResultVisitor): hdr_lat_2.get_value_at_percentile(90.0), hdr_lat_2.get_value_at_percentile(99.0) ) - if all(hdr_lat): return hdr_lat + else: + hdr_lat = ( + in_list_1[0], in_list_1[1], in_list_1[2], + in_list_2[0], in_list_2[1], in_list_2[2] + ) + for item in hdr_lat: + if item in (u"-1", u"4294967295", u"0"): + return None + return hdr_lat return None diff --git a/resources/tools/presentation/specifications/report/elements.yaml b/resources/tools/presentation/specifications/report/elements.yaml index 1702157c01..faba2b49c1 100644 --- a/resources/tools/presentation/specifications/report/elements.yaml +++ b/resources/tools/presentation/specifications/report/elements.yaml @@ -4094,7 +4094,7 @@ data: "data msg" data: "vpp-2n-icx-curr-iter-best" filter: "'NDRPDR'" - remove-ndr: True +# remove-ndr: True parameters: - "name" - "parent" @@ -4112,7 +4112,7 @@ # data: "data msg" # data: "vpp-3n-icx-curr-iter-best" # filter: "'NDRPDR'" -# remove-ndr: True +# # remove-ndr: True # parameters: # - "name" # - "parent" @@ -4194,7 +4194,7 @@ columns: - title: " |prein| Test Name |preout| " data: "data name" - - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99 P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99 P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99 P50 P90 P99 (90% PDR) |preout| " + - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. min avg max min avg max (10% PDR) |br| 4. min avg max min avg max (50% PDR) |br| 5. min avg max min avg max (90% PDR) |preout| " data: "data msg" data: "vpp-2n-aws-curr-cov" filter: "all" @@ -4211,7 +4211,7 @@ columns: - title: " |prein| Test Name |preout| " data: "data name" - - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. P50 P90 P99 P50 P90 P99 (10% PDR) |br| 4. P50 P90 P99 P50 P90 P99 (50% PDR) |br| 5. P50 P90 P99 P50 P90 P99 (90% PDR) |preout| " + - title: " |prein| Throughput: |br| 1. Mpps Gbps (NDR) |br| 2. Mpps Gbps (PDR) |br| |br| One-Way Latency Percentiles in uSec at %PDR load, |br| one set per each direction: |br| 3. min avg max min avg max (10% PDR) |br| 4. min avg max min avg max (50% PDR) |br| 5. min avg max min avg max (90% PDR) |preout| " data: "data msg" data: "vpp-3n-aws-curr-cov" filter: "all" @@ -4300,7 +4300,7 @@ data: "data conf-history" data: "vpp-2n-icx-curr-iter-best" filter: "'NDRPDR'" - remove-ndr: True +# remove-ndr: True parameters: - "parent" - "name" @@ -4318,7 +4318,7 @@ # data: "data conf-history" # data: "vpp-3n-icx-curr-iter-best" # filter: "'NDRPDR'" -# remove-ndr: True +# # remove-ndr: True # parameters: # - "parent" # - "name" |