fix ZMQ config files

configs/zmq/gnb_zmq.yaml

@@ -3,9 +3,18 @@
 # To run the srsRAN Project gNB with this config, use the following command: 
 #   sudo ./gnb -c gnb_zmq.yaml
 
-amf:
-  addr: 10.53.1.2                  # The address or hostname of the AMF.
-  bind_addr: 10.53.1.1             # A local IP that the gNB binds to for traffic from the AMF.
+cu_cp:
+  amf:
+    addr: 10.53.1.2                 # The address or hostname of the AMF.
+    port: 38412
+    bind_addr: 10.53.1.1            # A local IP that the gNB binds to for traffic from the AMF.
+    supported_tracking_areas:
+      - tac: 7
+        plmn_list:
+          - plmn: "00101"
+            tai_slice_support_list:
+              - sst: 1
+  inactivity_timer: 7200            # Sets the UE/PDU Session/DRB inactivity timer to 7200 seconds. Supported: [1 - 7200].
 
 ru_sdr:
   device_driver: zmq                # The RF driver name.
@@ -31,20 +40,13 @@ cell_cfg:
   prach:
     prach_config_index: 1           # Sets PRACH config to match what is expected by srsUE
 
-cu_cp:
-  inactivity_timer: 7200            # Sets the UE/PDU Session/DRB inactivity timer to 7200 seconds. Supported: [1 - 7200].
-
 log:
   filename: /tmp/gnb.log            # Path of the log file.
+  all_level: info                   # Logging level applied to all layers.
   hex_max_size: 0
 
 pcap:
   mac_enable: false                 # Set to true to enable MAC-layer PCAPs.
   mac_filename: /tmp/gnb_mac.pcap   # Path where the MAC PCAP is stored.
   ngap_enable: false                # Set to true to enable NGAP PCAPs.
-  ngap_filename: /tmp/gnb_ngap.pcap # Path where the NGAP PCAP is stored.
-
-metrics:
-    enable_json_metrics: true
-    addr: 172.19.1.4
-    port: 55555
+  ngap_filename: /tmp/gnb_ngap.pcap # Path where the NGAP PCAP is stored.

configs/zmq/ue_zmq.conf

@@ -19,12 +19,11 @@ max_nof_prb = 106
 nof_prb = 106
 
 [pcap]
-enable = mac_nr, nas
+enable = none
 mac_filename = /tmp/ue_mac.pcap
 mac_nr_filename = /tmp/ue_mac_nr.pcap
 nas_filename = /tmp/ue_nas.pcap
 
-
 [log]
 all_level = info
 phy_lib_level = none
@@ -34,7 +33,7 @@ file_max_size = -1
 
 [usim]
 mode = soft
-algo = opc
+algo = milenage
 opc  = 63BFA50EE6523365FF14C1F45F88737D
 k    = 00112233445566778899aabbccddeeff
 imsi = 001010123456780
@@ -49,9 +48,10 @@ apn = srsapn
 apn_protocol = ipv4
 
 [gw]
-#netns = ue1
-#ip_devname = tun_srsue
-#ip_netmask = 255.255.255.0
+netns = ue1
+ip_devname = tun_srsue
+ip_netmask = 255.255.255.0
 
 [gui]
 enable = false
+