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
Carlos Ramos Carreño
slapos
Commits
dce3f608
Commit
dce3f608
authored
Aug 31, 2023
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: add option for public websocket
parent
3d13ccaa
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
102 additions
and
4 deletions
+102
-4
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+4
-4
software/ors-amarisoft/config/enb.jinja2.cfg
software/ors-amarisoft/config/enb.jinja2.cfg
+7
-0
software/ors-amarisoft/config/gnb.jinja2.cfg
software/ors-amarisoft/config/gnb.jinja2.cfg
+7
-0
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
+5
-0
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+7
-0
software/ors-amarisoft/instance-fdd-enb-input-schema.json
software/ors-amarisoft/instance-fdd-enb-input-schema.json
+5
-0
software/ors-amarisoft/instance-fdd-gnb-input-schema.json
software/ors-amarisoft/instance-fdd-gnb-input-schema.json
+5
-0
software/ors-amarisoft/instance-fdd-lopcomm-enb-input-schema.json
.../ors-amarisoft/instance-fdd-lopcomm-enb-input-schema.json
+5
-0
software/ors-amarisoft/instance-fdd-lopcomm-gnb-input-schema.json
.../ors-amarisoft/instance-fdd-lopcomm-gnb-input-schema.json
+5
-0
software/ors-amarisoft/instance-fdd-ors-enb-input-schema.json
...ware/ors-amarisoft/instance-fdd-ors-enb-input-schema.json
+5
-0
software/ors-amarisoft/instance-fdd-ors-gnb-input-schema.json
...ware/ors-amarisoft/instance-fdd-ors-gnb-input-schema.json
+5
-0
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
+5
-0
software/ors-amarisoft/instance-gnb.jinja2.cfg
software/ors-amarisoft/instance-gnb.jinja2.cfg
+7
-0
software/ors-amarisoft/instance-tdd-enb-input-schema.json
software/ors-amarisoft/instance-tdd-enb-input-schema.json
+5
-0
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
+5
-0
software/ors-amarisoft/instance-tdd-m2ru-enb-input-schema.json
...are/ors-amarisoft/instance-tdd-m2ru-enb-input-schema.json
+5
-0
software/ors-amarisoft/instance-tdd-m2ru-gnb-input-schema.json
...are/ors-amarisoft/instance-tdd-m2ru-gnb-input-schema.json
+5
-0
software/ors-amarisoft/instance-tdd-ors-enb-input-schema.json
...ware/ors-amarisoft/instance-tdd-ors-enb-input-schema.json
+5
-0
software/ors-amarisoft/instance-tdd-ors-gnb-input-schema.json
...ware/ors-amarisoft/instance-tdd-ors-gnb-input-schema.json
+5
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
dce3f608
...
@@ -36,11 +36,11 @@ md5sum = b34fe47a73890097fbc6ea6374aeb38d
...
@@ -36,11 +36,11 @@ md5sum = b34fe47a73890097fbc6ea6374aeb38d
[template-enb]
[template-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
c3a4934e67856568f3d86b5e4e473c2e
md5sum =
62252527eb4998de5bb23058dbbdbd75
[template-gnb]
[template-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum =
f0f5e45f6316894ac9fde4e3078b1026
md5sum =
b4d7406d9d7df7fafbbf0ddbc792f5fb
[template-core-network]
[template-core-network]
_update_hash_filename_ = instance-core-network.jinja2.cfg
_update_hash_filename_ = instance-core-network.jinja2.cfg
...
@@ -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 = 1
490a80f446c8a9e18ea268350dc8a35
md5sum = 1
680fde9d6d5f8c1678fb11d7a891191
[sib23.jinja2.asn]
[sib23.jinja2.asn]
filename = config/sib23.jinja2.asn
filename = config/sib23.jinja2.asn
...
@@ -72,7 +72,7 @@ md5sum = 0af07bba51f8d4e773f9bfef4f2ca535
...
@@ -72,7 +72,7 @@ md5sum = 0af07bba51f8d4e773f9bfef4f2ca535
[gnb.jinja2.cfg]
[gnb.jinja2.cfg]
filename = config/gnb.jinja2.cfg
filename = config/gnb.jinja2.cfg
md5sum =
322affd5986b049fa6a1a96ece7108cf
md5sum =
f1e7f37a9c0866c08237b03cecdcd2c7
[ltelogs.jinja2.sh]
[ltelogs.jinja2.sh]
filename = ltelogs.jinja2.sh
filename = ltelogs.jinja2.sh
...
...
software/ors-amarisoft/config/enb.jinja2.cfg
View file @
dce3f608
...
@@ -109,7 +109,14 @@
...
@@ -109,7 +109,14 @@
tx_gain: {{ tx_gain }},
tx_gain: {{ tx_gain }},
rx_gain: {{ rx_gain }},
rx_gain: {{ rx_gain }},
{% endif %}
{% endif %}
{%- if slapparameter_dict.get('websocket_password', '') %}
com_addr: "[{{ gtp_addr_v6 }}]:9001",
com_auth: {
password: "{{ slapparameter_dict['websocket_password'] }}",
},
{%- else %}
com_addr: "127.0.1.2:9001",
com_addr: "127.0.1.2:9001",
{%- endif %}
mme_list: [
mme_list: [
{% if slapparameter_dict.get('mme_list', '') %}
{% if slapparameter_dict.get('mme_list', '') %}
...
...
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @
dce3f608
...
@@ -53,7 +53,14 @@
...
@@ -53,7 +53,14 @@
tx_gain: {{ tx_gain }},
tx_gain: {{ tx_gain }},
rx_gain: {{ rx_gain }},
rx_gain: {{ rx_gain }},
{% endif %}
{% endif %}
{%- if slapparameter_dict.get('websocket_password', '') %}
com_addr: "[{{ gtp_addr_v6 }}]:9001",
com_auth: {
password: "{{ slapparameter_dict['websocket_password'] }}",
},
{%- else %}
com_addr: "127.0.1.2:9001",
com_addr: "127.0.1.2:9001",
{%- endif %}
amf_list: [
amf_list: [
{% if slapparameter_dict.get('amf_list', '') %}
{% if slapparameter_dict.get('amf_list', '') %}
{%- for i, k in enumerate(slapparameter_dict['amf_list']) %}
{%- for i, k in enumerate(slapparameter_dict['amf_list']) %}
...
...
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @
dce3f608
...
@@ -359,6 +359,11 @@
...
@@ -359,6 +359,11 @@
"type": "object",
"type": "object",
"default": {}
"default": {}
},
},
"websocket_password": {
"title": "Websocket password",
"description": "Activates websocket for remote control and sets password",
"type": "string"
},
"inactivity_timer": {
"inactivity_timer": {
"title": "Inactivity Timer",
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
dce3f608
...
@@ -175,7 +175,11 @@ drb_stats_logspec =
...
@@ -175,7 +175,11 @@ drb_stats_logspec =
{%- endif %}
{%- endif %}
rotatespec = 100MB.9
rotatespec = 100MB.9
logspec = ${:stats_logspec} ${:drb_stats_logspec}
logspec = ${:stats_logspec} ${:drb_stats_logspec}
{%- if slapparameter_dict.get("websocket_password", "") %}
websock = ws://[${slap-configuration:ipv6-random}]:9001
{%- else %}
websock = ws://127.0.1.2:9001
websock = ws://127.0.1.2:9001
{%- endif %}
xamari = {{ buildout_directory }}/bin/xamari
xamari = {{ buildout_directory }}/bin/xamari
logfile = ${monitor-directory:public}/enb.xlog
logfile = ${monitor-directory:public}/enb.xlog
inline =
inline =
...
@@ -371,6 +375,9 @@ extra-context =
...
@@ -371,6 +375,9 @@ extra-context =
[publish-connection-information]
[publish-connection-information]
<= monitor-publish
<= monitor-publish
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
{%- if slapparameter_dict.get("websocket_password", "") %}
websocket_url = ws://[${slap-configuration:ipv6-random}]:9001
{%- endif %}
enb-ipv6 = ${slap-configuration:ipv6-random}
enb-ipv6 = ${slap-configuration:ipv6-random}
enb-ipv4 = {{ lan_ipv4 }}
enb-ipv4 = {{ lan_ipv4 }}
ors-version = {{ ors_version['ors-version'] }}
ors-version = {{ ors_version['ors-version'] }}
...
...
software/ors-amarisoft/instance-fdd-enb-input-schema.json
View file @
dce3f608
...
@@ -191,6 +191,11 @@
...
@@ -191,6 +191,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-fdd-gnb-input-schema.json
View file @
dce3f608
...
@@ -246,6 +246,11 @@
...
@@ -246,6 +246,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-fdd-lopcomm-enb-input-schema.json
View file @
dce3f608
...
@@ -285,6 +285,11 @@
...
@@ -285,6 +285,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-fdd-lopcomm-gnb-input-schema.json
View file @
dce3f608
...
@@ -246,6 +246,11 @@
...
@@ -246,6 +246,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-fdd-ors-enb-input-schema.json
View file @
dce3f608
...
@@ -186,6 +186,11 @@
...
@@ -186,6 +186,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-fdd-ors-gnb-input-schema.json
View file @
dce3f608
...
@@ -246,6 +246,11 @@
...
@@ -246,6 +246,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-gnb-input-schema.json.jinja2
View file @
dce3f608
...
@@ -267,6 +267,11 @@
...
@@ -267,6 +267,11 @@
"type": "object",
"type": "object",
"default": {}
"default": {}
},
},
"websocket_password": {
"title": "Websocket password",
"description": "Activates websocket for remote control and sets password",
"type": "string"
},
"inactivity_timer": {
"inactivity_timer": {
"title": "Inactivity Timer",
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
...
...
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @
dce3f608
...
@@ -143,7 +143,11 @@ drb_stats_logspec =
...
@@ -143,7 +143,11 @@ drb_stats_logspec =
rotatespec = 100MB.9
rotatespec = 100MB.9
logspec = ${:stats_logspec} ${:drb_stats_logspec}
logspec = ${:stats_logspec} ${:drb_stats_logspec}
logspec = ${:stats_logspec} ${:drb_stats_logspec}
logspec = ${:stats_logspec} ${:drb_stats_logspec}
{% if slapparameter_dict.get("websocket_password", "") %}
websock = ws://[${slap-configuration:ipv6-random}]:9001
{% else %}
websock = ws://127.0.1.2:9001
websock = ws://127.0.1.2:9001
{% endif %}
xamari = {{ buildout_directory }}/bin/xamari
xamari = {{ buildout_directory }}/bin/xamari
logfile = ${monitor-directory:public}/gnb.xlog
logfile = ${monitor-directory:public}/gnb.xlog
inline =
inline =
...
@@ -272,6 +276,9 @@ output = ${directory:etc}/gnb.cfg
...
@@ -272,6 +276,9 @@ output = ${directory:etc}/gnb.cfg
[publish-connection-information]
[publish-connection-information]
<= monitor-publish
<= monitor-publish
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
{%- if slapparameter_dict.get("websocket_password", "") %}
websocket_url = ws://[${slap-configuration:ipv6-random}]:9001
{%- endif %}
gnb-ipv6 = ${slap-configuration:ipv6-random}
gnb-ipv6 = ${slap-configuration:ipv6-random}
gnb-ipv4 = {{ lan_ipv4 }}
gnb-ipv4 = {{ lan_ipv4 }}
ors-version = {{ ors_version['ors-version'] }}
ors-version = {{ ors_version['ors-version'] }}
...
...
software/ors-amarisoft/instance-tdd-enb-input-schema.json
View file @
dce3f608
...
@@ -201,6 +201,11 @@
...
@@ -201,6 +201,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-tdd-gnb-input-schema.json
View file @
dce3f608
...
@@ -257,6 +257,11 @@
...
@@ -257,6 +257,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-tdd-m2ru-enb-input-schema.json
View file @
dce3f608
...
@@ -239,6 +239,11 @@
...
@@ -239,6 +239,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-tdd-m2ru-gnb-input-schema.json
View file @
dce3f608
...
@@ -257,6 +257,11 @@
...
@@ -257,6 +257,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-tdd-ors-enb-input-schema.json
View file @
dce3f608
...
@@ -196,6 +196,11 @@
...
@@ -196,6 +196,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
software/ors-amarisoft/instance-tdd-ors-gnb-input-schema.json
View file @
dce3f608
...
@@ -257,6 +257,11 @@
...
@@ -257,6 +257,11 @@
"type"
:
"object"
,
"type"
:
"object"
,
"default"
:
{}
"default"
:
{}
},
},
"websocket_password"
:
{
"title"
:
"Websocket password"
,
"description"
:
"Activates websocket for remote control and sets password"
,
"type"
:
"string"
},
"inactivity_timer"
:
{
"inactivity_timer"
:
{
"title"
:
"Inactivity Timer"
,
"title"
:
"Inactivity Timer"
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
"description"
:
"Send RRC connection release after this time (in ms) of network inactivity."
,
...
...
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