Skip to content
Snippets Groups Projects
Commit 152f7345 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

[DOCKER] fixes after review 


Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent da5a034e
No related branches found
No related tags found
9 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1093Issue in generating NR PRACH for High Speed case,!1074PBCH test case support for non-zero bchpyload,!1005Merge develop(w51 2) to nfapi_nr_develop,!1004Develop,!1003Merge develop(wk51) to nfapi_nr_develop,!1001Integration 2020 wk51,!989Docker and Deployment improvements
Hide whitespace changes
Inline Side-by-side
docker/scripts/generateTemplate.py
+ 3
− 0
View file @ 152f7345
#/*
# * 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. # * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under # * 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 # * the OAI Public License, Version 1.1 (the "License"); you may not use this file
......
docker/scripts/parameters.json deleted 100644 → 0
+ 0
− 304
View file @ da5a034e
[
{
"filePrefix": "cu",
"config": [
{
"key": "Active_eNBs",
"env": "@ENB_NAME@"
},
{
"key": "eNB_name",
"env": "@ENB_NAME@"
},
{
"key": "plmn_list",
"env": {"mcc": "@MCC@", "mnc": "@MNC@", "mnc_length": "@MNC_LENGTH@"}
},
{
"key": "tracking_area_code",
"env": "@TAC@"
},
{
"key": "local_s_if_name",
"env": "@F1_IF_NAME@"
},
{
"key": "remote_s_address",
"env": "@F1_DU_IP_ADDRESS@"
},
{
"key": "local_s_address",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "eutra_band",
"env": "@UTRA_BAND_ID@"
},
{
"key": "downlink_frequency",
"env": "@DL_FREQUENCY_IN_MHZ@000000"
},
{
"key": "uplink_frequency_offset",
"env": "@UL_FREQUENCY_OFFSET_IN_MHZ@000000"
},
{
"key": "Nid_cell",
"env": "@NID_CELL@"
},
{
"key": "N_RB_DL",
"env": "@NB_PRB@"
},
{
"key": "ipv4",
"env": "@MME_S1C_IP_ADDRESS@"
},
{
"key": "ENB_INTERFACE_NAME_FOR_S1_MME",
"env": "@S1C_IF_NAME@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_S1_MME",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "ENB_INTERFACE_NAME_FOR_S1U",
"env": "@S1U_IF_NAME@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_S1U",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_X2C",
"env": "@F1_CU_IP_ADDRESS@"
}
]
},
{
"filePrefix": "du",
"config": [
{
"key": "Active_eNBs",
"env": "@ENB_NAME@"
},
{
"key": "eNB_name",
"env": "@ENB_NAME@"
},
{
"key": "plmn_list",
"env": {"mcc": "@MCC@", "mnc": "@MNC@", "mnc_length": "@MNC_LENGTH@"}
},
{
"key": "tracking_area_code",
"env": "@TAC@"
},
{
"key": "local_n_if_name",
"env": "@F1_IF_NAME@"
},
{
"key": "remote_n_address",
"env": "@F1_DU_IP_ADDRESS@"
},
{
"key": "local_n_address",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "eutra_band",
"env": "@UTRA_BAND_ID@"
},
{
"key": "downlink_frequency",
"env": "@DL_FREQUENCY_IN_MHZ@000000"
},
{
"key": "uplink_frequency_offset",
"env": "@UL_FREQUENCY_OFFSET_IN_MHZ@000000"
},
{
"key": "Nid_cell",
"env": "@NID_CELL@"
},
{
"key": "N_RB_DL",
"env": "@NB_PRB@"
}
]
},
{
"filePrefix": "rru.fdd",
"config": [
{
"key": "local_if_name",
"env": "@@"
},
{
"key": "remote_address",
"env": "@@"
},
{
"key": "local_address",
"env": "@@"
},
{
"key": "bands",
"env": "@@"
}
]
},
{
"filePrefix": "rru.tdd",
"config": [
{
"key": "local_if_name",
"env": "@@"
},
{
"key": "remote_address",
"env": "@@"
},
{
"key": "local_address",
"env": "@@"
},
{
"key": "bands",
"env": "@@"
}
]
},
{
"filePrefix": "enb.band7.tm1.25PRB.usrpb210",
"config": [
{
"key": "Active_eNBs",
"env": "@ENB_NAME@"
},
{
"key": "eNB_name",
"env": "@ENB_NAME@"
},
{
"key": "plmn_list",
"env": {"mcc": "@MCC@", "mnc": "@MNC@", "mnc_length": "@MNC_LENGTH@"}
},
{
"key": "tracking_area_code",
"env": "@TAC@"
},
{
"key": "eutra_band",
"env": "@UTRA_BAND_ID@"
},
{
"key": "downlink_frequency",
"env": "@DL_FREQUENCY_IN_MHZ@000000"
},
{
"key": "uplink_frequency_offset",
"env": "@UL_FREQUENCY_OFFSET_IN_MHZ@000000"
},
{
"key": "Nid_cell",
"env": "@NID_CELL@"
},
{
"key": "N_RB_DL",
"env": "@NB_PRB@"
},
{
"key": "ipv4",
"env": "@MME_S1C_IP_ADDRESS@"
},
{
"key": "ENB_INTERFACE_NAME_FOR_S1_MME",
"env": "@S1C_IF_NAME@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_S1_MME",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "ENB_INTERFACE_NAME_FOR_S1U",
"env": "@S1U_IF_NAME@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_S1U",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_X2C",
"env": "@F1_CU_IP_ADDRESS@"
}
]
},
{
"filePrefix": "enb.band40.tm1.25PRB.FairScheduler.usrpb210",
"config": [
{
"key": "Active_eNBs",
"env": "@ENB_NAME@"
},
{
"key": "eNB_name",
"env": "@ENB_NAME@"
},
{
"key": "plmn_list",
"env": {"mcc": "@MCC@", "mnc": "@MNC@", "mnc_length": "@MNC_LENGTH@"}
},
{
"key": "tracking_area_code",
"env": "@TAC@"
},
{
"key": "eutra_band",
"env": "@UTRA_BAND_ID@"
},
{
"key": "downlink_frequency",
"env": "@DL_FREQUENCY_IN_MHZ@000000"
},
{
"key": "uplink_frequency_offset",
"env": "@UL_FREQUENCY_OFFSET_IN_MHZ@000000"
},
{
"key": "Nid_cell",
"env": "@NID_CELL@"
},
{
"key": "N_RB_DL",
"env": "@NB_PRB@"
},
{
"key": "ipv4",
"env": "@MME_S1C_IP_ADDRESS@"
},
{
"key": "ENB_INTERFACE_NAME_FOR_S1_MME",
"env": "@S1C_IF_NAME@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_S1_MME",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "ENB_INTERFACE_NAME_FOR_S1U",
"env": "@S1U_IF_NAME@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_S1U",
"env": "@F1_CU_IP_ADDRESS@"
},
{
"key": "ENB_IPV4_ADDRESS_FOR_X2C",
"env": "@F1_CU_IP_ADDRESS@"
}
]
}
]
docker/scripts/parameters.yaml
+ 22
− 1
View file @ 152f7345
#/*
# * 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
# */
--- ---
- paths: - paths:
source_dir: "/home/mohammed/Documents/conf_files/" source_dir: "ci-scripts/conf_files/"
dest_dir: docker/etc dest_dir: docker/etc
- configurations: - configurations:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment