Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
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
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos
Commits
929c0c0e
Commit
929c0c0e
authored
Feb 03, 2022
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: add option to link eNB/gNB/MME config
parent
3d6af70d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
5 deletions
+65
-5
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+5
-5
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-epc.jinja2.cfg
software/ors-amarisoft/instance-epc.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
+12
-0
software/ors-amarisoft/instance-gnb.jinja2.cfg
software/ors-amarisoft/instance-gnb.jinja2.cfg
+12
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
929c0c0e
...
@@ -20,23 +20,23 @@ md5sum = 6ea4fa210a91c15278c847a809de5991
...
@@ -20,23 +20,23 @@ md5sum = 6ea4fa210a91c15278c847a809de5991
[template-lte-enb-epc]
[template-lte-enb-epc]
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
_update_hash_filename_ = instance-enb-epc.jinja2.cfg
md5sum =
cf6c400d9fa5b0942f9be7145f77b8de
md5sum =
1358f8e0a4cecefe4cdf389b69067f34
[template-lte-enb]
[template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
fe249168a3f50b0efe6aeae39afb03ae
md5sum =
e4c224da723ad56091f27ed5c0b0bbca
[template-lte-gnb-epc]
[template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
md5sum =
f94c3e2f714629d9e1fc9b2f7c8eb586
md5sum =
b9a58fa4037d32fc1dc4f5ef89e6211a
[template-lte-gnb]
[template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum =
6deb38b3de44f6e0a43b49fd13f0f072
md5sum =
0b74993990a0dfa3c6429dc4ac716826
[template-lte-epc]
[template-lte-epc]
_update_hash_filename_ = instance-epc.jinja2.cfg
_update_hash_filename_ = instance-epc.jinja2.cfg
md5sum =
089f62e736cdc620eafc2c47b050fe13
md5sum =
35556ebd82be804584482a7fe5eff0be
[ue_db.jinja2.cfg]
[ue_db.jinja2.cfg]
filename = config/ue_db.jinja2.cfg
filename = config/ue_db.jinja2.cfg
...
...
software/ors-amarisoft/instance-enb-epc.jinja2.cfg
View file @
929c0c0e
...
@@ -52,6 +52,12 @@ return = monitor-base-url
...
@@ -52,6 +52,12 @@ return = monitor-base-url
name = EPC
name = EPC
software-type = epc
software-type = epc
config-name = epc
config-name = epc
{% if slapparameter_dict.get("mme_config_link", None) %}
config-mme_config_link = {{ dumps(slapparameter_dict["mme_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("mme_config_version", None) %}
config-mme_config_version = {{ dumps(slapparameter_dict["mme_config_version"]) }}
{% endif %}
[lte-enb-request]
[lte-enb-request]
<= request-common-base
<= request-common-base
...
@@ -76,6 +82,12 @@ config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
...
@@ -76,6 +82,12 @@ config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
{% if slapparameter_dict.get("enb_id", None) %}
{% if slapparameter_dict.get("enb_id", None) %}
config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
{% endif %}
{% endif %}
{% if slapparameter_dict.get("enb_config_link", None) %}
config-enb_config_link = {{ dumps(slapparameter_dict["enb_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("enb_config_version", None) %}
config-enb_config_version = {{ dumps(slapparameter_dict["enb_config_version"]) }}
{% endif %}
[monitor-base-url-dict]
[monitor-base-url-dict]
lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
...
...
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
929c0c0e
...
@@ -60,6 +60,14 @@ extensions = jinja2.ext.do
...
@@ -60,6 +60,14 @@ extensions = jinja2.ext.do
context =
context =
section directory directory
section directory directory
{% if slapparameter_dict.get("enb_config_link", None) %}
[enb-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("enb_config_link") }}
version = {{ slapparameter_dict.get("enb_config_version") }}
offline = false
{% endif %}
[lte-enb-sh-wrapper]
[lte-enb-sh-wrapper]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
rendered = ${directory:bin}/${:_buildout_section_name_}
rendered = ${directory:bin}/${:_buildout_section_name_}
...
@@ -98,7 +106,11 @@ context =
...
@@ -98,7 +106,11 @@ context =
[lte-enb-config]
[lte-enb-config]
<= config-base
<= config-base
{% if slapparameter_dict.get("enb_config_link", None) %}
template = ${enb-config-dl:target}
{% else %}
template = {{ enb_template }}
template = {{ enb_template }}
{% endif %}
rendered = ${directory:etc}/enb.cfg
rendered = ${directory:etc}/enb.cfg
[publish-connection-information]
[publish-connection-information]
...
...
software/ors-amarisoft/instance-epc.jinja2.cfg
View file @
929c0c0e
...
@@ -58,6 +58,14 @@ extensions = jinja2.ext.do
...
@@ -58,6 +58,14 @@ extensions = jinja2.ext.do
context =
context =
section directory directory
section directory directory
{% if slapparameter_dict.get("mme_config_link", None) %}
[mme-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("mme_config_link") }}
version = {{ slapparameter_dict.get("mme_config_version") }}
offline = false
{% endif %}
### IMS
### IMS
[lte-ims-service]
[lte-ims-service]
recipe = slapos.cookbook:wrapper
recipe = slapos.cookbook:wrapper
...
@@ -122,7 +130,11 @@ rendered = ${directory:etc}/ims.cfg
...
@@ -122,7 +130,11 @@ rendered = ${directory:etc}/ims.cfg
[lte-mme-config]
[lte-mme-config]
<= config-base
<= config-base
{% if slapparameter_dict.get("mme_config_link", None) %}
template = ${mme-config-dl:target}
{% else %}
template = {{ mme_template }}
template = {{ mme_template }}
{% endif %}
rendered = ${directory:etc}/mme.cfg
rendered = ${directory:etc}/mme.cfg
context =
context =
section directory directory
section directory directory
...
...
software/ors-amarisoft/instance-gnb-epc.jinja2.cfg
View file @
929c0c0e
...
@@ -52,6 +52,12 @@ return = monitor-base-url
...
@@ -52,6 +52,12 @@ return = monitor-base-url
name = EPC
name = EPC
software-type = epc
software-type = epc
config-name = epc
config-name = epc
{% if slapparameter_dict.get("mme_config_link", None) %}
config-mme_config_link = {{ dumps(slapparameter_dict["mme_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("mme_config_version", None) %}
config-mme_config_version = {{ dumps(slapparameter_dict["mme_config_version"]) }}
{% endif %}
[lte-gnb-request]
[lte-gnb-request]
<= request-common-base
<= request-common-base
...
@@ -79,6 +85,12 @@ config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
...
@@ -79,6 +85,12 @@ config-mme_addr = {{ dumps(slapparameter_dict["mme_addr"]) }}
{% if slapparameter_dict.get("enb_id", None) %}
{% if slapparameter_dict.get("enb_id", None) %}
config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
config-enb_id = {{ dumps(slapparameter_dict["enb_id"]) }}
{% endif %}
{% endif %}
{% if slapparameter_dict.get("gnb_config_link", None) %}
config-gnb_config_link = {{ dumps(slapparameter_dict["gnb_config_link"]) }}
{% endif %}
{% if slapparameter_dict.get("gnb_config_version", None) %}
config-gnb_config_version = {{ dumps(slapparameter_dict["gnb_config_version"]) }}
{% endif %}
[monitor-base-url-dict]
[monitor-base-url-dict]
lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
lte-epc-request = ${lte-epc-request:connection-monitor-base-url}
...
...
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @
929c0c0e
...
@@ -60,6 +60,14 @@ extensions = jinja2.ext.do
...
@@ -60,6 +60,14 @@ extensions = jinja2.ext.do
context =
context =
section directory directory
section directory directory
{% if slapparameter_dict.get("gnb_config_link", None) %}
[gnb-config-dl]
recipe = slapos.recipe.build:download
url = {{ slapparameter_dict.get("gnb_config_link") }}
version = {{ slapparameter_dict.get("gnb_config_version") }}
offline = false
{% endif %}
[lte-enb-sh-wrapper]
[lte-enb-sh-wrapper]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
rendered = ${directory:bin}/${:_buildout_section_name_}
rendered = ${directory:bin}/${:_buildout_section_name_}
...
@@ -98,7 +106,11 @@ context =
...
@@ -98,7 +106,11 @@ context =
[lte-gnb-config]
[lte-gnb-config]
<= config-base
<= config-base
{% if slapparameter_dict.get("gnb_config_link", None) %}
template = ${gnb-config-dl:target}
{% else %}
template = {{ gnb_template }}
template = {{ gnb_template }}
{% endif %}
rendered = ${directory:etc}/gnb.cfg
rendered = ${directory:etc}/gnb.cfg
[publish-connection-information]
[publish-connection-information]
...
...
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