fix(docker): fixes when generating the templates for gNB conf files

* The '0x' format was forgetting that an hexadecimal value can have a-f chars
  * If someone wants to use a dedicated NSSAI_SD value, it is possible now
  * For experimental purpose in cluster, SDR addresses can be provided for one config
    - could be expended later on other conf files

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
Raphael Defosseux
2022-09-21 10:52:05 +02:00
parent 18ead40b84
commit 0dff2c9bc3
3 changed files with 20 additions and 22 deletions
+9 -19
View File
@@ -28,7 +28,7 @@
- filePrefix: gnb.band78.tm1.fr1.106PRB.usrpb210.conf
outputfilename: "gnb.nsa.tdd.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -42,8 +42,6 @@
env: "@MNC_LENGTH@"
- key: sst
env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: tracking_area_code
env: "@TAC@"
- key: enable_x2
@@ -74,7 +72,7 @@
- filePrefix: gnb.band78.sa.fr1.106PRB.usrpn310.conf
outputfilename: "gnb.sa.tdd.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -90,8 +88,6 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -102,13 +98,15 @@
env: "@GNB_NGU_IF_NAME@"
- key: GNB_IPV4_ADDRESS_FOR_NGU
env: "@GNB_NGU_IP_ADDRESS@"
- key: sdr_addrs
env: "@SDR_ADDRESSES@"
- key: parallel_config
env: "@THREAD_PARALLEL_CONFIG@"
- filePrefix: gnb.sa.band78.fr1.106PRB.usrpb210.conf
outputfilename: "gnb.sa.tdd.b2xx.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -140,7 +138,7 @@
- filePrefix: gnb.sa.band66.fr1.106PRB.usrpn300.conf
outputfilename: "gnb.sa.fdd.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -156,8 +154,6 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -174,7 +170,7 @@
- filePrefix: gNB_SA_CU.conf
outputfilename: "gnb.sa.cu.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -190,8 +186,6 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -216,7 +210,7 @@
- filePrefix: gNB_SA_DU.conf
outputfilename: "gnb.sa.du.tdd.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -232,8 +226,6 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF
@@ -260,7 +252,7 @@
- filePrefix: proxy_gnb.band78.sa.fr1.106PRB.usrpn310.conf
outputfilename: "gnb.sa.nfapi.vnf.conf"
config:
- key: GNB_ID
- key: gNB_ID
env: "@GNB_ID@"
- key: Active_gNBs
env: "@GNB_NAME@"
@@ -276,8 +268,6 @@
env: "@TAC@"
- key: sst
env: "@NSSAI_SST@"
- key: sd
env: "@NSSAI_SD@"
- key: ipv4
env: "@AMF_IP_ADDRESS@"
- key: GNB_INTERFACE_NAME_FOR_NG_AMF