Merge "[Epic-ID: ODUHIGH-475][Task-ID: ODUHIGH-572] Fix LWR_MAC creation during PHY...

[o-du/l2.git] / build / config / odu_config.xml

diff --git a/build/config/odu_config.xml b/build/config/odu_config.xml
index 7e393f6..50527de 100644 (file)
--- a/build/config/odu_config.xml
+++ b/build/config/odu_config.xml
@@ -14,8 +14,6 @@
    <DU_ID>1</DU_ID>
    <DU_NAME>ORAN OAM DU</DU_NAME>
    <MAX_NUM_DRB>29</MAX_NUM_DRB>
-   <MAX_NUM_UE_SUPPORTED>3</MAX_NUM_UE_SUPPORTED>
-   <MAX_NUM_UE>32</MAX_NUM_UE>
    <DU_IP_V4_ADDR>192.168.130.81</DU_IP_V4_ADDR>
    <CU_IP_V4_ADDR>192.168.130.82</CU_IP_V4_ADDR>
    <RIC_IP_V4_ADDR>192.168.130.80</RIC_IP_V4_ADDR>
@@ -239,25 +237,22 @@
                <F1_SLICE_SUPP_LST>
                   <NUM_SUPPORT_SLICE>2</NUM_SUPPORT_SLICE>
                   <SNSSAI_LIST>
-                     <NUM_NSSAI>2</NUM_NSSAI>
-                     <LIST>
                      <SNSSAI>
                         <SST>1</SST>
                         <SD_SIZE>
-                        <SD>2</SD>
-                        <SD>3</SD>
-                        <SD>4</SD>
+                           <SD>2</SD>
+                           <SD>3</SD>
+                           <SD>4</SD>
                         </SD_SIZE>
                      </SNSSAI>
                      <SNSSAI>
                         <SST>5</SST>
                         <SD_SIZE>
-                        <SD>6</SD>
-                        <SD>7</SD>
-                        <SD>8</SD>
+                           <SD>6</SD>
+                           <SD>7</SD>
+                           <SD>8</SD>
                         </SD_SIZE>
                      </SNSSAI>
-                     </LIST>
                   </SNSSAI_LIST>
                </F1_SLICE_SUPP_LST>
             </F1_SRVD_PLMN>
@@ -276,18 +271,14 @@
                         <F1_NRB>14</F1_NRB>
                      </F1_TX_BW>
                   </F1_SUL_INFO>
+                   <MAX_NRCELL_BANDS>2</MAX_NRCELL_BANDS>
                   <F1_FREQ_BAND_LIST>
-                     <MAX_NRCELL_BANDS>2</MAX_NRCELL_BANDS>
-                     <LIST>
                      <F1_FREQ_BAND>
                         <NR_FREQ_BAND>1</NR_FREQ_BAND>
                         <SUL_BAND_LIST>
-                        <LIST>
                            <SUL_BAND>2</SUL_BAND>
-                        </LIST>
                         </SUL_BAND_LIST>
                      </F1_FREQ_BAND>
-                     </LIST>
                   </F1_FREQ_BAND_LIST>
                </F1_NR_FREQ_INFO_UL>
                <F1_NR_FREQ_INFO_DL>
@@ -299,18 +290,14 @@
                         <F1_NRB>14</F1_NRB>
                      </F1_TX_BW>
                   </F1_SUL_INFO>
+                  <MAX_NRCELL_BANDS>2</MAX_NRCELL_BANDS>
                   <F1_FREQ_BAND_LIST>
-                     <MAX_NRCELL_BANDS>2</MAX_NRCELL_BANDS>
-                     <LIST>
                      <F1_FREQ_BAND>
                         <NR_FREQ_BAND>1</NR_FREQ_BAND>
                         <SUL_BAND_LIST>
-                        <LIST>
                            <SUL_BAND>2</SUL_BAND>
-                        </LIST>
                         </SUL_BAND_LIST>
                      </F1_FREQ_BAND>
-                     </LIST>
                   </F1_FREQ_BAND_LIST>
                </F1_NR_FREQ_INFO_DL>
                <F1_TX_BW_UL>
@@ -332,18 +319,14 @@
                         <F1_NRB>28</F1_NRB>
                      </F1_TX_BW>
                   </F1_SUL_INFO>
+                  <MAX_NRCELL_BANDS>2</MAX_NRCELL_BANDS>
                   <F1_FREQ_BAND_LIST>
-                     <MAX_NRCELL_BANDS>2</MAX_NRCELL_BANDS>
-                     <LIST>
                      <F1_FREQ_BAND>
                         <NR_FREQ_BAND>78</NR_FREQ_BAND>
                         <SUL_BAND_LIST>
-                        <LIST>
                               <SUL_BAND>2</SUL_BAND>
-                        </LIST>
                         </SUL_BAND_LIST>
                      </F1_FREQ_BAND>
-                     </LIST>
                   </F1_FREQ_BAND_LIST>
                </F1_NR_FREQ_INFO>
                <F1_TX_BW>
@@ -642,28 +625,6 @@
          </RRM_POLICY_RATIO>
       </MAC_SLICE_RRM_POLICY>
    </SLICE_CFG>
-   <RADIO_FRAME_DURATION>10</RADIO_FRAME_DURATION>
-   <MAX_NUM_CELL>2</MAX_NUM_CELL>
-   <MAX_NUM_MU>4</MAX_NUM_MU>
-   <MAX_NUM_UE_PER_TTI>1</MAX_NUM_UE_PER_TTI>
-   <MAX_DRB_LCID>32</MAX_DRB_LCID>
-   <MAX_NUM_SRB>3</MAX_NUM_SRB>
-   <MAX_NUM_SSB>64</MAX_NUM_SSB>
-   <MAX_NUM_HARQ_PROC>16</MAX_NUM_HARQ_PROC>
-   <MAX_NUM_TB_PER_UE>2</MAX_NUM_TB_PER_UE>
-   <PHY_DELTA_DL>1</PHY_DELTA_DL>
-   <ODU_START_CRNTI>100</ODU_START_CRNTI>
-   <ODU_END_CRNTI>500</ODU_END_CRNTI>
-   <DEFAULT_MCS>4</DEFAULT_MCS>
-   <BANDWIDTH>20</BANDWIDTH>
-   <MAX_NUM_RB>106</MAX_NUM_RB>
-   <ODU_UE_THROUGHPUT_PRINT_TIME_INTERVAL>5</ODU_UE_THROUGHPUT_PRINT_TIME_INTERVAL>
-   <ODU_SNSSAI_THROUGHPUT_PRINT_TIME_INTERVAL>60000</ODU_SNSSAI_THROUGHPUT_PRINT_TIME_INTERVAL>
-   <MAX_PO_PER_PF>4</MAX_PO_PER_PF>
-   <MAX_SLOTS>10</MAX_SLOTS>
-   <MAX_SFN>1024</MAX_SFN>
-   <BASE_SCS>15</BASE_SCS>
-   <MAX_SYMB_PER_SLOT>14</MAX_SYMB_PER_SLOT>
    <DU_TIMER_INFO>
       <TIMER_TQ_CP>
          <TIMER_LEN>2</TIMER_LEN>
@@ -675,9 +636,9 @@
       <NUM_OF_TNL_ASSOC>1</NUM_OF_TNL_ASSOC>
       <TNL_ASSOC_LIST>
          <TNL_ASSOC>
-            <LOCAL_IP>192.168.130.71</LOCAL_IP>
+            <LOCAL_IP>192.168.130.81</LOCAL_IP>
             <LOCAL_PORT>36421</LOCAL_PORT>
-            <DESTINATION_IP>192.168.130.70</DESTINATION_IP>
+            <DESTINATION_IP>192.168.130.80</DESTINATION_IP>
             <DESTINATION_PORT>36421</DESTINATION_PORT>
             <ASSOC_USAGE>2</ASSOC_USAGE> 
          </TNL_ASSOC>
@@ -725,6 +686,35 @@
          </RAN_FUNCTION>
       </RAN_FUNCTION_LIST>
    </E2AP_CFG>
+   <GLOBAL_CFG>
+      <RADIO_FRAME_DURATION>10</RADIO_FRAME_DURATION>
+      <PHY_DELTA_DL>1</PHY_DELTA_DL>
+      <PHY_DELTA_UL>1</PHY_DELTA_UL>
+      <ODU_UE_THROUGHPUT_PRINT_TIME_INTERVAL>5</ODU_UE_THROUGHPUT_PRINT_TIME_INTERVAL>
+      <ODU_SNSSAI_THROUGHPUT_PRINT_TIME_INTERVAL>60000</ODU_SNSSAI_THROUGHPUT_PRINT_TIME_INTERVAL>
+<!--
+      <MAX_NUM_CELL>2</MAX_NUM_CELL>
+      <MAX_NUM_MU>4</MAX_NUM_MU>
+      <MAX_NUM_UE>3</MAX_NUM_UE>
+      <MAX_NUM_UE_PER_TTI>1</MAX_NUM_UE_PER_TTI>
+      <MAX_DRB_LCID>32</MAX_DRB_LCID>
+      <MAX_NUM_SRB>3</MAX_NUM_SRB>
+      <MAX_NUM_DRB>29</MAX_NUM_DRB>
+      <MAX_NUM_SSB>64</MAX_NUM_SSB>
+      <MAX_NUM_HARQ_PROC>16</MAX_NUM_HARQ_PROC>
+      <MAX_NUM_TB_PER_UE>2</MAX_NUM_TB_PER_UE>
+      <ODU_START_CRNTI>100</ODU_START_CRNTI>
+      <ODU_END_CRNTI>500</ODU_END_CRNTI>
+      <BANDWIDTH>20</BANDWIDTH>
+      <MAX_NUM_RB>106</MAX_NUM_RB>
+      <MAX_SLOTS>10</MAX_SLOTS>
+      <MAX_SFN>1024</MAX_SFN>
+      <MAX_SYMB_PER_SLOT>14</MAX_SYMB_PER_SLOT>
+      <MAX_NUM_STATS_GRP>5</MAX_NUM_STATS_GRP>
+      <MAX_NUM_STATS>10</MAX_NUM_STATS>
+      <MAX_TDD_PERIODICITY_SLOTS>100</MAX_TDD_PERIODICITY_SLOTS>
+-->
+   </GLOBAL_CFG>
 </DU_CFG_PARAMS>