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
Xavier Thompson
slapos
Commits
0461fb14
Commit
0461fb14
authored
Jul 12, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: add option to disable SDR
parent
8ed62d14
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
102 additions
and
2 deletions
+102
-2
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+8
-0
software/ors-amarisoft/config/gnb.jinja2.cfg
software/ors-amarisoft/config/gnb.jinja2.cfg
+8
-0
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
+6
-0
software/ors-amarisoft/instance-fdd-enb-input-schema.json
software/ors-amarisoft/instance-fdd-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-fdd-gnb-input-schema.json
software/ors-amarisoft/instance-fdd-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
+6
-0
software/ors-amarisoft/instance-tdd-enb-input-schema.json
software/ors-amarisoft/instance-tdd-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd1900-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd2600-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd3500-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd3700-enb-input-schema.json
+6
-0
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
+6
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
0461fb14
...
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
...
@@ -64,7 +64,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
[enb.jinja2.cfg]
[enb.jinja2.cfg]
filename = config/enb.jinja2.cfg
filename = config/enb.jinja2.cfg
md5sum = 7
303d4c122cfbb94ac9c99de21cdfe83
md5sum = 7
44e367d187c0ca9b351b253206d026f
[sib23.jinja2.asn]
[sib23.jinja2.asn]
filename = config/sib23.jinja2.asn
filename = config/sib23.jinja2.asn
...
@@ -72,7 +72,7 @@ md5sum = 5e782fd4b93dc621ddac936913c085f2
...
@@ -72,7 +72,7 @@ md5sum = 5e782fd4b93dc621ddac936913c085f2
[gnb.jinja2.cfg]
[gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg
filename = config/gnb.jinja2.cfg
md5sum =
f1dfb3f022a7d895679f3931c4850290
md5sum =
0bd86e6f1cdcafc284b9b9c6c3398caf
[ltelogs.jinja2.sh]
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
filename = ltelogs.jinja2.sh
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
0461fb14
...
@@ -22,7 +22,11 @@
...
@@ -22,7 +22,11 @@
{% if slapparameter_dict.get('rrh', 'ORS') == "Lopcomm ORAN" %}
{% if slapparameter_dict.get('rrh', 'ORS') == "Lopcomm ORAN" %}
rf_driver: {
rf_driver: {
{%- if slapparameter_dict.get('disable_sdr', False) %}
name: "dummy",
{%- else %}
name: "sdr",
name: "sdr",
{%- endif %}
args: "dev0=/dev/sdr0@0",
args: "dev0=/dev/sdr0@0",
cpri_mapping: "hw",
cpri_mapping: "hw",
cpri_mult: 16,
cpri_mult: 16,
...
@@ -35,7 +39,11 @@
...
@@ -35,7 +39,11 @@
rx_gain: 0,
rx_gain: 0,
{% elif slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
{% elif slapparameter_dict.get('rrh', 'ORS') == "ORS" %}
rf_driver: {
rf_driver: {
{%- if slapparameter_dict.get('disable_sdr', False) %}
name: "dummy",
{%- else %}
name: "sdr",
name: "sdr",
{%- endif %}
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
{% if slapparameter_dict.get('gps_sync', False) %}
{% if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
sync: "gps",
...
...
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @
0461fb14
...
@@ -22,7 +22,11 @@
...
@@ -22,7 +22,11 @@
log_filename: "{{ directory['log'] }}/gnb.log",
log_filename: "{{ directory['log'] }}/gnb.log",
{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
{% if slapparameter_dict.get('rrh', 'ORS') == "M2RU Sunwave" %}
rf_driver: {
rf_driver: {
{%- if slapparameter_dict.get('disable_sdr', False) %}
name: "dummy",
{%- else %}
name: "sdr",
name: "sdr",
{%- endif %}
args: "dev0=/dev/sdr0@0",
args: "dev0=/dev/sdr0@0",
cpri_mapping: "bf1",
cpri_mapping: "bf1",
cpri_mult: 16,
cpri_mult: 16,
...
@@ -35,7 +39,11 @@
...
@@ -35,7 +39,11 @@
rx_gain: 0,
rx_gain: 0,
{% else %}
{% else %}
rf_driver: {
rf_driver: {
{%- if slapparameter_dict.get('disable_sdr', False) %}
name: "dummy",
{%- else %}
name: "sdr",
name: "sdr",
{%- endif %}
args: "dev0=/dev/sdr0",
args: "dev0=/dev/sdr0",
{% if slapparameter_dict.get('gps_sync', False) %}
{% if slapparameter_dict.get('gps_sync', False) %}
sync: "gps",
sync: "gps",
...
...
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @
0461fb14
...
@@ -232,6 +232,12 @@
...
@@ -232,6 +232,12 @@
],
],
"default": "5ms 2UL 7DL 4/6 (default)"
"default": "5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr": {
"default": false,
"title": "Disable SDR",
"description": "Disables radio",
"type": "boolean"
},
"use_ipv4": {
"use_ipv4": {
"default": false,
"default": false,
"title": "Use IPv4",
"title": "Use IPv4",
...
...
software/ors-amarisoft/instance-fdd-enb-input-schema.json
View file @
0461fb14
...
@@ -230,6 +230,12 @@
...
@@ -230,6 +230,12 @@
],
],
"default"
:
"5ms 2UL 7DL 4/6 (default)"
"default"
:
"5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-fdd-gnb-input-schema.json
View file @
0461fb14
...
@@ -279,6 +279,12 @@
...
@@ -279,6 +279,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
10000
"default"
:
10000
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @
0461fb14
...
@@ -291,6 +291,12 @@
...
@@ -291,6 +291,12 @@
"type": "number",
"type": "number",
"default": {{ default_nr_inactivity_timer }}
"default": {{ default_nr_inactivity_timer }}
},
},
"disable_sdr": {
"default": false,
"title": "Disable SDR",
"description": "Disables radio",
"type": "boolean"
},
"use_ipv4": {
"use_ipv4": {
"default": false,
"default": false,
"title": "Use IPv4",
"title": "Use IPv4",
...
...
software/ors-amarisoft/instance-tdd-enb-input-schema.json
View file @
0461fb14
...
@@ -128,6 +128,12 @@
...
@@ -128,6 +128,12 @@
],
],
"default"
:
"5ms 2UL 7DL 4/6 (default)"
"default"
:
"5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
View file @
0461fb14
...
@@ -289,6 +289,12 @@
...
@@ -289,6 +289,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
10000
"default"
:
10000
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
View file @
0461fb14
...
@@ -128,6 +128,12 @@
...
@@ -128,6 +128,12 @@
],
],
"default"
:
"5ms 2UL 7DL 4/6 (default)"
"default"
:
"5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
View file @
0461fb14
...
@@ -279,6 +279,12 @@
...
@@ -279,6 +279,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
10000
"default"
:
10000
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
View file @
0461fb14
...
@@ -128,6 +128,12 @@
...
@@ -128,6 +128,12 @@
],
],
"default"
:
"5ms 2UL 7DL 4/6 (default)"
"default"
:
"5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
View file @
0461fb14
...
@@ -279,6 +279,12 @@
...
@@ -279,6 +279,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
10000
"default"
:
10000
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
View file @
0461fb14
...
@@ -128,6 +128,12 @@
...
@@ -128,6 +128,12 @@
],
],
"default"
:
"5ms 2UL 7DL 4/6 (default)"
"default"
:
"5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
View file @
0461fb14
...
@@ -279,6 +279,12 @@
...
@@ -279,6 +279,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
10000
"default"
:
10000
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
View file @
0461fb14
...
@@ -128,6 +128,12 @@
...
@@ -128,6 +128,12 @@
],
],
"default"
:
"5ms 2UL 7DL 4/6 (default)"
"default"
:
"5ms 2UL 7DL 4/6 (default)"
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
View file @
0461fb14
...
@@ -279,6 +279,12 @@
...
@@ -279,6 +279,12 @@
"type"
:
"number"
,
"type"
:
"number"
,
"default"
:
10000
"default"
:
10000
},
},
"disable_sdr"
:
{
"default"
:
false
,
"title"
:
"Disable SDR"
,
"description"
:
"Disables radio"
,
"type"
:
"boolean"
},
"use_ipv4"
:
{
"use_ipv4"
:
{
"default"
:
false
,
"default"
:
false
,
"title"
:
"Use IPv4"
,
"title"
:
"Use IPv4"
,
...
...
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