Merge branch 'x/lte-multiru' into xy/lte-multiru

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = 55d9182051ce13d07f1bc8e019173ae5
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 21b7f5611c20dc6f29e4e1e456493234
+md5sum = cf1d71dff3a37a80936ce1c2df373455
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -137,7 +137,7 @@ md5sum = f167b4be5e327b276b42267e0678f577
 
 [ru_dnsmasq.jinja2.cfg]
 _update_hash_filename_ = ru/dnsmasq.jinja2.cfg
-md5sum = 2607e31a5400b8fb03d0f0ced8434a95
+md5sum = 95f4f8fb85e0480eb3e9059b9db26540
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg

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

@@ -10,7 +10,8 @@ port=5354
 {%-   set plen = netaddr.IPNetwork(vtap.network).prefixlen  %}
 
 # {{ B(ru_ref) }} @ {{ ru_tap }}
-dhcp-range=tag:{{ ru_tap }},{{ vtap.gateway }},{{ vtap.gateway }},static,{{ plen }},5m
+{#- TODO consider using /128 as we give only 1 address to RU #}
+dhcp-range=tag:{{ ru_tap }},{{ vtap.gateway }},{{ vtap.gateway }},static,{{ max(plen,64) }},5m
 dhcp-host={{ ru.mac_addr }},tag:{{ ru_tap }},[{{ vtap.gateway }}]
 # option 17 used for RU callhome
 # dhcp-option=option6:17,[{{ vtap.addr }}]

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

@@ -73,7 +73,7 @@ config-stats-period = {{ slapparameter_dict.get("enb_stats_fetch_period", 60) }}
 recipe = plone.recipe.command
 ntap = {{ ntap }}
 command = {{ netcapdo }} {{ pythonwitheggs }} {{ ru_tapsplit }} {{ slaplte.tap }} ${:ntap}
-update-command = ${:command}
+update-command = :  # nothing - we create taps only once not to interfere later with enb
 stop-on-error = true
 {%-   if testing  %}
 # StandaloneSlapOS does not provide slaptap