O-RAN E Maintenance Release contribution for ODULOW

[o-du/phy.git] / fhi_lib / test / test_xran / u_plane_functional.cc

diff --git a/fhi_lib/test/test_xran/u_plane_functional.cc b/fhi_lib/test/test_xran/u_plane_functional.cc
index 5dba388..13afda3 100644 (file)
--- a/fhi_lib/test/test_xran/u_plane_functional.cc
+++ b/fhi_lib/test/test_xran/u_plane_functional.cc
@@ -1,6 +1,6 @@
 /******************************************************************************
 *
-*   Copyright (c) 2019 Intel.
+*   Copyright (c) 2020 Intel.
 *
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 *
 *******************************************************************************/
 
-
 #include "common.hpp"
 #include "xran_common.h"
 #include "xran_up_api.h"
@@ -44,7 +43,7 @@ protected:
             return;
         }
         iq_offset = rte_pktmbuf_mtod(test_buffer, char * );
-        iq_offset = iq_offset + sizeof(struct ether_hdr) +
+        iq_offset = iq_offset + sizeof(struct rte_ether_hdr) +
                                     sizeof (struct xran_ecpri_hdr) +
                                     sizeof (struct radio_app_common_hdr) +
                                     sizeof(struct data_section_hdr);
@@ -74,6 +73,7 @@ TEST_P(U_planeCheck, Test_DLUL)
     uint8_t seq_id =0;
     uint32_t do_copy = 0;
     uint8_t compMeth = 0;
+    enum xran_comp_hdr_type staticEn = XRAN_COMP_HDR_TYPE_DYNAMIC;
     uint8_t iqWidth =  16;
 
     int32_t prep_bytes;
@@ -88,7 +88,7 @@ TEST_P(U_planeCheck, Test_DLUL)
     prep_bytes = prepare_symbol_ex(direction,
                                 section_id,
                                 test_buffer,
-                                (struct rb_map *)iq_offset,
+                                (uint8_t *)iq_offset,
                                 compMeth,
                                 iqWidth,
                                 iq_buf_byte_order,
@@ -101,24 +101,25 @@ TEST_P(U_planeCheck, Test_DLUL)
                                 CC_ID,
                                 RU_Port_ID,
                                 seq_id,
-                                do_copy);
+                                do_copy,
+                                staticEn);
 
     ASSERT_EQ(prep_bytes, 3168);
 
     pChar = rte_pktmbuf_mtod(test_buffer, char*);
 
-    ecpri_hdr = (struct xran_ecpri_hdr *)(pChar + sizeof(struct ether_hdr));
-    app_hdr = (struct radio_app_common_hdr *)(pChar + sizeof(struct ether_hdr)
+    ecpri_hdr = (struct xran_ecpri_hdr *)(pChar + sizeof(struct rte_ether_hdr));
+    app_hdr = (struct radio_app_common_hdr *)(pChar + sizeof(struct rte_ether_hdr)
                                               + sizeof (struct xran_ecpri_hdr));
-    section_hdr = (struct data_section_hdr *)(pChar + sizeof(struct ether_hdr) +
+    section_hdr = (struct data_section_hdr *)(pChar + sizeof(struct rte_ether_hdr) +
                                             sizeof (struct xran_ecpri_hdr) +
                                             sizeof(struct radio_app_common_hdr));
 
-    ASSERT_EQ (ecpri_hdr->cmnhdr.ecpri_mesg_type,  ECPRI_IQ_DATA);
-    payl_size =  rte_be_to_cpu_16(ecpri_hdr->cmnhdr.ecpri_payl_size);
+    ASSERT_EQ (ecpri_hdr->cmnhdr.bits.ecpri_mesg_type,  ECPRI_IQ_DATA);
+    payl_size =  rte_be_to_cpu_16(ecpri_hdr->cmnhdr.bits.ecpri_payl_size);
     ASSERT_EQ (payl_size,  3180);
 
-    ASSERT_EQ(app_hdr->data_direction, direction);
+    ASSERT_EQ(app_hdr->data_feature.data_direction, direction);
     ASSERT_EQ(app_hdr->frame_id, frame_id);
 
     res_sect.fields.all_bits = rte_be_to_cpu_32(section_hdr->fields.all_bits);
@@ -128,7 +129,7 @@ TEST_P(U_planeCheck, Test_DLUL)
     {
         /* UL direction */
         void *iq_samp_buf;
-        struct ecpri_seq_id seq;
+        union ecpri_seq_id seq;
         int num_bytes = 0;
 
         uint8_t CC_ID = 0;
@@ -168,6 +169,7 @@ TEST_P(U_planeCheck, Test_DLUL)
                                 &rb,
                                 &sect_id,
                                 0,
+                                XRAN_COMP_HDR_TYPE_DYNAMIC,
                                 &compMeth,
                                 &iqWidth);