Merge pull request #24 from Spirent/5gc-r13

R13 release
Spirent · Sep 26, 2023 · 7ed3ae6 · 7ed3ae6
2 parents 1cfbeb4 + 97c3d39
commit 7ed3ae6
Show file tree

Hide file tree

Showing 621 changed files with 124,789 additions and 5,342 deletions.
diff --git a/Inventory/inventory.xml b/Inventory/inventory.xml
diff --git a/Landslide_5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-1-PF-UE_Triggered_SrvReq.ffpt b/Landslide_5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-1-PF-UE_Triggered_SrvReq.ffpt
@@ -275,5 +275,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t2 ports</description>
-    <tags>G-3TS</tags>
+    <tags>A-AMF-SMF-1-PF</tags>
 </ParameterTree>
diff --git a/...e_5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-2-PF-Network_Triggered_SrvReq.ffpt b/...e_5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-2-PF-Network_Triggered_SrvReq.ffpt
@@ -275,5 +275,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t2 ports</description>
-    <tags>G-3TS</tags>
+    <tags>A-AMF-SMF-2-PF</tags>
 </ParameterTree>
diff --git a/..._5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-3-CP-PDU_Session_Establishment.ffpt b/..._5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-3-CP-PDU_Session_Establishment.ffpt
@@ -261,5 +261,5 @@
    + Emulated SUT: \t2 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t1 port</description>
-    <tags>D-3TS</tags>
+    <tags>A-AMF-SMF-3-CP</tags>
 </ParameterTree>
diff --git a/..._5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-3-PF-PDU_Session_Establishment.ffpt b/..._5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-3-PF-PDU_Session_Establishment.ffpt
@@ -266,5 +266,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t1 port</description>
-    <tags>K-3TS</tags>
+    <tags>A-AMF-SMF-3-PF</tags>
 </ParameterTree>
diff --git a/Landslide_5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-4-PF-AN_Release.ffpt b/Landslide_5GC/ai_LS_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-4-PF-AN_Release.ffpt
@@ -72,8 +72,8 @@
                 <Enable_TAC_Report pt:datatype="BOOLEAN">false</Enable_TAC_Report>
                 <Expected_CPU_Threshold pt:datatype="INTEGER" pt:description="SUT CPU utilization threshold. SUT CPU utilization is below threshold agreed among all parties prior to development of the test case. Default value = 45%">45</Expected_CPU_Threshold>
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
-                <Starting_IMEI>10310140000120</Starting_IMEI>
-                <Starting_SUPI>310310140000120</Starting_SUPI>
+                <Starting_IMEI pt:description="Starting IMEI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10310140000120</Starting_IMEI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">310310140000120</Starting_SUPI>
                 <Start_Threshold_Percent pt:datatype="INTEGER" pt:description="Determine the start threshold percentage of target. It must be an integer between 50-80%.">80</Start_Threshold_Percent>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running sanity check, followed by 80% load specification, followed by etc., terminating at 100%">false</Optimistic_Mode>
             </TC_parameters>
@@ -256,5 +256,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t2 ports</description>
-    <tags>G-3TS</tags>
+    <tags>A-AMF-SMF-4-PF</tags>
 </ParameterTree>
diff --git a/.../parameters/adjacent/a-amf-smf/A-AMF-SMF-5-PF-Xn_Inter_NG-RAN_HO-no_UPF_Reallocation.ffpt b/.../parameters/adjacent/a-amf-smf/A-AMF-SMF-5-PF-Xn_Inter_NG-RAN_HO-no_UPF_Reallocation.ffpt
@@ -305,5 +305,5 @@
    + Emulated SUT: \t2 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t2 ports</description>
-    <tags>L-3TS</tags>
+    <tags>A-AMF-SMF-5-PF</tags>
 </ParameterTree>
diff --git a/...S_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-6-PF-Inter_NG-RAN_N2_based_HO-Execution.ffpt b/...S_5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-6-PF-Inter_NG-RAN_N2_based_HO-Execution.ffpt
@@ -266,5 +266,5 @@
    + Emulated SUT: \t1 port
    + TS 1: \t\t1 port
    + TS 2: \t\t1 port</description>
-    <tags>N-3TS</tags>
+    <tags>A-AMF-SMF-6-PF</tags>
 </ParameterTree>
diff --git a/...5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-9-PF-Inter_NG-RAN_N2_based_HO-Preparation.ffpt b/...5G/parameters/adjacent/a-amf-smf/A-AMF-SMF-9-PF-Inter_NG-RAN_N2_based_HO-Preparation.ffpt
@@ -308,5 +308,5 @@
    + Emulated SUT: \t2 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t2 ports</description>
-    <tags>L-3TS</tags>
+    <tags>A-AMF-SMF-9-PF</tags>
 </ParameterTree>
diff --git a/.../parameters/adjacent/a-smf-upf/A-SMF-UPF-1-CP-PDU_Session_Establishment-1_PDU_per_UE.ffpt b/.../parameters/adjacent/a-smf-upf/A-SMF-UPF-1-CP-PDU_Session_Establishment-1_PDU_per_UE.ffpt
@@ -240,5 +240,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t3 ports</description>
-    <tags>R-3TS</tags>
+    <tags>A-SMF-UPF-1-CP</tags>
 </ParameterTree>
diff --git a/.../parameters/adjacent/a-smf-upf/A-SMF-UPF-1-PF-PDU_Session_Establishment-1_PDU_per_UE.ffpt b/.../parameters/adjacent/a-smf-upf/A-SMF-UPF-1-PF-PDU_Session_Establishment-1_PDU_per_UE.ffpt
@@ -357,5 +357,5 @@
 + Emulated SUT: \t3 ports
 + TS 1: \t\t1 port
 + TS 2: \t\t3 ports</description>
-    <tags>R-3TS</tags>
+    <tags>A-SMF-UPF-1-PF</tags>
 </ParameterTree>
diff --git a/...arameters/adjacent/a-smf-upf/A-SMF-UPF-2-CP-PDU_Session_Establishment-Srv_Voice-Data.ffpt b/...arameters/adjacent/a-smf-upf/A-SMF-UPF-2-CP-PDU_Session_Establishment-Srv_Voice-Data.ffpt
@@ -271,5 +271,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t3 ports</description>
-    <tags>R-3TS</tags>
+    <tags>A-SMF-UPF-2-CP</tags>
 </ParameterTree>
diff --git a/...arameters/adjacent/a-smf-upf/A-SMF-UPF-2-PF-PDU_Session_Establishment-Srv_Voice-Data.ffpt b/...arameters/adjacent/a-smf-upf/A-SMF-UPF-2-PF-PDU_Session_Establishment-Srv_Voice-Data.ffpt
@@ -271,5 +271,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t3 ports</description>
-    <tags>R-3TS</tags>
+    <tags>A-SMF-UPF-2-PF</tags>
 </ParameterTree>
diff --git a/...5G/parameters/adjacent/a-smf-upf/A-SMF-UPF-3-PF-ControlPlane_vs_UserPlane-Decoupling.ffpt b/...5G/parameters/adjacent/a-smf-upf/A-SMF-UPF-3-PF-ControlPlane_vs_UserPlane-Decoupling.ffpt
@@ -259,5 +259,5 @@
    + TS 1: \t\t1 port
    + TS 2: \t\t1 port
    + TS 3:\t\t2 ports</description>
-    <tags>P-4TS</tags>
+    <tags>A-SMF-UPF-3-PF</tags>
 </ParameterTree>
diff --git a/...5G/parameters/adjacent/a-smf-upf/A-SMF-UPF-4-PF-UserPlane_vs_ControlPlane-Decoupling.ffpt b/...5G/parameters/adjacent/a-smf-upf/A-SMF-UPF-4-PF-UserPlane_vs_ControlPlane-Decoupling.ffpt
@@ -271,5 +271,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t3 ports</description>
-    <tags>R-3TS</tags>
+    <tags>A-SMF-UPF-4-PF</tags>
 </ParameterTree>
diff --git a/..._LS_5G/parameters/adjacent/a-smf-upf/A-SMF-UPF-5-PF-UserPlane_vs_Mobility-Decoupling.ffpt b/..._LS_5G/parameters/adjacent/a-smf-upf/A-SMF-UPF-5-PF-UserPlane_vs_Mobility-Decoupling.ffpt
@@ -277,5 +277,5 @@
    + Emulated SUT: \t3 ports
    + TS 1: \t\t1 port
    + TS 2: \t\t3 ports</description>
-    <tags>R-3TS</tags>
+    <tags>A-SMF-UPF-5-PF</tags>
 </ParameterTree>
diff --git a/...C/ai_LS_5G/parameters/endtoend/5gc/E-5GC-1-CP-PDU_Session_Establishment-1_PDU_per_UE.ffpt b/...C/ai_LS_5G/parameters/endtoend/5gc/E-5GC-1-CP-PDU_Session_Establishment-1_PDU_per_UE.ffpt
@@ -78,8 +78,8 @@
                 <Enable_Port_Capture pt:datatype="BOOLEAN" pt:description="Enable port capture for Nodal test on the sanity testing.">true</Enable_Port_Capture>
                 <Expected_CPU_Threshold pt:datatype="INTEGER" pt:description="SUT CPU utilization threshold. SUT CPU utilization is below threshold agreed among all parties prior to development of the test case. Default value = 45%">45</Expected_CPU_Threshold>
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
-                <Starting_IMEI>10000000000000</Starting_IMEI>
-                <Starting_SUPI>10000000000000</Starting_SUPI>
+                <Starting_IMEI pt:description="Starting IMEI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10000000000000</Starting_IMEI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10000000000000</Starting_SUPI>
                 <Enable_RemoteNetworkHost pt:datatype="BOOLEAN" pt:description="Enable to use Remote Network Host test session">false</Enable_RemoteNetworkHost>
                 <Multiplication_Factor_RemoteNetworkHost pt:datatype="INTEGER" pt:description="A multiplication factor of the nodal IP addresses">2</Multiplication_Factor_RemoteNetworkHost>
                 <Start_Threshold_Percent pt:datatype="INTEGER" pt:description="Determine the start threshold percentage of target. It must be an integer between 50-80%.">80</Start_Threshold_Percent>
@@ -193,5 +193,5 @@
 
 + Emulated SUT: \t3 ports
 + TS 1: \t\t3 ports</description>
-    <tags>B-2TS, B-3TS-RNH</tags>
+    <tags>E-5GC-1-CP</tags>
 </ParameterTree>
diff --git a/...slide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-10-PF-UserPlane-vs-N2-HO-Decoupling.ffpt b/...slide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-10-PF-UserPlane-vs-N2-HO-Decoupling.ffpt
@@ -79,10 +79,10 @@
                 <Enable_TAC_Report pt:datatype="BOOLEAN">false</Enable_TAC_Report>
                 <Expected_CPU_Threshold pt:datatype="INTEGER" pt:description="SUT CPU utilization threshold. SUT CPU utilization is below threshold agreed among all parties prior to development of the test case. Default value = 45%">45</Expected_CPU_Threshold>
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
-                <Starting_IMEI pt:description="10310140100000">10310140100000</Starting_IMEI>
-                <Starting_SUPI pt:description="111111115111111">111111115111111</Starting_SUPI>
-                <GnbId pt:description="10095">10095</GnbId>
-                <MobGnbId pt:description="34359738369">34359738369</MobGnbId>
+                <Starting_IMEI pt:description="Starting IMEI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10310140100000</Starting_IMEI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">111111115111111</Starting_SUPI>
+                <GnbId pt:description="gNB ID. Integer number in [0-687194476735]. This parameter will be adjusted for multi-nodal test sessions.">10095</GnbId>
+                <MobGnbId pt:description="gNB Targeted ID. Integer number in [0-687194476735]. This parameter will be adjusted for multi-nodal test sessions.">34359738369</MobGnbId>
                 <GnbName pt:description="gnb.spirent.com">gnb.spirent.com</GnbName>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running starting default tartget mobility rate (500), increase 500 each iteration if passes, followed by etc., terminating at 100%">false</Optimistic_Mode>
             </TC_parameters>
@@ -296,5 +296,5 @@
 
    + Emulated SUT: \t5 ports
    + TS 1: \t\t3 ports</description>
-    <tags>O-2TS</tags>
+    <tags>E-5GC-10-PF</tags>
 </ParameterTree>
diff --git a/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-11-CP_EPSFallback.ffpt b/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-11-CP_EPSFallback.ffpt
@@ -45,11 +45,11 @@
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running sanity check, followed by 80% load specification, followed by etc., terminating at 100%">false</Optimistic_Mode>
                 <Start_Threshold_Percent pt:datatype="INTEGER" pt:description="Determine the start threshold percentage of target. It must be an integer between 50-80%.">80</Start_Threshold_Percent>
-                <Starting_SUPI pt:description="310140000000001">310140000000001</Starting_SUPI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">310140000000001</Starting_SUPI>
                 <Gnb_Cell_Id pt:description="gNB Control Node Cell ID. Integer number in [0-687194476735]. This parameter will be adjusted for multi-nodal test sessions.">1</Gnb_Cell_Id>
-                <Gnb_Tac_Id pt:description="gNB Control Node Cell ID. Integer number in [0-687194476735]. This parameter will be adjusted for multi-nodal test sessions.">00001</Gnb_Tac_Id>
+                <Gnb_Tac_Id pt:description="gNB Control TAC ID. Integer number in [0-16777215]. This parameter will be adjusted for multi-nodal test sessions.">00001</Gnb_Tac_Id>
                 <Enb_Cell_Id pt:description="eNB Control Node Cell ID. Integer number in [0-268435455]. This parameter will be adjusted for multi-nodal test sessions.">1234567</Enb_Cell_Id>
-                <Enb_Tac_Id pt:description="gNB Control Node Cell ID. Integer number in [0-687194476735]. This parameter will be adjusted for multi-nodal test sessions.">00001</Enb_Tac_Id>
+                <Enb_Tac_Id pt:description="eNB Control TAC ID. Integer number in [00000-65535]. This parameter will be adjusted for multi-nodal test sessions.">00001</Enb_Tac_Id>
                 <User_Id>0</User_Id>
             </TC_parameters>
             <SUT>
@@ -269,5 +269,5 @@
 
    + Emulated SUT: \t1 port
    + TS 1: \t\t1 port</description>
-    <tags>I-2TS</tags>
+    <tags>E-5GC-11-CP</tags>
 </ParameterTree>
diff --git a/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-12-PF_EPSFallback.ffpt b/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-12-PF_EPSFallback.ffpt
@@ -45,7 +45,7 @@
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running sanity check, followed by 80% load specification, followed by etc., terminating at 100%">false</Optimistic_Mode>
                 <Start_Threshold_Percent pt:datatype="INTEGER" pt:description="Determine the start threshold percentage of target. It must be an integer between 50-80%.">80</Start_Threshold_Percent>
-                <Starting_SUPI pt:description="310140000000001">310140000000001</Starting_SUPI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">310140000000001</Starting_SUPI>
                 <Gnb_Cell_Id pt:description="gNB Control Node Cell ID. Integer number in [0-687194476735]. This parameter will be adjusted for multi-nodal test sessions.">1</Gnb_Cell_Id>
                 <Gnb_Tac_Id pt:description="gNB Control TAC ID. Integer number in [0-16777215]. This parameter will be adjusted for multi-nodal test sessions.">00001</Gnb_Tac_Id>
                 <Enb_Cell_Id pt:description="eNB Control Node Cell ID. Integer number in [0-268435455]. This parameter will be adjusted for multi-nodal test sessions.">1234567</Enb_Cell_Id>
@@ -269,5 +269,5 @@
 
    + Emulated SUT: \t1 port
    + TS 1: \t\t1 port</description>
-    <tags>I-2TS</tags>
+    <tags>E-5GC-12-PF</tags>
 </ParameterTree>
diff --git a/...lide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-18-PF_InterNgRanN2BasedHoPrepAndExec.ffpt b/...lide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-18-PF_InterNgRanN2BasedHoPrepAndExec.ffpt
@@ -58,8 +58,8 @@
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
                 <Start_Threshold_Percent pt:datatype="INTEGER" pt:description="Determine the start threshold percentage of target. It must be an integer between 50-80%.">80</Start_Threshold_Percent>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running sanity check, followed by 80% load specification, followed by etc., terminating at 100%">false</Optimistic_Mode>
-                <Starting_IMEI pt:description="10310140000120">10310140000120</Starting_IMEI>
-                <Starting_SUPI pt:description="123456700000001">123456700000001</Starting_SUPI>
+                <Starting_IMEI pt:description="Starting IMEI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10310140000120</Starting_IMEI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">123456700000001</Starting_SUPI>
                 <Gnb_Cell_Id pt:description="gNB Control Node Cell ID. This parameter will be adjusted for multi-nodal test sessions.">1</Gnb_Cell_Id>
                 <Target_Gnb_Cell_Id pt:description="Target gNB Control Node Cell ID. This parameter will be adjusted for multi-nodal test sessions.">34359738369</Target_Gnb_Cell_Id>
             </TC_parameters>
@@ -227,5 +227,5 @@
 
    + Emulated SUT: \t2 ports
    + TS 1: \t\t2 ports</description>
-    <tags>A-2TS</tags>
+    <tags>E-5GC-18-PF</tags>
 </ParameterTree>
diff --git a/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-19-CP_PeriodicRegistration.ffpt b/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-19-CP_PeriodicRegistration.ffpt
@@ -45,8 +45,8 @@
                 <Enable_TAC_Report pt:datatype="BOOLEAN">false</Enable_TAC_Report>
                 <Expected_CPU_Threshold pt:datatype="INTEGER" pt:description="SUT CPU utilization threshold. SUT CPU utilization is below threshold agreed among all parties prior to development of the test case. Default value = 45%">45</Expected_CPU_Threshold>
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
-                <Starting_IMEI>10310140000120</Starting_IMEI>
-                <Starting_SUPI>310310140000120</Starting_SUPI>
+                <Starting_IMEI pt:description="Starting IMEI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10310140000120</Starting_IMEI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">310310140000120</Starting_SUPI>
             </TC_parameters>
             <SUT>
                 <nodal_ts0_tc0>
@@ -105,5 +105,5 @@
 
    + Emulated SUT: \t1 port
    + TS 1: \t\t1 port</description>
-    <tags>I-2TS</tags>
+    <tags>E-5GC-19-CP</tags>
 </ParameterTree>
diff --git a/...C/ai_LS_5G/parameters/endtoend/5gc/E-5GC-2-PF-PDU_Session_Establishment-1_PDU_per_UE.ffpt b/...C/ai_LS_5G/parameters/endtoend/5gc/E-5GC-2-PF-PDU_Session_Establishment-1_PDU_per_UE.ffpt
@@ -78,8 +78,8 @@
                 <Enable_Port_Capture pt:datatype="BOOLEAN" pt:description="Enable port capture for Nodal test on the sanity testing.">true</Enable_Port_Capture>
                 <Expected_CPU_Threshold pt:datatype="INTEGER" pt:description="SUT CPU utilization threshold. SUT CPU utilization is below threshold agreed among all parties prior to development of the test case. Default value = 45%">45</Expected_CPU_Threshold>
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
-                <Starting_IMEI>10000000000000</Starting_IMEI>
-                <Starting_SUPI>10000000000000</Starting_SUPI>
+                <Starting_IMEI pt:description="Starting IMEI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10000000000000</Starting_IMEI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">10000000000000</Starting_SUPI>
                 <Enable_RemoteNetworkHost pt:datatype="BOOLEAN" pt:description="Enable to use Remote Network Host test session">false</Enable_RemoteNetworkHost>
                 <Multiplication_Factor_RemoteNetworkHost pt:datatype="INTEGER" pt:description="A multiplication factor of the nodal IP addresses">2</Multiplication_Factor_RemoteNetworkHost>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running sanity check, followed by 80% load specification, followed by etc., terminating at 100%">false</Optimistic_Mode>
@@ -193,5 +193,5 @@
 
 + Emulated SUT: \t3 ports
 + TS 1: \t\t3 ports</description>
-    <tags>B-2TS, B-3TS-RNH</tags>
+    <tags>E-5GC-2-PF</tags>
 </ParameterTree>
diff --git a/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-20-PF_MobilityRegistration.ffpt b/Landslide_5GC/ai_LS_5G/parameters/endtoend/5gc/E-5GC-20-PF_MobilityRegistration.ffpt
@@ -46,7 +46,7 @@
                 <Expected_Memory_Threshold pt:datatype="INTEGER" pt:description="SUT Memory utilization threshold. SUT Memory utilization is below threshold agreed among all parties prior to development of the test case. Default value = 20%">20</Expected_Memory_Threshold>
                 <Start_Threshold_Percent pt:datatype="INTEGER" pt:description="Determine the start threshold percentage of target. It must be an integer between 50-80%.">80</Start_Threshold_Percent>
                 <Optimistic_Mode pt:datatype="BOOLEAN" pt:description="Enable Optimistic Mode. When true, the test will test at 100% initially, and if no failure, will complete the test with a PASS verdict. Otherwise, it will revert back to running sanity check, followed by 80% load specification, followed by etc., terminating at 100%">false</Optimistic_Mode>
-                <Starting_SUPI>310310140000120</Starting_SUPI>
+                <Starting_SUPI pt:description="Starting SUPI. This will be adjusted automatically to avoid any overlap among multiple nodal instances.">310310140000120</Starting_SUPI>
             </TC_parameters>
             <SUT>
                 <nodal_ts0_tc0>
@@ -201,5 +201,5 @@
 
    + Emulated SUT: \t1 port
    + TS 1: \t\t1 port</description>
-    <tags>I-2TS</tags>
+    <tags>E-5GC-20-PF</tags>
 </ParameterTree>