.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 8c044b28682940fbca62657c16613157
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 3596f6d581c06c05506120474ef903ca
+md5sum = 031805301916a7d17a6a8fb31914cbea
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = fd5a80fce3fa1d63f56120b3a6e3a1c9
+md5sum = 409ab889d75ec260aa0e52548463a38f
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -74,6 +74,10 @@ ntap = {{ ntap }}
 command = {{ netcapdo }} {{ pythonwitheggs }} {{ ru_tapsplit }} {{ slaplte.tap }} ${:ntap}
 update-command = ${:command}
 stop-on-error = true
+{%-   if testing  %}
+# StandaloneSlapOS does not provide slaptap
+command = :
+{%-   endif %}
 
 {%-   if ntap <= 1  %}
 [vtap]
@@ -102,6 +106,7 @@ init =
     with open(path) as f:
       return f.read()
 
+  import netaddr
   # ~ import tapsplit
   tapsplit = types.ModuleType('tapsplit')
   exec(readfile('{{ ru_tapsplit }}'), tapsplit.__dict__)
@@ -109,6 +114,9 @@ init =
   # simulate what tapsplit would assign to the tap
   # ( tap subinterface will be created for real later at install time - when it
   #   is too late to update section options )
+  if {{ testing }}:
+    slapnet = netaddr.IPNetwork('1234::/71')  # no slaptap on StandaloneSlapOS
+  else:
     slapnet = tapsplit.ifnet6('{{ slaplte.tap }}')
   tapnet  = tapsplit.netsplit(slapnet, {{ 1+ntap }}) [{{ i }}]
 

software/ors-amarisoft/test/test.sh

@@ -5,7 +5,7 @@
 export SLAPOS_TEST_DEBUG=1
 export SLAPOS_TEST_VERBOSE=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
 mkdir snapshot