wip

software/ors-amarisoft/buildout.hash.cfg

@@ -100,7 +100,7 @@ md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = f9c412973d0bbc8053ee6a1f7ccbb0c1
+md5sum = d977efa46a1654e3d93845c13f0ef1d0
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -125,6 +125,7 @@ stop-on-error = true
 command = :
 {%-   endif %}
 
+{%-   set test_slapnet = netaddr.IPNetwork('1234::/71') %}
 {%-   for i in range(1,3)  %}
 {%-     set tun = '%s-%d' % (tun, i)   %}
 {%-     do vtun_list.append(tun) %}
@@ -149,7 +150,8 @@ init =
     slapnet = netaddr.IPNetwork('{{ str(test_slapnet) }}')
   else:
     slapnet = tunsplit.ifnet6('{{ tun }}')
-  tunnet  = tunsplit.netsplit(slapnet, {{ 1+ntun }}) [{{ i }}]
+  slapnet = tunsplit.ifnet6('{{ tun }}')
+  tunnet  = tunsplit.netsplit(slapnet, 2) [{{ i }}]
 
   options['network'] = str(tunnet)
   options['gateway'] = str(tunnet[1])
@@ -278,6 +280,8 @@ extensions = jinja2.ext.do
 context =
   section directory directory
   section slap_configuration slap-configuration
+  section vtun1 vtun.{{ slap_configuration.get('tun-name', '') }}-1
+  section vtun2 vtun.{{ slap_configuration.get('tun-name', '') }}-2
   key slapparameter_dict slap-configuration:configuration
   raw gtp_addr_v6 {{ my_ipv6 }}
   raw gtp_addr_v4 {{ lan_ipv4 }}