.

software/ors-amarisoft/amari/slap.jinja2

@@ -21,9 +21,6 @@
       'ru/sdr': {
         'txrx_active': 'ACTIVE',
       },
-      'ru/lopcomm': {
-        'mac_addr': '00:0a:00:00:10:20',
-      },
 
       'cell/lte': {
         'pci':  1,

software/ors-amarisoft/buildout.hash.cfg

@@ -20,15 +20,15 @@ md5sum = b51cf57dee296a1d4c9e29cf68e76103
 
 [amari_lte.jinja2]
 _update_hash_filename_ = amari/lte.jinja2
-md5sum = eb72383572bac14eb9a467b354381b26
+md5sum = 35ad3e7f7ef68831147a297586593660
 
 [amari_slap.jinja2]
 _update_hash_filename_ = amari/slap.jinja2
-md5sum = a00dbbae2026be41c2a839b68f2577ee
+md5sum = 246667cec21dba36477136c7aa8c2a9f
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 082aeda9f29b28f357929cddd1ee246e
+md5sum = b2c59d5b6616c23938d9b61b12bf2b8c
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = 7cd5331db13a8a901cb1b55a4596cf50
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = af0e3e3e991e19080bdc90e4fbde5975
+md5sum = 6fe4d6643399d397a241b05524c5a3d6
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg
@@ -56,27 +56,27 @@ md5sum = 6f8d0592cc4b0b695cea5a0c25aafc4e
 
 [ru_lopcomm_stats.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/stats.jinja2.py
-md5sum = 059fa51fd30372e4382e1c143e718791
+md5sum = 3a5a3c5588e1698ee81e983bb08e70d7
 
 [ru_lopcomm_config.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/config.jinja2.py
-md5sum = 51c523ac1ee254e5cc4a150f29e0e291
+md5sum = 1b409be8d1ef6ed628e47ac3aeadef68
 
 [ru_lopcomm_reset-info.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/reset-info.jinja2.py
-md5sum = e03d7fea24566aa8291f0dc4aaf09c67
+md5sum = 3d78df1993211efaabd3dc6f2ec8de30
 
 [ru_lopcomm_reset.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/reset.jinja2.py
-md5sum = 63472d5dc9bd46923d3941b5189e2ccd
+md5sum = 9741fbc99aaf768e9cc3ab48925dfee5
 
 [ru_lopcomm_software.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/software.jinja2.py
-md5sum = d7b8a8fb396b3a94839663732798928b
+md5sum = 6f189dc818b38c668fa72850ffed2252
 
 [ru_lopcomm_supervision.jinja2.py]
 _update_hash_filename_ = ru/lopcomm/supervision.jinja2.py
-md5sum = e5ca405581632c9ff9b435ff4a45d408
+md5sum = ec56bee0916563807197ed5ef0ca0908
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg

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

@@ -3,12 +3,12 @@
 {% if True %}  {# XXX temp disabled #}
 dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
 port=5354
-dhcp-range=::1,::1,constructor:{{ slap_configuration.get('tap-name', '') }},ra-names,64,5m
-dhcp-host={{ slapparameter_dict.get('rrh_mac_addr', '00:0a:00:00:10:20') }},[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) }}]
-dhcp-option=option6:dns-server,[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) + 1 }}],[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-gateway', '')) + 2 }}]
-dhcp-option=option6:domain-search,bbu.local
+dhcp-range=::1,::1,constructor:{{ ru.cpri_link._tap }},ra-names,64,5m
+dhcp-host={{ ru.mac_addr }},[{{ vtap[ru.cpri_link._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,[{{ netaddr.IPAddress(slap_configuration.get('tap-ipv6-addr', '')) }}]
+# dhcp-option=option6:17,[{{ vtap[ru.cpri_link._tap].addr }}]
 log-queries
 log-dhcp
 log-facility={{ directory['home'] }}/var/log/dnsmasq.log

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

@@ -69,16 +69,18 @@ stop-on-error = false
 
 {%-     if ntap == 1  %}
 [vtap.{{ slap_configuration['tap-name'] }}]
-netaddr = {{ slap_configuration['tap-ipv6-network'] }}
+network = {{ slap_configuration['tap-ipv6-network'] }}
 gateway = {{ slap_configuration['tap-ipv6-gateway'] }}
+addr    = {{ slap_configuration['tap-ipv6-addr'] }}
 {%-     endif %}
 
 {%-   else  %}
 
 {%-   for i in range(1,ntap+1)  %}
 [vtap.{{ slap_configuration['tap-name'] }}-{{ i }}]
-netaddr = ...
-gateway = ...
+network = ...
+gateway = ... network[1]
+addr    = ... network.last
 {%-   endfor  %}
 
 {%-   endif %}

software/ors-amarisoft/ru/lopcomm/input-schema.json

@@ -5,7 +5,7 @@
   "type": "object",
   "$ref": "../../ru/input-schema.json#/$defs/ru-common",
 
-  "required": [],
+  "required": ["mac_addr"],
   "properties": {
     "ru_type": {
       "const":    "lopcomm",
@@ -32,9 +32,8 @@
 
     "mac_addr": {
       "title": "RU MAC address",
-      "description": "RU MAC address used for DNSMASQ",
-      "type": "string",
-      "default": "00:0a:00:00:10:20"
+      "description": "RU MAC address used for NETCONF",
+      "type": "string"
     },
     "reset_schedule": {
       "title": "Cron schedule for RRH reset",