Modify 4x4 60MHz COTS UE test to use nFAPI

Modify the existing 4x4 60MHz USRP+COTS UE test to use nFAPI. The
throughput tests remain the same.

ci-scripts/conf_files/gnb-pnf.band77.usrpn310.4x4.conf

@@ -0,0 +1,31 @@
+usrp-tx-thread-config = 1;
+tune-offset = 30720000;
+
+L1s = ({
+  num_cc = 1;
+  tr_n_preference = "nfapi";
+  remote_n_address = "127.0.0.1"; // vnf addr
+  local_n_address  = "127.0.0.1"; // pnf addr
+  local_n_portc    = 50000; // pnf p5 port [!]
+  remote_n_portc   = 50001; // vnf p5 port
+  local_n_portd    = 50010; // pnf p7 port
+  remote_n_portd   = 50011; // vnf p7 port
+  prach_dtx_threshold = 120;
+  pusch_dtx_threshold = 20;
+  max_ldpc_iterations = 10;
+});
+
+RUs = ({
+  local_rf       = "yes"
+  nb_tx          = 4;
+  nb_rx          = 4;
+  att_tx         = 0;
+  att_rx         = 0;
+  bands          = [77];
+  max_pdschReferenceSignalPower = -27;
+  max_rxgain     = 75;
+  eNB_instances  = [0];
+  #clock_src = "internal";
+  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
+});
+

ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf

@@ -2,9 +2,6 @@ Active_gNBs = ( "gNB-OAI");
 # Asn1_verbosity, choice in: none, info, annoying
 Asn1_verbosity = "none";
 
-usrp-tx-thread-config = 1;
-tune-offset = 30720000;
-
 gNBs =
 (
  {
@@ -90,7 +87,7 @@ gNBs =
         powerRampingStep                                            = 1;
 #ra_ReponseWindow
 #1,2,4,8,10,20,40,80
-        ra_ResponseWindow                                           = 4;
+        ra_ResponseWindow                                           = 5;
 #ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
 #1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
         ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR                = 4;
@@ -180,7 +177,14 @@ gNBs =
 MACRLCs = (
 {
   num_cc                      = 1;
-  tr_s_preference             = "local_L1";
+  tr_s_preference = "nfapi";
+  remote_s_address = "127.0.0.1"; // pnf addr [!]
+  local_s_address  = "127.0.0.1"; // vnf addr
+  local_s_portc    = 50001; // vnf p5 port
+  remote_s_portc   = 50000; // pnf p5 port [!]
+  local_s_portd    = 50011; // vnf p7 port [!]
+  remote_s_portd   = 50010; // pnf p7 port [!]
+
   tr_n_preference             = "local_RRC";
   pusch_TargetSNRx10          = 250;
   pucch_TargetSNRx10          = 250;
@@ -189,33 +193,6 @@ MACRLCs = (
 }
 );
 
-L1s = (
-{
-  num_cc = 1;
-  tr_n_preference = "local_mac";
-  prach_dtx_threshold = 120;
-  pusch_dtx_threshold = 20;
-  max_ldpc_iterations = 10;
-}
-);
-
-RUs = (
-{
-  local_rf       = "yes"
-  nb_tx          = 4;
-  nb_rx          = 4;
-  att_tx         = 0;
-  att_rx         = 0;
-  bands          = [77];
-  max_pdschReferenceSignalPower = -27;
-  max_rxgain     = 75;
-  eNB_instances  = [0];
-  #clock_src = "internal";
-  sdr_addrs = "addr=192.168.80.53, clock_source=internal,time_source=internal"
-
-}
-);
-
 security = {
   # preferred ciphering algorithms
   # the first one of the list that an UE supports in chosen

ci-scripts/xml_files/container_sa_n310_4X4_60MHz_quectel.xml

@@ -22,7 +22,7 @@
 -->
 <testCaseList>
   <htmlTabRef>TEST-SA-FR1-N310-4x4-60MHz</htmlTabRef>
-  <htmlTabName>60 MHz 4x4 TDD SA</htmlTabName>
+  <htmlTabName>nFAPI 60 MHz 4x4 TDD SA</htmlTabName>
   <htmlTabIcon>tasks</htmlTabIcon>
   <TestCaseRequestedList>
     100000
@@ -85,7 +85,7 @@
   </testCase>
   <testCase id="030101">
       <class>Deploy_Object</class>
-      <desc>Deploy gNB (TDD/Band77/60MHz/N310) in a container</desc>
+      <desc>Deploy VNF-PNF (TDD/Band77/60MHz/N310) in a container</desc>
       <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
       <eNB_instance>0</eNB_instance>
       <eNB_serverId>0</eNB_serverId>
@@ -144,11 +144,11 @@
   <testCase id="030201">
     <class>Undeploy_Object</class>
     <always_exec>true</always_exec>
-    <desc>Undeploy gNB</desc>
+    <desc>Undeploy VNF-PNF</desc>
     <yaml_path>ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz</yaml_path>
     <eNB_instance>0</eNB_instance>
     <eNB_serverId>0</eNB_serverId>
-    <services>oai-gnb</services>
+    <services>oai-vnf oai-pnf</services>
     <d_retx_th>10,100,100,100</d_retx_th>
     <u_retx_th>10,100,100,100</u_retx_th>
   </testCase>

ci-scripts/yaml_files/5g_sa_n310_4x4_60MHz/docker-compose.yml

@@ -1,8 +1,8 @@
 services:
-    oai-gnb:
+    oai-vnf:
         image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
         network_mode: "host"
-        container_name: oai-gnb
+        container_name: oai-vnf
         cap_drop:
             - ALL
         cap_add:
@@ -10,9 +10,30 @@ services:
             - IPC_LOCK
         environment:
             TZ: Europe/Paris
-            USE_ADDITIONAL_OPTIONS: --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --nfapi VNF
+            NFAPI_TRACE_LEVEL: info
         volumes:
-            - ../../conf_files/gnb.sa.band77.162prb.usrpn310.4x4.conf:/opt/oai-gnb/etc/gnb.conf
+            - ../../conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf:/opt/oai-gnb/etc/gnb.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+    oai-pnf:
+        image: ${REGISTRY:-oaisoftwarealliance}/${GNB_IMG:-oai-gnb}:${TAG:-develop}
+        network_mode: "host"
+        container_name: oai-pnf
+        cap_drop:
+            - ALL
+        cap_add:
+            - SYS_NICE
+            - IPC_LOCK
+        environment:
+            TZ: Europe/Paris
+            USE_ADDITIONAL_OPTIONS: --nfapi PNF
+            NFAPI_TRACE_LEVEL: info
+        volumes:
+            - ../../conf_files/gnb-pnf.band77.usrpn310.4x4.conf:/opt/oai-gnb/etc/gnb.conf
         healthcheck:
             test: /bin/bash -c "pgrep nr-softmodem"
             interval: 10s