.

software/ors-amarisoft/buildout.hash.cfg

@@ -88,7 +88,7 @@ md5sum = 1accf8bab713629c546921f65a792518
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 23c7c23d386b7875cfb678299903905d
+md5sum = 7bad2412969c451934d218e88f9ad6d6
 
 [template-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
@@ -145,7 +145,7 @@ md5sum = f167b4be5e327b276b42267e0678f577
 
 [dnsmasq-enb.jinja2.cfg]
 filename = config/dnsmasq-enb.jinja2.cfg
-md5sum = 6edabcaa9ac3bb112c7e02a239a6670b
+md5sum = e2b415046926d9a9ef542816dd86eefb
 
 [ims.jinja2.cfg]
 filename = config/ims.jinja2.cfg

software/ors-amarisoft/config/dnsmasq-enb.jinja2.cfg

+{%- for (ru_ref, iru) in iru_dict|dictsort | selectattr('1._.cpri_link', 'defined') %}
+{%-   set ru = iru['_'] %}
+{%-   set ru_tap = ru.cpri_link._tap  %}
+
+# {{ ru_ref }} @ {{ ru_tap }}
 dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
 port=5354
-dhcp-range=::1,::1,constructor:{{ ru.cpri_link._tap }},ra-names,64,5m
-dhcp-host={{ ru.mac_addr }},[{{ vtap[ru.cpri_link._tap].gateway }}]
+dhcp-range=::1,::1,constructor:{{ ru_tap }},ra-names,64,5m
+dhcp-host={{ ru.mac_addr }},[{{ vtap[ru_tap].gateway }}]
 {# XXX kill  dhcp-option=option6:dns-server,[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) + 1 }}],[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) + 2 }}]  #}
 {# XXX kill  dhcp-option=option6:domain-search,bbu.local  #}
 # option 17 used for RU callhome
-# dhcp-option=option6:17,[{{ vtap[ru.cpri_link._tap].addr }}]
+# dhcp-option=option6:17,[{{ vtap[ru_tap].addr }}]
+{%- endfor %}
+
 log-queries
 log-dhcp
 log-facility={{ directory['home'] }}/var/log/dnsmasq.log

software/ors-amarisoft/instance-enb.jinja2.cfg

@@ -144,8 +144,10 @@ filename = dnsmasq.cfg
 extensions = jinja2.ext.do
 output = ${directory:etc}/${:filename}
 context =
-    import json_module json
-    import netaddr netaddr
+  import json_module json
+  import netaddr netaddr
+  section directory directory
+  json iru_dict {{ rulib.iru_dict | tojson }}
 
 [dnsmasq-service]
 recipe = slapos.cookbook:wrapper