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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos
Commits
65426514
Commit
65426514
authored
Sep 16, 2022
by
Joanne Hugé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ors-amarisoft: fix check-tun-up promise
parent
a97d44d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
15 deletions
+13
-15
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+3
-3
software/ors-amarisoft/instance-mme.jinja2.cfg
software/ors-amarisoft/instance-mme.jinja2.cfg
+8
-10
software/ors-amarisoft/promise/check_interface_up.py
software/ors-amarisoft/promise/check_interface_up.py
+2
-2
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
65426514
...
@@ -40,7 +40,7 @@ md5sum = 9732653a0e2c7fe91d80da80762430d2
...
@@ -40,7 +40,7 @@ md5sum = 9732653a0e2c7fe91d80da80762430d2
[template-lte-mme]
[template-lte-mme]
_update_hash_filename_ = instance-mme.jinja2.cfg
_update_hash_filename_ = instance-mme.jinja2.cfg
md5sum =
19166c4a4ecf6b744aac36a068248d85
md5sum =
728f4d3ae248710c23e4b73eea4d628e
[ue_db.jinja2.cfg]
[ue_db.jinja2.cfg]
filename = config/ue_db.jinja2.cfg
filename = config/ue_db.jinja2.cfg
...
@@ -75,5 +75,5 @@ _update_hash_filename_ = promise/check_sdr_busy.jinja2.py
...
@@ -75,5 +75,5 @@ _update_hash_filename_ = promise/check_sdr_busy.jinja2.py
md5sum = 93dacb1da15310eb70d0815711a06cdf
md5sum = 93dacb1da15310eb70d0815711a06cdf
[interface-up-promise]
[interface-up-promise]
_update_hash_filename_ = promise/check_interface_up.
jinja2.
py
_update_hash_filename_ = promise/check_interface_up.py
md5sum =
63d3bbac7b6f480ee0c510e80aa1ccf7
md5sum =
cbe3ac5d123e38cc6adf168f39cc8189
software/ors-amarisoft/instance-mme.jinja2.cfg
View file @
65426514
...
@@ -177,17 +177,15 @@ recipe = slapos.cookbook:publish.serialised
...
@@ -177,17 +177,15 @@ recipe = slapos.cookbook:publish.serialised
epc-ipv6 = ${slap-configuration:ipv6-random}
epc-ipv6 = ${slap-configuration:ipv6-random}
epc-ipv4 = {{ epc_ipv4 }}
epc-ipv4 = {{ epc_ipv4 }}
[tun-up-promise-template]
# Add custom promise to check if /dev/sdr0 is busy
recipe = slapos.recipe.template:jinja2
url = {{ interface_up_promise }}
output = ${directory:etc}/check-tun-up.py
extensions = jinja2.ext.do
context =
key slapparameter_dict slap-configuration:configuration
# Add custom promise to check if tun is up
[tun-up-promise]
[tun-up-promise]
recipe = slapos.cookbook:promise.plugin
recipe = slapos.cookbook:promise.plugin
eggs = slapos.core
eggs = slapos.core
file =
${tun-up-promise-template:output
}
file =
{{ interface_up_promise }
}
output = ${directory:plugins}/check-tun-up.py
output = ${directory:plugins}/check-tun-up.py
{% if not slapparameter_dict.get("testing", False) %}
config-ifname = ${slap-configuration:tun-name}
{% else %}
config-ifname =
{% endif %}
config-testing = {{ slapparameter_dict.get("testing", False) }}
software/ors-amarisoft/promise/check_interface_up.
jinja2.
py
→
software/ors-amarisoft/promise/check_interface_up.py
View file @
65426514
...
@@ -27,8 +27,8 @@ class RunPromise(GenericPromise):
...
@@ -27,8 +27,8 @@ class RunPromise(GenericPromise):
In this case, check whether the file exists.
In this case, check whether the file exists.
"""
"""
ifname
=
"{{ slapparameter_dict.get('tun-name', '') }}"
ifname
=
self
.
getConfig
(
'ifname'
)
testing
=
{{
slapparameter_dict
.
get
(
'testing'
,
False
)
}}
testing
=
self
.
getConfig
(
'testing'
)
if
testing
:
if
testing
:
self
.
logger
.
info
(
"skipping promise"
)
self
.
logger
.
info
(
"skipping promise"
)
...
...
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