Update TESTBenches.md to reflect current stetup

doc/TESTBenches.md

@@ -6,25 +6,25 @@
 
 | Machine       | IP address      | Lockable Resource     | Function           | Connected devices                                     |
 | ------------- | --------------- | --------------------- | ------------------ | ----------------------------------------------------- |
-| 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 (n78)          | B200mini (30C51D4)                                    |
+| asterix       | 172.21.16.127   | CI-Asterix-Usage      | gNB (n78)          | 172.21.19.14                                          |
+| obelix        | 172.21.16.128   | CI-Obelix-Usage       | eNB (n40, n78), nrUE | 172.21.19.13, X300 (192.168.60.2)                   |
+| porcepix      | 172.21.16.136   | CI-Porcepix           | Executor, EPC, 5GC | --                                                    |
+| nrmodule2     | 172.21.16.139   | CI-NrModule2          | Quectel            | Quectel module                                        |
+| nepes         | 172.21.16.137   | CI-Nepes              | gNB (n78), EPC/5GC | B200mini (30C51EB)                                    |
+| ofqot         | 172.21.16.109   | CI-Ofqot              | gNB (n78)          | B200mini (30C51D4)                                    |
+| idefix        | 172.21.16.135   | CI-Idefix             | Quectel            | Quectel module                                        |
 | 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 | nrUE               | Amarisoft UE simulator                                |
-| bellatrix     | 192.168.117.115 | CI-RAN-VM-Deployment  | Executor           | --                                                    |
-| nano          | 172.21.18.48    | CI-Bench-1-Phones     | EPC, adb           | 2x COTS (adb)                                         |
-| hutch         | 172.21.18.46    | CI-Bench-1-Phones     | eNB (B7)           | B200mini (30C5239)                                    |
-| starsky       | 172.21.18.45    | CI-Bench-1-Phones     | eNB (B40)          | b200mini (30A3E3C)                                    |
-| carabe        | 172.21.18.47    | CI-Bench-2-OAI-Phone  | UE (B7UE)          | B200mini (30AE8C9)                                    |
+| manarola      | 172.21.8.116    | _None_                | gNB                | AW2S                                                  |
+| nano          | 172.21.18.48    | CI-Nano-Legacy-EPC    | Executor, EPC, adb | 2x COTS (adb)                                         |
+| hutch         | 172.21.18.46    | CI-Hutch-Legacy-FDD-eNB | eNB (B7)           | B200mini (30C5239)                                  |
+| starsky       | 172.21.18.45    | CI-Starsky-Legacy-TDD-eNB       | eNB (B40)  | b200mini (30A3E3C)                                  |
+| carabe        | 172.21.18.47    | CI-Carabe-Legacy-FDD-OAI-LTE-UE | UE (B7UE)  | B200mini (30AE8C9)                                  |
+| nokiabox      | 172.21.19.39    | _None_                | gNB (Nokia), 5GC   | _Nokia RF integrated_                                 |
 
 Note: The available resources, and their current usage, is indicated here:
 - [Lockable resources of jenkins-oai](https://jenkins-oai.eurecom.fr/lockable-resources/):
   "New" Jenkins, i.e., with RAN-Container-Parent
-- [Lockable resources of open5glab jenkins](https://open5glab.eurecom.fr:8083/jenkins/lockable-resources/):
-  "Old" Jenkins, i.e., with RAN-CI-Develop
 
 ## Networked devices
 
@@ -35,37 +35,39 @@ Note: The available resources, and their current usage, is indicated here:
 
 ## Testbenches
 
-### OTA Testbench
+### 5G OTA Testbench
 
-**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!
+**Purpose**: Over-the-air 4G/5G (NSA/SA) tests, performance tests
 
 ![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
 
-### 5G NSA/Faraday Cage Testbench
 
-**Purpose**: Faraday cage 5G tests
+### 5G NSA/Faraday Cage Testbench
 
-Note: obelix and porcepix are both used in the OTA testbench and the 5G
-NSA/Faraday Cage testbench!
+**Purpose**: Faraday cage 5G tests, functional tests
 
 ![5G NSA/Faraday Cage Testbench](testbenches_doc_resources/5g-nsa-faraday-bench.png)
 
 [PDF version](testbenches_doc_resources/5g-nsa-faraday-bench.pdf) | [LaTeX/TikZ version](testbenches_doc_resources/5g-nsa-faraday-bench.tex) if you want to modify to reflect your setup
 
+### 5G AW2S Testbench
+
+**Purpose**: AW2S tests with Amarisoft
+
+Picture: TBD
+
+
 ### 4G Testbench(es)
 
 **Purpose**: 4G/LTE testbenches
 
-
 ![4G Faraday Cage Testbench](testbenches_doc_resources/4g-faraday-bench.png)
 
 [PDF version](testbenches_doc_resources/4g-faraday-bench.pdf) | [LaTeX/TikZ version](testbenches_doc_resources/4g-faraday-bench.tex) if you want to modify to reflect your setup
 
+
 ## Pipelines
 
 ### [RAN-Container-Parent](https://jenkins-oai.eurecom.fr/job/RAN-Container-Parent/)
@@ -76,50 +78,48 @@ Webhook
 - [RAN-cppcheck](https://jenkins-oai.eurecom.fr/job/RAN-cppcheck/1664/)
   - obelix
   - performs static code analysis, currently not actively enforced
-- [RAN-gNB-nrUE-MONO-TDD-Band78-N300](https://jenkins-oai.eurecom.fr/job/RAN-gNB-nrUE-MONO-TDD-Band78-N300/)
+- [RAN-gNB-N300-Timing-Phytest-LDPC](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-gNB-N300-Timing-Phytest-LDPC/)
   - caracal + N310
-  - pure performance test through phy-test scheduler, see command line for more
-    details
+  - pure performance test through phy-test scheduler, see command line for more details
 - [RAN-L2-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-4G/)
   - obelix (eNB, 1x UE, OAI EPC)
   - L2simulator: skips physical layer and uses proxy between eNB and UE
 - [RAN-L2-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-L2-Sim-Test-5G/)
   - obelix (gNB, 1x UE, OAI 5GC)
-  - L2simulator: skips physical layer and uses proxy between gNB and UE,
-    currently only ping
+  - L2simulator: skips physical layer and uses proxy between gNB and UE, currently only ping
+- [RAN-LTE-FDD-LTEBOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-LTE-FDD-LTEBOX-Container/)
+  - hutch + B210, nano w/ ltebox + 2x UE
+  - tests RRC inactivity timers, different bandwidths
+- [RAN-LTE-TDD-LTEBOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-LTE-TDD-LTEBOX-Container/)
+  - starsky + B210, nano w/ ltebox + 2x UE
+  - TM1 over bandwidths 5, 10, 20 MHz in Band 40, default scheduler for 20 MHz
 - [RAN-NSA-B200-Module-LTEBOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-NSA-B200-Module-LTEBOX-Container/)
-  - obelix + B200, nepes + B200, idefix + Quectel, porcepix w/ ltebox
+  - nepes + B200 (eNB), ofqot + B200 (gNB), idefix + Quectel, nepes w/ ltebox
   - basic NSA test
-- [RAN-SA-B200-Module-SABOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-SA-B200-Module-SABOX-Container/)
-  - obelix + B200, nepes + B200, idefix + Quectel, porcepix w/ sabox
-  - basic SA test (40 MHz TDD)
 - [RAN-PhySim-Cluster](https://jenkins-oai.eurecom.fr/job/RAN-PhySim-Cluster/)
-  - poseidon (jumphost, `Asterix-OC-oaicicd-session` resource), tests in
-    OpenShift Cluster
+  - cluster (`Asterix-OC-oaicicd-session` resource), tests in OpenShift Cluster
   - unitary simulators (`nr_dlsim`, etc.)
 - [RAN-RF-Sim-Test-4G](https://jenkins-oai.eurecom.fr/job/RAN-RF-Sim-Test-4G/)
-  - obelix (eNB, 1x UE, OAI EPC)
+  - obelix (eNB, lteUE, OAI EPC)
   - uses RFsimulator, for FDD 5, 10, 20MHz with core, 5MHz noS1
 - [RAN-RF-Sim-Test-5G](https://jenkins-oai.eurecom.fr/job/RAN-RF-Sim-Test-5G/)
-  - obelix (gNB, 2x UE, OAI 5GC)
+  - obelix (gNB, nrUE, OAI 5GC)
   - uses RFsimulator, TDD 40MHz, FDD 40MHz, F1 split
 - [RAN-RHEL8-Cluster-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-RHEL8-Cluster-Image-Builder/)
-  - poseidon (jumphost, `Asterix-OC-oaicicd-session` resource): RHEL 8 image
-    build using the OpenShift Cluster
-- [RAN-Ubuntu18-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
-  - obelix: Ubuntu 18 image build using docker
+  - cluster (`Asterix-OC-oaicicd-session` resource): RHEL 8 image build using the OpenShift Cluster
+- [RAN-SA-B200-Module-SABOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-SA-B200-Module-SABOX-Container/)
+  - ofqot + B200, idefix + Quectel, nepes w/ sabox
+  - basic SA test (20 MHz TDD), F1, reestablishment, ...
+- [RAN-Ubuntu20-Image-Builder](https://jenkins-oai.eurecom.fr/job/RAN-Ubuntu18-Image-Builder/)
+  - obelix: Ubuntu 20 image build using docker (Note: builds U20 images while pipeline is named U18!)
 
-### [RAN-CI-NSA-Trigger](https://jenkins-oai.eurecom.fr/view/RAN/job/RAN-CI-NSA-Trigger/)
+### RAN-CI-NSA-Trigger
 
-**Purpose**: longer-running over-the-air LTE, NSA, and SA tests, triggered
-through cron job at midnight
+***DEFUNCT***: longer-running over-the-air LTE, NSA, and SA tests. To be integrated into RAN-Container-Parent.
 
 - [RAN-LTE-2x2-Module-OAIEPC](https://jenkins-oai.eurecom.fr/job/RAN-LTE-2x2-Module-OAIEPC/)
   - obelix + N310, nrmodule2 + Quectel, porcepix w/ Magma EPC
   - LTE 2x2 test with TM1 and TM2
-- [RAN-NSA-B200-Module-LTEBOX](https://jenkins-oai.eurecom.fr/job/RAN-NSA-B200-Module-LTEBOX/)
-  - obelix + B200 (eNB), nepes + B200 (gNB), idefix + Quectel, porcepix w/ ltebox
-  - Note: like [RAN-NSA-B200-Module-LTEBOX-Container](https://jenkins-oai.eurecom.fr/job/RAN-NSA-B200-Module-LTEBOX-Container/) above, but compiled/run from source
 - [RAN-NSA-2x2-Module-OAIEPC](https://jenkins-oai.eurecom.fr/job/RAN-NSA-2x2-Module-OAIEPC/)
   - obelix + N310 (eNB), asterix + N310 (gNB), nrmodule2 + Quectel, porcepix w/ Magma EPC
   - LTE 2x2 and NR 2x2 (non-standalone)
@@ -133,32 +133,22 @@ through cron job at midnight
   - asterix + N310, amariue (1x UE), porcepix w/ OAI 5GC
   - Amarisoft UE simulator: expected to be increased to more UEs
 
-### [RAN-CI-develop](https://open5glab.eurecom.fr:8083/jenkins/job/RAN-CI-develop/)
+### RAN-CI-develop
 
-**Purpose**: automatically triggered tests, mostly 4G, to be phased out and
+***DEFUNCT***: automatically triggered tests, mostly 4G, to be phased out and
 integrated into RAN-Container-Parent
 
-runs tests:
-- bellatrix: runs 4G/5G simulators directly (eNB + 1x UE + (opt.) OAI EPC, gNB + 1x UE in "noS1")
-
-triggers pipelines:
-- [eNB-CI-FDD-Band7-B210](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-CI-FDD-Band7-B210/)
-  - hutch + B210, nano w/ ltebox + 2x UE
-  - tests T tracer, RRC inactivity timers, different bandwidths
-- [eNB-CI-IF4p5-FDD-Band7-B210](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-CI-IF4p5-FDD-Band7-B210/)
+The following defunct pipelines remain to be integrated into RAN-Container-Parent:
+- eNB-CI-IF4p5-FDD-Band7-B210
   - hutch + B210, nano w/ ltebox + 2x UE
   - tests IF4.5 split over bandwidths 5, 10, 20 MHz in Band 7
-- [eNB-CI-IF4p5-TDD-Band40-B210](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-CI-IF4p5-TDD-Band40-B210/)
+- eNB-CI-IF4p5-TDD-Band40-B210
   - starsky + B210, nano w/ ltebox + 2x UE
   - tests IF4.5 split over bandwidths 5, 10, 20 MHz in Band 40
-- [eNB-CI-TDD-Band40-B210](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-CI-TDD-Band40-B210/)
-  - starsky + B210, nano w/ ltebox + 2x UE
-  - T tracer, TM1 over bandwidths 5, 10, 20 MHz in Band 40, default scheduler
-    for 20 MHz
-- [eNB-UE-CI-MONO-FDD-Band7-B200](https://open5glab.eurecom.fr:8083/jenkins/job/eNB-UE-CI-MONO-FDD-Band7-B200/)
+- eNB-UE-CI-MONO-FDD-Band7-B200
   - hutch + B210 (eNB), carabe + B210 (4G UE), nano w/ ltebox
   - tests OAI 4G for 5 MHz/TM1 with both CN and in noS1 model, MBMS; known to
     be unstable
-- [UE-CI-FDD-Band20-B200](https://open5glab.eurecom.fr:8083/jenkins/job/UE-CI-FDD-Band20-B200/)
+- UE-CI-FDD-Band20-B200
   - starsky + B210 (sniffer)
   - Sniff MIB + SIB1 of Orange, SFR

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

@@ -15,27 +15,24 @@
 
   \node[faraday, label={[anchor=south east]above right:Faraday cage}] (faraday) {};
 
-  \node[above left=0cm and 2.8cm of faraday, label=above:obelix] (obelix)
+  \node[above left=-0.50cm and 2.8cm of faraday, label=above:nepes] (nepes)
     {\includegraphics[width=1.2cm]{server}};
-  \node[right=0.3cm of obelix, label=above:B200-mini] (b210o)
-    {\includegraphics[width=1.2cm]{b200-mini}} edge (obelix);
+  \node[right=0.3cm of nepes, label=above:B200-mini] (b210o)
+    {\includegraphics[width=1.2cm]{b200-mini}} edge (nepes);
   \node[below right=0.35cm of faraday.north west] (anto)
     {\includegraphics[width=0.3cm]{antenna}};
   \draw (b210o) -| node [pos=0.2, duplexer] {B7} (anto);
 
-  \node[below left=0cm and 2.8cm of faraday, label=above:nepes] (nepes)
+  \node[below left=-0.50cm and 2.8cm of faraday, label=below:ofqot] (ofqot)
     {\includegraphics[width=1.2cm]{server}};
-  \node[right=0.3cm of nepes, label=above:B200-mini] (b210n)
-    {\includegraphics[width=1.2cm]{b200-mini}} edge (nepes);
-  \draw (obelix) -- (b210o);
+  \node[right=0.3cm of ofqot, label=above:B200-mini] (b210n)
+    {\includegraphics[width=1.2cm]{b200-mini}} edge (ofqot);
+  \draw (nepes) -- (b210o);
   \node[above right=0.35cm of faraday.south west] (antn)
     {\includegraphics[width=0.3cm]{antenna}};
   \draw (b210n) -| node [pos=0.2, duplexer] {n78} (antn);
 
-  \node[left=5cm of faraday, label=above:porcepix] (porcepix)
-    {\includegraphics[width=1.2cm]{server}};
-  \draw (obelix) -- (porcepix);
-  \draw (nepes) -- (porcepix);
+  \draw (nepes) -- (ofqot);
 
   \node[right=1.5cm of faraday, label=above:RM500Q-GL] (quectel)
     {\includegraphics[height=1.2cm]{quectel}};

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

@@ -16,7 +16,7 @@
   \node[label=above:porcepix] (porcepix)
     {\includegraphics[width=1.2cm]{server}};
 
-  \node[above right=1cm and 2cm of porcepix, label=above:asterix] (asterix)
+  \node[above right=-0.4cm and 2cm of porcepix, label=above:asterix] (asterix)
     {\includegraphics[width=1.2cm]{server}}
     edge (porcepix);
   \node[right=0.3cm of asterix, label=above:N310] (n310a)
@@ -27,7 +27,7 @@
   \node[above right=-0.1cm and 0.35cm of b78o.east] (anto2)
     {\includegraphics[width=0.3cm]{antenna}} edge (b78o);
 
-  \node[right=2cm of porcepix, label=above:obelix] (obelix)
+  \node[below right=-0.4cm 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)
@@ -45,7 +45,7 @@
   \node[above right=-0.1cm and 0.35cm of b78o.east] (anto2)
     {\includegraphics[width=0.3cm]{antenna}} edge (b78o);
 
-  \node[above right=-1.3cm and 5.0cm of n310a.east, label=above:RM500Q-GL] (quectel)
+  \node[above right=-0.5cm and 5.0cm of n310o.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,10 +59,5 @@
     {\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}