Bupt Tutorial

docs/DEPLOY_SA5G_VM_COTSUE.md

+<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">OpenAirInterface 5G Core Network Deployment in Virtual Machines and Testing with COTSUE</font></b>
+    </td>
+  </tr>
+</table>
+![SA COTSUE Demo](./images/virtual-machine/cots-ue/bupt/overall-architecture.png)
+
+**TABLE OF CONTENTS**
+
+1.  [Description](#1-description)
+2.  [Pre-requisites](#2-pre-requisites)
+3.  [Creating Virtual Machines](#3-creating-virtual-machines)
+4.  [Building Network Functions](#4-building-network-functions)
+5.  [Configuring Network Functions](#5-configuring-network-functions)
+6.  [Starting Network Functions](#6-starting-network-functions)
+7.  [Analysing Results](#7-analysing-results)
+8.  [Demo Video](#8-demo-video)
+
+
+## 1. Description
+
+This tutorial shows how to use OAI 5g Core network in standalone deployment with commercial gNB and COTS UE. The tutorial and testbed was made by [Opensource5g group](http://www.opensource5g.org) located in BUPT, Beijing.
+
+- The core network is deployed in two Virtual Machines
+- The commercial gNB used for this tutorial is Amarisoft
+- The COTS UE used for this tutorial is Xiaomi K30i
+- [Openair-spgwu-tiny](https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny/tree/gtp_extension_header) is choosen as the UPF for this tutorial
+
+## 2. Pre-requisites
+
+The host machine hosting the virtual machines have the below configuration:
+
+| Params |                   Value |
+| :----- | ----------------------: |
+| CPU    | Intel Core i9-9980HK 16 |
+| Memory |                   32 GB |
+| Disk   |              512 GB SSD |
+| System |            Ubuntu 18.04 |
+
+The virtual machines are configured using KVM, though any other virtual machine manager can be used. To install KVM and virt-manager follow the below commands:
+
+```bash=
+~$ sudo apt-get install qemu-kvm
+~$ sudo apt-get install qemu
+~$ sudo apt-get install virt-manager
+~$ sudo apt-get install virt-viewer 
+~$ sudo apt-get install libvirt-bin 
+~$ sudo apt-get install bridge-utils
+```
+
+Verify the installation:
+
+```bash=shell
+~$ sudo kvm-ok
+```
+
+If everything is ok, you would see
+
+```bash=shell
+INFO: /dev/kvm exists
+KVM acceleration can be used
+```
+
+Create virtual machines by using virt-manager GUI:
+
+ ```bash=shell
+~$ sudo virt-manager
+ ```
+
+## 3. Creating Virtual Machines
+
+Recommendation is to create two VMs with 4 Cores, 8GB memory, 40GB disk. First one for 5G Core control plane 5G-CCP, and the second for 5G User plane 5G-UP. 
+
+Network configuration for both the VMs
+
+- 5G-CCP VM
+
+| NIC  |    Network Source | IP address      | Usage |
+| ---- | ----------------: | :-------------- | ----: |
+| ens3 |               NAT | 192.168.122.197 |   SBI |
+| ens9 | Bridge to Phy NIC | 192.168.199.28  |  NGAP |
+
+- 5G-UP VM
+
+| NIC   | Network Source    |      IP address |  Usage |
+| ----- | :---------------- | --------------: | -----: |
+| ens9  | NAT               |  192.168.122.78 |     N4 |
+| ens10 | NAT               |  192.168.122.55 | N6/SGi |
+| ens12 | Bridge to Phy NIC | 192.168.199.126 |     N3 |
+
+## 4. Building Network functions
+
+The branch commits used at the time of the demo are listed below:
+
+| NF Name |          Branch Name | Commit                                   |
+| ------- | -------------------: | :--------------------------------------- |
+| AMF     |             bupt_amf | 951db2252b149d78f55aa143a4639d1c25c3dac0 |
+| SMF     |              develop | fcc61f82cc5e0054eeb8c37860cb825e85259036 |
+| SPGW-u  | gtp_extension_header | f13f4a5e2807355d23f136119f85fbf48ed569ea |
+
+### 4.1 Build AMF
+
+- Login to 5G-CCP VM and open the terminal to fetch, build and install the AMF. 
+- The build can be made in two modes Debug and Release. Debug mode will provide more logs for debuging but may effect the performance. 
+
+``` bash=
+~$ git clone -b bupt_amf https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf.git
+~$ cd ./oai-cn5g-amf/
+~$ cd ./build/scripts/
+~$ sudo ./build_amf --install-deps --force
+~$ sudo ./build_amf --clean --Verbose --build-type Debug --jobs
+```
+
+### 4.2 Build SMF
+
+- Remain logged in to the same virtual machine to compile and install SMF
+- The build can be made in two modes Debug and Release. Debug mode will provide more logs for debuging but may effect the performance.
+
+``` bash=
+~$ git clone -b develop https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-smf.git
+~$ cd ./oai-cn5g-smf/
+~$ cd ./build/scripts/
+~$ sudo ./build_smf --install-deps --force
+~$ sudo ./build_smf--clean --Verbose --build-type Debug --jobs
+```
+
+### 4.3 Build SPGWU
+
+- Login to 5G-UP VM and open a terminal to fetch, build and install SPGWU
+- The build can be made in two modes Debug and Release. Debug mode will provide more logs for debuging but may effect the performance.
+
+``` bash= 
+~$ git clone -b gtp_extension_header https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git
+~$ cd ./openair-spgwu-tiny/
+~$ sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && DEBIAN_FRONTEND=noninteractive apt-get install --yes \
+    psmisc \
+    net-tools \
+    iproute2 \
+    ethtool \
+    iptables \
+    tshark \
+    libgoogle-glog0v5 \
+    libdouble-conversion1 \
+    libconfig++9v5 \
+    libboost-system1.65.1 \
+  && rm -rf /var/lib/apt/lists/*
+~$ cd ./build/scripts/
+~$ sudo ./build_spgwu --install-deps --force
+~$ sudo ./build_spgwu --clean --build-type Debug --jobs --Verbose
+```
+
+## 5. Configuring Network Functions
+
+### 5.1 AMF Configuration
+
+| File Name |                 Repository |                                                     Location |
+| --------- | -------------------------: | -----------------------------------------------------------: |
+| amf.conf  | (Gitlab) cn5g/oai-cn5g-amf | [etc/successful.conf/amf.conf](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf/-/blob/bupt_amf/etc/successful.conf/amf.conf) |
+
+- MCC, MNC and TAC configured according to the SIM card, it will change based on the subscriber information
+
+```
+MCC = "460"  #Mobile Country Code
+MNC = "11"   #Mobile Network Code
+TAC = 100    #Type Allocation Code 
+SST = "1"    #Slice and service type of S-NSSAI
+SD  = "none" #S-NSSAI parameter slice, composition of service type and slice component
+```
+
+- Network interface configuration for AMF based on the interfaces configured for 5G-CCP virtual machine
+  ![amf_interface](./images/virtual-machine/cots-ue/bupt/amf_interface.png)
+
+- NGAP_AMF interface configuration
+
+```
+INTEFACE_NAME: Interface name of AMF which connects to gNB
+PORT: Port number which connects to gNB
+```
+
+- N11 interface configuration
+
+```
+INTERFACE_NAME: Interface name of AMF which connects to SMF
+PORT: Port number which connects to SMF
+IPV4_ADDRESS: SMF IP address
+SELECTED: true/false indicate whether SMF is selected or not
+```
+
+- AMF DATABASE configuration
+  ![mysql_amf](./images/virtual-machine/cots-ue/bupt/MYSQL.png)
+
+### 5.2 SMF Configuration
+
+| File Name |                 Repository |                                                     Location |
+| --------- | -------------------------: | -----------------------------------------------------------: |
+| smf.conf  | (Gitlab) cn5g/oai-cn5g-amf | [etc/successful.conf/smf.conf](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf/-/blob/bupt_amf/etc/successful.conf/smf.conf) |
+
+- Network interface configuration for SMF based on the interfaces configured for 5G-CCP virtual machine
+  ![smf_interface](./images/virtual-machine/cots-ue/bupt/smf_inteface.png)
+
+- The DNN configuration is based on the UE configuration these values should match with the UE
+  ![dnn_list](./images/virtual-machine/cots-ue/bupt/smf_dnn_list.png)
+
+- Field explanation.
+
+```
+DNN_NI : DNN name which smf will support
+PDU_SESSION_TYPE : IPv4/IPv4v6, this corresponds to the session type requested by UE
+IPV4_POOL/IPV6_POOL : Above this location in the configuration file, select the IP pool assigned to UE by serial number. If not support IPv6 set IPV6_POOL to '-1'.
+```
+
+- AMF,UPF information, UDM and NRF were not used for this demo
+  ![network_ip_address](./images/virtual-machine/cots-ue/bupt/network_Ip_Address.png)
+
+- Configure some PDU session information and Qos parameter 
+  ![pdu_session](./images/virtual-machine/cots-ue/bupt/session_management_list.png)
+
+### 5.3 SPGWU Configuration
+
+| File Name   |                 Repository |                                                     Location |
+| ----------- | -------------------------: | -----------------------------------------------------------: |
+| spgw_u.conf | (Gitlab) cn5g/oai-cn5g-amf | [etc/successful.conf/spgw_u.conf](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf/-/blob/bupt_amf/etc/successful.conf/spgw_u.conf) |
+
+- S4, SX and SGI Network interface configuration
+  ![](./images/virtual-machine/cots-ue/bupt/spgwu_s4.png)
+  ![](./images/virtual-machine/cots-ue/bupt/spgwu_sx.png)
+  ![](./images/virtual-machine/cots-ue/bupt/spgwu_sgi.png)
+
+- SMF network information
+  ![](./images/virtual-machine/cots-ue/bupt/spgwu_Ip_list.png)
+
+- Slice configuration (NSSAI_SST,NSSAI_SD,DNN) 
+  ![](./images/virtual-machine/cots-ue/bupt/spgwu_slice.png)
+
+
+### 5.4 Configure SIM card and database
+
+- User Subscprition Profile: The UE used in this demo and tutorial has  the below profile. If the user profile is different then the corresponding entry should be present in the mysql database. The database file is [OPENXG_DB.sql](https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-amf/-/blob/bupt_amf/etc/openxg.sql) 
+
+  ```
+  IMSI - 460110000000001
+  IMEI - 35609204079301
+  Secret Key (K) - 00112233445566778899AABBCCDDEEFF
+  OPc - 000102030405060708090A0B0C0D0E0F
+  ```
+
+### 5.5 UE Configuration
+
+- UE configuration.
+
+  ```
+  APN - ctnet
+  MCC - 460
+  MNC - 11
+  APN Protocol - IPv4/IPv6
+  Preferred network type - NR only
+  ```
+
+### 5.6 gNB Parameters
+
+- MCC,MNC and TAC which the gNB should support.
+
+  ```
+  TAC - 0x64
+  MCC - 460
+  MNC - 11
+  ```
+
+## 6. Starting the network functions
+
+- Open two terminals on the host machine and login to 5G-CCP (AMF, SMF) and 5G-UP (SPGWU) virtual machines. Start taking pcaps at the respective interfaces to analyse them later. 
+- Execute the below commands in the respected virtual machines. 
+
+### 6.1 Start AMF
+
+```bash=
+~$ sudo amf -c /etc/openxg/amf.conf -o --no-ausf
+[2021-04-20T11:56:06.526139] [AMF] [amf_app] [start] Options parsed!
+[2021-04-20T11:56:06.526232] [AMF] [amf_app] [debug] 
+Load AMF system configuration file(/etc/openxg/amf.conf)
+[2021-04-20T11:56:06.526660] [AMF] [amf_app] [error] SettingNotFoundException : AMF.INTERFACES.NGAP_AMF.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:06.526716] [AMF] [amf_app] [error] SettingNotFoundException : AMF.INTERFACES.N11.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:06.526785] [AMF] [configurations] [info ] ======================    AMF   =====================
+[2021-04-20T11:56:06.526798] [AMF] [configurations] [info ] Configuration AMF:
+[2021-04-20T11:56:06.526804] [AMF] [configurations] [info ] - Instance ...........................................: 10
+[2021-04-20T11:56:06.526809] [AMF] [configurations] [info ] - PID dir ............................................: /var/run
+[2021-04-20T11:56:06.526814] [AMF] [configurations] [info ] - AMF NAME............................................: OAI-AMF
+[2021-04-20T11:56:06.526818] [AMF] [configurations] [info ] - GUAMI (MCC, MNC, Region ID, AMF Set ID, AMF pointer): 
+[2021-04-20T11:56:06.526823] [AMF] [configurations] [info ]    (460, 11, 128, 1, 1 )
+[2021-04-20T11:56:06.526828] [AMF] [configurations] [info ] - SERVED_GUAMI_LIST...................................: 
+[2021-04-20T11:56:06.526832] [AMF] [configurations] [info ]    (460, 11, 128 , 1, 1)
+[2021-04-20T11:56:06.526837] [AMF] [configurations] [info ] - RELATIVE_CAPACITY...................................: 30
+[2021-04-20T11:56:06.526841] [AMF] [configurations] [info ] - PLMN_SUPPORT_LIST...................................: 
+[2021-04-20T11:56:06.526846] [AMF] [configurations] [info ]    (MCC 460, MNC 11) 
+[2021-04-20T11:56:06.526850] [AMF] [configurations] [info ]    TAC: 100
+[2021-04-20T11:56:06.526854] [AMF] [configurations] [info ]    SLICE_SUPPORT_LIST (SST, SD) ....................: 
+[2021-04-20T11:56:06.526859] [AMF] [configurations] [info ]      (1, none) 
+[2021-04-20T11:56:06.526863] [AMF] [configurations] [info ] - Emergency Support................... ...............: false
+[2021-04-20T11:56:06.526892] [AMF] [configurations] [info ] - MYSQL Server Addr...................................: 127.0.0.1
+[2021-04-20T11:56:06.526899] [AMF] [configurations] [info ] - MYSQL user .........................................: root
+[2021-04-20T11:56:06.526904] [AMF] [configurations] [info ] - MYSQL pass .........................................: linux
+[2021-04-20T11:56:06.526908] [AMF] [configurations] [info ] - MYSQL db ...........................................: OPENXG_DB
+[2021-04-20T11:56:06.526912] [AMF] [configurations] [info ] - operator key .......................................: 63bfa50ee6523365ff14c1f45f88737d
+[2021-04-20T11:56:06.526917] [AMF] [configurations] [info ] - random .............................................: true
+```
+
+### 6.2 Start SMF
+
+```bash=
+~$ sudo smf -c /etc/openxg/smf.conf -o
+[2021-04-20T11:56:08.499979] [smf] [smf_app] [start] Options parsed
+[2021-04-20T11:56:08.500451] [smf] [smf_app] [info ] SettingNotFoundException : SMF.ITTI_TASKS, using defaults
+[2021-04-20T11:56:08.500540] [smf] [smf_app] [info ] SettingNotFoundException : SMF.INTERFACES.N4.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:08.500576] [smf] [smf_app] [info ] SettingNotFoundException : SMF.INTERFACES.SBI.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:08.500821] [smf] [smf_app] [info ] Finalize config...
+[2021-04-20T11:56:08.500836] [smf] [smf_app] [info ] Finalized config
+[2021-04-20T11:56:08.500874] [smf] [smf_app] [info ] ==== EURECOM SMF vBranch: develop Abrev. Hash: fcc61f8 Date: Thu Mar 25 22:38:41 2021 +0000 ====
+[2021-04-20T11:56:08.500881] [smf] [smf_app] [info ] Configuration SMF:
+[2021-04-20T11:56:08.500886] [smf] [smf_app] [info ] - Instance ..............: 0
+
+[2021-04-20T11:56:08.500891] [smf] [smf_app] [info ] - PID dir ...............: /var/run
+
+[2021-04-20T11:56:08.500895] [smf] [smf_app] [info ] - N4 Networking:
+[2021-04-20T11:56:08.500899] [smf] [smf_app] [info ]     Interface name ......: ens3
+[2021-04-20T11:56:08.500905] [smf] [smf_app] [info ]     IPv4 Addr ...........: 192.168.122.197
+[2021-04-20T11:56:08.500909] [smf] [smf_app] [info ]     Port ................: 8805
+[2021-04-20T11:56:08.500914] [smf] [smf_app] [info ] - SBI Networking:
+[2021-04-20T11:56:08.500918] [smf] [smf_app] [info ]     Interface name ......: ens3
+[2021-04-20T11:56:08.500923] [smf] [smf_app] [info ]     IPv4 Addr ...........: 192.168.122.197
+[2021-04-20T11:56:08.500928] [smf] [smf_app] [info ]     Port ................: 8889
+[2021-04-20T11:56:08.500932] [smf] [smf_app] [info ]     HTTP2 port ..........: 8890
+[2021-04-20T11:56:08.500937] [smf] [smf_app] [info ]     API version..........: v2
+[2021-04-20T11:56:08.500941] [smf] [smf_app] [info ] - N4 Threading:
+[2021-04-20T11:56:08.500945] [smf] [smf_app] [info ]     CPU id ..............: 0
+[2021-04-20T11:56:08.500950] [smf] [smf_app] [info ]     Scheduling policy ...: 1
+[2021-04-20T11:56:08.500954] [smf] [smf_app] [info ]     Scheduling prio .....: 90
+[2021-04-20T11:56:08.500959] [smf] [smf_app] [info ] - ITTI Timer Task Threading:
+[2021-04-20T11:56:08.500963] [smf] [smf_app] [info ]     CPU id ..............: 0
+[2021-04-20T11:56:08.500968] [smf] [smf_app] [info ]     Scheduling policy ...: 1
+[2021-04-20T11:56:08.500972] [smf] [smf_app] [info ]     Scheduling prio .....: 85
+```
+
+### 6.3 Start SPGWU
+
+```bash=
+~$ spgwu -c /etc/openxg/spgw_u.conf -o
+[2021-04-20T11:56:10.587369] [spgwu] [spgwu_app] [start] Options parsed
+[2021-04-20T11:56:10.588010] [spgwu] [spgwu_app] [info ] SettingNotFoundException : SPGW-U.ITTI_TASKS, using defaults
+[2021-04-20T11:56:10.588132] [spgwu] [spgwu_app] [info ] SettingNotFoundException : SPGW-U.INTERFACES.S1U_S12_S4_UP.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:10.588190] [spgwu] [spgwu_app] [info ] SettingNotFoundException : SPGW-U.INTERFACES.SX.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:10.588769] [spgwu] [spgwu_app] [info ] SettingNotFoundException : SPGW-U.INTERFACES.SGI.SCHED_PARAMS, using defaults
+[2021-04-20T11:56:10.588935] [spgwu] [spgwu_app] [info ] ==== EURECOM SPGW-U vBranch: gtp_extension_header Abrev. Hash: f13f4a5 Date: Tue Feb 23 20:03:58 2021 +0000 ====
+[2021-04-20T11:56:10.588953] [spgwu] [spgwu_app] [info ] Configuration:
+[2021-04-20T11:56:10.588963] [spgwu] [spgwu_app] [info ] - Instance ..............: 0
+[2021-04-20T11:56:10.589259] [spgwu] [spgwu_app] [info ] - PID dir ...............: /var/run
+[2021-04-20T11:56:10.589273] [spgwu] [spgwu_app] [info ] - ITTI tasks:
+[2021-04-20T11:56:10.589282] [spgwu] [spgwu_app] [info ]     ITTI Timer task:
+[2021-04-20T11:56:10.589291] [spgwu] [spgwu_app] [info ]       CPU ID .........: 0
+[2021-04-20T11:56:10.589300] [spgwu] [spgwu_app] [info ]       sched policy....: 1
+[2021-04-20T11:56:10.589309] [spgwu] [spgwu_app] [info ]       sched priority..: 85
+[2021-04-20T11:56:10.589318] [spgwu] [spgwu_app] [info ]     SPGWU-S1U task:
+[2021-04-20T11:56:10.589326] [spgwu] [spgwu_app] [info ]       CPU ID .........: 0
+[2021-04-20T11:56:10.589335] [spgwu] [spgwu_app] [info ]       sched policy....: 1
+[2021-04-20T11:56:10.589343] [spgwu] [spgwu_app] [info ]       sched priority..: 84
+[2021-04-20T11:56:10.589352] [spgwu] [spgwu_app] [info ]     SPGWU-SX task:
+[2021-04-20T11:56:10.589361] [spgwu] [spgwu_app] [info ]       CPU ID .........: 0
+[2021-04-20T11:56:10.589369] [spgwu] [spgwu_app] [info ]       sched policy....: 1
+[2021-04-20T11:56:10.589378] [spgwu] [spgwu_app] [info ]       sched priority..: 84
+[2021-04-20T11:56:10.589386] [spgwu] [spgwu_app] [info ]     SPGWU_APP task:
+[2021-04-20T11:56:10.589395] [spgwu] [spgwu_app] [info ]       CPU ID .........: 0
+[2021-04-20T11:56:10.589403] [spgwu] [spgwu_app] [info ]       sched policy....: 1
+[2021-04-20T11:56:10.589412] [spgwu] [spgwu_app] [info ]       sched priority..: 84
+[2021-04-20T11:56:10.589420] [spgwu] [spgwu_app] [info ]     ASYNC_SHELL_CMD task:
+[2021-04-20T11:56:10.589521] [spgwu] [spgwu_app] [info ]       CPU ID .........: 0
+[2021-04-20T11:56:10.589534] [spgwu] [spgwu_app] [info ]       sched policy....: 1
+[2021-04-20T11:56:10.589543] [spgwu] [spgwu_app] [info ]       sched priority..: 84
+```
+
+### 6.4 Start the gNB and turn on the UE
+
+- Start the gNB and turn on the mobile phone or change from airplane mode to signalling mode. 
+- Once the UE is successfully connected and receives an ip-address try to reach public site via internet and then stop all the core network components and gNB to analyze the pcaps, logs, etc. 
+
+## 7. Analyzing the Results
+
+- Log files and pcaps for the demo
+
+| file_name                                                 |
+| :-------------------------------------------------------- |
+| [amf.log](./results/cotsue/logs/amf.log)     |
+| [smf.log](./results/cotsue/logs/smf.log)     |
+| [spgw-u.log](./results/cotsue/logs/spgwu.log) |
+| [core.pcap](./results/cotsue/pcap/core.pcap) |
+
+### 7.1 Analyzing initial message exchange
+
+Using wireshark open core.pcap  use the filter `ngap || http || pfcp || gtp`
+
+1. Initial UE Message registration request: Packet 197
+
+2. Authentication and security process: Packet 394, 401, 556, 564
+
+3. Registration complete: 768
+
+4. PDU session establishment request: Packet 883
+
+5. AMF <--> SMF PDU session request: Packet 984
+
+6. SMF <--> UPF PFCP session establishment: Packet 1164 & 1176
+
+7. Allocated UE IP-address can be seen in Packet 1164, 1274, 1359
+
+8. Echo request response between UE and Dn：Packet 2076, 2080
+  
+  ![](./images/virtual-machine/cots-ue/bupt/process.png]
+
+## 8. Demo Video
+
+- Here is the link to the [video](https://drive.google.com/file/d/1oPzYoVwbV5zzn0TV17AfqVOsxxIdGJXT/view?usp=sharing)

docs/DEPLOY_SA5G_WITH_DS_TESTER.md

@@ -7,13 +7,13 @@
       </a>
     </td>
     <td style="border-collapse: collapse; border: none; vertical-align: center;">
-      <b><font size = "5">OpenAirInterface 5G Core Network Deployment and Testing with dsTest</font></b>
+      <b><font size = "5">OpenAirInterface 5G Core Network Deployment using Docker-Compose and Testing with dsTest</font></b>
     </td>
   </tr>
 </table>
 
 
-![SA dsTest Demo](./images/5gCN.jpg)
+![SA dsTest Demo](./images/docker-compose/5gCN.jpg)
 
 **TABLE OF CONTENTS**
 
@@ -183,7 +183,7 @@ To know how to configure the machine with the above requirements vist [pre-requi
 
 - [SmartEvents State Machine](https://www.developingsolutions.com/Help/Topics/SmartFlow-SmartEvents-State-Machines.htm) used for this dsTest scenario is below, the number on each arrow between different states depicts transition interval in milli seconds. 
 
-![SmartEvent State Machine](./images/smartevent.png)
+![SmartEvent State Machine](./images/docker-compose/smartevent.png)
 
 
 
@@ -299,14 +299,15 @@ This section is subdivided in two parts the first part for analysing the message
 
 
 
-| Pcap/log files                                                                             |
-|:------------------------------------------------------------------------------------------ |
-| [5gcn-deployment.pcap](./results/pcap/5gcn-deployment.pcap)                                |
-| [scenario-execution.pcap](./results/pcap/scenario-execution.pcap)                          |
-| [amf.log](./results/logs/amf.log), [initialmessage.log](./results/logs/initialmessage.log) |
-| [smf.log](./results/logs/smf.log)                                                          |
-| [nrf.log](./results/logs/nrf.log)                                                          |
-| [spgwu.log](./results/logs/spgwu.log)                                                      |
+
+| Pcap/log files                                                                                           |
+|:-------------------------------------------------------------------------------------------------------- |
+| [5gcn-deployment.pcap](./results/dsTest/pcap/5gcn-deployment.pcap)                                       |
+| [scenario-execution.pcap](./results/dsTest/pcap/scenario-execution.pcap)                                 |
+| [amf.log](./results/dsTest/logs/amf.log), [initialmessage.log](./results/dsTest/logs/initialmessage.log) |
+| [smf.log](./results/dsTest/logs/smf.log)                                                                 |
+| [nrf.log](./results/dsTest/logs/nrf.log)                                                                 |
+| [spgwu.log](./results/dsTest/logs/spgwu.log)                                                             |
 
 
 ### Analysing initial message exchange
@@ -320,7 +321,7 @@ Using wireshark open 5gcn-deployment.pcap use the filter http || pfcp
 - SMF <--> UPF PFCP Association Setup request and response: Packet 42, 46
 - Message exchange between SMF, NRF and UPF can be seen in nrf.log but the name of the network function is replaced with a unique identifier (UUID). 
 
-![Analysing initial message exchange](./images/start.png)
+![Analysing initial message exchange](./images/docker-compose/start.png)
 
 
 ### Analysing scenario execution
@@ -338,13 +339,13 @@ Using wireshark open scenario-execution.pcap use the filter ngap || http || pfcp
 - Allocated UE IP-address can be seen in Packet 93, 102, 109
 - Echo request response between UE and oai-ext-dn container: Packet 129, 130
 
-![Scenario execution 1](./images/scenario-1.png)
+![Scenario execution 1](./images/docker-compose/scenario-1.png)
 
 - UE PDU session release request: Packet 394
 - AMF <--> SMF PDU session release request: Packet 398
 - NGreset : Packet 473
 
-![Scenario execution 2](./images/scenario-2.png)
+![Scenario execution 2](./images/docker-compose/scenario-2.png)
 
 
 ## 9. Demo Video ##