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
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
e41706c1
Commit
e41706c1
authored
Jan 05, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
9cc9eab0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
software/ors-amarisoft/buildout.hash.cfg
software/ors-amarisoft/buildout.hash.cfg
+2
-2
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+9
-1
software/ors-amarisoft/test/test.sh
software/ors-amarisoft/test/test.sh
+1
-1
No files found.
software/ors-amarisoft/buildout.hash.cfg
View file @
e41706c1
...
@@ -28,7 +28,7 @@ md5sum = 8c044b28682940fbca62657c16613157
...
@@ -28,7 +28,7 @@ md5sum = 8c044b28682940fbca62657c16613157
[ru_libinstance.jinja2.cfg]
[ru_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/libinstance.jinja2.cfg
_update_hash_filename_ = ru/libinstance.jinja2.cfg
md5sum =
3596f6d581c06c05506120474ef903c
a
md5sum =
031805301916a7d17a6a8fb31914cbe
a
[ru_sdr_libinstance.jinja2.cfg]
[ru_sdr_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
_update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
...
@@ -36,7 +36,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
...
@@ -36,7 +36,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
[ru_lopcomm_libinstance.jinja2.cfg]
[ru_lopcomm_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
_update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
md5sum =
fd5a80fce3fa1d63f56120b3a6e3a1c9
md5sum =
409ab889d75ec260aa0e52548463a38f
[ru_sunwave_libinstance.jinja2.cfg]
[ru_sunwave_libinstance.jinja2.cfg]
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
_update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
e41706c1
...
@@ -74,6 +74,10 @@ ntap = {{ ntap }}
...
@@ -74,6 +74,10 @@ ntap = {{ ntap }}
command = {{ netcapdo }} {{ pythonwitheggs }} {{ ru_tapsplit }} {{ slaplte.tap }} ${:ntap}
command = {{ netcapdo }} {{ pythonwitheggs }} {{ ru_tapsplit }} {{ slaplte.tap }} ${:ntap}
update-command = ${:command}
update-command = ${:command}
stop-on-error = true
stop-on-error = true
{%- if testing %}
# StandaloneSlapOS does not provide slaptap
command = :
{%- endif %}
{%- if ntap <= 1 %}
{%- if ntap <= 1 %}
[vtap]
[vtap]
...
@@ -102,6 +106,7 @@ init =
...
@@ -102,6 +106,7 @@ init =
with open(path) as f:
with open(path) as f:
return f.read()
return f.read()
import netaddr
# ~ import tapsplit
# ~ import tapsplit
tapsplit = types.ModuleType('tapsplit')
tapsplit = types.ModuleType('tapsplit')
exec(readfile('{{ ru_tapsplit }}'), tapsplit.__dict__)
exec(readfile('{{ ru_tapsplit }}'), tapsplit.__dict__)
...
@@ -109,7 +114,10 @@ init =
...
@@ -109,7 +114,10 @@ init =
# simulate what tapsplit would assign to the tap
# simulate what tapsplit would assign to the tap
# ( tap subinterface will be created for real later at install time - when it
# ( tap subinterface will be created for real later at install time - when it
# is too late to update section options )
# is too late to update section options )
slapnet = tapsplit.ifnet6('{{ slaplte.tap }}')
if {{ testing }}:
slapnet = netaddr.IPNetwork('1234::/71') # no slaptap on StandaloneSlapOS
else:
slapnet = tapsplit.ifnet6('{{ slaplte.tap }}')
tapnet = tapsplit.netsplit(slapnet, {{ 1+ntap }}) [{{ i }}]
tapnet = tapsplit.netsplit(slapnet, {{ 1+ntap }}) [{{ i }}]
options['network'] = str(tapnet)
options['network'] = str(tapnet)
...
...
software/ors-amarisoft/test/test.sh
View file @
e41706c1
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
export
SLAPOS_TEST_DEBUG
=
1
export
SLAPOS_TEST_DEBUG
=
1
export
SLAPOS_TEST_VERBOSE
=
1
export
SLAPOS_TEST_VERBOSE
=
1
export
SLAPOS_TEST_SKIP_SOFTWARE_CHECK
=
1
export
SLAPOS_TEST_SKIP_SOFTWARE_CHECK
=
1
export
SLAPOS_TEST_SKIP_SOFTWARE_REBUILD
=
1
export
SLAPOS_TEST_SKIP_SOFTWARE_REBUILD
=
0
rm
-rf
snapshot
rm
-rf
snapshot
mkdir
snapshot
mkdir
snapshot
...
...
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