Commit 4ca5681d authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 15e5c402
...@@ -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
......
...@@ -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 }}]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment