Skip to content

slapos
slapos
Commit 9c6ed6c5 authored by Lu Xu's avatar Lu Xu 👀
Browse files
Options

software/ors-amarisoft: re-use cu_config.jinja2.xml to generate cu_inactive_config.xml

parent 76642bf9
Pipeline #34564 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 8 additions and 149 deletions
    software/ors-amarisoft/buildout.hash.cfg
    View file @ 9c6ed6c5
    ......@@ -16,7 +16,7 @@
    [template]
    filename = instance.cfg
    md5sum = acd9dd8dbe613e7101e62930a8380ef0
    md5sum = 43f02b7b3552d0d657fa7dbf43ce20a5
    [template-ors]
    filename = instance-ors.cfg
    ......@@ -44,7 +44,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
    [ru_lopcomm_libinstance.jinja2.cfg]
    _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
    md5sum = 7d05f6a3980a79bfd35677dbb8b988ee
    md5sum = d1a724be968a2d5ea1432c0f4a34f199
    [ru_sunwave_libinstance.jinja2.cfg]
    _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
    ......@@ -154,10 +154,6 @@ md5sum = e435990eb0a0d4be41efa9bd16dce09b
    _update_hash_filename_ = ru/lopcomm/cu_config.jinja2.xml
    md5sum = 346c911e1ac5e5001a39c8926b44c91e
    [ru_lopcomm_cu_inactive_config.jinja2.xml]
    _update_hash_filename_ = ru/lopcomm/cu_inactive_config.jinja2.xml
    md5sum = 9d48c35f9939446ce75ae9f85e44c26a
    [software.cfg.html]
    _update_hash_filename_ = gadget/software.cfg.html
    md5sum = 61a2f783fbf683a34aed3d13e00baca2
    ......
    software/ors-amarisoft/instance.cfg
    View file @ 9c6ed6c5
    ......@@ -165,7 +165,7 @@ extra-context =
    raw ru_lopcomm_reset_template ${ru_lopcomm_reset.jinja2.py:target}
    raw ru_lopcomm_CreateProcessingEle_template ${ru_lopcomm_CreateProcessingEle.jinja2.xml:target}
    raw ru_lopcomm_cu_config_template ${ru_lopcomm_cu_config.jinja2.xml:target}
    raw ru_lopcomm_cu_inactive_config_template ${ru_lopcomm_cu_inactive_config.jinja2.xml:target}
    raw ru_lopcomm_cu_inactive_config_template ${ru_lopcomm_cu_config.jinja2.xml:target}
    raw ru_lopcomm_firmware_path ${ru_lopcomm_firmware-dl:target}
    raw ru_lopcomm_firmware_filename ${ru_lopcomm_firmware-dl:filename}
    raw ru_tapsplit ${ru_tapsplit:target}
    ......@@ -221,7 +221,7 @@ extra-context =
    raw ru_lopcomm_reset_template ${ru_lopcomm_reset.jinja2.py:target}
    raw ru_lopcomm_CreateProcessingEle_template ${ru_lopcomm_CreateProcessingEle.jinja2.xml:target}
    raw ru_lopcomm_cu_config_template ${ru_lopcomm_cu_config.jinja2.xml:target}
    raw ru_lopcomm_cu_inactive_config_template ${ru_lopcomm_cu_inactive_config.jinja2.xml:target}
    raw ru_lopcomm_cu_inactive_config_template ${ru_lopcomm_cu_config.jinja2.xml:target}
    raw ru_lopcomm_firmware_path ${ru_lopcomm_firmware-dl:target}
    raw ru_lopcomm_firmware_filename ${ru_lopcomm_firmware-dl:filename}
    raw ru_tapsplit ${ru_tapsplit:target}
    ......
    software/ors-amarisoft/ru/lopcomm/buildout.cfg
    View file @ 9c6ed6c5
    ......@@ -32,9 +32,6 @@ destination = ${buildout:directory}/ncclient_common.py
    [ru_lopcomm_cu_config.jinja2.xml]
    <= download-base
    [ru_lopcomm_cu_inactive_config.jinja2.xml]
    <= download-base
    [ru_lopcomm_firmware-dl]
    recipe = slapos.recipe.build:download
    url = https://lab.nexedi.com/nexedi/ors-utils/raw/master/lopcomm-firmware/${:filename}
    ......
    software/ors-amarisoft/ru/lopcomm/cu_inactive_config.jinja2.xml deleted 100644 → 0
    View file @ 76642bf9
    <xc:config xmlns:xc="urn:ietf:params:xml:ns:netconf:base:1.0">
    <user-plane-configuration xc:operation="replace" xmlns="urn:o-ran:uplane-conf-option8:1.0">
    <!-- TX path: eaxcid → TxEndpoint
    ↘
    mod → static TxEndpoint → TxArray
    ↗
    TxCarrier
    (static TxEndpoint, TxArray and their association are defined by RU itself)
    -->
    {%- set TxCarrier = 'TXA0CC00' %}
    {%- for ant in range(ru.n_antenna_dl) %}
    {%- set port = ant // 2 %}
    {%- set chan = ant % 2 %}
    {%- set txep = 'TXA0P%02dC%02d' % (port, chan) %}
    <!-- TxAntenna{{ ant }} -->
    <tx-endpoints>
    <name>{{ txep }}</name>
    <e-axcid>
    <o-du-port-bitmask>61440</o-du-port-bitmask>
    <band-sector-bitmask>3968</band-sector-bitmask>
    <ccid-bitmask>112</ccid-bitmask>
    <ru-port-bitmask>15</ru-port-bitmask>
    <eaxc-id>{{ ant }}</eaxc-id>
    </e-axcid>
    </tx-endpoints>
    <tx-links>
    <name>{{ txep }}</name>
    <processing-element>PE0</processing-element>
    <tx-array-carrier>{{ TxCarrier }}</tx-array-carrier>
    <tx-endpoint>{{ txep }}</tx-endpoint>
    </tx-links>
    {%- endfor %}
    <!--
    RX path: eaxcid ← RxEndpoint
    (data ∪ prach)
    ↖
    demod ← static RxEndpoint ← RxArray
    ↗
    RxCarrier
    (static RxEndpoint, RxArray and their association are defined by RU itself)
    -->
    {%- set RxCarrier = 'RXA0CC00' %}
    {%- for ant in range(ru.n_antenna_ul) %}
    {%- set port = ant // 2 %}
    {%- set chan = ant % 2 %}
    {%- set rxep = 'RXA0P%02dC%02d' % (port, chan) %}
    {%- set prachep = 'PRACH0P%02dC%02d' % (port, chan) %}
    <!-- RxAntenna{{ ant }} -->
    <rx-endpoints>
    <name>{{ rxep }}</name>
    <e-axcid>
    <o-du-port-bitmask>61440</o-du-port-bitmask>
    <band-sector-bitmask>3968</band-sector-bitmask>
    <ccid-bitmask>112</ccid-bitmask>
    <ru-port-bitmask>15</ru-port-bitmask>
    <eaxc-id>{{ ant }}</eaxc-id>
    </e-axcid>
    </rx-endpoints>
    <rx-endpoints>
    <name>{{ prachep }}</name>
    <e-axcid>
    <o-du-port-bitmask>61440</o-du-port-bitmask>
    <band-sector-bitmask>3968</band-sector-bitmask>
    <ccid-bitmask>112</ccid-bitmask>
    <ru-port-bitmask>15</ru-port-bitmask>
    <eaxc-id>{{ 16*chan + 8 + port }}</eaxc-id>
    </e-axcid>
    </rx-endpoints>
    <rx-links>
    <name>{{ rxep }}</name>
    <processing-element>PE0</processing-element>
    <rx-array-carrier>{{ RxCarrier }}</rx-array-carrier>
    <rx-endpoint>{{ rxep }}</rx-endpoint>
    </rx-links>
    <rx-links>
    <name>{{ prachep }}</name>
    <processing-element>PE0</processing-element>
    <rx-array-carrier>{{ RxCarrier }}</rx-array-carrier>
    <rx-endpoint>{{ prachep }}</rx-endpoint>
    </rx-links>
    {%- endfor %}
    <!-- TX/RX carriers -->
    <!-- TODO support multiple cells over 1 RU -->
    {%- if cell.cell_type == 'lte' %}
    {%- set dl_arfcn = cell.dl_earfcn %}
    {%- set ul_arfcn = cell.ul_earfcn %}
    {%- set dl_freq = int(xearfcn_module.frequency(dl_arfcn) * 1e6) %}
    {%- set ul_freq = int(xearfcn_module.frequency(ul_arfcn) * 1e6) %}
    {%- elif cell.cell_type == 'nr' %}
    {%- set dl_arfcn = cell.dl_nr_arfcn %}
    {%- set ul_arfcn = cell.ul_nr_arfcn %}
    {%- set dl_freq = int(xnrarfcn_module.frequency(dl_arfcn) * 1e6) %}
    {%- set ul_freq = int(xnrarfcn_module.frequency(ul_arfcn) * 1e6) %}
    {%- else %}
    {%- do bug('unreachable') %}
    {%- endif %}
    {%- set bw = int(cell.bandwidth * 1e6) %}
    <tx-array-carriers>
    <name>{{ TxCarrier }}</name>
    <absolute-frequency-center>{{ dl_arfcn }}</absolute-frequency-center>
    <center-of-channel-bandwidth>{{ dl_freq }}</center-of-channel-bandwidth>
    <channel-bandwidth>{{ bw }}</channel-bandwidth>
    <active>INACTIVE</active>
    <rw-type>{{ cell.cell_type | upper }}</rw-type>
    <rw-duplex-scheme>{{ cell.rf_mode | upper }}</rw-duplex-scheme>
    <gain>{{ ru.tx_gain }}</gain>
    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
    <downlink-sfn-offset>0</downlink-sfn-offset>
    </tx-array-carriers>
    <rx-array-carriers>
    <name>{{ RxCarrier }}</name>
    <absolute-frequency-center>{{ ul_arfcn }}</absolute-frequency-center>
    <center-of-channel-bandwidth>{{ ul_freq }}</center-of-channel-bandwidth>
    <channel-bandwidth>{{ bw }}</channel-bandwidth>
    <active>INACTIVE</active>
    <downlink-radio-frame-offset>0</downlink-radio-frame-offset>
    <downlink-sfn-offset>0</downlink-sfn-offset>
    <!-- <gain>{{ ru.rx_gain }}</gain> -->
    <!-- TODO(lu.xu): clarify with Lopcomm regaring rx gain -->
    <gain-correction>0.0</gain-correction>
    <n-ta-offset>0</n-ta-offset>
    </rx-array-carriers>
    </user-plane-configuration>
    </xc:config>
    software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg
    View file @ 9c6ed6c5
    ......@@ -3,6 +3,8 @@
    {%- macro buildout_iru(iru, icell_list) %}
    {%- set ru_ref = J(jref_of_shared(iru)) %}
    {%- set ru = iru['_'] %}
    {%- set ns = namespace(inactive_ru=ru.copy()) %}
    {%- do ns.inactive_ru.update({'txrx_active': 'INACTIVE'}) %}
    {%- if len(icell_list) != 1 %}
    {%- do ierror(iru, 'ru/lopcomm supports only 1 cell ; requested %d' % len(icell_list)) %}
    ......@@ -66,11 +68,7 @@ offline = false
    [{{ B('%s-cu-config' % ru_ref) }}]
    <= config-base
    {% if ru.get("cu_config_link", None) %}
    url = ${ {{-B('%s-cu-config-dl' % ru_ref)}}:target}
    {% else %}
    url = {{ ru_lopcomm_cu_config_template }}
    {% endif %}
    output = ${directory:etc}/{{B('%s-cu_config.xml' % ru_ref)}}
    extra-context =
    import xearfcn_module xlte.earfcn
    ......@@ -82,14 +80,14 @@ cell = {{ dumps(cell) }}
    [{{ B('%s-cu-inactive-config' % ru_ref) }}]
    <= config-base
    url = {{ ru_lopcomm_cu_inactive_config_template }}
    url = {{ ru_lopcomm_cu_config_template }}
    output = ${directory:etc}/{{B('%s-cu_inactive_config.xml' % ru_ref)}}
    extra-context =
    import xearfcn_module xlte.earfcn
    import xnrarfcn_module xlte.nrarfcn
    key ru :ru
    key cell :cell
    ru = {{ dumps(ru) }}
    ru = {{ dumps(ns.inactive_ru) }}
    cell = {{ dumps(cell) }}
    [{{ B('%s-config-template' % ru_ref) }}]
    ......
    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
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7