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 = 78adcae68456e957520c019ec8add80a
+md5sum = f9c412973d0bbc8053ee6a1f7ccbb0c1
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg

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

@@ -121,9 +121,9 @@ recipe = plone.recipe.command
 command = {{ netcapdo }} {{ pythonwitheggs }} {{ tunsplit }} {{ tun }} 2
 update-command = ${:command}
 stop-on-error = true
-#{%-   if testing  %}
-#command = :
-#{%-   endif %}
+{%-   if slapparameter_dict.get("testing", False)  %}
+command = :
+{%-   endif %}
 
 {%-   for i in range(1,3)  %}
 {%-     set tun = '%s-%d' % (tun, i)   %}
@@ -145,11 +145,10 @@ init =
   # simulate what tunsplit would assign to the tun
   # ( tun subinterface will be created for real later at install time - when it
   #   is too late to update section options )
-#  if {{ testing }}:
-#    slapnet = netaddr.IPNetwork('{{ str(test_slapnet) }}')
-#  else:
-#    slapnet = tunsplit.ifnet6('{{ tun }}')
-   slapnet = tunsplit.ifnet6('{{ tun }}')
+  if {{ slapparameter_dict.get("testing", False) }}:
+    slapnet = netaddr.IPNetwork('{{ str(test_slapnet) }}')
+  else:
+    slapnet = tunsplit.ifnet6('{{ tun }}')
   tunnet  = tunsplit.netsplit(slapnet, {{ 1+ntun }}) [{{ i }}]
 
   options['network'] = str(tunnet)