Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
9aea71de
Commit
9aea71de
authored
Oct 20, 2023
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
aeef6983
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
30 deletions
+26
-30
software/ors-amarisoft/amari/lte.jinja2
software/ors-amarisoft/amari/lte.jinja2
+1
-0
software/ors-amarisoft/amari/slap.jinja2
software/ors-amarisoft/amari/slap.jinja2
+14
-0
software/ors-amarisoft/ru/input-schema.json
software/ors-amarisoft/ru/input-schema.json
+8
-0
software/ors-amarisoft/ru/lopcomm/cu_config.jinja2.xml
software/ors-amarisoft/ru/lopcomm/cu_config.jinja2.xml
+2
-2
software/ors-amarisoft/ru/lopcomm/input-schema.json
software/ors-amarisoft/ru/lopcomm/input-schema.json
+1
-28
No files found.
software/ors-amarisoft/amari/lte.jinja2
View file @
9aea71de
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
{%- macro ru_config(iru_dict, slapparameter_dict) %}
{%- macro ru_config(iru_dict, slapparameter_dict) %}
// Radio Units
// Radio Units
rf_driver: {
rf_driver: {
// XXX vvv <- ru.txrx_active
{%- if slapparameter_dict.get('disable_sdr', False) %}
{%- if slapparameter_dict.get('disable_sdr', False) %}
name: "dummy",
name: "dummy",
{%- else %}
{%- else %}
...
...
software/ors-amarisoft/amari/slap.jinja2
View file @
9aea71de
...
@@ -9,11 +9,19 @@
...
@@ -9,11 +9,19 @@
it should be kept in sync with "default" in json schemas #}
it should be kept in sync with "default" in json schemas #}
{#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000" #}
{#- XXX ssb_pos_bitmap=10000000 is for TDD only; FDD -> "1000" #}
{#- XXX opc='milenage' is not meaningful ? #}
{#- XXX opc='milenage' is not meaningful ? #}
{#- XXX txrx_active=ACTIVE for sdr - needed ? (bwcompat for ORS) - if yes -> update ru/sdr/input-schema.json #}
{%- set defaults = {
{%- set defaults = {
'enb_id': '0x1A2D0',
'enb_id': '0x1A2D0',
'gnb_id': '0x12345',
'gnb_id': '0x12345',
'gnb_id_bits': 28,
'gnb_id_bits': 28,
'ru': {
'txrx_active': 'INACTIVE',
},
'ru/sdr': {
'txrx_active': 'ACTIVE',
},
'cell/lte': {
'cell/lte': {
'pci': 1,
'pci': 1,
'tac': "0x0001",
'tac': "0x0001",
...
@@ -147,6 +155,12 @@
...
@@ -147,6 +155,12 @@
{%- set _ = ishared['_'] %}
{%- set _ = ishared['_'] %}
{%- if 'ru_type' in _ %}
{%- if 'ru_type' in _ %}
{%- set iru = ishared %}
{%- set iru = ishared %}
{%- for k, v in defaults['ru'].items() %}
{%- do _.setdefault(k, v) %}
{%- endfor %}
{%- for k, v in defaults.get('ru/'+_.ru_type, {}).items() %}
{%- do _.setdefault(k, v) %}
{%- endfor %}
{%- if _.ru_link_type == 'cpri' %}
{%- if _.ru_link_type == 'cpri' %}
{%- set link = _.cpri_link %}
{%- set link = _.cpri_link %}
{%- for k, v in defaults['cpri_link'].items() %}
{%- for k, v in defaults['cpri_link'].items() %}
...
...
software/ors-amarisoft/ru/input-schema.json
View file @
9aea71de
...
@@ -52,6 +52,14 @@
...
@@ -52,6 +52,14 @@
"type"
:
"number"
"type"
:
"number"
},
},
"txrx_active"
:
{
"title"
:
"Activate Tx/Rx"
,
"description"
:
"Activate or inactivate Tx transmission and Rx reception. When inactive RU does no radio."
,
"type"
:
"string"
,
"enum"
:
[
"ACTIVE"
,
"INACTIVE"
],
"default"
:
"INACTIVE"
},
"cpri_link"
:
{
"cpri_link"
:
{
"title"
:
"CPRI link settings"
,
"title"
:
"CPRI link settings"
,
...
...
software/ors-amarisoft/ru/lopcomm/cu_config.jinja2.xml
View file @
9aea71de
...
@@ -109,7 +109,7 @@
...
@@ -109,7 +109,7 @@
<absolute-frequency-center>
{{ dl_arfcn }}
</absolute-frequency-center>
<absolute-frequency-center>
{{ dl_arfcn }}
</absolute-frequency-center>
<center-of-channel-bandwidth>
{{ dl_freq }}
</center-of-channel-bandwidth>
<center-of-channel-bandwidth>
{{ dl_freq }}
</center-of-channel-bandwidth>
<channel-bandwidth>
{{ bw }}
</channel-bandwidth>
<channel-bandwidth>
{{ bw }}
</channel-bandwidth>
<active>
{{
slapparameter_dict.get('txa0cc00_active', 'INACTIVE')
}}
</active>
<active>
{{
ru.txrx_active
}}
</active>
<rw-type>
{{ cell.cell_type | upper }}
</rw-type>
<rw-type>
{{ cell.cell_type | upper }}
</rw-type>
<rw-duplex-scheme>
{{ cell.rf_mode | upper }}
</rw-duplex-scheme>
<rw-duplex-scheme>
{{ cell.rf_mode | upper }}
</rw-duplex-scheme>
<gain>
{{ ru.tx_gain }}
</gain>
<gain>
{{ ru.tx_gain }}
</gain>
...
@@ -121,7 +121,7 @@
...
@@ -121,7 +121,7 @@
<absolute-frequency-center>
{{ ul_arfcn }}
</absolute-frequency-center>
<absolute-frequency-center>
{{ ul_arfcn }}
</absolute-frequency-center>
<center-of-channel-bandwidth>
{{ ul_freq }}
</center-of-channel-bandwidth>
<center-of-channel-bandwidth>
{{ ul_freq }}
</center-of-channel-bandwidth>
<channel-bandwidth>
{{ bw }}
</channel-bandwidth>
<channel-bandwidth>
{{ bw }}
</channel-bandwidth>
<active>
{{
slapparameter_dict.get('rxa0cc00_active', 'INACTIVE')
}}
</active>
<active>
{{
ru.txrx_active
}}
</active>
<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> -->
...
...
software/ors-amarisoft/ru/lopcomm/input-schema.json
View file @
9aea71de
...
@@ -5,14 +5,7 @@
...
@@ -5,14 +5,7 @@
"type"
:
"object"
,
"type"
:
"object"
,
"$ref"
:
"../../ru/input-schema.json#/$defs/ru-common"
,
"$ref"
:
"../../ru/input-schema.json#/$defs/ru-common"
,
"required"
:
[
"required"
:
[],
"mac_addr"
,
"txa0cc00_active"
,
"rxa0cc00_active"
,
"txa0cc00_center_frequency"
,
"rxa0cc00_center_frequency_earfcn"
,
"rxa0cc00_center_frequency"
],
"properties"
:
{
"properties"
:
{
"ru_type"
:
{
"ru_type"
:
{
"const"
:
"lopcomm"
,
"const"
:
"lopcomm"
,
...
@@ -42,26 +35,6 @@
...
@@ -42,26 +35,6 @@
"description"
:
"RU MAC address used for DNSMASQ"
,
"description"
:
"RU MAC address used for DNSMASQ"
,
"type"
:
"string"
"type"
:
"string"
},
},
"txa0cc00_active"
:
{
"title"
:
"TX array carriers (TXA0CC00)"
,
"description"
:
"Activate or inactivate TX array carriers (TXA0CC00)"
,
"type"
:
"string"
,
"default"
:
"INACTIVE"
,
"enum"
:
[
"ACTIVE"
,
"INACTIVE"
]
},
"rxa0cc00_active"
:
{
"title"
:
"RX array carriers (RXA0CC00)"
,
"description"
:
"Activate or inactivate RX array carriers (RXA0CC00)"
,
"type"
:
"string"
,
"default"
:
"INACTIVE"
,
"enum"
:
[
"ACTIVE"
,
"INACTIVE"
]
},
"reset_schedule"
:
{
"reset_schedule"
:
{
"title"
:
"Cron schedule for RRH reset"
,
"title"
:
"Cron schedule for RRH reset"
,
"description"
:
"Refer https://crontab.guru/ to make a reset schedule for RRH, for example, '0 1 * * *' means the RRH will reset every day at 1 am"
,
"description"
:
"Refer https://crontab.guru/ to make a reset schedule for RRH, for example, '0 1 * * *' means the RRH will reset every day at 1 am"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment