Merge remote-tracking branch 'origin/Fix_DedicatedBWPs' into integration_2025_w31 (!3461)

Fix Dedicated BWPs

- Improve SearchSpace selection
- Improve CORESET selection
- Fix fill 'initialDownlinkBWP->pdsch_Config' when there are
  DedicatedBWPs
  * This fixes the reported 'RSRP = 0' issue when the UE is in the
    InitialBWP and we have DedicatedBWPs configured
- Add a 'common' type SearchSpace in the NR_BWP_DownlinkDedicated IE for
  DedicatedBWPs
- Fix hardcoded 'controlResourceSetId' by making it dynamic
- Remove 'searchspaceid' from 'verify_agg_levels' function because it
  was used only for LOG
- CI: Add DedicatedBWP to '40 MHz TDD F1+E1 SA' in
  'RAN-SA-B200-Module-SABOX-Container'

ci-scripts/conf_files/gnb-du.sa.band78.106prb.usrpb200.conf

@@ -34,11 +34,9 @@ gNBs =
 
 #  downlinkConfigCommon
     #frequencyInfoDL
-      # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
-      absoluteFrequencySSB                                          = 641280;
+      absoluteFrequencySSB                                             = 641280; # GSCN: 7929, Freq: 3619.200 MHz
       dl_frequencyBand                                                 = 78;
-      # this is 3600 MHz
-      dl_absoluteFrequencyPointA                                       = 640008;
+      dl_absoluteFrequencyPointA                                       = 640752; # 3611.280 MHz
       #scs-SpecificCarrierList
         dl_offstToCarrier                                              = 0;
 # subcarrierSpacing
@@ -47,13 +45,12 @@ gNBs =
         dl_carrierBandwidth                                            = 106;
      #initialDownlinkBWP
       #genericParameters
-        # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
+        initialDLBWPlocationAndBandwidth                               = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                              = 12;
+        initialDLBWPcontrolResourceSetZero                              = 10;
         initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon 
@@ -68,7 +65,7 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 28875;
+        initialULBWPlocationAndBandwidth                            = 13750; # RBstart=0, L=51 (275*(L-1))+RBstart
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialULBWPsubcarrierSpacing                                           = 1;
@@ -152,6 +149,18 @@ gNBs =
 
   );
 
+    servingCellConfigDedicated = ({
+      dl_bwp-Id_1 = 1;
+      dl_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
+      dl_bwp1_subcarrierSpacing = 1;
+      firstActiveDownlinkBWP-Id = 1;
+      defaultDownlinkBWP-Id = 1;
+      ul_bwp-Id_1 = 1;
+      ul_bwp1_locationAndBandwidth = 28875; # RBstart=0, L=106 (275*(L-1))+RBstart
+      ul_bwp1_subcarrierSpacing = 1;
+      firstActiveUplinkBWP-Id = 1;
+    });
+
 
     # ------- SCTP definitions
     SCTP :

ci-scripts/xml_files/container_sa_e1_b200_quectel.xml

@@ -30,11 +30,10 @@
     310000
     800813
     330101
-    800814
     330102
-    800815
     330103
     310001
+    400001
     350000
     370001
     370000
@@ -147,6 +146,13 @@
     <iperf_bitrate_threshold>95</iperf_bitrate_threshold>
   </testCase>
 
+  <testCase id="400001">
+    <class>Custom_Command</class>
+    <desc>Check UE is on dedicated BWP ID 1</desc>
+    <node>ofqot</node>
+    <command>echo ci get_current_bwp | nc -N 127.0.0.1 9091 | grep 'DL BWP ID 1 (dedicated) UL BWP ID 1 (dedicated)'</command>
+  </testCase>
+
   <testCase id="370001">
     <class>Iperf</class>
     <desc>iperf (UL/8Mbps/UDP)(30 sec)</desc>