diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md index d47c4842de..3ac4962321 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/README.md @@ -410,16 +410,33 @@ in HSS config: NB_USERS: 10 ``` -in UE config: +All UE parameter values will be taken from the mounted config file, so modify +the corresponding UE file to reflect the above changes ```yaml - MCC: '208' - MNC: '96' - SHORT_IMSI: '0100000001' - LTE_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'c42449363bbad02b66d16bc975d77cc1' - MSISDN: '001011234561010' - HPLMN: 20896 + oai_ue0: + [...] + volumes: + - ../../conf_files/lteue.usim-ci.conf:/opt/oai-lte-ue/etc/ue_usim.conf +``` + +and in the UE file, you should have +``` +PLMN: { + PLMN0: { + FULLNAME="OpenAirInterface"; + SHORTNAME="OAICN"; + MNC="96"; + MCC="208"; + }; +}; +[...] + SIM: { + MSIN="0100000001"; + USIM_API_K="fec86ba6eb707ed08905757b1bb44b8f"; + OPC="c42449363bbad02b66d16bc975d77cc1"; + MSISDN="001011234561010"; + }; ``` As you can see: `LTE_K` and `LTE_KEY` are the same value. And `OP_KEY` and `OPC` can be deduced from each other. Look in HSS logs. @@ -471,13 +488,19 @@ in SPGW-C/-U configs: REALM: openairinterface.org ``` -in eNB config: +In eNB, all the parameter values will be taken from the mounted config file. ```yaml - MCC: '208' - MNC: '96' - MNC_LENGTH: 2 - TAC: 1 +oai_enb0: + [...] + volumes: + - ../../conf_files/enb.band7.25prb.rfsim.conf:/opt/oai-enb/etc/enb.conf +``` + +with the eNB config reading: + +```libconfig + plmn_list = ( { mcc = 208; mnc = 96; mnc_length = 2; } ); ``` The values SHALL match, and `TAC` shall match `TAC_0` from MME. diff --git a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md index 48081e71dd..126951f1d0 100644 --- a/ci-scripts/yaml_files/5g_l2sim_tdd/README.md +++ b/ci-scripts/yaml_files/5g_l2sim_tdd/README.md @@ -321,19 +321,52 @@ In the `SMF` section, provide your own DNS IP address: DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100 ``` -In the `gNB` section, provide your docker-host primary IP address and interface name: in our case `172.21.16.128` and `eno1`. +gNB section: + +All the parameter values will be taken from the mounted config file ```yaml - GNB_NGA_IF_NAME: eno1 - GNB_NGA_IP_ADDRESS: 172.21.16.128 - GNB_NGU_IF_NAME: eno1 - GNB_NGU_IP_ADDRESS: 172.21.16.128 +oai-gnb: + [...] + volumes: + - ../../conf_files/gnb.sa.band78.106prb.l2sim.conf:/opt/oai-gnb/etc/gnb.conf ``` -Same thing in the `nr-ue` section: +with the configuration file having something like: + +```libconfig + NETWORK_INTERFACES : + { + GNB_INTERFACE_NAME_FOR_NG_AMF = "eno1"; + GNB_IPV4_ADDRESS_FOR_NG_AMF = "172.21.16.128"; + GNB_INTERFACE_NAME_FOR_NGU = "eno1"; + GNB_IPV4_ADDRESS_FOR_NGU = "172.21.16.128"; + GNB_PORT_FOR_NGU = 2152; # Spec 2152 + }; +``` + +For the UE, all the parameter values will be taken from the mounted config +file. Example: ```yaml - NR_UE_NFAPI_IF_NAME: eno1 + oai-nr-ue0: + [...] + volumes: + - ../../conf_files/nrue.band78.106prb.l2sim.conf:/opt/oai-nr-ue/etc/nr-ue.conf + - ../../../openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results:/opt/oai-nr-ue/openair1/SIMULATION/LTE_PHY/BLER_SIMULATIONS/AWGN/AWGN_results +``` + +where the UE configuration (mounted to `/opt/oai-nr-ue/etc/nr-ue.conf`) reads + +```libconfig +MACRLCs = ( + { + num_cc = 1; + tr_n_preference = "nfapi"; + local_n_if_name = "eno1"; + remote_n_address = "127.0.0.1"; //Proxy IP + local_n_address = "127.0.0.1"; + ... ``` This tutorial is a first draft. This nFAPI feature and the proxy are still under development. diff --git a/ci-scripts/yaml_files/5g_rfsimulator/README.md b/ci-scripts/yaml_files/5g_rfsimulator/README.md index a018c085d6..572a3c2470 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/README.md +++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md @@ -244,14 +244,11 @@ Create entry for Second UE in docker-compose.yaml file as follows: privileged: true container_name: rfsim5g-oai-nr-ue2 environment: - FULL_IMSI: '208990100001101' - FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f' - OPC: 'C42449363BBAD02B66D16BC975D77CC1' - DNN: oai - NSSAI_SST: 1 USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 -C 3619200000 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time depends_on: - oai-gnb + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf networks: public_net: ipv4_address: 192.168.71.151 @@ -496,13 +493,25 @@ INSERT INTO `users` VALUES ('208990100001101','1','55000000000000',NULL,'PURGED' As you can see, 2 other values shall match in the NR-UE section of `docker-compose.yaml`: -OAI UE - 1 -* `FULL_IMSI: '208990100001100'` -* `FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'` +All the values such as IMSI and KEY are taken from the configuration file mounted into the container. -OAI UE - 2 -* `FULL_IMSI: '208990100001101'` -* `FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'` +```yaml + oai-nr-ue: + [...] + volumes: + - ../../conf_files/nrue.uicc.conf:/opt/oai-nr-ue/etc/nr-ue.conf +``` + +with the config having: +```libconfig +uicc0 = { + imsi = "208990100001100"; + key = "fec86ba6eb707ed08905757b1bb44b8f"; + opc= "C42449363BBAD02B66D16BC975D77CC1"; + dnn= "oai"; + nssai_sst=1; +} +``` We are also using a dedicated `oai-smf.conf` for the `SMF` container: the `oai` DNN shall match the one in the NR-UE section of `docker-compose.yaml` (`DNN: oai`).