.

software/ors-amarisoft/amari/slap.jinja2

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

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

@@ -4,7 +4,7 @@
 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-host={{ ru.mac_addr }},[{{ 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
 # option 17 used for RU callhome

software/ors-amarisoft/instance-enb-input-schema.json.jinja2

@@ -174,20 +174,6 @@
       "description": "Rx gain (in dB)",
       "type": "number"
     },
-{%- endif %}
-{%- if trx == 'cpri' %}
-    "dnsmasq": {
-      "default": false,
-      "title": "dnsmasq",
-      "description": "dnsmasq",
-      "type": "boolean"
-    },
-    "rrh_mac_addr": {
-      "default": "00:0a:00:00:10:20",
-      "title": "RRH MAC address",
-      "description": "RRH MAC address used for DNSMASQ",
-      "type": "string"
-    },
 {%- endif %}
     "enb_id": {
       "title": "eNB ID",

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

@@ -33,7 +33,8 @@
     "mac_addr": {
       "title": "RU MAC address",
       "description": "RU MAC address used for DNSMASQ",
-      "type": "string"
+      "type": "string",
+      "default": "00:0a:00:00:10:20"
     },
     "reset_schedule": {
       "title": "Cron schedule for RRH reset",