Commit 94bf8492 authored by Joanne Hugé's avatar Joanne Hugé

ors-amarisoft: fix enb software type

parent 47a77ea3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = 3321c394922374a868e0b15fe09bd46e md5sum = 06331958afaaeb200e4d7f48b417cde8
[template-lte-enb-epc] [template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg _update_hash_filename_ = instance-enb-epc.jinja2.cfg
...@@ -24,7 +24,7 @@ md5sum = 946c70155a691e508e934a7ef2e442ba ...@@ -24,7 +24,7 @@ md5sum = 946c70155a691e508e934a7ef2e442ba
[template-lte-enb] [template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg _update_hash_filename_ = instance-enb.jinja2.cfg
md5sum = 79f3c30ab08efbb22b0cbcbbc45a66cb md5sum = 2b0ba32fb176fead6fb32779fa4d88be
[template-lte-gnb-epc] [template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
...@@ -48,7 +48,11 @@ md5sum = dcaac06553a3222b14c0013a13f4a149 ...@@ -48,7 +48,11 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg] [enb.jinja2.cfg]
filename = config/enb.jinja2.cfg filename = config/enb.jinja2.cfg
md5sum = 04105bfaede4254c3f95637898a3361f md5sum = 18a8f16240881dbb87ecb5183d9872e0
[sib23.asn]
filename = config/sib23.asn
md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
[gnb.jinja2.cfg] [gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg filename = config/gnb.jinja2.cfg
......
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
n_antenna_dl: N_ANTENNA_DL, n_antenna_dl: N_ANTENNA_DL,
n_antenna_ul: N_ANTENNA_UL, n_antenna_ul: N_ANTENNA_UL,
uldl_config: 2 uldl_config: 2,
sp_config: 7 sp_config: 7,
n_rb_dl: N_RB_DL, n_rb_dl: N_RB_DL,
cyclic_prefix: "normal", cyclic_prefix: "normal",
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
si_window_length: 40, si_window_length: 40,
sib_sched_list: [ sib_sched_list: [
{ {
filename: "{{ directory['software'] }}/enb/config/sib23.asn", filename: "{{ sib23 }}",
si_periodicity: 16, si_periodicity: 16,
}, },
], ],
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
], ],
#define T_REORDERING 65 #define T_REORDERING 65
drb_config: "[ drb_config: [
{ {
qci: 1, qci: 1,
......
{
message c1: systemInformation: {
criticalExtensions systemInformation-r8: {
sib-TypeAndInfo {
sib2: {
radioResourceConfigCommon {
rach-ConfigCommon {
preambleInfo {
numberOfRA-Preambles n52
},
powerRampingParameters {
powerRampingStep dB2,
preambleInitialReceivedTargetPower dBm-104
},
ra-SupervisionInfo {
preambleTransMax n10,
ra-ResponseWindowSize sf10,
mac-ContentionResolutionTimer sf40
},
maxHARQ-Msg3Tx 5
},
bcch-Config {
modificationPeriodCoeff n4
},
pcch-Config {
defaultPagingCycle rf128,
nB oneT
},
prach-Config {
rootSequenceIndex 0, /* patched by eNB */
prach-ConfigInfo {
prach-ConfigIndex 4, /* patched by eNB */
highSpeedFlag FALSE,
zeroCorrelationZoneConfig 11,
prach-FreqOffset 4 /* patched by eNB */
}
},
pdsch-ConfigCommon {
referenceSignalPower -8, /* patched by eNB */
p-b 1 /* patched by eNB */
},
pusch-ConfigCommon {
pusch-ConfigBasic {
n-SB 1,
hoppingMode interSubFrame,
pusch-HoppingOffset 8, /* patched by eNB */
enable64QAM FALSE /* patched by eNB */
},
ul-ReferenceSignalsPUSCH {
groupHoppingEnabled FALSE,
groupAssignmentPUSCH 0,
sequenceHoppingEnabled FALSE,
cyclicShift 0
}
},
pucch-ConfigCommon {
deltaPUCCH-Shift ds2,
nRB-CQI 4, /* patched by eNB */
nCS-AN 0,
n1PUCCH-AN 12 /* patched by eNB */
},
soundingRS-UL-ConfigCommon setup: {
srs-BandwidthConfig bw2, /* patched by eNB */
srs-SubframeConfig sc3, /* patched by eNB */
ackNackSRS-SimultaneousTransmission TRUE
},
uplinkPowerControlCommon {
p0-NominalPUSCH -85,
alpha al1,
p0-NominalPUCCH -117,
deltaFList-PUCCH {
deltaF-PUCCH-Format1 deltaF0,
deltaF-PUCCH-Format1b deltaF3,
deltaF-PUCCH-Format2 deltaF1,
deltaF-PUCCH-Format2a deltaF2,
deltaF-PUCCH-Format2b deltaF2
},
deltaPreambleMsg3 4
},
ul-CyclicPrefixLength len1
},
ue-TimersAndConstants {
t300 ms200,
t301 ms200,
t310 ms200,
n310 n6,
t311 ms10000,
n311 n5
},
freqInfo {
additionalSpectrumEmission 1
},
timeAlignmentTimerCommon infinity
},
sib3: {
cellReselectionInfoCommon {
q-Hyst dB2
},
cellReselectionServingFreqInfo {
s-NonIntraSearch 3,
threshServingLow 2,
cellReselectionPriority 6
},
intraFreqCellReselectionInfo {
q-RxLevMin -61,
p-Max 23,
s-IntraSearch 5,
presenceAntennaPort1 TRUE,
neighCellConfig '01'B,
t-ReselectionEUTRA 1
}
}
}
}
}
}
...@@ -41,12 +41,6 @@ ...@@ -41,12 +41,6 @@
"type": "number", "type": "number",
"default": {{ default_lte_n_rb_dl }} "default": {{ default_lte_n_rb_dl }}
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -106,6 +106,7 @@ context = ...@@ -106,6 +106,7 @@ context =
section slap_configuration slap-configuration section slap_configuration slap-configuration
key slapparameter_dict slap-configuration:configuration key slapparameter_dict slap-configuration:configuration
key gtp_addr slap-configuration:ipv6-random key gtp_addr slap-configuration:ipv6-random
raw sib23 {{ sib23 }}
import netaddr netaddr import netaddr netaddr
[lte-enb-config] [lte-enb-config]
......
...@@ -39,12 +39,6 @@ ...@@ -39,12 +39,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -39,12 +39,6 @@ ...@@ -39,12 +39,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -39,12 +39,6 @@ ...@@ -39,12 +39,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -39,12 +39,6 @@ ...@@ -39,12 +39,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -27,12 +27,6 @@ ...@@ -27,12 +27,6 @@
"type": "number", "type": "number",
"default": 100 "default": 100
}, },
"mme_addr": {
"title": "MME Address",
"description": "IPv4 of the core network",
"type": "string",
"default": "127.0.0.100"
},
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
......
...@@ -85,6 +85,7 @@ extra-context = ...@@ -85,6 +85,7 @@ extra-context =
raw monitor_template ${monitor2-template:output} raw monitor_template ${monitor2-template:output}
key enb amarisoft:enb key enb amarisoft:enb
raw enb_template ${enb.jinja2.cfg:target} raw enb_template ${enb.jinja2.cfg:target}
raw sib23 ${sib23.asn:target}
raw ltelogs_template ${ltelogs.jinja2.sh:target} raw ltelogs_template ${ltelogs.jinja2.sh:target}
raw sdr_busy_promise ${sdr-busy-promise:target} raw sdr_busy_promise ${sdr-busy-promise:target}
raw openssl_location ${openssl:location} raw openssl_location ${openssl:location}
......
...@@ -16,6 +16,7 @@ parts += ...@@ -16,6 +16,7 @@ parts +=
enb.jinja2.cfg enb.jinja2.cfg
gnb.jinja2.cfg gnb.jinja2.cfg
ue_db.jinja2.cfg ue_db.jinja2.cfg
sib23.asn
# unimplemented parts - the http monitor and better log handling using logrotate # unimplemented parts - the http monitor and better log handling using logrotate
# apache-php # apache-php
# logrotate # logrotate
...@@ -64,6 +65,9 @@ url = ${:_profile_base_location_}/config/${:_buildout_section_name_} ...@@ -64,6 +65,9 @@ url = ${:_profile_base_location_}/config/${:_buildout_section_name_}
[enb.jinja2.cfg] [enb.jinja2.cfg]
<= copy-config-to-instance <= copy-config-to-instance
filename = enb.jinja2.cfg filename = enb.jinja2.cfg
[sib23.asn]
<= copy-config-to-instance
filename = sib23.asn
[gnb.jinja2.cfg] [gnb.jinja2.cfg]
<= copy-config-to-instance <= copy-config-to-instance
filename = gnb.jinja2.cfg filename = gnb.jinja2.cfg
......
Markdown is supported
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