X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Fperf%2F10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot;h=33f299a917131ce1c537a0e5d92eb6c4a356c72b;hp=f289c32ae4ca47faaacecabc1a01c56ae7db0fdb;hb=fe29ca4b7e6c412c69f1c56404513a33236aa617;hpb=e3ed9257cd7ef50b44eca72ef7d9ae6c7c792647

diff --git a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot
index f289c32ae4..33f299a917 100644
--- a/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot
+++ b/tests/perf/10ge2p1x520-dot1ad-l2xcbase-ndrdisc.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -14,19 +14,18 @@
 *** Settings ***
 | Resource | resources/libraries/robot/performance.robot
 | Resource | resources/libraries/robot/tagging.robot
-| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | PERFTEST_LONG
-| ...        | NIC_Intel-X520-DA2
+| ...
+| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
+| ... | NIC_Intel-X520-DA2 | L2XCFWD | BASE | DOT1AD
+| ...
 | Suite Setup | 3-node Performance Suite Setup with DUT's NIC model
 | ... | L2 | Intel-X520-DA2
 | Suite Teardown | 3-node Performance Suite Teardown
-| Test Setup | Setup all DUTs before test
-| Test Teardown | Run Keywords
-| ...           | Run Keyword If Test Failed
-| ...           | Traffic should pass with no loss | 10
-| ...           | ${min_rate}pps | ${framesize} | 3-node-xconnect
-| ...           | fail_on_loss=${False}
-| ...           | AND | Remove startup configuration of VPP from all DUTs
-| ...           | AND | Show vpp trace dump on all DUTs
+| ...
+| Test Setup | Performance test setup
+| Test Teardown | Performance test teardown | ${min_rate}pps | ${framesize}
+| ... | 3-node-xconnect
+| ...
 | Documentation | *RFC2544: Pkt throughput L2XC with 802.1ad test cases*
 | ...
 | ... | *[Top] Network Topologies:* TG-DUT1-DUT2-TG 3-node circular topology
@@ -56,16 +55,16 @@
 | ${inner_vlan_id}= | 200
 | ${type_subif}= | two_tags
 | ${tag_rewrite}= | pop-2
-#X520-DA2 bandwidth limit
+# X520-DA2 bandwidth limit
 | ${s_limit} | ${10000000000}
 
 *** Test Cases ***
-| TC01: 64B NDR binary search - DUT L2XC with 802.1ad - 1thread 1core 1rxq
+| tc01-64B-1t1c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1T1C | STHREAD | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -91,12 +90,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC02: 64B PDR binary search - DUT L2XC with 802.1ad - 1thread 1core 1rxq
+| tc02-64B-1t1c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -121,15 +120,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC03: 1514B NDR binary search - DUT L2XC with 802.1ad - 1thread 1core 1rxq
+| tc03-1514B-1t1c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1T1C | STHREAD | NDRDISC
 | | ${framesize}= | Set Variable | ${1514}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -155,12 +154,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC04: 1514B PDR binary search - DUT L2XC with 802.1ad - 1thread 1core 1rxq
+| tc04-1514B-1t1c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1514}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -185,15 +184,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC05: 9000B NDR binary search - DUT L2XC with 802.1ad - 1thread 1core 1rxq
+| tc05-9000B-1t1c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | NDR
+| | [Tags] | 1T1C | STHREAD | NDRDISC
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -218,12 +217,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC06: 9000B PDR binary search - DUT L2XC with 802.1ad - 1thread 1core 1rxq
+| tc06-9000B-1t1c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 1 thread, 1 phy core, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 1_THREAD_NOHTT_RXQUEUES_1 | SINGLE_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 1T1C | STHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -247,15 +246,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC07: 64B NDR binary search - DUT L2XC with 802.1ad - 2threads 2cores 1rxq
+| tc07-64B-2t2c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR
+| | [Tags] | 2T2C | MTHREAD | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -281,12 +280,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC08: 64B PDR binary search - DUT L2XC with 802.1ad - 2threads 2cores 1rxq
+| tc08-64B-2t2c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -311,15 +310,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC09: 1514B NDR binary search - DUT L2XC with 802.1ad - 2threads 2cores 1rxq
+| tc09-1514B-2t2c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1514}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -345,12 +344,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC10: 1514B PDR binary search - DUT L2XC with 802.1ad - 2threads 2cores 1rxq
+| tc10-1514B-2t2c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1514}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -375,15 +374,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC11: 9000B NDR binary search - DUT L2XC with 802.1ad - 2threads 2cores 1rxq
+| tc11-9000B-2t2c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -408,12 +407,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC12: 9000B PDR binary search - DUT L2XC with 802.1ad - 2threads 2cores 1rxq
+| tc12-9000B-2t2c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 2 threads, 2 phy cores, \
 | | ... | 1 receive queue per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 2_THREAD_NOHTT_RXQUEUES_1 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 2T2C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -437,15 +436,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC13: 64B NDR binary search - DUT L2XC with 802.1ad - 4threads 4cores 2rxq
+| tc13-64B-4t4c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR
+| | [Tags] | 4T4C | MTHREAD | NDRDISC
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -471,12 +470,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC14: 64B PDR binary search - DUT L2XC with 802.1ad - 4threads 4cores 2rxq
+| tc14-64B-4t4c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 64 Byte frames
 | | ... | using binary search start at 10GE linerate, step 100kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${64}
 | | ${min_rate}= | Set Variable | ${100000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -501,15 +500,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC15: 1514B NDR binary search - DUT L2XC with 802.1ad - 4threads 4cores 2rxq
+| tc15-1514B-4t4c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1514}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -535,12 +534,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC16: 1514B PDR binary search - DUT L2XC with 802.1ad - 4threads 4cores 2rxq
+| tc16-1514B-4t4c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 1514 Byte frames
 | | ... | using binary search start at 10GE linerate, step 10kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${1514}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -565,15 +564,15 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}
 
-| TC17: 9000B NDR binary search - DUT L2XC with 802.1ad - 4threads 4cores 2rxq
+| tc17-9000B-4t4c-dot1ad-l2xcbase-ndrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find NDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | NDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | NDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -598,12 +597,12 @@
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
 
-| TC18: 9000B PDR binary search - DUT L2XC with 802.1ad - 4threads 4cores 2rxq
+| tc18-9000B-4t4c-dot1ad-l2xcbase-pdrdisc
 | | [Documentation]
 | | ... | [Cfg] DUT runs L2XC forwarding config with 4 threads, 4 phy cores, \
 | | ... | 2 receive queues per NIC port. [Ver] Find PDR for 9000 Byte frames
 | | ... | using binary search start at 10GE linerate, step 5kpps, LT=0.5%.
-| | [Tags] | 4_THREAD_NOHTT_RXQUEUES_2 | MULTI_THREAD | PDR | SKIP_PATCH
+| | [Tags] | 4T4C | MTHREAD | PDRDISC | SKIP_PATCH
 | | ${framesize}= | Set Variable | ${9000}
 | | ${min_rate}= | Set Variable | ${10000}
 | | ${max_rate}= | Calculate pps | ${s_limit} | ${framesize + 8}
@@ -627,5 +626,5 @@
 | | ...                                       | ${binary_max} | 3-node-xconnect
 | | ...                                       | ${min_rate} | ${max_rate}
 | | ...                                       | ${threshold}
-| | ...                                       | ${glob_loss_acceptance}
-| | ...                                       | ${glob_loss_acceptance_type}
+| | ...                                       | ${perf_pdr_loss_acceptance}
+| | ...                                       | ${perf_pdr_loss_acceptance_type}