diff --git a/ci-scripts/ci_infra.yaml b/ci-scripts/ci_infra.yaml index 31706446f6..d1cfe3130a 100644 --- a/ci-scripts/ci_infra.yaml +++ b/ci-scripts/ci_infra.yaml @@ -26,16 +26,13 @@ up2-fhi72: IF: wwan0 MTU: 1500 -sphex_quectel: - Host: sphex - InitScript: sudo stdbuf -oL /home/oaicicd/quectel-CM/quectel-CM -4 -s oai.ipv4 &> /tmp/quecel-cm.log & - TermScript: sudo -S killall --signal SIGKILL quectel-CM - AttachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 wup - DetachScript: sudo python3 ci_ctl_qtel.py /dev/ttyUSB3 detach +up2-aerial: + Host: up2 + AttachScript: sudo /opt/mbim-aerial/start_quectel_mbim.sh + DetachScript: sudo /opt/mbim-aerial/stop_quectel_mbim.sh NetworkScript: ip a show dev wwan0 IF: wwan0 MTU: 1500 - LogStore: /media/ci_qlogs adb_ue_1: Host: nano diff --git a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf index 58fc70043f..4250ec5571 100644 --- a/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf +++ b/ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf @@ -30,6 +30,7 @@ gNBs = ////////// Physical parameters: pdsch_AntennaPorts_XP = 2; + pdsch_AntennaPorts_N1 = 2; pusch_AntennaPorts = 2; do_CSIRS = 1; do_SRS = 0; @@ -166,10 +167,10 @@ gNBs = # pattern1 # dl_UL_TransmissionPeriodicity # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10 - dl_UL_TransmissionPeriodicity = 5; #6; - nrofDownlinkSlots = 3; #7; - nrofDownlinkSymbols = 6; - nrofUplinkSlots = 1; #2; + dl_UL_TransmissionPeriodicity = 6; #5; + nrofDownlinkSlots = 6; #3; + nrofDownlinkSymbols = 10; #6; + nrofUplinkSlots = 3; #1; nrofUplinkSymbols = 0; ssPBCH_BlockPower = -25; diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel.xml b/ci-scripts/xml_files/container_sa_aerial_quectel.xml index 7d7e992c12..877b694e61 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel.xml @@ -28,17 +28,14 @@ 111111 000222 - 001111 800813 002222 002223 000111 - 100000 000011 000022 000033 000222 - 003333 222222 @@ -50,17 +47,13 @@ oai-gnb-aerial - - Initialize_UE - Initialize Quectel - sphex_quectel - Create_Workspace Creating new Workspace for server 0 0 0 + Deploy_Object Deploy PNF/Nvidia CUBB in a container @@ -69,6 +62,7 @@ 0 0 + Deploy_Object Deploy VNF in a container @@ -81,40 +75,33 @@ Attach_UE Attach Quectel - sphex_quectel - - - - Custom_Command - Adding a IP route - sphex - sudo ip route add 192.168.71.128/26 via 12.1.1.151 dev wwan0 + up2-aerial Ping Ping: 100pings in 20sec - sphex_quectel + up2-aerial -c 100 -i 0.2 %cn_ip% 5 Iperf - iperf (DL/UDP/80M)(30 sec)(single-ue profile) - -u -b 150M -t 30 -R + iperf (DL/UDP/700M)(30 sec)(single-ue profile) + -u -b 700M -t 30 -R porcepix-cn5g - sphex_quectel + up2-aerial 25 80 Iperf - iperf (UL/UDP/40M)(30 sec)(single-ue profile) - -u -b 40M -t 30 + iperf (UL/UDP/50M)(30 sec)(single-ue profile) + -u -b 50M -t 30 porcepix-cn5g - sphex_quectel + up2-aerial 25 80 @@ -122,13 +109,7 @@ Detach_UE Detach Quectel - sphex_quectel - - - - Terminate_UE - Terminate Quectel - sphex_quectel + up2-aerial diff --git a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml b/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml index 23ecc5195e..4a8a88fd8a 100644 --- a/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml +++ b/ci-scripts/xml_files/container_sa_aerial_quectel_cleanup.xml @@ -28,7 +28,6 @@ 000000 111111 222222 - 333333 @@ -49,13 +48,7 @@ Detach_UE Terminate UE - sphex_quectel - - - - Terminate_UE - Terminate UE - sphex_quectel + up2-aerial diff --git a/doc/TESTBenches.md b/doc/TESTBenches.md index ec918a6e33..77aab0a487 100644 --- a/doc/TESTBenches.md +++ b/doc/TESTBenches.md @@ -38,7 +38,7 @@ Note: The available resources, and their current usage, is indicated here: ![5G OTA Testbench](testbenches_doc_resources/5g-ota-bench.png) -[PDF version](testbenches_doc_resources/5g-ota-bench.pdf) | [LaTeX/TikZ version](testbenches_doc_resources/5g-ota-bench.tex) if you want to modify to reflect your setup +[LaTeX/TikZ version](testbenches_doc_resources/5g-ota-bench.tex) if you want to modify to reflect your setup ### 5G NSA/Faraday Cage Testbench @@ -193,7 +193,7 @@ information on how the images are built. - OpenShift cluster for CN deployment and container images for gNB and UE deployment - [RAN-SA-AERIAL-CN5G](https://jenkins-oai.eurecom.fr/job/RAN-SA-AERIAL-CN5G/) ~5G-NR - - 5G-NR SA test setup: OAI VNF + PNF/NVIDIA CUBB on Aerial2 (U22) + Foxconn RU, sphex + COTS UE (Quectel RM520N), OAI CN5G + - 5G-NR SA test setup: OAI VNF + PNF/NVIDIA CUBB on Aerial2 (U22) + Foxconn RU, up2 + COTS UE (Quectel RM520N), OAI CN5G - container images for gNB deployment - [RAN-SA-2x2-Module-CN5G](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-SA-2x2-Module-CN5G/) ~5G-NR diff --git a/doc/testbenches_doc_resources/5g-ota-bench.pdf b/doc/testbenches_doc_resources/5g-ota-bench.pdf deleted file mode 100644 index 3dc2e39e80..0000000000 Binary files a/doc/testbenches_doc_resources/5g-ota-bench.pdf and /dev/null differ diff --git a/doc/testbenches_doc_resources/5g-ota-bench.png b/doc/testbenches_doc_resources/5g-ota-bench.png index 1a84e4dd20..e72263629d 100644 Binary files a/doc/testbenches_doc_resources/5g-ota-bench.png and b/doc/testbenches_doc_resources/5g-ota-bench.png differ diff --git a/doc/testbenches_doc_resources/5g-ota-bench.tex b/doc/testbenches_doc_resources/5g-ota-bench.tex index 0ffd01fa63..818d10f0fe 100644 --- a/doc/testbenches_doc_resources/5g-ota-bench.tex +++ b/doc/testbenches_doc_resources/5g-ota-bench.tex @@ -16,9 +16,23 @@ \node[label=above:porcepix] (porcepix) {\includegraphics[width=1.2cm]{server}}; - \node[above right=-0.4cm and 2cm of porcepix, label=above:matix] (matix) + \node[above right=-0.8cm and 2cm of porcepix, label=above:aerial2] (aerial2) {\includegraphics[width=1.2cm]{server}} edge (porcepix); + \node[right=0.3cm of aerial2, label=above:Foxconn, draw, + minimum width=1.7cm, minimum height=0.8cm] (foxconn) + {O-RU} edge (aerial2); + \node[below right=+0.45cm and 0.35cm of foxconn.east] (antf1) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + \node[below right=-0.1cm and 0.35cm of foxconn.east] (antf2) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + \node[above right=-0.1cm and 0.35cm of foxconn.east] (antf3) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + \node[above right=+0.45cm and 0.35cm of foxconn.east] (antf4) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + + \node[above right=+1.3cm and 2cm of porcepix, label=above:matix] (matix) + {\includegraphics[width=1.2cm]{server}}; \node[right=0.3cm of matix, label=above:N310] (n310a) {\includegraphics[width=1.5cm]{n310}} edge (matix); \node[right=.2cm of n310a, duplexer] (b77o) {n77} edge (n310a); @@ -27,25 +41,35 @@ \node[above right=-0.1cm and 0.35cm of b77o.east] (anto2) {\includegraphics[width=0.3cm]{antenna}} edge (b77o); - \node[below right=-0.4cm and 2cm of porcepix, label=above:obelix] (obelix) + \node[below right=-0.6cm and 2cm of porcepix, label=above:obelix] (obelix) {\includegraphics[width=1.2cm]{server}} edge (porcepix); - \node[above right=-0.5cm and 0.3cm of obelix, label=above:N310] (n310o) + \node[right=0.3cm of obelix, label=above:N310] (n310o) {\includegraphics[width=1.5cm]{n310}} edge (obelix); \node[right=.2cm of n310o, duplexer] (b78o) {n40} edge (n310o); - \node[below right=-0.1cm and 0.35cm of b78o.east] (anto1) - {\includegraphics[width=0.3cm]{antenna}} edge (b78o); - \node[above right=-0.1cm and 0.35cm of b78o.east] (anto2) - {\includegraphics[width=0.3cm]{antenna}} edge (b78o); - \node[below right=-0.5cm and 0.3cm of obelix, label=above:X310] (x310o) - {\includegraphics[width=1.5cm]{x310}} edge (obelix); - \node[right=.2cm of x310o, duplexer] (b78o) {n78} edge (x310o); \node[below right=-0.1cm and 0.35cm of b78o.east] (anto1) {\includegraphics[width=0.3cm]{antenna}} edge (b78o); \node[above right=-0.1cm and 0.35cm of b78o.east] (anto2) {\includegraphics[width=0.3cm]{antenna}} edge (b78o); - \node[above right=-0.5cm and 5.0cm of n310o.east, label=above:RM520N-GL] (quectel) + \node[below=2cm of porcepix, label=above:Cluster] (cluster) + {\includegraphics[width=1.2cm]{server}}; + \node[right=2cm of cluster, label=above:cacofonix] (cacofonix) + {\includegraphics[width=1.2cm]{server}} + edge (cluster); + \node[right=0.3cm of cacofonix, label=above:VVDN, draw, + minimum width=1.7cm, minimum height=0.8cm] (vvdn) + {O-RU} edge (cacofonix); + \node[below right=+0.45cm and 0.35cm of vvdn.east] (antv1) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + \node[below right=-0.1cm and 0.35cm of vvdn.east] (antv2) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + \node[above right=-0.1cm and 0.35cm of vvdn.east] (antv3) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + \node[above right=+0.45cm and 0.35cm of vvdn.east] (antv4) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + + \node[above right=+0.0cm and 5.0cm of n310o.east, label=above:RM520N-GL] (quectel) {\includegraphics[height=1.2cm]{quectel}}; \node[above left=-0.1cm and 0.8cm of quectel.west] (aq2) {\includegraphics[width=0.3cm]{antenna}} edge (quectel);