From edcbff8f587d36621047c1cfc4b90019c7408209 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Tue, 27 Sep 2022 11:34:00 +0200
Subject: [PATCH] chore(ci): changes after peer review
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
...oxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf | 2 +-
ci-scripts/conf_files/gNB_SA_CU.conf | 2 +-
ci-scripts/conf_files/gNB_SA_DU.conf | 2 +-
.../gnb.band78.sa.fr1.106PRB.usrpn310.conf | 2 +-
.../gnb.sa.band66.fr1.106PRB.usrpn300.conf | 2 +-
.../gnb.sa.band78.fr1.106PRB.usrpb210.conf | 2 +-
docker/scripts/gnb_entrypoint.sh | 6 +---
docker/scripts/gnb_parameters.yaml | 28 +++++++++++++++++--
8 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
index 50dba38a511..20b0d3caf7f 100644
--- a/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/episci/proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -11,7 +11,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+ plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
nr_cellid = 12345678L;
diff --git a/ci-scripts/conf_files/gNB_SA_CU.conf b/ci-scripts/conf_files/gNB_SA_CU.conf
index 664af9d65ea..81635f7eb20 100644
--- a/ci-scripts/conf_files/gNB_SA_CU.conf
+++ b/ci-scripts/conf_files/gNB_SA_CU.conf
@@ -15,7 +15,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+ plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
nr_cellid = 12345678L;
diff --git a/ci-scripts/conf_files/gNB_SA_DU.conf b/ci-scripts/conf_files/gNB_SA_DU.conf
index 50a34683400..2a2524cb877 100644
--- a/ci-scripts/conf_files/gNB_SA_DU.conf
+++ b/ci-scripts/conf_files/gNB_SA_DU.conf
@@ -14,7 +14,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+ plmn_list = ({ mcc = 208; mnc = 99; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
nr_cellid = 12345678L;
diff --git a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
index 9f83c3f654e..53adb4eae14 100644
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
@@ -15,7 +15,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+ plmn_list = ({ mcc = 208; mnc = 97; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
nr_cellid = 12345678L
diff --git a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
index 787701fc9c3..d45f9bfd622 100644
--- a/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+++ b/ci-scripts/conf_files/gnb.sa.band66.fr1.106PRB.usrpn300.conf
@@ -11,7 +11,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1 }) });
+ plmn_list = ({ mcc = 208; mnc = 95; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
nr_cellid = 12345678L;
diff --git a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index 3ec265f12c0..b82944805a1 100644
--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -11,7 +11,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1; }) });
+ plmn_list = ({ mcc = 222; mnc = 01; mnc_length = 2; snssaiList = ({ sst = 1, sd = 0xffffff }) });
nr_cellid = 12345678L;
diff --git a/docker/scripts/gnb_entrypoint.sh b/docker/scripts/gnb_entrypoint.sh
index c17f71de652..f1d6bd83333 100755
--- a/docker/scripts/gnb_entrypoint.sh
+++ b/docker/scripts/gnb_entrypoint.sh
@@ -20,13 +20,9 @@ if [[ -v USE_VOLUMED_CONF ]]; then cp $PREFIX/etc/mounted.conf $PREFIX/etc/gnb.c
# Defualt Parameters
GNB_ID=${GNB_ID:-e00}
+NSSAI_SD=${NSSAI_SD:-ffffff}
USE_FQDN=${USE_FQDN:-false}
AMF_FQDN=${AMF_FQDN:-oai-amf-svc}
-# if you explicitly want to use an SD, it should be added in the docker-compose or the helm chart
-# if you want to support more than 1 NSSAI, then you need to mount a more-complex conf file
-if [[ -v NSSAI_SST ]] && [[ -v NSSAI_SD ]] then
- NSSAI_SST=$NSSAI_SST" , sd = "$NSSAI_SD
-fi
# Resolve AMF FQDN
if ($USE_FQDN); then AMF_IP_ADDRESS=(`getent hosts $AMF_FQDN | awk '{print $1}'`); fi
diff --git a/docker/scripts/gnb_parameters.yaml b/docker/scripts/gnb_parameters.yaml
index 0894bd88ad2..d1c41d966be 100644
--- a/docker/scripts/gnb_parameters.yaml
+++ b/docker/scripts/gnb_parameters.yaml
@@ -40,8 +40,6 @@
env: "@MNC@"
- key: mnc_length
env: "@MNC_LENGTH@"
- - key: sst
- env: "@NSSAI_SST@"
- key: tracking_area_code
env: "@TAC@"
- key: enable_x2
@@ -88,6 +86,10 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
+ - key: sd
+ env: "@NSSAI_SD@"
+ - key: tracking_area_code
+ env: "@TAC@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -99,7 +101,7 @@
- key: GNB_IPV4_ADDRESS_FOR_NGU
env: "@GNB_NGU_IP_ADDRESS@"
- key: sdr_addrs
- env: "@SDR_ADDRESSES@"
+ env: "@SDR_ADDRS@"
- key: parallel_config
env: "@THREAD_PARALLEL_CONFIG@"
@@ -122,6 +124,10 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
+ - key: sd
+ env: "@NSSAI_SD@"
+ - key: tracking_area_code
+ env: "@TAC@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -154,6 +160,10 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
+ - key: sd
+ env: "@NSSAI_SD@"
+ - key: tracking_area_code
+ env: "@TAC@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -186,6 +196,10 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
+ - key: sd
+ env: "@NSSAI_SD@"
+ - key: tracking_area_code
+ env: "@TAC@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -226,6 +240,10 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
+ - key: sd
+ env: "@NSSAI_SD@"
+ - key: tracking_area_code
+ env: "@TAC@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -268,6 +286,10 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
+ - key: sd
+ env: "@NSSAI_SD@"
+ - key: tracking_area_code
+ env: "@TAC@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
--
GitLab