chore(ci): changes after peer review

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

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

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