Merge remote-tracking branch 'origin/fix-testbenches-doc' into integration_2022_wk29

doc/TESTBenches.md

@@ -9,19 +9,19 @@
 
 | Machine       | IP address      | Lockable Resource     | Function           | Connected devices                                     |
 | ------------- | --------------- | --------------------- | ------------------ | ----------------------------------------------------- |
-| asterix       | 172.21.16.127   | CI-Asterix-Usage      | gNB                | 173.21.19.14                                          |
-| obelix        | 172.21.16.128   | CI-Obelix-Usage       | eNB, UE (5G)       | 172.21.19.13, X300 (192.168.60.2), B200mini (30C51EB) |
+| asterix       | 172.21.16.127   | CI-Asterix-Usage      | gNB (n78)          | 173.21.19.14                                          |
+| obelix        | 172.21.16.128   | CI-Obelix-Usage       | eNB (n40, n78), nrUE | 172.21.19.13, X300 (192.168.60.2), B200mini (30C51EB) |
 | porcepix      | 172.21.16.136   | CI-NSA-MiniBench      | Executor, EPC, 5GC | --                                                    |
 | nrmodule2     | 172.21.16.139   | CI-NSA-MiniBench      | Quectel            | Quectel module                                        |
-| nepes         | 172.21.16.137   | CI-NSA-MiniBench      | gNB                | B200mini (30C51D4)                                    |
+| nepes         | 172.21.16.137   | CI-NSA-MiniBench      | gNB (n78)          | B200mini (30C51D4)                                    |
 | caracal       | 172.21.16.132   | CI-Caracal            | gNB/phytest        | N300 (192.168.10.2)                                   |
 | idefix        | 172.21.16.135   | CI-NSA-MiniBench      | Quectel            | Quectel module                                        |
-| amariue       | 172.21.16.144   | CI-Amarisoft-UE-Usage | TBD                | Amarisoft UE simulator                                |
+| amariue       | 172.21.16.144   | CI-Amarisoft-UE-Usage | nrUE               | Amarisoft UE simulator                                |
 | bellatrix     | 192.168.117.115 | CI-RAN-VM-Deployment  | Executor           | --                                                    |
 | nano          | 192.168.12.62   | CI-Bench-1-Phones     | EPC, adb           | 2x COTS (adb)                                         |
 | hutch         | 192.168.12.19   | CI-Bench-1-Phones     | eNB (B7)           | B200mini (30C5239)                                    |
 | starsky       | 192.168.12.18   | CI-Bench-1-Phones     | eNB (B40)          | b200mini (30A3E3C)                                    |
-| carabe        | 192.168.12.211  | CI-Bench-2-OAI-Phone  | UE 4G (B)          | B200mini (30AE8C9)                                    |
+| carabe        | 192.168.12.211  | CI-Bench-2-OAI-Phone  | UE (B7UE)          | B200mini (30AE8C9)                                    |
 
 Note: The available resources, and their current usage, is indicated here:
 - [Lockable resources of jenkins-oai](https://jenkins-oai.eurecom.fr/lockable-resources/):
@@ -40,7 +40,7 @@ Note: The available resources, and their current usage, is indicated here:
 
 ### OTA Testbench
 
-[Proper image to be followed up. TBD: add antennas/circulators]
+**Purpose**: Over-the-air 4G/5G (NSA/SA) tests
 
 Note: obelix and porcepix are both used in the OTA testbench and the 5G
 NSA/Faraday Cage testbench!

doc/testbenches_doc_resources/5g-nsa-faraday-bench.tex

@@ -30,7 +30,7 @@
   \draw (obelix) -- (b210o);
   \node[above right=0.35cm of faraday.south west] (antn)
     {\includegraphics[width=0.3cm]{antenna}};
-  \draw (b210n) -| node [pos=0.2, duplexer] {B78} (antn);
+  \draw (b210n) -| node [pos=0.2, duplexer] {n78} (antn);
 
   \node[left=5cm of faraday, label=above:porcepix] (porcepix)
     {\includegraphics[width=1.2cm]{server}};

doc/testbenches_doc_resources/5g-ota-bench.tex

@@ -21,7 +21,7 @@
     edge (porcepix);
   \node[right=0.3cm of asterix, label=above:N310] (n310a)
     {\includegraphics[width=1.5cm]{n310}} edge (asterix);
-  \node[right=.2cm of n310a, duplexer] (b78o) {B78} edge (n310a);
+  \node[right=.2cm of n310a, duplexer] (b78o) {n78} edge (n310a);
   \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)
@@ -32,20 +32,20 @@
     edge (porcepix);
   \node[above right=-0.5cm and 0.3cm of obelix, label=above:N310] (n310o)
     {\includegraphics[width=1.5cm]{n310}} edge (obelix);
-  \node[right=.2cm of n310o, duplexer] (b78o) {B40} edge (n310o);
+  \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) {B78} edge (x310o);
+  \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[right=5.0cm of n310o, label=above:RM500Q-GL] (quectel)
+  \node[above right=-1.3cm and 5.0cm of n310a.east, label=above:RM500Q-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);
@@ -59,5 +59,10 @@
     {\includegraphics[width=1.2cm]{server}}
     edge (quectel);
 
+  \node[above right=-0.3cm and 5.0cm of x310o.east, label=above:amariue] (amariue)
+    {\includegraphics[height=1.2cm]{server}};
+  \node[left=0.8cm of amariue.west] (aa1)
+    {\includegraphics[width=0.3cm]{antenna}} edge (amariue);
+
 \end{tikzpicture}
 \end{document}