From 049a21eba01542b0bfa9bf59cd5a967e09894aba Mon Sep 17 00:00:00 2001 From: Thierry Turletti <thierry.turletti@inria.fr> Date: Thu, 28 Mar 2024 19:53:24 +0000 Subject: [PATCH] Revert "Revert "Merge tag 'v2.0.1' into develop-r2lab"" This reverts commit 8ed01f94bcb789f4fb6678d9d8b42d3f7f6cc255 --- CHANGELOG.md | 31 ++ README.md | 2 +- charts/oai-5g-core/oai-5g-advance/Chart.yaml | 20 +- .../oai-5g-advance/nssf_slice_config.yaml | 2 +- charts/oai-5g-core/oai-5g-advance/values.yaml | 16 +- charts/oai-5g-core/oai-5g-basic/Chart.yaml | 18 +- charts/oai-5g-core/oai-5g-basic/values.yaml | 14 +- charts/oai-5g-core/oai-5g-mini/Chart.yaml | 12 +- charts/oai-5g-core/oai-5g-mini/values.yaml | 8 +- charts/oai-5g-core/oai-amf/Chart.yaml | 4 +- charts/oai-5g-core/oai-amf/values.yaml | 2 +- charts/oai-5g-core/oai-ausf/Chart.yaml | 4 +- charts/oai-5g-core/oai-ausf/values.yaml | 2 +- charts/oai-5g-core/oai-nrf/Chart.yaml | 4 +- charts/oai-5g-core/oai-nrf/values.yaml | 2 +- charts/oai-5g-core/oai-nssf/Chart.yaml | 4 +- charts/oai-5g-core/oai-nssf/values.yaml | 2 +- charts/oai-5g-core/oai-smf/Chart.yaml | 4 +- charts/oai-5g-core/oai-smf/values.yaml | 2 +- charts/oai-5g-core/oai-udm/Chart.yaml | 4 +- charts/oai-5g-core/oai-udm/values.yaml | 2 +- charts/oai-5g-core/oai-udr/Chart.yaml | 4 +- charts/oai-5g-core/oai-udr/values.yaml | 2 +- charts/oai-5g-core/oai-upf/Chart.yaml | 4 +- charts/oai-5g-core/oai-upf/values.yaml | 2 +- ci-scripts/Jenkinsfile-GitLab-COTS-UE-Test | 79 +--- ci-scripts/Jenkinsfile-GitLab-Load-Check | 2 +- ci-scripts/Jenkinsfile-GitLab-NGAP-Tester | 2 +- ci-scripts/Jenkinsfile-GitLab-Tutorial-Check | 2 +- .../Jenkinsfile-GitLab-Tutorial-Check-eBPF | 2 +- ci-scripts/checkCOTS-UE-Testing.py | 7 + ci-scripts/checkOcRegistry.py | 136 ++++++ ci-scripts/checkUePduSession.py | 96 ++++ component/oai-amf | 2 +- component/oai-smf | 2 +- component/oai-udm | 2 +- component/oai-udr | 2 +- .../docker-compose-basic-nrf-ebpf.yaml | 14 +- .../docker-compose-basic-nrf-mongodb.yaml | 14 +- docker-compose/docker-compose-basic-nrf.yaml | 14 +- .../docker-compose-basic-vpp-nrf.yaml | 14 +- ...ker-compose-basic-vpp-pcf-redirection.yaml | 16 +- ...docker-compose-basic-vpp-pcf-steering.yaml | 16 +- .../docker-compose-basic-vpp-pcf-ulcl.yaml | 20 +- docker-compose/docker-compose-mini-nonrf.yaml | 6 +- .../docker-compose-no-privilege.yaml | 6 +- .../docker-compose-slicing-basic-nrf.yaml | 26 +- docs/BUILD_IMAGES.md | 34 +- docs/DEPLOY_SA5G_HC.md | 7 +- docs/DEPLOY_SA5G_MINI_WITH_GNBSIM.md | 8 +- docs/DEPLOY_SA5G_REDIRECTION.md | 18 +- docs/DEPLOY_SA5G_SLICING.md | 41 +- docs/DEPLOY_SA5G_STEERING.md | 18 +- docs/DEPLOY_SA5G_WITH_UPF_EBPF.md | 16 +- docs/RETRIEVE_OFFICIAL_IMAGES.md | 52 +-- docs/meeting_invitations/invite-2023.ics | 242 ---------- docs/meeting_invitations/invite-2024.ics | 429 ++++++++++++++++++ 57 files changed, 952 insertions(+), 564 deletions(-) create mode 100755 ci-scripts/checkOcRegistry.py create mode 100755 ci-scripts/checkUePduSession.py delete mode 100644 docs/meeting_invitations/invite-2023.ics create mode 100644 docs/meeting_invitations/invite-2024.ics diff --git a/CHANGELOG.md b/CHANGELOG.md index 32bee7fe..08251950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,36 @@ # RELEASE NOTES: # +## v2.0.1 -- January 2024 ## + +* `AMF` changes: + * Features + - NGAP AMF status indication + - Add UE Retention Information support + - Update NAS with Rel 16.14.0 IEs + * Refactoring code for Encode/Decode functions + * Cleanup NAS lib + * Fixes + - Fix typo for N1N2MessageSubscribe + - Fix issue when receiving PDU session reject from SMF + * Tech debt + - Reformating of the SCTP code + - Refactor promise handling + - Removing dependencies to libconfig++ (Only YAML file can be read as configuration) +* `SMF` changes: + * Features + - Add N1/N2 info in the message response to AMF if available + * Fixes + - Remove NRF dependency from SMF + * Tech debt + - Refactor SMF PFCP associations to always use UPF info +* `UDM` changes: + * Fixes + - Remove NRF dependency from SMF +* `UDR` changes: + * Tech debt + - Fixed builds + - Refactor mongoDB + ## v2.0.0 -- December 2023 ## * 2 new Network Functions: diff --git a/README.md b/README.md index 5e70852c..693c904c 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ Process is explained in [CONTRIBUTING](CONTRIBUTING.md) file. If you wish to discuss development topics, we have a weekly one-hour meeting every Tuesday at 11AM CET. -The meeting details are available through this [ics file](./docs/meeting_invitations/invite-2023.ics). +The meeting details are available through this [ics file](./docs/meeting_invitations/invite-2024.ics). # Contribution requests diff --git a/charts/oai-5g-core/oai-5g-advance/Chart.yaml b/charts/oai-5g-core/oai-5g-advance/Chart.yaml index e97b3312..c3e47318 100644 --- a/charts/oai-5g-core/oai-5g-advance/Chart.yaml +++ b/charts/oai-5g-core/oai-5g-advance/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: oai-5g-advance -version: v2.0.0 -appVersion: master-v2.0.0 +version: v2.0.1 +appVersion: master-v2.0.1 icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png description: OAI 5G Release 16 Core Network type: application @@ -30,35 +30,35 @@ dependencies: - condition: oai-nssf.enabled name: oai-nssf repository: "file://../oai-nssf" - version: v2.0.0 + version: v2.0.1 - condition: oai-nrf.enabled name: oai-nrf repository: "file://../oai-nrf" - version: v2.0.0 + version: v2.0.1 - condition: oai-udr.enabled name: oai-udr repository: "file://../oai-udr" - version: v2.0.0 + version: v2.0.1 - condition: oai-udm.enabled name: oai-udm repository: "file://../oai-udm" - version: v2.0.0 + version: v2.0.1 - condition: oai-ausf.enabled name: oai-ausf repository: "file://../oai-ausf" - version: v2.0.0 + version: v2.0.1 - condition: oai-amf.enabled name: oai-amf repository: "file://../oai-amf" - version: v2.0.0 + version: v2.0.1 - condition: oai-smf.enabled name: oai-smf repository: "file://../oai-smf" - version: v2.0.0 + version: v2.0.1 - condition: oai-upf.enabled name: oai-upf repository: "file://../oai-upf" - version: v2.0.0 + version: v2.0.1 #- condition: oai-traffic-server.enabled # name: oai-traffic-server # repository: "file://../oai-traffic-server" diff --git a/charts/oai-5g-core/oai-5g-advance/nssf_slice_config.yaml b/charts/oai-5g-core/oai-5g-advance/nssf_slice_config.yaml index 97a73c69..69efff0b 100644 --- a/charts/oai-5g-core/oai-5g-advance/nssf_slice_config.yaml +++ b/charts/oai-5g-core/oai-5g-advance/nssf_slice_config.yaml @@ -1,7 +1,7 @@ # Reference:- TS 29.531 R16.0.0., Section- 6.1.6 Data Model info: version: 2.0.0 - description: OAI-NSSF Release v2.0.0 + description: OAI-NSSF Release v2.0.1 configuration: nsiInfoList: - snssai: diff --git a/charts/oai-5g-core/oai-5g-advance/values.yaml b/charts/oai-5g-core/oai-5g-advance/values.yaml index 70e52873..51c322df 100644 --- a/charts/oai-5g-core/oai-5g-advance/values.yaml +++ b/charts/oai-5g-core/oai-5g-advance/values.yaml @@ -17,7 +17,7 @@ oai-nrf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-nrf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -31,7 +31,7 @@ oai-nssf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-nssf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent imagePullSecrets: @@ -45,7 +45,7 @@ oai-udr: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-udr ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -59,7 +59,7 @@ oai-udm: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-udm ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -73,7 +73,7 @@ oai-ausf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-ausf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -94,7 +94,7 @@ oai-amf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-amf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: @@ -129,7 +129,7 @@ oai-upf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-upf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: @@ -215,7 +215,7 @@ oai-smf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-smf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: diff --git a/charts/oai-5g-core/oai-5g-basic/Chart.yaml b/charts/oai-5g-core/oai-5g-basic/Chart.yaml index 1e9ee156..4721ebf8 100644 --- a/charts/oai-5g-core/oai-5g-basic/Chart.yaml +++ b/charts/oai-5g-core/oai-5g-basic/Chart.yaml @@ -2,10 +2,10 @@ apiVersion: v2 name: oai-5g-basic type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 description: OAI 5G Release 16 Core Network -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN @@ -30,31 +30,31 @@ dependencies: - condition: oai-nrf.enabled name: oai-nrf repository: "file://../oai-nrf" - version: v2.0.0 + version: v2.0.1 - condition: oai-udr.enabled name: oai-udr repository: "file://../oai-udr" - version: v2.0.0 + version: v2.0.1 - condition: oai-udm.enabled name: oai-udm repository: "file://../oai-udm" - version: v2.0.0 + version: v2.0.1 - condition: oai-ausf.enabled name: oai-ausf repository: "file://../oai-ausf" - version: v2.0.0 + version: v2.0.1 - condition: oai-amf.enabled name: oai-amf repository: "file://../oai-amf" - version: v2.0.0 + version: v2.0.1 - condition: oai-smf.enabled name: oai-smf repository: "file://../oai-smf" - version: v2.0.0 + version: v2.0.1 - condition: oai-upf.enabled name: oai-upf repository: "file://../oai-upf" - version: v2.0.0 + version: v2.0.1 #- condition: oai-traffic-server.enabled # name: oai-traffic-server # repository: "file://../oai-traffic-server" diff --git a/charts/oai-5g-core/oai-5g-basic/values.yaml b/charts/oai-5g-core/oai-5g-basic/values.yaml index ee460f24..50641bd0 100644 --- a/charts/oai-5g-core/oai-5g-basic/values.yaml +++ b/charts/oai-5g-core/oai-5g-basic/values.yaml @@ -18,7 +18,7 @@ oai-nrf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-nrf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -32,7 +32,7 @@ oai-udr: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-udr ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -46,7 +46,7 @@ oai-udm: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-udm ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: @TCPDUMP_CONTAINER@ #only for taking pcaps inside network function pod @@ -60,7 +60,7 @@ oai-ausf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-ausf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: @@ -80,7 +80,7 @@ oai-amf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-amf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: @@ -117,7 +117,7 @@ oai-upf: #repository: docker.io/r2labuser/oai-upf ## The image will be pulled from dockerhub #version: v2.0.0 ## The branch to be used to pull from dockerhub repository: docker.io/oaisoftwarealliance/oai-upf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: @@ -203,7 +203,7 @@ oai-smf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-smf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent start: diff --git a/charts/oai-5g-core/oai-5g-mini/Chart.yaml b/charts/oai-5g-core/oai-5g-mini/Chart.yaml index e06b352d..431476ab 100644 --- a/charts/oai-5g-core/oai-5g-mini/Chart.yaml +++ b/charts/oai-5g-core/oai-5g-mini/Chart.yaml @@ -2,10 +2,10 @@ apiVersion: v2 name: oai-5g-mini type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 description: OAI 5G Release 16 Core Network -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN @@ -26,19 +26,19 @@ dependencies: - condition: oai-nrf.enabled name: oai-nrf repository: "file://../oai-nrf" - version: v2.0.0 + version: v2.0.1 - condition: oai-amf.enabled name: oai-amf repository: "file://../oai-amf" - version: v2.0.0 + version: v2.0.1 - condition: oai-smf.enabled name: oai-smf repository: "file://../oai-smf" - version: v2.0.0 + version: v2.0.1 - condition: oai-upf.enabled name: oai-upf repository: "file://../oai-upf" - version: v2.0.0 + version: v2.0.1 #- condition: oai-traffic-server.enabled # name: oai-traffic-server # repository: "file://../oai-traffic-server" diff --git a/charts/oai-5g-core/oai-5g-mini/values.yaml b/charts/oai-5g-core/oai-5g-mini/values.yaml index 2add72cb..c12b6fb3 100644 --- a/charts/oai-5g-core/oai-5g-mini/values.yaml +++ b/charts/oai-5g-core/oai-5g-mini/values.yaml @@ -17,7 +17,7 @@ oai-nrf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-nrf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: false #only for taking pcaps inside network function pod @@ -31,7 +31,7 @@ oai-amf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-amf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: false #only for taking pcaps inside network function pod @@ -57,7 +57,7 @@ oai-upf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-upf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: false #only for taking pcaps inside network function pod @@ -130,7 +130,7 @@ oai-smf: kubernetesType: Vanilla #Openshift/Vanilla Vanilla for Upstream Kubernetes nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-smf ## The image will be pulled from dockerhub - version: v2.0.0 ## The branch to be used to pull from dockerhub + version: v2.0.1 ## The branch to be used to pull from dockerhub # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent includeTcpDumpContainer: false #only for taking pcaps inside network function pod diff --git a/charts/oai-5g-core/oai-amf/Chart.yaml b/charts/oai-5g-core/oai-amf/Chart.yaml index f0c3aac7..7a7b3558 100644 --- a/charts/oai-5g-core/oai-amf/Chart.yaml +++ b/charts/oai-5g-core/oai-amf/Chart.yaml @@ -26,9 +26,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN diff --git a/charts/oai-5g-core/oai-amf/values.yaml b/charts/oai-5g-core/oai-amf/values.yaml index 6f13e8ca..6028ee2b 100644 --- a/charts/oai-5g-core/oai-amf/values.yaml +++ b/charts/oai-5g-core/oai-amf/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: # image name either locally present or in a public/private repository repository: docker.io/oaisoftwarealliance/oai-amf ## The image will be pulled from dockerhub - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-ausf/Chart.yaml b/charts/oai-5g-core/oai-ausf/Chart.yaml index 9cae24cf..c5f4fc97 100644 --- a/charts/oai-5g-core/oai-ausf/Chart.yaml +++ b/charts/oai-5g-core/oai-ausf/Chart.yaml @@ -26,9 +26,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN diff --git a/charts/oai-5g-core/oai-ausf/values.yaml b/charts/oai-5g-core/oai-ausf/values.yaml index 4e75d050..71a47b7c 100644 --- a/charts/oai-5g-core/oai-ausf/values.yaml +++ b/charts/oai-5g-core/oai-ausf/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: repository: docker.io/oaisoftwarealliance/oai-ausf ## oaisoftwarealliance/oai-ausf # image name either locally present or in a public/private repository - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features #pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-nrf/Chart.yaml b/charts/oai-5g-core/oai-nrf/Chart.yaml index 047d05e1..4ce8d0ac 100644 --- a/charts/oai-5g-core/oai-nrf/Chart.yaml +++ b/charts/oai-5g-core/oai-nrf/Chart.yaml @@ -26,9 +26,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN diff --git a/charts/oai-5g-core/oai-nrf/values.yaml b/charts/oai-5g-core/oai-nrf/values.yaml index da9a89f9..c43338b8 100644 --- a/charts/oai-5g-core/oai-nrf/values.yaml +++ b/charts/oai-5g-core/oai-nrf/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: repository: docker.io/oaisoftwarealliance/oai-nrf - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-nssf/Chart.yaml b/charts/oai-5g-core/oai-nssf/Chart.yaml index 5257024b..08370829 100644 --- a/charts/oai-5g-core/oai-nssf/Chart.yaml +++ b/charts/oai-5g-core/oai-nssf/Chart.yaml @@ -26,9 +26,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN diff --git a/charts/oai-5g-core/oai-nssf/values.yaml b/charts/oai-5g-core/oai-nssf/values.yaml index 9e0e5e24..0eb468c9 100644 --- a/charts/oai-5g-core/oai-nssf/values.yaml +++ b/charts/oai-5g-core/oai-nssf/values.yaml @@ -2,7 +2,7 @@ kubernetesType: Vanilla # Vanilla (Community Kubernetes) or Openshift (For RedH nfimage: repository: docker.io/oaisoftwarealliance/oai-nssf # image name either locally present or in a public/private repository - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features #pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-smf/Chart.yaml b/charts/oai-5g-core/oai-smf/Chart.yaml index b86290e6..9a7b7856 100644 --- a/charts/oai-5g-core/oai-smf/Chart.yaml +++ b/charts/oai-5g-core/oai-smf/Chart.yaml @@ -26,9 +26,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5G diff --git a/charts/oai-5g-core/oai-smf/values.yaml b/charts/oai-5g-core/oai-smf/values.yaml index dea1534b..60c856eb 100644 --- a/charts/oai-5g-core/oai-smf/values.yaml +++ b/charts/oai-5g-core/oai-smf/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: repository: docker.io/oaisoftwarealliance/oai-smf #docker.io/oaisoftwarealliance/oai-smf # dockerhub oaisoftwarealliance/oai-smf - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features #pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-udm/Chart.yaml b/charts/oai-5g-core/oai-udm/Chart.yaml index ebcce7e8..40244523 100644 --- a/charts/oai-5g-core/oai-udm/Chart.yaml +++ b/charts/oai-5g-core/oai-udm/Chart.yaml @@ -27,9 +27,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN diff --git a/charts/oai-5g-core/oai-udm/values.yaml b/charts/oai-5g-core/oai-udm/values.yaml index 41a0953a..5eaa4dff 100644 --- a/charts/oai-5g-core/oai-udm/values.yaml +++ b/charts/oai-5g-core/oai-udm/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: repository: docker.io/oaisoftwarealliance/oai-udm - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features #pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-udr/Chart.yaml b/charts/oai-5g-core/oai-udr/Chart.yaml index 59c597dc..e22f98bf 100644 --- a/charts/oai-5g-core/oai-udr/Chart.yaml +++ b/charts/oai-5g-core/oai-udr/Chart.yaml @@ -27,9 +27,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5GCN diff --git a/charts/oai-5g-core/oai-udr/values.yaml b/charts/oai-5g-core/oai-udr/values.yaml index d570623b..01e05254 100644 --- a/charts/oai-5g-core/oai-udr/values.yaml +++ b/charts/oai-5g-core/oai-udr/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: repository: docker.io/oaisoftwarealliance/oai-udr # image name either locally present or in a public/private repository - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features #pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/charts/oai-5g-core/oai-upf/Chart.yaml b/charts/oai-5g-core/oai-upf/Chart.yaml index 76afc773..d561c738 100644 --- a/charts/oai-5g-core/oai-upf/Chart.yaml +++ b/charts/oai-5g-core/oai-upf/Chart.yaml @@ -26,9 +26,9 @@ type: application icon: http://www.openairinterface.org/wp-content/uploads/2015/06/cropped-oai_final_logo.png -version: v2.0.0 +version: v2.0.1 -appVersion: v2.0.0 +appVersion: v2.0.1 keywords: - 5G diff --git a/charts/oai-5g-core/oai-upf/values.yaml b/charts/oai-5g-core/oai-upf/values.yaml index 7d6535d6..5cac1d0c 100644 --- a/charts/oai-5g-core/oai-upf/values.yaml +++ b/charts/oai-5g-core/oai-upf/values.yaml @@ -4,7 +4,7 @@ kubernetesType: Vanilla #Vanilla for community kubernetes distribution else Ope ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift nfimage: repository: docker.io/oaisoftwarealliance/oai-upf # dockerhub oaisoftwarealliance/oai-upf - version: v2.0.0 #image tag, develop tag for experimental features + version: v2.0.1 #image tag, develop tag for experimental features # pullPolicy: IfNotPresent or Never or Always pullPolicy: IfNotPresent diff --git a/ci-scripts/Jenkinsfile-GitLab-COTS-UE-Test b/ci-scripts/Jenkinsfile-GitLab-COTS-UE-Test index ef9e34d7..0c8efa67 100644 --- a/ci-scripts/Jenkinsfile-GitLab-COTS-UE-Test +++ b/ci-scripts/Jenkinsfile-GitLab-COTS-UE-Test @@ -123,25 +123,10 @@ pipeline { } if ((branchNames[ii] == "develop") && (baseTags[ii] == "develop")) { destTags[ii] = getLastCommitFromBranch(ii, repoNames[ii], branchNames[ii]) - baseTags[ii] = getCorrectBaseTag(imageNames[ii], destTags[ii]) } else { destTags[ii] = baseTags[ii] } } - // Checking if all needed images are on cetautomatix to be pushed - imageStatus = 0 - for (ii = 0; ii < imageNames.size(); ii++) { - imageStatus += checkImageInfo(imageNames[ii], baseTags[ii]) - } - if (imageStatus > 0) { - coreDeploy = false - gnbDeploy = false - testStart0 = false - testStart1 = false - testStop0 = false - testStop1 = false - error ("Some images are not present!") - } } } } @@ -153,17 +138,11 @@ pipeline { [$class: 'UsernamePasswordMultiBinding', credentialsId: "${params.cn_oc_credentials}", usernameVariable: 'OC_Username', passwordVariable: 'OC_Password'] ]) { sh "oc login -u ${OC_Username} -p ${OC_Password}" - sh "oc whoami -t | sudo podman login -u ${OC_Username} --password-stdin ${oc_registry_url} --tls-verify=false" logoutToDo = true - } - sh "oc project ${oc_project_name}" - for (ii = 0; ii < imageNames.size(); ii++) { - pushToOpenshiftRegistry (imageNames[ii], baseTags[ii], destTags[ii]) - appendImageInfo(imageNames[ii], destTags[ii]) - } - // Checking that will-be-used tags have been pushed - for (ii = 0; ii < imageNames.size(); ii++) { - sh "oc describe is ${imageNames[ii]} | grep ${destTags[ii]}" + sh "oc project ${oc_project_name}" + for (ii = 0; ii < imageNames.size(); ii++) { + sh "./ci-scripts/checkOcRegistry.py --image-name ${imageNames[ii]} --tag ${destTags[ii]} --project ${oc_project_name} -u ${OC_Username}" + } } // Putting the new tags in charts // Let's work now in the basic chart folder @@ -386,7 +365,6 @@ pipeline { sh "oc get pods -o wide" deployedCore = false } - sh "sudo podman logout ${oc_registry_url}" sh 'oc logout' logoutToDo = false } @@ -445,7 +423,6 @@ pipeline { } } if (logoutToDo) { - sh "sudo podman logout ${oc_registry_url}" sh 'oc logout' } sh 'zip -r cn5g_cots_ue_test_logs.zip archives' @@ -495,54 +472,6 @@ def getLastCommitFromBranch(index, repoName, branchName) { return "${branchName}-${shaone}" } -def getCorrectBaseTag(imageName, destTag) { - baseTag = "develop" - try { - sh "sudo podman images | grep ${imageName} | grep ${destTag}" - baseTag = destTag - } catch (Exception e) { - echo "Still using develop as base tag" - } - return baseTag -} - -def checkImageInfo (imageName, origTag) { - status = 0 - sh "echo 'Tested Tag is ${imageName}:${origTag}' > archives/${imageName}-image-info.log" - try { - sh "sudo podman image inspect --format='Size = {{.Size}} bytes' ${imageName}:${origTag} >> archives/${imageName}-image-info.log" - sh "sudo podman image inspect --format='Date = {{.Created}}' ${imageName}:${origTag} >> archives/${imageName}-image-info.log" - } catch (Exception e) { - echo "${imageName} Image tag to test (${imageName}:${origTag} does not exist!" - status = 1 - } - return status -} - -def appendImageInfo (imageName, destTag) { - sh "echo 'OC Pushed Tag is ${imageName}:${destTag}' >> archives/${imageName}-image-info.log" -} - -def pushToOpenshiftRegistry (imageName, origTag, destTag) { - noHttpsURL = oc_registry_url.replaceAll("https://", "") - sh "sudo podman rmi ${noHttpsURL}/${oc_project_name}/${imageName}:${destTag} || true" - sh "sudo podman image tag ${imageName}:${origTag} ${noHttpsURL}/${oc_project_name}/${imageName}:${destTag}" - cnt = 0 - while (cnt < 4) { - try { - sh "sudo podman push --tls-verify=false ${noHttpsURL}/${oc_project_name}/${imageName}:${destTag}" - cnt = 10 - } catch (Exception e) { - echo "Network issue when pushing? Trying again!" - cnt += 1 - } - } - sh "sudo podman rmi ${noHttpsURL}/${oc_project_name}/${imageName}:${destTag} || true" - if (cnt != 10) { - error "Could not push" - } -} - def checkCoreNetworkDeployment() { status = 0 sh 'mkdir -p archives' diff --git a/ci-scripts/Jenkinsfile-GitLab-Load-Check b/ci-scripts/Jenkinsfile-GitLab-Load-Check index 0b272617..6eba6da9 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Load-Check +++ b/ci-scripts/Jenkinsfile-GitLab-Load-Check @@ -559,7 +559,7 @@ def checkImageInfo(imageName, origTag) { def updateDockerCompose(filename, lRanTag) { for (ii = 0; ii < imageNames.size(); ii++) { - sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename + sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.1@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename } sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename sh 'sed -i -e "s@5gc-gnbsim:tag-to-use@5gc-gnbsim:' + lRanTag + '@" ci-scripts/docker-compose/load-test-gnbsim/docker-compose-omec-gnbsim.yaml' diff --git a/ci-scripts/Jenkinsfile-GitLab-NGAP-Tester b/ci-scripts/Jenkinsfile-GitLab-NGAP-Tester index 07c841da..b31f9229 100644 --- a/ci-scripts/Jenkinsfile-GitLab-NGAP-Tester +++ b/ci-scripts/Jenkinsfile-GitLab-NGAP-Tester @@ -381,7 +381,7 @@ def checkImageInfo(imageName, origTag) { def updateDockerCompose(filename, lRanTag) { for (ii = 0; ii < imageNames.size(); ii++) { - sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename + sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.1@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename } sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename sh 'sed -i -e "s@ngap-tester:develop@ngap-tester:' + lRanTag + '@" ci-scripts/docker-compose/ngap-tester/docker-compose-ngap-tester.yaml' diff --git a/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check b/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check index ab4030e5..5468c513 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check +++ b/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check @@ -502,7 +502,7 @@ def checkImageInfo(imageName, origTag) { def updateDockerCompose(filename, lRanTag) { for (ii = 0; ii < imageNames.size(); ii++) { - sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename + sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.1@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename } sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename // Using the develop variant of gnbsim diff --git a/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check-eBPF b/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check-eBPF index 4146bb95..ec425ee3 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check-eBPF +++ b/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check-eBPF @@ -338,7 +338,7 @@ def checkImageInfo(imageName, origTag) { def updateDockerCompose(filename, lRanTag) { for (ii = 0; ii < imageNames.size(); ii++) { - sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename + sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.0.1@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename } sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename // Using the develop variant of gnbsim diff --git a/ci-scripts/checkCOTS-UE-Testing.py b/ci-scripts/checkCOTS-UE-Testing.py index 5c6a4432..3f5aa04c 100755 --- a/ci-scripts/checkCOTS-UE-Testing.py +++ b/ci-scripts/checkCOTS-UE-Testing.py @@ -176,12 +176,19 @@ def nfDetails(nfName): size = f'{(sizeInt/1000000000):.3f} Gbytes' else: size = f'{(sizeInt/1000000):.1f} Mbytes' + result = re.search('Image Size:\\t*(?P<imageSize>[0-9\.]+)MB', line) + if result is not None: + sizeInt = float(result.group('imageSize')) * 2.6 + size = f'{sizeInt:.1f} Mbytes' result = re.search('Date = (?P<imageDate>[0-9\-]+ [0-9\:]+)', line) if result is not None: creationDate = result.group('imageDate') result = re.search('Date = (?P<imageDate>[0-9\-]+T[0-9\:]+)', line) if result is not None: creationDate = re.sub('T', ' ', result.group('imageDate')) + result = re.search('"(?P<imageDate>[0-9\-]+T[0-9\:]+)Z"', line) + if result is not None: + creationDate = re.sub('T', ' ', result.group('imageDate')) return generate_image_table_row(contName, fullTag, ocTag, creationDate, size) diff --git a/ci-scripts/checkOcRegistry.py b/ci-scripts/checkOcRegistry.py new file mode 100755 index 00000000..9677053c --- /dev/null +++ b/ci-scripts/checkOcRegistry.py @@ -0,0 +1,136 @@ +#!/usr/bin/env python3 +""" +Licensed to the OpenAirInterface (OAI) Software Alliance under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The OpenAirInterface Software Alliance licenses this file to You under +the OAI Public License, Version 1.1 (the "License"); you may not use this file +except in compliance with the License. +You may obtain a copy of the License at + + http://www.openairinterface.org/?page_id=698 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +------------------------------------------------------------------------------ +For more information about the OpenAirInterface (OAI) Software Alliance: + contact@openairinterface.org +--------------------------------------------------------------------- +""" + +import argparse +import logging +import re +import sys +import time +import common.python.cls_cmd as cls_cmd + +logging.basicConfig( + level=logging.DEBUG, + stream=sys.stdout, + format="[%(asctime)s] %(levelname)8s: %(message)s" +) + +oc_registry_url = 'https://default-route-openshift-image-registry.apps.oai.cs.eurecom.fr' + +def _parse_args() -> argparse.Namespace: + """Parse the command line args + + Returns: + argparse.Namespace: the created parser + """ + example_text = '''example: + ./ci-scripts/checkOcRegistry.py --help + ./ci-scripts/checkOcRegistry.py --image-name iName --tag tName''' + + parser = argparse.ArgumentParser(description='OAI 5G CORE NETWORK Utility tool', + epilog=example_text, + formatter_class=argparse.RawDescriptionHelpFormatter) + + # Container Name + parser.add_argument( + '--image-name', '-in', + action='store', + required=True, + help='Image Name to check', + ) + + # Tag + parser.add_argument( + '--tag', '-t', + action='store', + required=True, + help='Image Tag to check', + ) + + # OC project + parser.add_argument( + '--project', '-p', + action='store', + required=True, + help='Openshift project', + ) + + # OC username + parser.add_argument( + '--username', '-u', + action='store', + required=True, + help='Openshift Account', + ) + return parser.parse_args() + +def checkImageInfo(imageName, imageTag): + myCmds = cls_cmd.LocalCmd() + ret = myCmds.run(f'oc describe istag {imageName}:{imageTag}', silent=True) + if ret.returncode != 0: + logging.error(f'Image Tag {imageName}:{imageTag} not present in OC registry') + myCmds.close() + return -1 + myCmds.run(f'echo "Tested Tag is {imageName}:{imageTag}" > archives/{imageName}-image-info.log') + myCmds.run(f'oc describe istag {imageName}:{imageTag} | grep "Image Size:" >> archives/{imageName}-image-info.log') + ret = myCmds.run(f'oc describe istag {imageName}:{imageTag} | grep --color=never "Image Name:" | sed -e "s#Image Name:.*sha256#{imageName}@sha256#"', silent=True) + myCmds.run(f'oc get -o json isimage {ret.stdout} | jq .image.dockerImageMetadata.Created >> archives/{imageName}-image-info.log') + myCmds.run(f'echo "OC Pushed Tag is {imageName}:{imageTag}" >> archives/{imageName}-image-info.log') + myCmds.close() + return 0 + +def pushToOcProjectRegistry(imageName, imageTag, ocProject, ocUser): + myCmds = cls_cmd.LocalCmd() + myCmds.run(f'oc whoami -t | sudo podman login -u {ocUser} --password-stdin {oc_registry_url} --tls-verify=false') + noHttpsURL = re.sub("https://", "", oc_registry_url) + logging.debug(f'noHttpsURL is {noHttpsURL}') + myCmds.run(f'sudo podman rmi {noHttpsURL}/{ocProject}/{imageName}:{imageTag} || true') + myCmds.run(f'sudo podman image tag {imageName}:{imageTag} {noHttpsURL}/{ocProject}/{imageName}:{imageTag}') + cnt = 0 + while (cnt < 4): + cnt += 1 + ret = myCmds.run(f'sudo podman push --tls-verify=false {noHttpsURL}/{ocProject}/{imageName}:{imageTag}') + if ret.returncode == 0: + cnt = 10 + myCmds.run(f'sudo podman rmi {noHttpsURL}/{ocProject}/{imageName}:{imageTag} || true') + myCmds.run(f'sudo podman logout {oc_registry_url}') + myCmds.close() + if cnt == 10: + return 0 + else: + return -1 + +if __name__ == '__main__': + # Parse the arguments + args = _parse_args() + + firstStatus = checkImageInfo(args.image_name, args.tag) + # If image is already on the OC registry, we are done + if firstStatus == 0: + sys.exit(0) + + pushStatus = pushToOcProjectRegistry(args.image_name, args.tag, args.project, args.username) + if pushStatus == -1: + sys.exit(-1) + + checkImageInfo(args.image_name, args.tag) + sys.exit(0) diff --git a/ci-scripts/checkUePduSession.py b/ci-scripts/checkUePduSession.py new file mode 100755 index 00000000..fcf1e4f8 --- /dev/null +++ b/ci-scripts/checkUePduSession.py @@ -0,0 +1,96 @@ +#!/usr/bin/env python3 +""" +Licensed to the OpenAirInterface (OAI) Software Alliance under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The OpenAirInterface Software Alliance licenses this file to You under +the OAI Public License, Version 1.1 (the "License"); you may not use this file +except in compliance with the License. +You may obtain a copy of the License at + + http://www.openairinterface.org/?page_id=698 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +------------------------------------------------------------------------------ +For more information about the OpenAirInterface (OAI) Software Alliance: + contact@openairinterface.org +--------------------------------------------------------------------- +""" + +import argparse +import logging +import re +import sys +import time +import common.python.cls_cmd as cls_cmd + +logging.basicConfig( + level=logging.DEBUG, + stream=sys.stdout, + format="[%(asctime)s] %(levelname)8s: %(message)s" +) + +def _parse_args() -> argparse.Namespace: + """Parse the command line args + + Returns: + argparse.Namespace: the created parser + """ + example_text = '''example: + ./ci-scripts/checkContainerStatus.py --help + ./ci-scripts/checkContainerStatus.py --container_name NameOfContainer --max_tries MaxNumberOfAttachTries''' + + parser = argparse.ArgumentParser(description='OAI 5G CORE NETWORK Utility tool', + epilog=example_text, + formatter_class=argparse.RawDescriptionHelpFormatter) + + # Container Name + parser.add_argument( + '--container_name', '-n', + action='store', + help='Name of Container to follow', + ) + + # Time out in seconds + parser.add_argument( + '--max_tries', '-t', + action='store', + type=int, + default=3, + help='Maximum number of UE Attachments Tries', + ) + return parser.parse_args() + +if __name__ == '__main__': + # Parse the arguments + args = _parse_args() + + myCmds = cls_cmd.LocalCmd() + doLoop = True + status = -1 + count = 0 + while doLoop: + if args.container_name == 'rfsim5g-oai-nr-ue1': + time.sleep(20) + res = myCmds.run('docker exec rfsim5g-oai-nr-ue1 ifconfig oaitun_ue1') + if res.returncode == 0: + if re.search('inet 12', res.stdout) is not None: + status = 0 + break + if count == args.max_tries: + break + myCmds.run('docker stop rfsim5g-oai-nr-ue1') + time.sleep(5) + myCmds.run('docker restart rfsim5g-oai-nr-ue1') + time.sleep(10) + count += 1 + else: + status = 0 + break + + myCmds.close() + sys.exit(status) diff --git a/component/oai-amf b/component/oai-amf index 1386199e..2c31091d 160000 --- a/component/oai-amf +++ b/component/oai-amf @@ -1 +1 @@ -Subproject commit 1386199ef610e632b00c90bfee5f7b1f5ae21632 +Subproject commit 2c31091d69682f8af6fac85320431c7bc41cbdd8 diff --git a/component/oai-smf b/component/oai-smf index f499edf0..ffd50b6d 160000 --- a/component/oai-smf +++ b/component/oai-smf @@ -1 +1 @@ -Subproject commit f499edf0e2bd70f52ecd23fd6bfdb960b334cd69 +Subproject commit ffd50b6d9648ea37bdc75497a413a49eeeb29f99 diff --git a/component/oai-udm b/component/oai-udm index 82a284b8..74224d7c 160000 --- a/component/oai-udm +++ b/component/oai-udm @@ -1 +1 @@ -Subproject commit 82a284b8cebe676353e087597879a9533b8f9b05 +Subproject commit 74224d7c2ee9173b44cd5bee290ad0654ee065ae diff --git a/component/oai-udr b/component/oai-udr index c3cddad5..ab5ad7e7 160000 --- a/component/oai-udr +++ b/component/oai-udr @@ -1 +1 @@ -Subproject commit c3cddad5df26b067ebb1228ef7e2b72c80d26430 +Subproject commit ab5ad7e7d39b39c6a3c182facba3c660d00f193a diff --git a/docker-compose/docker-compose-basic-nrf-ebpf.yaml b/docker-compose/docker-compose-basic-nrf-ebpf.yaml index 7a9f6ae4..3d08e497 100644 --- a/docker-compose/docker-compose-basic-nrf-ebpf.yaml +++ b/docker-compose/docker-compose-basic-nrf-ebpf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -68,7 +68,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -81,7 +81,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -99,7 +99,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -118,7 +118,7 @@ services: - "oai-upf:192.168.70.129" oai-upf: container_name: "oai-upf" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 expose: - 2152/udp - 8805/udp diff --git a/docker-compose/docker-compose-basic-nrf-mongodb.yaml b/docker-compose/docker-compose-basic-nrf-mongodb.yaml index 59017f90..f6478f22 100644 --- a/docker-compose/docker-compose-basic-nrf-mongodb.yaml +++ b/docker-compose/docker-compose-basic-nrf-mongodb.yaml @@ -21,7 +21,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -37,7 +37,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -52,7 +52,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -67,7 +67,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -80,7 +80,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -98,7 +98,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -115,7 +115,7 @@ services: ipv4_address: 192.168.70.133 oai-upf: container_name: "oai-upf" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 expose: - 2152/udp - 8805/udp diff --git a/docker-compose/docker-compose-basic-nrf.yaml b/docker-compose/docker-compose-basic-nrf.yaml index ef21bc60..4a55d1c4 100644 --- a/docker-compose/docker-compose-basic-nrf.yaml +++ b/docker-compose/docker-compose-basic-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -68,7 +68,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -81,7 +81,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -99,7 +99,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -116,7 +116,7 @@ services: ipv4_address: 192.168.70.133 oai-upf: container_name: "oai-upf" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 expose: - 2152/udp - 8805/udp diff --git a/docker-compose/docker-compose-basic-vpp-nrf.yaml b/docker-compose/docker-compose-basic-vpp-nrf.yaml index a95f61c7..69a00eb3 100644 --- a/docker-compose/docker-compose-basic-vpp-nrf.yaml +++ b/docker-compose/docker-compose-basic-vpp-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -68,7 +68,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -81,7 +81,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -100,7 +100,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -119,7 +119,7 @@ services: vpp-upf: privileged: true container_name: "vpp-upf" - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 environment: - IF_1_IP=192.168.70.201 - IF_1_TYPE=N4 diff --git a/docker-compose/docker-compose-basic-vpp-pcf-redirection.yaml b/docker-compose/docker-compose-basic-vpp-pcf-redirection.yaml index e9801e6d..375be795 100644 --- a/docker-compose/docker-compose-basic-vpp-pcf-redirection.yaml +++ b/docker-compose/docker-compose-basic-vpp-pcf-redirection.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -68,7 +68,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -81,7 +81,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -100,7 +100,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -118,7 +118,7 @@ services: ipv4_address: 192.168.70.133 oai-pcf: container_name: "oai-pcf" - image: oaisoftwarealliance/oai-pcf:v2.0.0 + image: oaisoftwarealliance/oai-pcf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -135,7 +135,7 @@ services: vpp-upf: privileged: true container_name: "vpp-upf" - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 environment: - IF_1_IP=192.168.70.201 - IF_1_TYPE=N4 diff --git a/docker-compose/docker-compose-basic-vpp-pcf-steering.yaml b/docker-compose/docker-compose-basic-vpp-pcf-steering.yaml index e253447e..185dc6c3 100644 --- a/docker-compose/docker-compose-basic-vpp-pcf-steering.yaml +++ b/docker-compose/docker-compose-basic-vpp-pcf-steering.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -68,7 +68,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -81,7 +81,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -100,7 +100,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -118,7 +118,7 @@ services: ipv4_address: 192.168.70.133 oai-pcf: container_name: "oai-pcf" - image: oaisoftwarealliance/oai-pcf:v2.0.0 + image: oaisoftwarealliance/oai-pcf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -135,7 +135,7 @@ services: vpp-upf: privileged: true container_name: "vpp-upf" - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 environment: - IF_1_IP=192.168.70.201 - IF_1_TYPE=N4 diff --git a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml index ebc412fd..12e68688 100644 --- a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml +++ b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -68,7 +68,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -81,7 +81,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -103,7 +103,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -124,7 +124,7 @@ services: ipv4_address: 192.168.70.133 oai-pcf: container_name: "oai-pcf" - image: oaisoftwarealliance/oai-pcf:v2.0.0 + image: oaisoftwarealliance/oai-pcf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -140,7 +140,7 @@ services: ipv4_address: 192.168.70.139 vpp-upf-ulcl: container_name: "vpp-upf-ulcl" - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 privileged: true environment: - IF_1_IP=192.168.70.201 @@ -190,7 +190,7 @@ services: public_net_core21: ipv4_address: 192.168.74.151 vpp-upf-aupf1: - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 privileged: true container_name: "vpp-upf-aupf1" environment: @@ -236,7 +236,7 @@ services: public_net_core12: ipv4_address: 192.168.75.152 vpp-upf-aupf2: - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 privileged: true container_name: "vpp-upf-aupf2" environment: diff --git a/docker-compose/docker-compose-mini-nonrf.yaml b/docker-compose/docker-compose-mini-nonrf.yaml index ae76acd1..e7c57f81 100644 --- a/docker-compose/docker-compose-mini-nonrf.yaml +++ b/docker-compose/docker-compose-mini-nonrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 volumes: - ./conf/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml environment: @@ -34,7 +34,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 volumes: - ./conf/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml environment: @@ -49,7 +49,7 @@ services: - "oai-upf:192.168.70.134" oai-upf: container_name: "oai-upf" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 volumes: - ./conf/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml environment: diff --git a/docker-compose/docker-compose-no-privilege.yaml b/docker-compose/docker-compose-no-privilege.yaml index 02c6e0bb..97a6a540 100644 --- a/docker-compose/docker-compose-no-privilege.yaml +++ b/docker-compose/docker-compose-no-privilege.yaml @@ -23,7 +23,7 @@ services: ipv4_address: 192.168.70.131 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 volumes: - ./conf/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml environment: @@ -35,7 +35,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 volumes: - ./conf/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml environment: @@ -50,7 +50,7 @@ services: - "oai-upf:192.168.70.134" oai-upf: container_name: "oai-upf" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 volumes: - ./conf/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml environment: diff --git a/docker-compose/docker-compose-slicing-basic-nrf.yaml b/docker-compose/docker-compose-slicing-basic-nrf.yaml index db9c185b..450154b4 100644 --- a/docker-compose/docker-compose-slicing-basic-nrf.yaml +++ b/docker-compose/docker-compose-slicing-basic-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-nssf: container_name: "oai-nssf" - image: oaisoftwarealliance/oai-nssf:v2.0.0 + image: oaisoftwarealliance/oai-nssf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -40,7 +40,7 @@ services: ipv4_address: 192.168.70.132 oai_udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v2.0.0 + image: oaisoftwarealliance/oai-udr:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -53,7 +53,7 @@ services: ipv4_address: 192.168.70.133 oai_udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v2.0.0 + image: oaisoftwarealliance/oai-udm:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -66,7 +66,7 @@ services: ipv4_address: 192.168.70.134 oai_ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v2.0.0 + image: oaisoftwarealliance/oai-ausf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -79,7 +79,7 @@ services: ipv4_address: 192.168.70.135 oai_nrf_slice12: container_name: "oai-nrf-slice12" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -90,7 +90,7 @@ services: ipv4_address: 192.168.70.136 oai_nrf_slice3: container_name: "oai-nrf-slice3" - image: oaisoftwarealliance/oai-nrf:v2.0.0 + image: oaisoftwarealliance/oai-nrf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -101,7 +101,7 @@ services: ipv4_address: 192.168.70.137 oai_amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v2.0.0 + image: oaisoftwarealliance/oai-amf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -117,7 +117,7 @@ services: ipv4_address: 192.168.70.138 oai_smf_slice1: container_name: "oai-smf-slice1" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -132,7 +132,7 @@ services: ipv4_address: 192.168.70.139 oai_smf_slice2: container_name: "oai-smf-slice2" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -147,7 +147,7 @@ services: ipv4_address: 192.168.70.140 oai_smf_slice3: container_name: "oai-smf-slice3" - image: oaisoftwarealliance/oai-smf:v2.0.0 + image: oaisoftwarealliance/oai-smf:v2.0.1 expose: - 80/tcp - 8080/tcp @@ -164,7 +164,7 @@ services: ipv4_address: 192.168.70.141 oai_upf_slice1: container_name: "oai-upf-slice1" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 expose: - 2152/udp - 8805/udp @@ -187,7 +187,7 @@ services: ipv4_address: 192.168.70.142 oai_upf_slice2: container_name: "oai-upf-slice2" - image: oaisoftwarealliance/oai-upf:v2.0.0 + image: oaisoftwarealliance/oai-upf:v2.0.1 expose: - 2152/udp - 8805/udp @@ -210,7 +210,7 @@ services: ipv4_address: 192.168.70.143 vpp_upf_slice3: container_name: "vpp-upf-slice3" - image: oaisoftwarealliance/oai-upf-vpp:v2.0.0 + image: oaisoftwarealliance/oai-upf-vpp:v2.0.1 privileged: true environment: - IF_1_IP=192.168.70.201 diff --git a/docs/BUILD_IMAGES.md b/docs/BUILD_IMAGES.md index 6e879453..a04ac10c 100644 --- a/docs/BUILD_IMAGES.md +++ b/docs/BUILD_IMAGES.md @@ -47,31 +47,31 @@ We recommend to synchronize with the master branches on all git sub-modules. We also recommend that you synchronize this "tutorial" repository with a provided tag. By doing so, the `docker-compose` files will be aligned with feature sets of each cNF. -**At the time of writing (2023/12/19), the release tag was `v2.0.0`.** +**At the time of writing (2023/12/19), the release tag was `v2.0.1`.** | CNF Name | Branch Name | Tag | Ubuntu 22.04 | RHEL8 (UBI8) | | ----------- | ----------- | -------- | ------------ | ----------------| -| FED REPO | N/A | `v2.0.0` | | | -| AMF | `master` | `v2.0.0` | X | X | -| SMF | `master` | `v2.0.0` | X | X | -| NRF | `master` | `v2.0.0` | X | X | -| UPF | `master` | `v2.0.0` | X | X | -| UDR | `master` | `v2.0.0` | X | X | -| UDM | `master` | `v2.0.0` | X | X | -| AUSF | `master` | `v2.0.0` | X | X | -| UPF-VPP | `master` | `v2.0.0` | X | X | -| NSSF | `master` | `v2.0.0` | X | X | -| NEF | `master` | `v2.0.0` | X | X | -| PCF | `master` | `v2.0.0` | X | X | +| FED REPO | N/A | `v2.0.1` | | | +| AMF | `master` | `v2.0.1` | X | X | +| SMF | `master` | `v2.0.1` | X | X | +| NRF | `master` | `v2.0.1` | X | X | +| UPF | `master` | `v2.0.1` | X | X | +| UDR | `master` | `v2.0.1` | X | X | +| UDM | `master` | `v2.0.1` | X | X | +| AUSF | `master` | `v2.0.1` | X | X | +| UPF-VPP | `master` | `v2.0.1` | X | X | +| NSSF | `master` | `v2.0.1` | X | X | +| NEF | `master` | `v2.0.1` | X | X | +| PCF | `master` | `v2.0.1` | X | X | ```bash -# Clone directly on the v2.0.0 release tag -$ git clone --branch v2.0.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git +# Clone directly on the v2.0.1 release tag +$ git clone --branch v2.0.1 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git $ cd oai-cn5g-fed -# If you forgot to clone directly to the v2.0.0 release tag -$ git checkout -f v2.0.0 +# If you forgot to clone directly to the v2.0.1 release tag +$ git checkout -f v2.0.1 # Synchronize all git submodules $ ./scripts/syncComponents.sh diff --git a/docs/DEPLOY_SA5G_HC.md b/docs/DEPLOY_SA5G_HC.md index d3af04d9..9edec6c4 100644 --- a/docs/DEPLOY_SA5G_HC.md +++ b/docs/DEPLOY_SA5G_HC.md @@ -28,13 +28,13 @@ OAI 5G core network have different network functions which can be used invidiual ### Pre-requisite -1. Minimum 4 CPU (Threaded), 16GBi RAM and 50G storage +1. Minimum 4 CPU (Threaded), 16GBi RAM and 50G storage required by NFs 2. (Optional) Multus CNI if using multiple interfaces for NFs Clone the git repository ```console -$: git clone -b <Branch> https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed +git clone -b <Branch> https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed ``` ## 1. Description @@ -429,6 +429,7 @@ NOTES: 4. In case you want to test these charts with USRP then make sure your CPU sleep states are off``` </details> ``` +</details> Wait for the NR-UE to start @@ -905,4 +906,4 @@ oai-smf-5bf8b96d74-cg7s4 12m 6Mi oai-udm-5994fc6847-tpzgw 29m 3Mi oai-udr-754d6cd48-f6n7n 28m 4Mi oai-upf-6576bc8496-jnpxl 11m 130Mi -``` +``` \ No newline at end of file diff --git a/docs/DEPLOY_SA5G_MINI_WITH_GNBSIM.md b/docs/DEPLOY_SA5G_MINI_WITH_GNBSIM.md index 8df00245..b6e3d630 100644 --- a/docs/DEPLOY_SA5G_MINI_WITH_GNBSIM.md +++ b/docs/DEPLOY_SA5G_MINI_WITH_GNBSIM.md @@ -39,10 +39,10 @@ Note: In case readers are interested in deploying debuggers/developers core netw | CNF Name | Branch Name | tag | Ubuntu 22.04 | RHEL8 | | ----------- |:----------------------- | ---------| ------------ | ---------------| -| AMF | `master` | `v2.0.0` | X | X | -| SMF | `master` | `v2.0.0` | X | X | -| NRF | `master` | `v2.0.0` | X | X | -| UPF | `master` | `v2.0.0` | X | X | +| AMF | `master` | `v2.0.1` | X | X | +| SMF | `master` | `v2.0.1` | X | X | +| NRF | `master` | `v2.0.1` | X | X | +| UPF | `master` | `v2.0.1` | X | X | <br/> diff --git a/docs/DEPLOY_SA5G_REDIRECTION.md b/docs/DEPLOY_SA5G_REDIRECTION.md index 3555a615..75a0b0db 100644 --- a/docs/DEPLOY_SA5G_REDIRECTION.md +++ b/docs/DEPLOY_SA5G_REDIRECTION.md @@ -39,15 +39,15 @@ For this demo, all the images which use the `develop` branch have been retrieved | NF Name | Branch Name | Tag used at time of writing | Ubuntu 22.04 | RHEL8 | |----------|:------------|-----------------------------|--------------|-------| -| NSSF | `develop` | `v2.0.0` | X | - | -| AMF | `develop` | `v2.0.0` | X | - | -| AUSF | `develop` | `v2.0.0` | X | - | -| NRF | `develop` | `v2.0.0` | X | - | -| SMF | `develop` | `v2.0.0` | X | - | -| UDR | `develop` | `v2.0.0` | X | - | -| UDM | `develop` | `v2.0.0` | X | - | -| PCF | `develop` | `v2.0.0` | X | - | -| UPF-VPP | `develop` | `v2.0.0` | X | - | +| NSSF | `develop` | `v2.0.1` | X | - | +| AMF | `develop` | `v2.0.1` | X | - | +| AUSF | `develop` | `v2.0.1` | X | - | +| NRF | `develop` | `v2.0.1` | X | - | +| SMF | `develop` | `v2.0.1` | X | - | +| UDR | `develop` | `v2.0.1` | X | - | +| UDM | `develop` | `v2.0.1` | X | - | +| PCF | `develop` | `v2.0.1` | X | - | +| UPF-VPP | `develop` | `v2.0.1` | X | - | <br/> diff --git a/docs/DEPLOY_SA5G_SLICING.md b/docs/DEPLOY_SA5G_SLICING.md index 58bf4e0c..375a73ec 100644 --- a/docs/DEPLOY_SA5G_SLICING.md +++ b/docs/DEPLOY_SA5G_SLICING.md @@ -34,15 +34,15 @@ You can also retrieve the images from `docker-hub`. See [Retrieving images](./RE | CNF Name | Branch Name | Tag used at time of writing | Ubuntu 22.04 | RHEL8 | | ----------- |:------------- | ----------------------------- | ------------ | --------------| -| NSSF | `master` | `v2.0.0` | X | X | -| AMF | `master` | `v2.0.0` | X | X | -| AUSF | `master` | `v2.0.0` | X | X | -| NRF | `master` | `v2.0.0` | X | X | -| SMF | `master` | `v2.0.0` | X | X | -| UDR | `master` | `v2.0.0` | X | X | -| UDM | `master` | `v2.0.0` | X | X | -| UPF | `master` | `v2.0.0` | X | X | -| UPF-VPP | `master` | `v2.0.0` | X | X | +| NSSF | `master` | `v2.0.1` | X | X | +| AMF | `master` | `v2.0.1` | X | X | +| AUSF | `master` | `v2.0.1` | X | X | +| NRF | `master` | `v2.0.1` | X | X | +| SMF | `master` | `v2.0.1` | X | X | +| UDR | `master` | `v2.0.1` | X | X | +| UDM | `master` | `v2.0.1` | X | X | +| UPF | `master` | `v2.0.1` | X | X | +| UPF-VPP | `master` | `v2.0.1` | X | X | <br/> @@ -220,9 +220,10 @@ Creating rfsim5g-oai-nr-ue1 ... done ``` Wait a bit (5 to 10 seconds). <!--- -For CI purposes please ignore this line +For CI purposes please ignore these lines ``` shell docker-compose-host $: ../ci-scripts/checkContainerStatus.py --container_name rfsim5g-oai-nr-ue1 --timeout 30 +docker-compose-host $: ../ci-scripts/checkUePduSession.py --container_name rfsim5g-oai-nr-ue1 ``` --> Deploy ran simulator for slice 3 @@ -277,7 +278,7 @@ In this section we perform traffic test between oai-ext-dn node and UEs <br/> ``` shell docker-compose-host $: docker logs gnbsim 2>&1 | tail -10 -docker-compose-host $: docker logs oai-amf 2>&1 | tail -20 +docker-compose-host $: docker logs oai-amf 2>&1 | grep --color=never info | tail -20 docker-compose-host $: docker exec oai-ext-dn ping -c 4 12.1.1.2 PING 12.1.1.2 (12.1.1.2) 56(84) bytes of data. 64 bytes from 12.1.1.2: icmp_seq=2 ttl=63 time=0.346 ms @@ -299,16 +300,16 @@ PING 12.2.1.2 (12.2.1.2) 56(84) bytes of data. 4 packets transmitted, 4 received, 0% packet loss, time 3039ms rtt min/avg/max/mdev = 0.390/0.635/1.004/0.232 ms -docker-compose-host $: docker exec oai-ext-dn ping -c 4 12.1.1.130 -PING 12.1.1.130 (12.1.1.130) 56(84) bytes of data. -64 bytes from 12.1.1.130: icmp_seq=1 ttl=63 time=40.0 ms -64 bytes from 12.1.1.130: icmp_seq=2 ttl=63 time=39.5 ms -64 bytes from 12.1.1.130: icmp_seq=3 ttl=63 time=11.2 ms -64 bytes from 12.1.1.130: icmp_seq=4 ttl=63 time=11.2 ms +docker-compose-host $: docker exec rfsim5g-oai-nr-ue1 ping -I oaitun_ue1 -c 4 192.168.70.145 +PING 192.168.70.145 (192.168.70.145) from 12.1.1.130 oaitun_ue1: 56(84) bytes of data. +64 bytes from 192.168.70.145: icmp_seq=1 ttl=63 time=9.74 ms +64 bytes from 192.168.70.145: icmp_seq=2 ttl=63 time=9.17 ms +64 bytes from 192.168.70.145: icmp_seq=3 ttl=63 time=8.07 ms +64 bytes from 192.168.70.145: icmp_seq=4 ttl=63 time=5.94 ms ---- 12.1.1.130 ping statistics --- -4 packets transmitted, 4 received, 0% packet loss, time 3003ms -rtt min/avg/max/mdev = 11.206/25.511/40.071/14.292 ms +--- 192.168.70.145 ping statistics --- +4 packets transmitted, 4 received, 0% packet loss, time 3004ms +rtt min/avg/max/mdev = 5.936/8.226/9.739/1.452 ms ``` ## 9. Analyzing Scenario Results diff --git a/docs/DEPLOY_SA5G_STEERING.md b/docs/DEPLOY_SA5G_STEERING.md index 9bfa12f2..4457a6e1 100644 --- a/docs/DEPLOY_SA5G_STEERING.md +++ b/docs/DEPLOY_SA5G_STEERING.md @@ -38,15 +38,15 @@ For this demo, all the images which use the `develop` branch have been retrieved | NF Name | Branch Name | Tag used at time of writing | Ubuntu 22.04 | RHEL8 | |----------|:------------|-----------------------------|--------------|-------| -| NSSF | `develop` | `v2.0.0` | X | - | -| AMF | `develop` | `v2.0.0` | X | - | -| AUSF | `develop` | `v2.0.0` | X | - | -| NRF | `develop` | `v2.0.0` | X | - | -| SMF | `develop` | `v2.0.0` | X | - | -| UDR | `develop` | `v2.0.0` | X | - | -| UDM | `develop` | `v2.0.0` | X | - | -| PCF | `develop` | `v2.0.0` | X | - | -| UPF-VPP | `develop` | `v2.0.0` | X | - | +| NSSF | `develop` | `v2.0.1` | X | - | +| AMF | `develop` | `v2.0.1` | X | - | +| AUSF | `develop` | `v2.0.1` | X | - | +| NRF | `develop` | `v2.0.1` | X | - | +| SMF | `develop` | `v2.0.1` | X | - | +| UDR | `develop` | `v2.0.1` | X | - | +| UDM | `develop` | `v2.0.1` | X | - | +| PCF | `develop` | `v2.0.1` | X | - | +| UPF-VPP | `develop` | `v2.0.1` | X | - | <br/> diff --git a/docs/DEPLOY_SA5G_WITH_UPF_EBPF.md b/docs/DEPLOY_SA5G_WITH_UPF_EBPF.md index d5e97a3c..d9c49112 100644 --- a/docs/DEPLOY_SA5G_WITH_UPF_EBPF.md +++ b/docs/DEPLOY_SA5G_WITH_UPF_EBPF.md @@ -103,7 +103,7 @@ In previous tutorials, we were using the `oai-spgwu-tiny` implementation as UPF. - `Simple Switch` Mode: is reusing the code from the `oai-spgwu-tiny` to do simple UPF features. The purpose of using this mode is first to show the functioning of the entire OAI 5G setup (RAN & CN), but also enable some functionalities that are not yet implemented within the eBPF-XDP deplyment mode. Please notice that this mode is hidden in Figure 1 for the sake of understanding and providing too much details. By default this mode (i.e., `Simple Switch`) is the one running. - - `eBPF-XDP` Mode: The main goal of using this mode is to seek for throughput and high UPF performance. This first release of UPF (v2.0.0) is offering yet basic features including (PDRs and FARs). In the upcoming versions we will implement additional features (such as QERs, MARs, and URRs). This mode is shown in Figure 1, and to be activated you have to use the line `enable_bpf_datapath: yes` in the config file `conf/basic_nrf_config_ebpf.yaml`. To disable the `eBPF-XDP` mode, you have to put the value of `enable_bpf_datapath` to `no`. + - `eBPF-XDP` Mode: The main goal of using this mode is to seek for throughput and high UPF performance. This first release of UPF (v2.0.1) is offering yet basic features including (PDRs and FARs). In the upcoming versions we will implement additional features (such as QERs, MARs, and URRs). This mode is shown in Figure 1, and to be activated you have to use the line `enable_bpf_datapath: yes` in the config file `conf/basic_nrf_config_ebpf.yaml`. To disable the `eBPF-XDP` mode, you have to put the value of `enable_bpf_datapath` to `no`. The two modes are independent, therefore if you want to switch between these two modes, you will have to restart the setup after updating the `enable_bpf_datapath` feature. @@ -136,13 +136,13 @@ You can also retrieve the images from `docker-hub`. See [Retrieving images](./RE | CNF Name | Branch Name | Tag used at time of writing | Ubuntu 20.04 | Ubuntu 22.04 | RHEL8 | | ----------- |:-------------- | ----------------------------- | ------------ | --------------|------------- | -| AMF | `master` | `v2.0.0` | x | X | x | -| AUSF | `master` | `v2.0.0` | x | X | x | -| NRF | `master` | `v2.0.0` | x | X | x | -| SMF | `master` | `v2.0.0` | x | X | x | -| UDR | `master` | `v2.0.0` | x | X | x | -| UDM | `master` | `v2.0.0` | x | X | x | -| UPF | `master` | `v2.0.0` | X | X | | +| AMF | `master` | `v2.0.1` | x | X | x | +| AUSF | `master` | `v2.0.1` | x | X | x | +| NRF | `master` | `v2.0.1` | x | X | x | +| SMF | `master` | `v2.0.1` | x | X | x | +| UDR | `master` | `v2.0.1` | x | X | x | +| UDM | `master` | `v2.0.1` | x | X | x | +| UPF | `master` | `v2.0.1` | X | X | | <br/> diff --git a/docs/RETRIEVE_OFFICIAL_IMAGES.md b/docs/RETRIEVE_OFFICIAL_IMAGES.md index 191af606..feec3aef 100644 --- a/docs/RETRIEVE_OFFICIAL_IMAGES.md +++ b/docs/RETRIEVE_OFFICIAL_IMAGES.md @@ -44,17 +44,17 @@ Now pull images according to your requirement, ```bash #!/bin/bash -docker pull oaisoftwarealliance/oai-amf:v2.0.0 -docker pull oaisoftwarealliance/oai-nrf:v2.0.0 -docker pull oaisoftwarealliance/oai-upf:v2.0.0 -docker pull oaisoftwarealliance/oai-smf:v2.0.0 -docker pull oaisoftwarealliance/oai-udr:v2.0.0 -docker pull oaisoftwarealliance/oai-udm:v2.0.0 -docker pull oaisoftwarealliance/oai-ausf:v2.0.0 -docker pull oaisoftwarealliance/oai-upf-vpp:v2.0.0 -docker pull oaisoftwarealliance/oai-nssf:v2.0.0 -docker pull oaisoftwarealliance/oai-pcf:v2.0.0 -docker pull oaisoftwarealliance/oai-nef:v2.0.0 +docker pull oaisoftwarealliance/oai-amf:v2.0.1 +docker pull oaisoftwarealliance/oai-nrf:v2.0.1 +docker pull oaisoftwarealliance/oai-upf:v2.0.1 +docker pull oaisoftwarealliance/oai-smf:v2.0.1 +docker pull oaisoftwarealliance/oai-udr:v2.0.1 +docker pull oaisoftwarealliance/oai-udm:v2.0.1 +docker pull oaisoftwarealliance/oai-ausf:v2.0.1 +docker pull oaisoftwarealliance/oai-upf-vpp:v2.0.1 +docker pull oaisoftwarealliance/oai-nssf:v2.0.1 +docker pull oaisoftwarealliance/oai-pcf:v2.0.1 +docker pull oaisoftwarealliance/oai-nef:v2.0.1 # Utility image to generate traffic docker pull oaisoftwarealliance/trf-gen-cn5g:latest ``` @@ -73,29 +73,29 @@ We will push new versions when new features are validated. This repository only has tutorials and Continuous Integration scripts. -**At the time of writing (2023/12), the release tag is `v2.0.0`.** +**At the time of writing (2023/12), the release tag is `v2.0.1`.** | CNF Name | Branch Name | Tag | Ubuntu 22.04 | RHEL8 (UBI8) | | ----------- | ----------- | -------- | ------------ | ----------------| -| FED REPO | N/A | `v2.0.0` | | | -| AMF | `master` | `v2.0.0` | X | X | -| SMF | `master` | `v2.0.0` | X | X | -| NRF | `master` | `v2.0.0` | X | X | -| UPF | `master` | `v2.0.0` | X | X | -| UDR | `master` | `v2.0.0` | X | X | -| UDM | `master` | `v2.0.0` | X | X | -| AUSF | `master` | `v2.0.0` | X | X | -| UPF-VPP | `master` | `v2.0.0` | X | X | -| NSSF | `master` | `v2.0.0` | X | X | -| NEF | `master` | `v2.0.0` | X | X | -| PCF | `master` | `v2.0.0` | X | X | +| FED REPO | N/A | `v2.0.1` | | | +| AMF | `master` | `v2.0.1` | X | X | +| SMF | `master` | `v2.0.1` | X | X | +| NRF | `master` | `v2.0.1` | X | X | +| UPF | `master` | `v2.0.1` | X | X | +| UDR | `master` | `v2.0.1` | X | X | +| UDM | `master` | `v2.0.1` | X | X | +| AUSF | `master` | `v2.0.1` | X | X | +| UPF-VPP | `master` | `v2.0.1` | X | X | +| NSSF | `master` | `v2.0.1` | X | X | +| NEF | `master` | `v2.0.1` | X | X | +| PCF | `master` | `v2.0.1` | X | X | ```bash # Clone directly on the latest release tag -$ git clone --branch v2.0.0 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git +$ git clone --branch v2.0.1 https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed.git $ cd oai-cn5g-fed # If you forgot to clone directly to the latest release tag -$ git checkout -f v2.0.0 +$ git checkout -f v2.0.1 # Synchronize all git submodules $ ./scripts/syncComponents.sh diff --git a/docs/meeting_invitations/invite-2023.ics b/docs/meeting_invitations/invite-2023.ics deleted file mode 100644 index a071cf96..00000000 --- a/docs/meeting_invitations/invite-2023.ics +++ /dev/null @@ -1,242 +0,0 @@ -BEGIN:VCALENDAR -PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN -VERSION:2.0 -METHOD:REQUEST -BEGIN:VTIMEZONE -TZID:Europe/Paris -BEGIN:DAYLIGHT -TZOFFSETFROM:+0100 -TZOFFSETTO:+0200 -TZNAME:CEST -DTSTART:19700329T020000 -RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU -END:DAYLIGHT -BEGIN:STANDARD -TZOFFSETFROM:+0200 -TZOFFSETTO:+0100 -TZNAME:CET -DTSTART:19701025T030000 -RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU -END:STANDARD -END:VTIMEZONE -BEGIN:VEVENT -CREATED:20220103T101137Z -LAST-MODIFIED:20230119T105835Z -DTSTAMP:20230119T105835Z -UID:d551e83f-b8f3-8a4a-8cc3-d11eb63767fb -SUMMARY: OpenAirInterface 5G-Core Project Weekly -ORGANIZER;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:camille.lerda@o - penairinterface.org -ATTENDEE;CN=Camille Lerda;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto - :camille.lerda@icloud.com -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:Tien-Thinh.Nguye - n@eurecom.fr -ATTENDEE;CN=Raphael Defosseux;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:ma - ilto:raphael.defosseux@openairinterface.org -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:carsten.fuchs@pa - ngranet.com -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:joseph.murray@In - terDigital.com -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:mohammed.ismail@ - openairinterface.org -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:rohan.kharade@op - enairinterface.org -ATTENDEE;CN=sagar arora;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:s - agar.arora@eurecom.fr -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:kunderu@eurecom. - fr -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:laurent.depersin - @interdigital.com -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:surya-kumar.kund - eru@eurecom.fr -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:adlen.ksentini@e - urecom.fr -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:lionel.gauthier@ - eurecom.fr -ATTENDEE;CN=irfan.ghauri;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto: - irfan.ghauri@openairinterface.org -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:banu.prasad.baya - nagari@ng4t.com -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:thomas.patzelt@n - g4t.com -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:stefan.Spettel@e - urecom.fr -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:bartolo.scanavin - o@firecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:anurag.ashokan@f - irecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:vijay.chadachan@ - firecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:theoni.magounaki - @firecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:neeraj.gupta@fir - ecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:reddy.venkataram - i@firecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:vaibhav.shrivast - ava@firecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:manu.agrawal@fir - ecell.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:martin@wilab.io -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:imane.elfettochi - @openairinterface.org -ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:amirsalar.p.d74@ - gmail.com -RRULE:FREQ=WEEKLY -EXDATE:20220920T090000Z -EXDATE:20221129T080000Z -EXDATE:20230103T090000Z -EXDATE:20220719T090000Z -DTSTART;TZID=Europe/Paris:20220719T110000 -DTEND;TZID=Europe/Paris:20220719T120000 -TRANSP:OPAQUE -LOCATION:Shannon room -DESCRIPTION;ALTREP="data:text/html,%3Cbody%3E%0A%3Cdiv%3EDear%20All%2C%3C%2 - Fdiv%3E%0A%3Cdiv%3E%3Cbr%3E%0AHere%20is%20the%20shared%20tracking%20sheet%3 - A%20%3Cbr%3E%0Ahttps%3A%2F%2Fdrive.google.com%2Ffile%2Fd%2F1elIEAkbD6Ue-ds4 - a6c3E7lkqLcvD6JIy%2Fview%3Fusp%3Dsharing%0A%0A%0A%20%3C%2Fdiv%3E%0A%3Cdiv%3 - E%3Cbr%3E%0AYou%20can%20find%20the%20zoom%20invitation%20here%3A%3C%2Fdiv%3 - E%0A%3Cdiv%3E%3Cbr%3EOSA%20-%20Zoom%20is%20inviting%20you%20to%20a%20schedu - led%20Zoom%20meeting.%3Cbr%3E%0A%3Cbr%3E%0ATopic%3A%20OpenAirInterface%205G - -Core%20Project%20Weekly%3Cbr%3E%0ATime%3A%20Jan%2024%2C%202023%2011%3A00%2 - 0Paris%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Every%20week% - 20on%20Tue%2C%20until%20Dec%2019%2C%202023%2C%2048%20occurrence(s)%3Cbr%3E% - 0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jan%2024%2C%202023%2011%3A00 - %3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jan%2031%2C%202023% - 2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Feb%207%2C - %202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Fe - b%2014%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C - 2%A0%20Feb%2021%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A - 0%C2%A0%C2%A0%20Feb%2028%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C - 2%A0%C2%A0%C2%A0%C2%A0%20Mar%207%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0 - %C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Mar%2014%2C%202023%2011%3A00%3Cbr%3E%0A%C2 - %A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Mar%2021%2C%202023%2011%3A00%3Cbr - %3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Mar%2028%2C%202023%2011% - 3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Apr%204%2C%2020 - 23%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Apr%201 - 1%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0% - 20Apr%2018%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2% - A0%C2%A0%20Apr%2025%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0% - C2%A0%C2%A0%C2%A0%20May%202%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A - 0%C2%A0%C2%A0%C2%A0%C2%A0%20May%209%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2 - %A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20May%2016%2C%202023%2011%3A00%3Cbr%3E%0A - %C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20May%2023%2C%202023%2011%3A00%3 - Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20May%2030%2C%202023%20 - 11%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jun%206%2C%2 - 02023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jun% - 2013%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2% - A0%20Jun%2020%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0% - C2%A0%C2%A0%20Jun%2027%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2% - A0%C2%A0%C2%A0%C2%A0%20Jul%204%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C - 2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jul%2011%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A - 0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jul%2018%2C%202023%2011%3A00%3Cbr%3 - E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Jul%2025%2C%202023%2011%3A - 00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Aug%201%2C%202023 - %2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Aug%208%2 - C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20A - ug%2015%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0% - C2%A0%20Aug%2022%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2% - A0%C2%A0%C2%A0%20Aug%2029%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0% - C2%A0%C2%A0%C2%A0%C2%A0%20Sep%205%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A - 0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Sep%2012%2C%202023%2011%3A00%3Cbr%3E%0A%C - 2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Sep%2019%2C%202023%2011%3A00%3Cb - r%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Sep%2026%2C%202023%2011 - %3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Oct%203%2C%202 - 023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Oct%20 - 10%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0 - %20Oct%2017%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2 - %A0%C2%A0%20Oct%2024%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0 - %C2%A0%C2%A0%C2%A0%20Oct%2031%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2 - %A0%C2%A0%C2%A0%C2%A0%C2%A0%20Nov%207%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0% - C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Nov%2014%2C%202023%2011%3A00%3Cbr%3E% - 0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Nov%2021%2C%202023%2011%3A00 - %3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Nov%2028%2C%202023% - 2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20Dec%205%2C - %202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20De - c%2012%2C%202023%2011%3A00%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C - 2%A0%20Dec%2019%2C%202023%2011%3A00%3Cbr%3E%0APlease%20download%20and%20imp - ort%20the%20following%20iCalendar%20(.ics)%20files%20to%20your%20%0Acalenda - r%20system.%3Cbr%3E%0AWeekly%3A%20%0Ahttps%3A%2F%2Fus02web.zoom.us%2Fmeetin - g%2FtZUoceCurz8qHN1W1cVyuE0FZooSc1qNFSl8%2Fics%3FicsToken%3D98tyKuGpqz0jHNW - RsB-ORpwcGY_oXe7zmClfgo0Mq07mNTlGR1PQDO1NAbEuAfb2%3Cbr%3E%0A%3Cbr%3E%0AJoin - %20Zoom%20Meeting%3Cbr%3E%0Ahttps%3A%2F%2Fus02web.zoom.us%2Fj%2F81569614069 - %3Fpwd%3DaS9pWW1QRXpkMVEzcWNUMUdXd0RaZz09%3Cbr%3E%0A%3Cbr%3E%0AMeeting%20ID - %3A%20815%206961%204069%3Cbr%3E%0APasscode%3A%20448655%3Cbr%3E%0AOne%20tap% - 20mobile%3Cbr%3E%0A%2B33170379729%2C%2C81569614069%23%2C%2C%2C%2C*448655%23 - %20France%3Cbr%3E%0A%2B33170950103%2C%2C81569614069%23%2C%2C%2C%2C*448655%2 - 3%20France%3Cbr%3E%0A%3Cbr%3E%0ADial%20by%20your%20location%3Cbr%3E%0A%C2%A - 0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B33%201%207037%209729%20France%3C - br%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B33%201%207095%20010 - 3%20France%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B33%201 - %207095%200350%20France%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A - 0%20%2B33%201%208699%205831%20France%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2% - A0%C2%A0%C2%A0%20%2B33%201%207037%202246%20France%3Cbr%3E%0A%C2%A0%C2%A0%C2 - %A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%20646%20931%203860%20US%3Cbr%3E%0A%C2%A0 - %C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%20669%20444%209171%20US%3Cbr%3E - %0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%20669%20900%209128%20U - S%20(San%20Jose)%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B - 1%20689%20278%201000%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2 - %A0%20%2B1%20719%20359%204580%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0 - %C2%A0%C2%A0%20%2B1%20253%20205%200468%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2 - %A0%C2%A0%C2%A0%C2%A0%20%2B1%20253%20215%208782%20US%20(Tacoma)%3Cbr%3E%0A% - C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%20301%20715%208592%20US%20 - (Washington%20DC)%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2 - B1%20305%20224%201968%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C - 2%A0%20%2B1%20309%20205%203325%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A - 0%C2%A0%C2%A0%20%2B1%20312%20626%206799%20US%20(Chicago)%3Cbr%3E%0A%C2%A0%C - 2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%20346%20248%207799%20US%20(Housto - n)%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%20360%20209% - 205623%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%20%2B1%203 - 86%20347%205053%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%2 - 0%2B1%20507%20473%204847%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C2%A0%C2%A - 0%C2%A0%20%2B1%20564%20217%202000%20US%3Cbr%3E%0A%C2%A0%C2%A0%C2%A0%C2%A0%C - 2%A0%C2%A0%C2%A0%20%2B1%20646%20558%208656%20US%20(New%20York)%3Cbr%3E%0AMe - eting%20ID%3A%20815%206961%204069%3Cbr%3E%0APasscode%3A%20448655%3Cbr%3E%0A - Find%20your%20local%20number%3A%20https%3A%2F%2Fus02web.zoom.us%2Fu%2Fkcj1J - 5g9z6%3Cbr%3E%0A%3Cbr%3E%0A%3Cbr%3E%0A%3C%2Fdiv%3E%0A%3C%2Fbody%3E":Dear Al - l\,\n\nHere is the shared tracking sheet:\nhttps://drive.google.com/file/d/ - 1elIEAkbD6Ue-ds4a6c3E7lkqLcvD6JIy/view?usp=sharing\n\nYou can find the zoom - invitation here:\n\nOSA - Zoom is inviting you to a scheduled Zoom meeting - .\n\nTopic: OpenAirInterface 5G-Core Project Weekly\nTime: Jan 24\, 2023 11 - :00 Paris\n Every week on Tue\, until Dec 19\, 2023\, 48 occurrence( - s)\n Jan 24\, 2023 11:00\n Jan 31\, 2023 11:00\n Feb 7 - \, 2023 11:00\n Feb 14\, 2023 11:00\n Feb 21\, 2023 11:00\n - Feb 28\, 2023 11:00\n Mar 7\, 2023 11:00\n Mar 14\, 202 - 3 11:00\n Mar 21\, 2023 11:00\n Mar 28\, 2023 11:00\n - Apr 4\, 2023 11:00\n Apr 11\, 2023 11:00\n Apr 18\, 2023 11:0 - 0\n Apr 25\, 2023 11:00\n May 2\, 2023 11:00\n May 9\, - 2023 11:00\n May 16\, 2023 11:00\n May 23\, 2023 11:00\n - May 30\, 2023 11:00\n Jun 6\, 2023 11:00\n Jun 13\, 2023 - 11:00\n Jun 20\, 2023 11:00\n Jun 27\, 2023 11:00\n Ju - l 4\, 2023 11:00\n Jul 11\, 2023 11:00\n Jul 18\, 2023 11:00\ - n Jul 25\, 2023 11:00\n Aug 1\, 2023 11:00\n Aug 8\, 2 - 023 11:00\n Aug 15\, 2023 11:00\n Aug 22\, 2023 11:00\n - Aug 29\, 2023 11:00\n Sep 5\, 2023 11:00\n Sep 12\, 2023 11 - :00\n Sep 19\, 2023 11:00\n Sep 26\, 2023 11:00\n Oct - 3\, 2023 11:00\n Oct 10\, 2023 11:00\n Oct 17\, 2023 11:00\n - Oct 24\, 2023 11:00\n Oct 31\, 2023 11:00\n Nov 7\, 20 - 23 11:00\n Nov 14\, 2023 11:00\n Nov 21\, 2023 11:00\n - Nov 28\, 2023 11:00\n Dec 5\, 2023 11:00\n Dec 12\, 2023 11: - 00\n Dec 19\, 2023 11:00\nPlease download and import the following i - Calendar (.ics) files to your calendar\nsystem.\nWeekly:\nhttps://us02web.z - oom.us/meeting/tZUoceCurz8qHN1W1cVyuE0FZooSc1qNFSl8/ics?icsToken=98tyKuGpqz - 0jHNWRsB-ORpwcGY_oXe7zmClfgo0Mq07mNTlGR1PQDO1NAbEuAfb2\n\nJoin Zoom Meeting - \nhttps://us02web.zoom.us/j/81569614069?pwd=aS9pWW1QRXpkMVEzcWNUMUdXd0RaZz0 - 9\n\nMeeting ID: 815 6961 4069\nPasscode: 448655\nOne tap mobile\n+33170379 - 729\,\,81569614069#\,\,\,\,*448655# France\n+33170950103\,\,81569614069#\,\ - ,\,\,*448655# France\n\nDial by your location\n +33 1 7037 9729 Fran - ce\n +33 1 7095 0103 France\n +33 1 7095 0350 France\n - +33 1 8699 5831 France\n +33 1 7037 2246 France\n +1 646 931 - 3860 US\n +1 669 444 9171 US\n +1 669 900 9128 US (San Jose) - \n +1 689 278 1000 US\n +1 719 359 4580 US\n +1 253 20 - 5 0468 US\n +1 253 215 8782 US (Tacoma)\n +1 301 715 8592 US - (Washington DC)\n +1 305 224 1968 US\n +1 309 205 3325 US\n - +1 312 626 6799 US (Chicago)\n +1 346 248 7799 US (Houston)\n - +1 360 209 5623 US\n +1 386 347 5053 US\n +1 507 473 4 - 847 US\n +1 564 217 2000 US\n +1 646 558 8656 US (New York)\n - Meeting ID: 815 6961 4069\nPasscode: 448655\nFind your local number: https: - //us02web.zoom.us/u/kcj1J5g9z6\n\n\n -SEQUENCE:8 -END:VEVENT -END:VCALENDAR - diff --git a/docs/meeting_invitations/invite-2024.ics b/docs/meeting_invitations/invite-2024.ics new file mode 100644 index 00000000..a720d57a --- /dev/null +++ b/docs/meeting_invitations/invite-2024.ics @@ -0,0 +1,429 @@ +BEGIN:VCALENDAR +PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN +VERSION:2.0 +METHOD:REQUEST +BEGIN:VTIMEZONE +TZID:Europe/Paris +X-TZINFO:Europe/Paris[2023c] +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+000921 +TZNAME:Europe/Paris(STD) +DTSTART:19110311T000000 +RDATE:19110311T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19160614T230000 +RDATE:19160614T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19161002T000000 +RDATE:19161002T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19170324T230000 +RDATE:19170324T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19171008T000000 +RDATE:19171008T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19180309T230000 +RDATE:19180309T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19190301T230000 +RDATE:19190301T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19181007T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1MO;UNTIL=19191006T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19200214T230000 +RDATE:19200214T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19201024T000000 +RDATE:19201024T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19210314T230000 +RDATE:19210314T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19211026T000000 +RDATE:19211026T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19220325T230000 +RDATE:19220325T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19221008T000000 +RDATE:19221008T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19230526T230000 +RDATE:19230526T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19240329T230000 +RDATE:19240329T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19250404T230000 +RDATE:19250404T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19260417T230000 +RDATE:19260417T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19270409T230000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=2SA;UNTIL=19280414T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19290420T230000 +RDATE:19290420T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19300412T230000 +RDATE:19300412T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19310418T230000 +RDATE:19310418T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19320402T230000 +RDATE:19320402T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19231007T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19321002T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19330325T230000 +RDATE:19330325T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19331008T000000 +RDATE:19331008T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19340407T230000 +RDATE:19340407T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19350330T230000 +RDATE:19350330T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19360418T230000 +RDATE:19360418T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19370403T230000 +RDATE:19370403T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19380326T230000 +RDATE:19380326T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19341007T000000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=1SU;UNTIL=19381002T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19390415T230000 +RDATE:19390415T230000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+000000 +TZNAME:Europe/Paris(DST) +DTSTART:19400225T020000 +RDATE:19400225T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+000000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(STD) +DTSTART:19391119T000000 +RDATE:19391119T000000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19400614T230000 +RDATE:19400614T230000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19421102T030000 +RDATE:19421102T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19430329T020000 +RDATE:19430329T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19440403T020000 +RDATE:19440403T020000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(DST) +DTSTART:19440825T000000 +RDATE:19440825T000000 +END:DAYLIGHT +BEGIN:DAYLIGHT +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(DST) +DTSTART:19441008T010000 +RDATE:19441008T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19431004T030000 +RDATE:19431004T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19450402T020000 +RDATE:19450402T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19450916T030000 +RDATE:19450916T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19760328T010000 +RDATE:19760328T010000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19760926T010000 +RDATE:19760926T010000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19770925T030000 +RDATE:19770925T030000 +END:STANDARD +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19781001T030000 +RDATE:19781001T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19770403T020000 +RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU;UNTIL=19800406T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19790930T030000 +RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU;UNTIL=19950924T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:Europe/Paris(DST) +DTSTART:19810329T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU;UNTIL=19960331T020000 +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:Europe/Paris(STD) +DTSTART:19961027T030000 +RDATE:19961027T030000 +END:STANDARD +BEGIN:DAYLIGHT +TZOFFSETTO:+020000 +TZOFFSETFROM:+010000 +TZNAME:(DST) +DTSTART:19970330T020000 +RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU +END:DAYLIGHT +BEGIN:STANDARD +TZOFFSETTO:+010000 +TZOFFSETFROM:+020000 +TZNAME:(STD) +DTSTART:19971026T030000 +RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU +END:STANDARD +END:VTIMEZONE +BEGIN:VEVENT +CREATED:20220103T101137Z +LAST-MODIFIED:20231222T112013Z +DTSTAMP:20231222T112013Z +UID:d551e83f-b8f3-8a4a-8cc3-d11eb63767fb +SUMMARY:OpenAirInterface 5G-Core Network Weekly +ORGANIZER;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:camille.lerda@o + penairinterface.org +ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT:mailto:Tien-T + hinh.Nguyen@eurecom.fr +ATTENDEE;RSVP=TRUE;CN=Raphael Defosseux;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PART + ICIPANT:mailto:raphael.defosseux@openairinterface.org +ATTENDEE;RSVP=TRUE;CN=Sagar Arora;PARTSTAT=NEEDS-ACTION;CUTYPE=INDIVIDUAL;R + OLE=REQ-PARTICIPANT:mailto:sagar.arora@openairinterface.org +ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICI + PANT:mailto:franck.messaoudi@openairinterface.org +RRULE:FREQ=WEEKLY +EXDATE:20240305T100000Z +EXDATE:20240514T090000Z +EXDATE:20240618T100000Z +EXDATE:20240102T100000Z +EXDATE;TZID=Europe/Paris:20241217T120000 +DTSTART;TZID=Europe/Paris:20240102T110000 +DTEND;TZID=Europe/Paris:20240102T120000 +TRANSP:OPAQUE +LOCATION:Shannon room +DESCRIPTION;ALTREP="data:text/html,%0A%3Cdiv%3EDear%20All%2C%3C%2Fdiv%3E%0A + %3Cdiv%3E%3Cbr%3EYou%20can%20find%20the%20Microsoft%20Teams%20link%20and%20 + passcode%20here%3A%3Cbr%3E%3Cbr%3E%3Cb%3ELink%3A%3C%2Fb%3E%20https%3A%2F%2F + teams.microsoft.com%2Fl%2Fmeetup-join%2F19%253ameeting_ZjA4ZjIwMDktMzU4Ny00 + MGJhLThmYjQtZDdkMmU0YWYzOWUx%2540thread.v2%2F0%3Fcontext%3D%257b%2522Tid%25 + 22%253a%2522385df7a5-d39f-465f-b89c-0d74287c0231%2522%252c%2522Oid%2522%253 + a%25221b245629-67a8-4991-8bf7-9971f40cdb5c%2522%257d%3Cbr%3E%3Cb%3EPasscode + %3A%3C%2Fb%3E%20ZvgnbK%0A%3C%2Fdiv%3E%0A":Dear All\,\n\n\nYou can find the + Microsoft Teams link and passcode here:\n\nLink: https://teams.microsoft.co + m/l/meetup-join/19%3ameeting_ZjA4ZjIwMDktMzU4Ny00MGJhLThmYjQtZDdkMmU0YWYzOW + Ux%40thread.v2/0?context=%7b%22Tid%22%3a%22385df7a5-d39f-465f-b89c-0d74287c + 0231%22%2c%22Oid%22%3a%221b245629-67a8-4991-8bf7-9971f40cdb5c%22%7d\nPassco + de: ZvgnbK\n\n +SEQUENCE:12 +END:VEVENT +END:VCALENDAR + -- GitLab