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/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