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
0
Merge Requests
0
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
Kirill Smelkov
slapos
Commits
4ca5681d
Commit
4ca5681d
authored
Jan 17, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
15e5c402
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
software/ors-amarisoft/instance.cfg
software/ors-amarisoft/instance.cfg
+1
-0
software/ors-amarisoft/ru/libinstance.jinja2.cfg
software/ors-amarisoft/ru/libinstance.jinja2.cfg
+8
-1
No files found.
software/ors-amarisoft/instance.cfg
View file @
4ca5681d
...
@@ -27,6 +27,7 @@ extra-context =
...
@@ -27,6 +27,7 @@ extra-context =
depends = $${activate-eggs:recipe}
depends = $${activate-eggs:recipe}
context =
context =
import xbuildout xbuildout
import xbuildout xbuildout
import netaddr netaddr
import json_module json
import json_module json
import nrarfcn_module nrarfcn
import nrarfcn_module nrarfcn
import xearfcn_module xlte.earfcn
import xearfcn_module xlte.earfcn
...
...
software/ors-amarisoft/ru/libinstance.jinja2.cfg
View file @
4ca5681d
...
@@ -77,6 +77,7 @@ update-command = : # nothing - we create taps only once not to interfere later
...
@@ -77,6 +77,7 @@ update-command = : # nothing - we create taps only once not to interfere later
stop-on-error = true
stop-on-error = true
{%- if testing %}
{%- if testing %}
# StandaloneSlapOS does not provide slaptap
# StandaloneSlapOS does not provide slaptap
{%- set test_slapnet = netaddr.IPNetwork('1234::/71') %}
command = :
command = :
{%- endif %}
{%- endif %}
...
@@ -88,9 +89,15 @@ stop-on-error = false
...
@@ -88,9 +89,15 @@ stop-on-error = false
{%- if ntap == 1 %}
{%- if ntap == 1 %}
{%- do vtap_list.append(slaplte.tap) %}
{%- do vtap_list.append(slaplte.tap) %}
[vtap.{{ slaplte.tap }}]
[vtap.{{ slaplte.tap }}]
{%- if testing %}
network = {{ str(test_slapnet) }}
gateway = {{ str(test_slapnet[1]) }}
addr = {{ str(test_slapnet[-1]) }}
{%- else %}
network = {{ slap_configuration['tap-ipv6-network'] }}
network = {{ slap_configuration['tap-ipv6-network'] }}
gateway = {{ slap_configuration['tap-ipv6-gateway'] }}
gateway = {{ slap_configuration['tap-ipv6-gateway'] }}
addr = {{ slap_configuration['tap-ipv6-addr'] }}
addr = {{ slap_configuration['tap-ipv6-addr'] }}
{%- endif %}
{%- endif %}
{%- endif %}
{%- else %}
{%- else %}
...
@@ -116,7 +123,7 @@ init =
...
@@ -116,7 +123,7 @@ init =
# ( 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 )
if {{ testing }}:
if {{ testing }}:
slapnet = netaddr.IPNetwork('
1234::/71') # no slaptap on StandaloneSlapOS
slapnet = netaddr.IPNetwork('
{{ str(test_slapnet) }}')
else:
else:
slapnet = tapsplit.ifnet6('{{ slaplte.tap }}')
slapnet = tapsplit.ifnet6('{{ slaplte.tap }}')
tapnet = tapsplit.netsplit(slapnet, {{ 1+ntap }}) [{{ i }}]
tapnet = tapsplit.netsplit(slapnet, {{ 1+ntap }}) [{{ i }}]
...
...
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