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
Joanne Hugé
slapos
Commits
f1d23e54
Commit
f1d23e54
authored
Oct 06, 2022
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/ors-amarisoft: fix mme promise and rename json files
parent
776d4d77
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
11 additions
and
24 deletions
+11
-24
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+5
-5
software/ors-amarisoft/instance-enb.jinja2.cfg
software/ors-amarisoft/instance-enb.jinja2.cfg
+2
-9
software/ors-amarisoft/instance-gnb.jinja2.cfg
software/ors-amarisoft/instance-gnb.jinja2.cfg
+2
-9
software/ors-amarisoft/instance-ue-lte-input-schema.json.jinja2
...re/ors-amarisoft/instance-ue-lte-input-schema.json.jinja2
+0
-0
software/ors-amarisoft/instance-ue-nr-input-schema.json.jinja2
...are/ors-amarisoft/instance-ue-nr-input-schema.json.jinja2
+0
-0
software/ors-amarisoft/promise/check_interface_up.py
software/ors-amarisoft/promise/check_interface_up.py
+1
-1
software/ors-amarisoft/promise/check_sdr_busy.py
software/ors-amarisoft/promise/check_sdr_busy.py
+1
-0
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
f1d23e54
...
...
@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
[template-lte-enb]
_update_hash_filename_ = instance-enb.jinja2.cfg
md5sum =
34026b07bdd850dd3fb3ffff5377a0c2
md5sum =
7f101e9777fb53e06e9138b3be562a68
[template-lte-gnb-epc]
_update_hash_filename_ = instance-gnb-epc.jinja2.cfg
...
...
@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d
[template-lte-gnb]
_update_hash_filename_ = instance-gnb.jinja2.cfg
md5sum =
7acdbad30c130faa3bce49b04b2c0c2f
md5sum =
69faf2e00fd0beb906bf11f40a4e4d91
[template-lte-mme]
_update_hash_filename_ = instance-mme.jinja2.cfg
...
...
@@ -87,9 +87,9 @@ filename = config/ue-nr.jinja2.cfg
md5sum = 2082bcb28d9be653225ce6db46dc236a
[sdr-busy-promise]
_update_hash_filename_ = promise/check_sdr_busy.
jinja2.
py
md5sum =
93dacb1da15310eb70d0815711a06cdf
_update_hash_filename_ = promise/check_sdr_busy.py
md5sum =
e5853b4fecae68debcb7b32d3c13368c
[interface-up-promise]
_update_hash_filename_ = promise/check_interface_up.py
md5sum =
cbe3ac5d123e38cc6adf168f39cc8189
md5sum =
7797aeaf02e055226249f2c08209775a
software/ors-amarisoft/instance-enb.jinja2.cfg
View file @
f1d23e54
...
...
@@ -129,17 +129,10 @@ monitor-title = {{ slapparameter_dict['name'] | string }}
password = {{ slapparameter_dict['monitor-password'] | string }}
{% endif %}
[sdr-busy-promise-template]
recipe = slapos.recipe.template:jinja2
url = {{ sdr_busy_promise }}
output = ${directory:etc}/check-sdr-busy.py
extensions = jinja2.ext.do
context =
key slapparameter_dict slap-configuration:configuration
# Add custom promise to check if /dev/sdr0 is busy
[sdr-busy-promise]
recipe = slapos.cookbook:promise.plugin
eggs = slapos.core
file =
${sdr-busy-promise-template:output
}
file =
{{ sdr_busy_promise }
}
output = ${directory:plugins}/check-sdr-busy.py
config-testing = {{ slapparameter_dict.get("testing", False) }}
software/ors-amarisoft/instance-gnb.jinja2.cfg
View file @
f1d23e54
...
...
@@ -129,17 +129,10 @@ monitor-title = {{ slapparameter_dict['name'] | string }}
password = {{ slapparameter_dict['monitor-password'] | string }}
{% endif %}
[sdr-busy-promise-template]
recipe = slapos.recipe.template:jinja2
url = {{ sdr_busy_promise }}
output = ${directory:etc}/check-sdr-busy.py
extensions = jinja2.ext.do
context =
key slapparameter_dict slap-configuration:configuration
# Add custom promise to check if /dev/sdr0 is busy
[sdr-busy-promise]
recipe = slapos.cookbook:promise.plugin
eggs = slapos.core
file =
${sdr-busy-promise-template:output
}
file =
{{ sdr_busy_promise }
}
output = ${directory:plugins}/check-sdr-busy.py
config-testing = {{ slapparameter_dict.get("testing", False) }}
software/ors-amarisoft/instance-ue-lte-input-schema.jso.jinja2
→
software/ors-amarisoft/instance-ue-lte-input-schema.jso
n
.jinja2
View file @
f1d23e54
File moved
software/ors-amarisoft/instance-ue-nr-input-schema.jso.jinja2
→
software/ors-amarisoft/instance-ue-nr-input-schema.jso
n
.jinja2
View file @
f1d23e54
File moved
software/ors-amarisoft/promise/check_interface_up.py
View file @
f1d23e54
...
...
@@ -28,7 +28,7 @@ class RunPromise(GenericPromise):
In this case, check whether the file exists.
"""
ifname
=
self
.
getConfig
(
'ifname'
)
testing
=
self
.
getConfig
(
'testing'
)
testing
=
self
.
getConfig
(
'testing'
)
==
"True"
if
testing
:
self
.
logger
.
info
(
"skipping promise"
)
...
...
software/ors-amarisoft/promise/check_sdr_busy.
jinja2.
py
→
software/ors-amarisoft/promise/check_sdr_busy.py
View file @
f1d23e54
...
...
@@ -28,6 +28,7 @@ class RunPromise(GenericPromise):
In this case, check whether the file exists.
"""
testing
=
{{
slapparameter_dict
.
get
(
'testing'
,
False
)
}}
testing
=
self
.
getConfig
(
'testing'
)
==
"True"
sdr_dev
=
'/dev/sdr0'
if
testing
:
...
...
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