Commit 9c97eaf0 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 31100214
...@@ -153,7 +153,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b ...@@ -153,7 +153,7 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
[ru_lopcomm_cu_config.jinja2.xml] [ru_lopcomm_cu_config.jinja2.xml]
_update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
md5sum = 274faf246197cbdd4973b772569daa8e md5sum = 346c911e1ac5e5001a39c8926b44c91e
[software.cfg.html] [software.cfg.html]
_update_hash_filename_ = gadget/software.cfg.html _update_hash_filename_ = gadget/software.cfg.html
......
...@@ -124,6 +124,7 @@ ...@@ -124,6 +124,7 @@
<downlink-radio-frame-offset>0</downlink-radio-frame-offset> <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
<downlink-sfn-offset>0</downlink-sfn-offset> <downlink-sfn-offset>0</downlink-sfn-offset>
<!-- <gain>{{ ru.rx_gain }}</gain> --> <!-- <gain>{{ ru.rx_gain }}</gain> -->
<!-- TODO(lu.xu): clarify with Lopcomm regaring rx gain -->
<gain-correction>0.0</gain-correction> <gain-correction>0.0</gain-correction>
<n-ta-offset>0</n-ta-offset> <n-ta-offset>0</n-ta-offset>
</rx-array-carriers> </rx-array-carriers>
......
...@@ -424,15 +424,40 @@ class TestENB_Lopcomm(ENBTestCase): ...@@ -424,15 +424,40 @@ class TestENB_Lopcomm(ENBTestCase):
# RU configuration in cu_config.xml # RU configuration in cu_config.xml
def test_ru_cu_cfg(t): def test_ru_cu_cfg(t):
def uctx(rf_mode, cell_type, dl_arfcn, ul_arfcn, bw, dl_freq, ul_freq, tx_gain, rx_gain):
return {
'tx-array-carriers': {
'rw-duplex-scheme': rf_mode,
'rw-type': cell_type,
'absolute-frequency-center': '%d' % dl_arfcn,
'center-of-channel-bandwidth': '%d' % dl_freq,
'channel-bandwidth': '%d' % bw,
'gain': '%d' % tx_gain,
'active': 'INACTIVE',
},
'rx-array-carriers': {
'absolute-frequency-center': '%d' % ul_arfcn,
'center-of-channel-bandwidth': '%d' % ul_freq,
'channel-bandwidth': '%d' % bw,
# XXX no rx_gain
'active': 'INACTIVE',
},
}
_ = t._test_ru_cu_cfg
def CU(i): # -> cu_config.xml of RU i # rf_mode ctype dl_arfcn ul_arfcn bw dl_freq ul_freq txg rxg
_(1, uctx('FDD', 'LTE', 100, 18100, 5000000, 2120000000, 1930000000, 11, 21))
_(2, uctx('TDD', 'LTE', 40200, 40200, 10000000, 2551000000, 2551000000, 12, 22))
def _test_ru_cu_cfg(t, i, uctx):
cu_xml = t.ipath('etc/%s' % xbuildout.encode('%s-cu_config.xml' % t.ref('RU%d' % i))) cu_xml = t.ipath('etc/%s' % xbuildout.encode('%s-cu_config.xml' % t.ref('RU%d' % i)))
with open(cu_xml, 'r') as f: with open(cu_xml, 'r') as f:
cu = f.read() cu = f.read()
return xmltodict.parse(cu) cu = xmltodict.parse(cu)
cu1 = CU(1) assertMatch(t, cu, {
assertMatch(t, cu1, {
'xc:config': { 'xc:config': {
'user-plane-configuration': { 'user-plane-configuration': {
'tx-endpoints': [ 'tx-endpoints': [
...@@ -459,24 +484,7 @@ class TestENB_Lopcomm(ENBTestCase): ...@@ -459,24 +484,7 @@ class TestENB_Lopcomm(ENBTestCase):
{'name': 'RXA0P00C01', 'rx-endpoint': 'RXA0P00C01'}, {'name': 'RXA0P00C01', 'rx-endpoint': 'RXA0P00C01'},
{'name': 'PRACH0P00C01', 'rx-endpoint': 'PRACH0P00C01'}, {'name': 'PRACH0P00C01', 'rx-endpoint': 'PRACH0P00C01'},
], ],
# CELL1 FDD LTE(100) BW(5) } | uctx
'tx-array-carriers': {
'rw-duplex-scheme': 'FDD',
'rw-type': 'LTE',
'absolute-frequency-center': '100',
'center-of-channel-bandwidth': '2120000000',
'channel-bandwidth': '5000000',
'gain': '11',
'active': 'INACTIVE',
},
'rx-array-carriers': {
'absolute-frequency-center': '18100',
'center-of-channel-bandwidth': '1930000000',
'channel-bandwidth': '5000000',
# XXX no <gain>ru.rx_gain</gain> TODO(lu.xu): clarify this with Lopcomm
'active': 'INACTIVE',
},
}
} }
}) })
......
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