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
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
b0d1a1ea
Commit
b0d1a1ea
authored
Feb 08, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: enb/ors: Reuse ru/ schemas for n_antenna_{dl,ul} and {tx,rx}_gain
A bit less duplication.
parent
84e417ac
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
48 deletions
+48
-48
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
+12
-12
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
+12
-12
software/ors-amarisoft/instance-ors-enb-input-schema.json
software/ors-amarisoft/instance-ors-enb-input-schema.json
+12
-12
software/ors-amarisoft/instance-ors-gnb-input-schema.json
software/ors-amarisoft/instance-ors-gnb-input-schema.json
+12
-12
No files found.
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @
b0d1a1ea
...
@@ -19,15 +19,19 @@
...
@@ -19,15 +19,19 @@
"default": "{{ default_lte_bandwidth }}"
"default": "{{ default_lte_bandwidth }}"
},
},
"n_antenna_dl": {
"n_antenna_dl": {
"title": "Number of DL antennas",
"$ref": "ru/common.json#/properties/n_antenna_dl",
"description": "1 or 2. Number of DL antennas.",
"enum": [
"type": "number",
1,
2
],
"default": {{ default_n_antenna_dl }}
"default": {{ default_n_antenna_dl }}
},
},
"n_antenna_ul": {
"n_antenna_ul": {
"title": "Number of UL antennas",
"$ref": "ru/common.json#/properties/n_antenna_ul",
"description": "1 or 2. Number of UL antennas.",
"enum": [
"type": "number",
1,
2
],
"default": {{ default_n_antenna_ul }}
"default": {{ default_n_antenna_ul }}
},
},
"rf_mode": {
"rf_mode": {
...
@@ -173,14 +177,10 @@
...
@@ -173,14 +177,10 @@
{%- endif %}
{%- endif %}
{%- if bbu == 'ors' %}
{%- if bbu == 'ors' %}
"tx_gain": {
"tx_gain": {
"title": "Tx gain",
"$ref": "ru/sdr/input-schema.json#/properties/tx_gain"
"description": "Tx gain (in dB)",
"type": "number"
},
},
"rx_gain": {
"rx_gain": {
"title": "Rx gain",
"$ref": "ru/sdr/input-schema.json#/properties/rx_gain"
"description": "Rx gain (in dB)",
"type": "number"
},
},
{%- endif %}
{%- endif %}
{%- if bbu != 'ors' %}
{%- if bbu != 'ors' %}
...
...
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @
b0d1a1ea
...
@@ -11,15 +11,19 @@
...
@@ -11,15 +11,19 @@
"default": {{ default_nr_bandwidth }}
"default": {{ default_nr_bandwidth }}
},
},
"n_antenna_dl": {
"n_antenna_dl": {
"title": "Number of DL antennas",
"$ref": "ru/common.json#/properties/n_antenna_dl",
"description": "1 or 2. Number of DL antennas.",
"enum": [
"type": "number",
1,
2
],
"default": {{ default_n_antenna_dl }}
"default": {{ default_n_antenna_dl }}
},
},
"n_antenna_ul": {
"n_antenna_ul": {
"title": "Number of UL antennas",
"$ref": "ru/common.json#/properties/n_antenna_ul",
"description": "1 or 2. Number of UL antennas.",
"enum": [
"type": "number",
1,
2
],
"default": {{ default_n_antenna_ul }}
"default": {{ default_n_antenna_ul }}
},
},
"rf_mode": {
"rf_mode": {
...
@@ -164,14 +168,10 @@
...
@@ -164,14 +168,10 @@
{%- endif %}
{%- endif %}
{%- if bbu == 'ors' %}
{%- if bbu == 'ors' %}
"tx_gain": {
"tx_gain": {
"title": "Tx gain",
"$ref": "ru/sdr/input-schema.json#/properties/tx_gain"
"description": "Tx gain (in dB)",
"type": "number"
},
},
"rx_gain": {
"rx_gain": {
"title": "Rx gain",
"$ref": "ru/sdr/input-schema.json#/properties/rx_gain"
"description": "Rx gain (in dB)",
"type": "number"
},
},
{%- endif %}
{%- endif %}
{%- if bbu != 'ors' %}
{%- if bbu != 'ors' %}
...
...
software/ors-amarisoft/instance-ors-enb-input-schema.json
View file @
b0d1a1ea
...
@@ -18,15 +18,19 @@
...
@@ -18,15 +18,19 @@
"default"
:
"20 MHz"
"default"
:
"20 MHz"
},
},
"n_antenna_dl"
:
{
"n_antenna_dl"
:
{
"title"
:
"Number of DL antennas"
,
"$ref"
:
"ru/common.json#/properties/n_antenna_dl"
,
"description"
:
"1 or 2. Number of DL antennas."
,
"enum"
:
[
"type"
:
"number"
,
1
,
2
],
"default"
:
2
"default"
:
2
},
},
"n_antenna_ul"
:
{
"n_antenna_ul"
:
{
"title"
:
"Number of UL antennas"
,
"$ref"
:
"ru/common.json#/properties/n_antenna_ul"
,
"description"
:
"1 or 2. Number of UL antennas."
,
"enum"
:
[
"type"
:
"number"
,
1
,
2
],
"default"
:
2
"default"
:
2
},
},
"rf_mode"
:
{
"rf_mode"
:
{
...
@@ -84,14 +88,10 @@
...
@@ -84,14 +88,10 @@
"default"
:
204
"default"
:
204
},
},
"tx_gain"
:
{
"tx_gain"
:
{
"title"
:
"Tx gain"
,
"$ref"
:
"ru/sdr/input-schema.json#/properties/tx_gain"
"description"
:
"Tx gain (in dB)"
,
"type"
:
"number"
},
},
"rx_gain"
:
{
"rx_gain"
:
{
"title"
:
"Rx gain"
,
"$ref"
:
"ru/sdr/input-schema.json#/properties/rx_gain"
"description"
:
"Rx gain (in dB)"
,
"type"
:
"number"
},
},
"enb_id"
:
{
"enb_id"
:
{
"title"
:
"eNB ID"
,
"title"
:
"eNB ID"
,
...
...
software/ors-amarisoft/instance-ors-gnb-input-schema.json
View file @
b0d1a1ea
...
@@ -10,15 +10,19 @@
...
@@ -10,15 +10,19 @@
"default"
:
40
"default"
:
40
},
},
"n_antenna_dl"
:
{
"n_antenna_dl"
:
{
"title"
:
"Number of DL antennas"
,
"$ref"
:
"ru/common.json#/properties/n_antenna_dl"
,
"description"
:
"1 or 2. Number of DL antennas."
,
"enum"
:
[
"type"
:
"number"
,
1
,
2
],
"default"
:
2
"default"
:
2
},
},
"n_antenna_ul"
:
{
"n_antenna_ul"
:
{
"title"
:
"Number of UL antennas"
,
"$ref"
:
"ru/common.json#/properties/n_antenna_ul"
,
"description"
:
"1 or 2. Number of UL antennas."
,
"enum"
:
[
"type"
:
"number"
,
1
,
2
],
"default"
:
2
"default"
:
2
},
},
"rf_mode"
:
{
"rf_mode"
:
{
...
@@ -76,14 +80,10 @@
...
@@ -76,14 +80,10 @@
"default"
:
"0x01"
"default"
:
"0x01"
},
},
"tx_gain"
:
{
"tx_gain"
:
{
"title"
:
"Tx gain"
,
"$ref"
:
"ru/sdr/input-schema.json#/properties/tx_gain"
"description"
:
"Tx gain (in dB)"
,
"type"
:
"number"
},
},
"rx_gain"
:
{
"rx_gain"
:
{
"title"
:
"Rx gain"
,
"$ref"
:
"ru/sdr/input-schema.json#/properties/rx_gain"
"description"
:
"Rx gain (in dB)"
,
"type"
:
"number"
},
},
"gnb_id"
:
{
"gnb_id"
:
{
"title"
:
"gNB ID"
,
"title"
:
"gNB ID"
,
...
...
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