Merge remote-tracking branch 'origin/NR_SA_Tutorials_v3' into integration_2022_wk42

2022-10-17 12:33:56 +02:00
parent c25d07c1c5 89d6ddc482
commit 9358f2f274
23 changed files with 89 additions and 479 deletions
@@ -12,11 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Detailed Description](#2-detailed-description)
 3.  [Typical Usage](#3-typical-usage)
 # 1. Introduction #
@@ -12,10 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Detailed Description](#2-detailed-description)
 # 1. Introduction #
@@ -12,11 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Detailed Description](#2-detailed-description)
 3.  [Typical Usage](#3-typical-usage)
 # 1. Introduction #
@@ -12,11 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Detailed Description](#2-detailed-description)
 3.  [Typical Usage](#3-typical-usage)
 # 1. Introduction #
@@ -12,12 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Prerequisites](#2-prerequisites)
    1.  [uvtool installation](#21-uvtool-installation)
    2.  [apt-cacher-server installation](#22-apt-cacher-server-installation)
 # 1. Introduction #
@@ -12,11 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Sub BASH scripts](#2-sub-bash-scripts)
 3.  [Main script features](#3-main-script-features)
 # 1. Introduction #
@@ -12,11 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Centralized Workspace](#2-centralized-workspace)
 3.  [Create the ZIP file](#3-create-the-zip-file)
 # 1. Introduction #
@@ -12,14 +12,9 @@
  </tr>
 </table>
-## Table of Contents ##
+**Table of Contents**
-1.  [Introduction](#1-introduction)
+[[_TOC_]]
 2.  [Detailed Description](#2-detailed-description)
 3.  [Typical Usage](#3-typical-usage)
    1.  [Testing the physical simulators](#31-testing-the-physicals-simulators)
    2.  [Testing the RF simulator](#33-testing-the-rf-simulator)
    3.  [Testing the L2-nFAPI simulator](#33-testing-the-l2-nfapi-simulator)
 # 1. Introduction #
@@ -14,20 +14,9 @@
 This page is only valid for an `Ubuntu18` host.
-**TABLE OF CONTENTS**
+**Table of Contents**
-1. [Retrieving the images on Docker-Hub](#1-retrieving-the-images-on-docker-hub)
+[[_TOC_]]
 2. [Deploy containers](#2-deploy-containers)
   1. [Deploy and Configure Cassandra Database](#21-deploy-and-configure-cassandra-database)
   2. [Deploy OAI CN4G containers](#22-deploy-oai-cn4g-containers)
   3. [Deploy OAI eNB in RF simulator mode](#23-deploy-oai-enb-in-rf-simulator-mode)
   4. [Deploy OAI LTE UE in RF simulator mode](#24-deploy-oai-lte-ue-in-rf-simulator-mode)
 3. [Check traffic](#3-check-traffic)
 4. [Un-deployment](#4-un-deployment)
 5. [Explanation on the configuration](#5-explanation-on-the-configuration)
   1. [UE IMSI and Keys](#51-ue-imsi-and-keys)
   2. [PLMN and TAI](#52-plmn-and-tai)
   3. [Access to Internet](#53-access-to-internet)
 # 1. Retrieving the images on Docker-Hub #
@@ -16,22 +16,9 @@ This page is only valid for an `Ubuntu18` host.
 **NOTE: this version (2022-01-27) has been updated  for the `v1.3.0` version of the `OAI 5G CN`.**
-**TABLE OF CONTENTS**
+**Table of Contents**
-1. [Retrieving the images on Docker-Hub](#1-retrieving-the-images-on-docker-hub)
+[[_TOC_]]
 2. [Deploy containers](#2-deploy-containers)
   1. [Deploy OAI 5G Core Network](#21-deploy-oai-5g-core-network)
   2. [Deploy OAI gNB in RF simulator mode and in Standalone Mode](#22-deploy-oai-gnb-in-rf-simulator-mode-and-in-standalone-mode)
   3. [Deploy OAI NR-UE in RF simulator mode and in Standalone Mode](#23-deploy-oai-nr-ue-in-rf-simulator-mode-and-in-standalone-mode)
   4. [Deploy Second OAI NR-UE in RF simulator mode and in Standalone Mode](#24-deploy-second-oai-nr-ue-in-rf-simulator-mode-and-in-standalone-mode)
 3. [Check traffic](#3-check-traffic)
   1. [Check your Internet connectivity](#31-check-your-internet-connectivity)
   2. [Start the iperf server inside the NR-UE container](#32-start-the-iperf-server-inside-the-nr-ue-container)
   3. [Start the iperf client inside the ext-dn container](#33-start-the-iperf-client-inside-the-ext-dn-container)
 4. [Un-deployment](#4-un-deployment)
 5. [Explanations on the configuration in the docker-compose.yaml](##5-explanations-on-the-configuration-in-the-docker-composeyaml)
   1. [Making the NR-UE connect to the core network](#51-making-the-nr-ue-connect-to-the-core-network)
   2. [Making the gNB connect to the core network](#52-making-the-gnb-connect-to-the-core-network)
 # 1. Retrieving the images on Docker-Hub #
@@ -1,30 +1,6 @@
 **Table of Contents**
-1. [Functional Split Architecture](#functional-split-architecture)
+[[_TOC_]]
 2. [OpenAirInterface Block Diagram](#openairinterface-block-diagram)
 2. [OpenAirInterface 4G-LTE eNB Feature Set](#openairinterface-4g-lte-enb-feature-set)
   1. [eNB PHY Layer](#enb-phy-layer)
   2. [eNB MAC Layer](#enb-mac-layer)
   3. [eNB RLC Layer](#enb-rlc-layer)
   4. [eNB PDCP Layer](#enb-pdcp-layer)
   5. [eNB RRC Layer](#enb-rrc-layer)
   6. [eNB X2AP](#enb-x2ap)
   7. [eNB/MCE M2AP](#enbmce-m2ap)
   8. [MCE/MME M3AP](#mcemme-m3ap)
 3. [OpenAirInterface 4G-LTE UE Feature Set](#openairinterface-4g-lte-ue-feature-set)
   1.  [LTE UE PHY Layer](#lte-ue-phy-layer)
   2.  [LTE UE MAC Layer](#lte-ue-mac-layer)
   3.  [LTE UE RLC Layer](#lte-ue-rlc-layer)
   4.  [LTE UE PDCP Layer](#lte-ue-pdcp-layer)
   5.  [LTE UE RRC Layer](#lte-ue-rrc-layer)
 4. [OpenAirInterface 5G-NR gNB Feature Set](#openairinterface-5g-nr-feature-set)
   1. [General Parameters](#general-parameters)
   2. [gNB Physical Layer](#gnb-phy-layer)
   3. [gNB Higher Layers](#gnb-higher-layers)
 5. [OpenAirInterface 5G-NR UE Feature Set](#openairinterface-5g-nr-ue-feature-set)
   1. [UE Physical Layer](#ue-phy-layer)
   2. [UE Higher Layers](#ue-higher-layers)
 # Functional Split Architecture #
@@ -14,13 +14,9 @@
 This page is valid for the develop branch
-# Table of Contents: #
+**Table of Contents**
-* [How to build the eNB and the UE](#build)
+[[_TOC_]]
 * [How to run an eNB built with the noS1 option](#run-noS1-eNB)
 * [How to run a UE built with the noS1 option](#run-noS1-UE)
 * [Continuous Integration notes](#CInote)
 * [How to ping an eNB from a UE and vice versa (with the noS1 option)](#noS1-pinging)
 The old oaisim is dead! Long live oaisim! :)
@@ -16,19 +16,9 @@
 **2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
-## Table of Contents ##
+**Table of Contents**
-1.   [Environment](#1-environment)
+[[_TOC_]]
 2.   [Retrieve the OAI eNB-UE source code](#2-retrieve-the-oai-enb-ue-source-code)
 3.   [Setup of the USIM information in UE folder](#3-setup-of-the-usim-information-in-ue-folder)
 4.   [Setup of the Configuration files](#4-setup-of-the-configuration-files)
     1.   [The eNB Configuration file](#41-the-enb-configuration-file)
     2.   [The UE Configuration file](#42-the-ue-configuration-file)
 5.   [Build OAI UE and eNodeB](#5-build-oai-ue-and-enodeb)
 6.   [Start the eNB](#6-start-the-enb)
 7.   [Start the UE](#7-start-the-ue)
 8.   [Test with ping](#8-test-with-ping)
 9.   [Limitations](#9-limitations)
 # 1. Environment #
@@ -16,21 +16,9 @@
 **2022/03/08: CAUTION, THE LAST VALID TAG on `develop` branch is `2021.w51_c`.**
-## Table of Contents ##
+**Table of Contents**
-1.   [Environment](#1-environment)
+[[_TOC_]]
 2.   [Prepare the EPC](#2-prepare-the-epc)
 3.   [Retrieve the OAI eNB-UE source code](#3-retrieve-the-oai-enb-ue-source-code)
 4.   [Setup of the USIM information in UE folder](#4-setup-of-the-usim-information-in-ue-folder)
 5.   [Setup of the Configuration files](#5-setup-of-the-configuration-files)
     1.   [The eNB Configuration file](#51-the-enb-configuration-file)
     2.   [The UE Configuration file](#52-the-ue-configuration-file)
 6.   [Build OAI UE and eNodeB](#6-build-oai-ue-and-enodeb)
 7.   [Start EPC](#7-start-epc)
 8.   [Start the eNB](#8-start-the-enb)
 9.   [Start the UE](#9-start-the-ue)
 10.   [Test with ping](#10-test-with-ping)
 11.   [Limitations](#11-limitations)
 # 1. Environment #
@@ -1,227 +0,0 @@
 <table style="border-collapse: collapse; border: none;">
  <tr style="border-collapse: collapse; border: none;">
    <td style="border-collapse: collapse; border: none;">
      <a href="http://www.openairinterface.org/">
         <img src="./images/oai_final_logo.png" alt="" border=3 height=50 width=150>
         </img>
      </a>
    </td>
    <td style="border-collapse: collapse; border: none; vertical-align: center;">
      <b><font size = "5">OAI 5G SA tutorial</font></b>
    </td>
  </tr>
 </table>
 **TABLE OF CONTENTS**
 1. [Scenario](#1-scenario)
 2. [OAI CN5G](#2-oai-cn5g)
    1. [OAI CN5G pre-requisites](#21-oai-cn5g-pre-requisites)
    2. [OAI CN5G Setup](#22-oai-cn5g-setup)
    3. [OAI CN5G Configuration files](#23-oai-cn5g-configuration-files)
    4. [SIM Card](#24-sim-card)
 3. [OAI gNB](#3-oai-gnb)
    1. [OAI gNB pre-requisites](#31-oai-gnb-pre-requisites)
    2. [Build OAI gNB](#32-build-oai-gnb)
 4. [Run OAI CN5G and OAI gNB with USRP B210](#4-run-oai-cn5g-and-oai-gnb-with-usrp-b210)
    1. [Run OAI CN5G](#41-run-oai-cn5g)
    2. [Run OAI gNB](#42-run-oai-gnb)
 5. [Testing with QUECTEL RM500Q](#5-testing-with-quectel-rm500q)
    1. [Setup QUECTEL](#51-setup-quectel)
    2. [Ping test](#52-ping-test)
    3. [Downlink iPerf test](#53-downlink-iperf-test)
 # 1. Scenario
 In this tutorial we describe how to configure and run a 5G end-to-end setup with OAI CN5G, OAI gNB and COTS UE.
 Minimum hardware requirements:
 - Laptop/Desktop/Server for OAI CN5G and OAI gNB
    - Operating System: [Ubuntu 20.04.4 LTS](https://releases.ubuntu.com/20.04.4/ubuntu-20.04.4-desktop-amd64.iso)
    - CPU: 8 cores x86_64 @ 3.5 GHz
    - RAM: 32 GB
 - Laptop for UE
    - Operating System: Microsoft Windows 10 x64
    - CPU: 4 cores x86_64
    - RAM: 8 GB
    - Windows driver for Quectel MUST be equal or higher than version **2.2.4**
 - [USRP B210](https://www.ettus.com/all-products/ub210-kit/)
 - Quectel RM500Q
    - Module, M.2 to USB adapter, antennas and SIM card
    - Firmware version of Quectel MUST be equal or higher than **RM500QGLABR11A06M4G**
 # 2. OAI CN5G
 ## 2.1 OAI CN5G pre-requisites
 ```bash
 sudo apt install -y git net-tools putty
 sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
 curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
 sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu  $(lsb_release -cs)  stable"
 sudo apt update
 sudo apt install -y docker docker-ce
 # Add your username to the docker group, otherwise you will have to run in sudo mode.
 sudo usermod -a -G docker $(whoami)
 reboot
 # https://docs.docker.com/compose/install/
 sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
 ```
 ## 2.2 OAI CN5G Setup
 ```bash
 # Git oai-cn5g-fed repository
 git clone https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git ~/oai-cn5g-fed
 # Pull docker images
 docker pull oaisoftwarealliance/oai-amf:develop
 docker pull oaisoftwarealliance/oai-nrf:develop
 docker pull oaisoftwarealliance/oai-smf:develop
 docker pull oaisoftwarealliance/oai-udr:develop
 docker pull oaisoftwarealliance/oai-udm:develop
 docker pull oaisoftwarealliance/oai-ausf:develop
 docker pull oaisoftwarealliance/oai-spgwu-tiny:develop
 docker pull oaisoftwarealliance/trf-gen-cn5g:latest
 # Tag docker images
 docker image tag oaisoftwarealliance/oai-amf:develop oai-amf:develop
 docker image tag oaisoftwarealliance/oai-nrf:develop oai-nrf:develop
 docker image tag oaisoftwarealliance/oai-smf:develop oai-smf:develop
 docker image tag oaisoftwarealliance/oai-udr:develop oai-udr:develop
 docker image tag oaisoftwarealliance/oai-udm:develop oai-udm:develop
 docker image tag oaisoftwarealliance/oai-ausf:develop oai-ausf:develop
 docker image tag oaisoftwarealliance/oai-spgwu-tiny:develop oai-spgwu-tiny:develop
 docker image tag oaisoftwarealliance/trf-gen-cn5g:latest trf-gen-cn5g:latest
 ```
 ## 2.3 OAI CN5G Configuration files
 Download and copy configuration files:
 - Copy [docker-compose-basic-nrf.yaml](tutorial_resources/docker-compose-basic-nrf.yaml) to `~/oai-cn5g-fed/docker-compose`
 - Copy [oai_db.sql](tutorial_resources/oai_db.sql) to `~/oai-cn5g-fed/docker-compose/database`
 Change permissions on oai_db.sql to prevent mysql permission denied error:
 ```bash
 chmod 644 ~/oai-cn5g-fed/docker-compose/database/oai_db.sql
 ```
 ## 2.4 SIM Card
 Program SIM Card with [Open Cells Project](https://open-cells.com/) application [uicc-v2.6](https://open-cells.com/d5138782a8739209ec5760865b1e53b0/uicc-v2.6.tgz).
 ```bash
 sudo ./program_uicc --adm 12345678 --imsi 208990000000001 --isdn 00000001 --acc 0001 --key fec86ba6eb707ed08905757b1bb44b8f --opc C42449363BBAD02B66D16BC975D77CC1 -spn "OpenAirInterface" --authenticate
 ```
 # 3. OAI gNB
 ## 3.1 OAI gNB pre-requisites
 ### Build UHD from source
 ```bash
 sudo apt install -y libboost-all-dev libusb-1.0-0-dev doxygen python3-docutils python3-mako python3-numpy python3-requests python3-ruamel.yaml python3-setuptools cmake build-essential
 git clone https://github.com/EttusResearch/uhd.git ~/uhd
 cd ~/uhd
 git checkout v4.0.0.0
 cd host
 mkdir build
 cd build
 cmake ../
 make -j 4
 make test # This step is optional
 sudo make install
 sudo ldconfig
 sudo uhd_images_downloader
 ```
 ## 3.2 Build OAI gNB
 ```bash
 # Get openairinterface5g source code
 git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git ~/openairinterface5g
 cd ~/openairinterface5g
 git checkout develop
 # Install dependencies in Ubuntu 20.04
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets
 ./build_oai -I
 # Build OAI gNB
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets
 ./build_oai -w USRP --nrUE --gNB --build-lib all -c
 ```
 # 4. Run OAI CN5G and OAI gNB with USRP B210
 ## 4.1 Run OAI CN5G
 ```bash
 cd ~/oai-cn5g-fed/docker-compose
 python3 core-network.py --type start-basic --scenario 1
 ```
 ## 4.2 Run OAI gNB
 ```bash
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --sa -E --continuous-tx
 ```
 Make sure that during USRP initialization, it shows that USB 3 is used.
 # 5. Testing with Quectel RM500Q
 ## 5.1 Setup Quectel
 With [PuTTY](https://the.earth.li/~sgtatham/putty/latest/w64/putty.exe), send the following AT commands to the module using a serial interface (ex: COM2) at 115200 bps:
 ```bash
 # MUST be sent at least once everytime there is a firmware upgrade!
 AT+QMBNCFG="Select","ROW_Commercial"
 AT+QMBNCFG="AutoSel",0
 AT+CFUN=1,1
 AT+CGDCONT=1
 AT+CGDCONT=2
 AT+CGDCONT=3
 AT+CGDCONT=1,"IP","oai"
 # (Optional, debug only, AT commands) Activate PDP context, retrieve IP address and test with ping
 AT+CGACT=1,1
 AT+CGPADDR=1
 AT+QPING=1,"openairinterface.org"
 ```
 ## 5.2 Ping test
 - UE host
 ```bash
 ping 192.168.70.135 -n 1000 -S 12.1.1.2
 ```
 - CN5G host
 ```bash
 docker exec -it oai-ext-dn ping 12.1.1.2
 ```
 ## 5.3 Downlink iPerf test
 - UE host
    - Download iPerf for Microsoft Windows from [here](https://iperf.fr/download/windows/iperf-2.0.9-win64.zip).
    - Extract to Desktop and run with Command Prompt:
 ```bash
 cd C:\Users\User\Desktop\iPerf\iperf-2.0.9-win64\iperf-2.0.9-win64
 iperf -s -u -i 1 -B 12.1.1.2
 ```
 - CN5G host
 ```bash
 docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 125M -c 12.1.1.2
 ```
@@ -12,26 +12,9 @@
  </tr>
 </table>
-**TABLE OF CONTENTS**
+**Table of Contents**
 1. [Scenario](#1-scenario)
 2. [OAI CN5G](#2-oai-cn5g)
    1. [OAI CN5G pre-requisites](#21-oai-cn5g-pre-requisites)
    2. [OAI CN5G Setup](#22-oai-cn5g-setup)
    3. [OAI CN5G Configuration files](#23-oai-cn5g-configuration-files)
    4. [SIM Card](#24-sim-card)
 3. [OAI gNB](#3-oai-gnb)
    1. [OAI gNB pre-requisites](#31-oai-gnb-pre-requisites)
    2. [Build OAI gNB](#32-build-oai-gnb)
    3. [N300 Ethernet Tuning](#33-n300-ethernet-tuning)
 4. [Run OAI CN5G and OAI gNB with USRP N300](#4-run-oai-cn5g-and-oai-gnb-with-usrp-n300)
    1. [Run OAI CN5G](#41-run-oai-cn5g)
    2. [Run OAI gNB](#42-run-oai-gnb)
 5. [Testing with QUECTEL RM500Q](#5-testing-with-quectel-rm500q)
    1. [Setup QUECTEL](#51-setup-quectel)
    2. [Ping test](#52-ping-test)
    3. [Downlink iPerf test](#53-downlink-iperf-test)
 [[_TOC_]]
 #  1. Scenario
 In this tutorial we describe how to configure and run a 5G end-to-end setup with OAI CN5G, OAI gNB and COTS UE.
@@ -46,7 +29,8 @@ Minimum hardware requirements:
    - CPU: 4 cores x86_64
    - RAM: 8 GB
    - Windows driver for Quectel MUST be equal or higher than version **2.2.4**
- [USRP N300](https://www.ettus.com/all-products/USRP-N300/): Please identify the network interface(s) on which the N300 is connected.
+- [USRP B210](https://www.ettus.com/all-products/ub210-kit/), [USRP N300](https://www.ettus.com/all-products/USRP-N300/) or [USRP X300](https://www.ettus.com/all-products/x300-kit/)
    - Please identify the network interface(s) on which the USRP is connected and update the gNB configuration file
 - Quectel RM500Q
    - Module, M.2 to USB adapter, antennas and SIM card
    - Firmware version of Quectel MUST be equal or higher than **RM500QGLABR11A06M4G**
@@ -159,28 +143,32 @@ cd cmake_targets
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets
-./build_oai -w USRP --nrUE --gNB --build-lib all -c
+./build_oai -w USRP --ninja --nrUE --gNB --build-lib all -c
 ```
-## 3.3 N300 Ethernet Tuning
+## 3.3 USRP N300 and X300 Ethernet Tuning
 Please also refer to the official [USRP Host Performance Tuning Tips and Tricks](https://kb.ettus.com/USRP_Host_Performance_Tuning_Tips_and_Tricks) tuning guide.
 The following steps are recommended. Please change the network interface(s) as required. Also, you should have 10Gbps interface(s): if you use two cables, you should have the XG interface. Refer to the [N300 Getting Started Guide](https://kb.ettus.com/USRP_N300/N310/N320/N321_Getting_Started_Guide) for more information.
 * Use an MTU of 9000: how to change this depends on the network management tool. In the case of Network Manager, this can be done from the GUI.
-* Increase the kernel socket buffer (also done by the USRP driver in OAI):
+* Increase the kernel socket buffer (also done by the USRP driver in OAI)
  ```
  sysctl -w net.core.rmem_max=8388608
  sysctl -w net.core.wmem_max=8388608
  sysctl -w net.core.rmem_default=65536
  sysctl -w net.core.wmem_default=65536
  ```
 * Increase Ethernet Ring Buffers: `sudo ethtool -G <ifname> rx 4096 tx 4096`
-* Disable hyper-threading in the BIOS
+* Disable hyper-threading in the BIOS (This step is optional)
-* Disable KPTI Protections for Spectre/Meltdown for more performance. **This is a security risk.** Add `mitigations=off nosmt` in your grub config and update grub.
+* Optional: Disable KPTI Protections for Spectre/Meltdown for more performance. **This is a security risk.** Add `mitigations=off nosmt` in your grub config and update grub. (This step is optional)
-# 4. Run OAI CN5G and OAI gNB with USRP N300
+Example code to run:
 ```
 for ((i=0;i<$(nproc);i++)); do sudo cpufreq-set -c $i -r -g performance; done
 sudo sysctl -w net.core.wmem_max=62500000
 sudo sysctl -w net.core.rmem_max=62500000
 sudo sysctl -w net.core.wmem_default=62500000
 sudo sysctl -w net.core.rmem_default=62500000
 sudo ethtool -G enp1s0f0 tx 4096 rx 4096
 ```
 # 4. Run OAI CN5G and OAI gNB
 ## 4.1 Run OAI CN5G
@@ -191,13 +179,28 @@ python3 core-network.py --type start-basic --scenario 1
 ## 4.2 Run OAI gNB
 ### USRP B210
 ```bash
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
-sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1
+sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf --sa -E --continuous-tx
 ```
 ### USRP N300
 ```bash
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1
 ```
 ### USRP X300
 ```bash
 cd ~/openairinterface5g
 source oaienv
 cd cmake_targets/ran_build/build
 sudo ./nr-softmodem -O ../../../targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band77.fr1.273PRB.2x2.usrpn300.conf --sa --usrp-tx-thread-config 1 -E --continuous-tx
 ```
 # 5. Testing with Quectel RM500Q
@@ -208,10 +211,9 @@ With [PuTTY](https://the.earth.li/~sgtatham/putty/latest/w64/putty.exe), send th
 AT+QMBNCFG="Select","ROW_Commercial"
 AT+QMBNCFG="AutoSel",0
 AT+CFUN=1,1
-AT+CGDCONT=1
+AT+CGDCONT=1,"IP","oai"
 AT+CGDCONT=2
 AT+CGDCONT=3
 AT+CGDCONT=1,"IP","oai"
 # (Optional, debug only, AT commands) Activate PDP context, retrieve IP address and test with ping
 AT+CGACT=1,1
@@ -222,7 +224,7 @@ AT+QPING=1,"openairinterface.org"
 ## 5.2 Ping test
 - UE host
 ```bash
-ping 192.168.70.135 -n 1000 -S 12.1.1.2
+ping 192.168.70.135 -t -S 12.1.1.2
 ```
 - CN5G host
 ```bash
@@ -240,5 +242,11 @@ iperf -s -u -i 1 -B 12.1.1.2
 - CN5G host
 ```bash
-docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 200M -c 12.1.1.2
+docker exec -it oai-ext-dn iperf -u -t 86400 -i 1 -fk -B 192.168.70.135 -b 100M -c 12.1.1.2
 ```
 # 6. Advanced configuration (optional)
 - If you get real-time problems on heavy UL traffic, reduce the maximum UL MCS using an additional command-line switch: `--MACRLCs.[0].ul_max_mcs 14`.
 - There is noise on the DC carriers on N300 and especially the X300 in UL. To avoid their use or shift them away from the center to use more UL spectrum, use the `--tune-offset <Hz>` command line switch, where `<Hz>` is ideally half the bandwidth, or possibly less.
@@ -1,9 +1,6 @@
-## Table of Contents ##
+**Table of Contents**
-1.   [Machines](#machines)
+[[_TOC_]]
 2.   [Networked devices](#networked-devices)
 3.   [Testbenches](#testbenches)
 4.   [Pipelines](#pipelines)
 ## Machines
@@ -12,16 +12,9 @@
  </tr>
 </table>
-**TABLE OF CONTENTS**
+**Table of Contents**
-1. [SA setup with COTS UE](#1--sa-setup-with-cots-ue)
+[[_TOC_]]
   1.  [gNB build and configuration](#11--gnb-build-and-configuration)
   2.  [OAI 5G Core Network installation and configuration](#12--oai-5g-core-network-installation-and-configuration)
   3.  [Execution of SA scenario](#13--execution-of-sa-scenario)
 2. [SA Setup with OAI NR UE Softmodem](#2-sa-setup-with-oai-nr-ue-softmodem)
   1.  [Build and configuration](#21-build-and-configuration)
   2.  [OAI 5G Core Network installation and configuration](#22--oai-5g-core-network-installation-and-configuration)
   3.  [Execution of SA scenario](#23-execution-of-sa-scenario)
 In the following tutorial we describe how to deploy configure and test the two SA OAI setups:
@@ -1,20 +1,8 @@
 STATUS 2020/10/15 : added External Resources section and links  
 **Table of Contents**
-## Table of Contents ##
+[[_TOC_]]
 1.   [External Resources](#external-resources) 
 2.   [Configuration Overview](#configuration-overview)
 3.   [SW Repository / Branch](#repository)
 4.   [Architecture Setup](#architecture-setup)
 5.   [Build / Install](#build-and-install)
 6.   [Run / Test](#run-and-test)
 7.   [Test case](#test-case)
 8.   [Log file monitoring](#log-file-monitoring)
 9.   [Required tools for debug](#required-tools-for-debug)
 10.   [Status of interoperability](#status-of-interoperability) 
 11.   [CI integration](#ci-integration)  
 ## External Resources
@@ -181,6 +181,8 @@ services:
            - UDM_PORT=80
            - UDM_API_VERSION=v2
            - UDM_FQDN=oai-udm
            - INT_ALGO_LIST=["NIA1", "NIA2"]
            - CIPH_ALGO_LIST=["NEA0", "NEA2"]
        depends_on:
            - mysql
            - oai-nrf
@@ -272,7 +274,7 @@ services:
            - NRF_API_VERSION=v1
            - NRF_FQDN=oai-nrf
            - NSSAI_SST_0=1
-            - NSSAI_SD_0=0xffffff
+            - NSSAI_SD_0=0x1
            - DNN_0=oai
        depends_on:
            - oai-nrf
@@ -294,6 +296,11 @@ services:
              "ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity"
        depends_on:
            - oai-spgwu
        healthcheck:
            test: /bin/bash -c "ip r | grep 12.1.1"
            interval: 10s
            timeout: 5s
            retries: 5
        networks:
            public_net:
                ipv4_address: 192.168.70.135
@@ -16,12 +16,7 @@
 **Table of Contents**
-1. [Build Strategy](#1-build-strategy)
+[[_TOC_]]
 2. [File organization](#2-file-organization)
 3. [Building using docker under Ubuntu 18.04](#3-building-using-docker-under-ubuntu-1804)
 4. [Building using podman under Red Hat Entreprise Linux 8.2](#4-building-using-podman-under-red-hat-entreprise-linux-82)
 5. [Running modems using docker under Ubuntu 18.04](#5-running-modems-using-docker-under-ubuntu-1804)
 6. [Running modems using podman under Red Hat Entreprise Linux 8.2](#6-running-modems-using-podman-under-red-hat-entreprise-linux-82)
 ---
@@ -10,7 +10,7 @@ gNBs = (
  // Tracking area code, 0x0000 and 0xfffe are reserved values
  tracking_area_code = 1;
-  plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }); });
+  plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }); });
  nr_cellid = 12345678L;
@@ -11,7 +11,7 @@ gNBs =
    // Tracking area code, 0x0000 and 0xfffe are reserved values
    tracking_area_code  =  1;
-    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+    plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1; sd = 0x1; }) });
    nr_cellid = 12345678L;
@@ -155,64 +155,6 @@ gNBs =
  );
 # Dedicated Serving Cell Configuration
 servingCellConfigDedicated = ({
  # BWP-Downlink
    # BWP 1 Configuration
      dl_bwp-Id_1 = 1;
      dl_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
      # subcarrierSpacing
      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      dl_bwp1_subcarrierSpacing = 1;
    # BWP 2 Configuration
      dl_bwp-Id_2 = 2;
      dl_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
      # subcarrierSpacing
      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      dl_bwp2_subcarrierSpacing = 1;
    # BWP 3 Configuration
      dl_bwp-Id_3 = 3;
      dl_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
      # subcarrierSpacing
      # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
      dl_bwp3_subcarrierSpacing = 1;
    firstActiveDownlinkBWP-Id = 1;  #BWP-Id
    defaultDownlinkBWP-Id     = 1;  #BWP-Id
    # bwp-InactivityTimer                 ENUMERATED {ms2, ms3, ms4, ms5, ms6, ms8, ms10, ms20, ms30,
    #                                                ms40,ms50, ms60, ms80,ms100, ms200,ms300, ms500,
    #                                                ms750, ms1280, ms1920, ms2560, spare10, spare9, spare8,
    #                                                spare7, spare6, spare5, spare4, spare3, spare2, spare1 }
  # UplinkConfig
    # BWP-Uplink
      # BWP 1 Configuration
        ul_bwp-Id_1 = 1;
        ul_bwp1_locationAndBandwidth = 28875; // RBstart=0, L=106 (40 MHz BW)
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        ul_bwp1_subcarrierSpacing = 1;
      # BWP 2 Configuration
        ul_bwp-Id_2 = 2;
        ul_bwp2_locationAndBandwidth = 13750; // RBstart=0, L=51 (20 MHz BW)
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        ul_bwp2_subcarrierSpacing = 1;
      # BWP 3 Configuration
        ul_bwp-Id_3 = 3;
        ul_bwp3_locationAndBandwidth = 6325; // RBstart=0, L=24 (10 MHz BW)
        # subcarrierSpacing
        # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
        ul_bwp3_subcarrierSpacing = 1;
      firstActiveUplinkBWP-Id = 1;  #BWP-Id
  }
 );
    # ------- SCTP definitions
    SCTP :