Commit e8848e07 authored by Joanne Hugé's avatar Joanne Hugé

.

parent 92edc976
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null", log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
log_filename: "log/ue.log", log_filename: "log/ue.log",
rue_bind_addr: "::1", // rue_bind_addr: "::1",
com_addr: "[::1]:9002", com_addr: "[::1]:9002",
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
name: "sdr", name: "sdr",
// _UCELL1_ru 1T1R // _UCELL1_ru 1T1R
// _UCELL2_ru 1T1R // _UCELL2_ru 1T1R
args: "dev0=/dev/sdr0,dev1=/dev/sdr2", args: "dev0=/dev/sdr4,dev1=/dev/sdr6",
rx_antenna:"tx_rx", rx_antenna:"tx_rx",
tdd_tx_mod: 1, tdd_tx_mod: 1,
}, },
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
impi: "", impi: "",
imsi: "001010123456789", imsi: "001010123456789",
K: "00112233445566778899aabbccddeeff", K: "00112233445566778899aabbccddeeff",
rue_addr: "host1", // rue_addr: "host1",
ue_category: 12, ue_category: 12,
tun_setup_script: "ue-ifup", tun_setup_script: "ue-ifup",
apn: "internet", apn: "internet",
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null", log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
log_filename: "{{ directory['log'] }}/ue.log", log_filename: "{{ directory['log'] }}/ue.log",
rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}", // rue_bind_addr: "{{ pub_info['rue_bind_addr'] }}",
com_addr: "{{ pub_info['com_addr'] }}", com_addr: "{{ pub_info['com_addr'] }}",
{# instantiate radio units #} {# instantiate radio units #}
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
impi: "{{ ue.impi }}", impi: "{{ ue.impi }}",
imsi: "{{ ue.imsi }}", imsi: "{{ ue.imsi }}",
K: "{{ ue.k }}", K: "{{ ue.k }}",
rue_addr: "{{ ue.rue_addr }}", // rue_addr: "{{ ue.rue_addr }}",
{%- if ue.ue_type == 'lte' %} {%- if ue.ue_type == 'lte' %}
ue_category: 12, ue_category: 12,
{%- elif ue.ue_type == 'nr' %} {%- elif ue.ue_type == 'nr' %}
......
...@@ -235,38 +235,35 @@ def iRU2_LOPCOMM_fLTE2(ienb): ...@@ -235,38 +235,35 @@ def iRU2_LOPCOMM_fLTE2(ienb):
# RU_0004['mac_addr'] = 'YYY' # RU_0004['mac_addr'] = 'YYY'
RU_0004['cpri_link']['sfp_port'] = 1 RU_0004['cpri_link']['sfp_port'] = 1
ienb.ishared('Radio Unit 2a', '_RU_0002', RU_0002) if 1:
# ienb.ishared('Radio Unit 2b', '_RU_0004', RU_0004) ienb.ishared('Radio Unit 2a', '_RU_0002', RU_0002)
ienb.ishared('Cell 2', '_CELL2', {
#""" 'cell_type': 'lte',
ienb.ishared('Cell 2', '_CELL2', { 'rf_mode': 'fdd',
'cell_type': 'lte', 'bandwidth': '20 MHz',
'rf_mode': 'fdd', 'dl_earfcn': 100, # 2120 MHz @ B1
'bandwidth': '20 MHz', 'pci': 21,
'dl_earfcn': 100, # 2120 MHz @ B1 'cell_id': '0x21',
'pci': 21, 'ru': {
'cell_id': '0x21', 'ru_type': 'ru_ref',
'ru': { 'ru_ref': 'RU_0002'
'ru_type': 'ru_ref', }
'ru_ref': 'RU_0002' })
}
}) if 1:
#""" ienb.ishared('Radio Unit 2b', '_RU_0004', RU_0004)
ienb.ishared('Cell 4', '_CELL4', {
""" 'cell_type': 'lte',
ienb.ishared('Cell 4', '_CELL4', { 'rf_mode': 'fdd',
'cell_type': 'lte', 'bandwidth': '20 MHz',
'rf_mode': 'fdd', 'dl_earfcn': 500, # 2160 MHz @ B1
'bandwidth': '20 MHz', 'pci': 22,
'dl_earfcn': 500, # 2160 MHz @ B1 'cell_id': '0x22',
'pci': 22, 'ru': {
'cell_id': '0x22', 'ru_type': 'ru_ref',
'ru': { 'ru_ref': 'RU_0004'
'ru_type': 'ru_ref', }
'ru_ref': 'RU_0004' })
}
})
"""
def do_enb(): def do_enb():
ienb = Instance('enb') ienb = Instance('enb')
...@@ -310,7 +307,7 @@ def do_ue(): ...@@ -310,7 +307,7 @@ def do_ue():
'ru': { 'ru': {
'ru_type': 'sdr', 'ru_type': 'sdr',
'ru_link_type': 'sdr', 'ru_link_type': 'sdr',
'sdr_dev_list': [0], 'sdr_dev_list': [4],
'n_antenna_dl': 1, 'n_antenna_dl': 1,
'n_antenna_ul': 1, 'n_antenna_ul': 1,
'tx_gain': 60, 'tx_gain': 60,
...@@ -325,7 +322,7 @@ def do_ue(): ...@@ -325,7 +322,7 @@ def do_ue():
'ru': { # NOTE contrary to eNB UEsim cannot share one RU in between several cells 'ru': { # NOTE contrary to eNB UEsim cannot share one RU in between several cells
'ru_type': 'sdr', 'ru_type': 'sdr',
'ru_link_type': 'sdr', 'ru_link_type': 'sdr',
'sdr_dev_list': [2], 'sdr_dev_list': [6],
'n_antenna_dl': 1, 'n_antenna_dl': 1,
'n_antenna_ul': 1, 'n_antenna_ul': 1,
'tx_gain': 60, 'tx_gain': 60,
......
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