software/ors-amarisoft: remove mac_addr from dnsmasq

software/ors-amarisoft/ru/common.json

@@ -108,18 +108,6 @@
           "default": 0
         }
       }
-    },
-
-    "mac_addr": {
-      "title": "RU MAC address",
-      "description": "RU MAC address used for NETCONF",
-      "type": "string",
-
-      "options": {
-        "dependencies": {
-          "ru_link_type": "cpri"
-        }
-      }
     }
 
   }

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

@@ -12,7 +12,6 @@ port=5354
 # {{ B(ru_ref) }} @ {{ ru_tap }}
 {#- 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 }}]
 {%- endfor %}

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

@@ -12,8 +12,7 @@
     "tx_gain",
     "rx_gain",
 
-    "cpri_link",
-    "mac_addr"
+    "cpri_link"
   ],
 
   "properties": {

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

@@ -12,8 +12,7 @@
     "tx_gain",
     "rx_gain",
 
-    "cpri_link",
-    "mac_addr"
+    "cpri_link"
   ],
 
   "properties": {

software/ors-amarisoft/slapos-render-config.py

@@ -204,7 +204,6 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
     RU1 = {
         'ru_type':      'lopcomm',
         'ru_link_type': 'cpri',
-        'mac_addr':     '00:00:00:00:00:01',
         'cpri_link':    {
             'sdr_dev':  2,
             'sfp_port': 0,
@@ -221,7 +220,6 @@ def iRU2_LOPCOMM_fLTE_fNR(ienb):
     }
 
     RU2 = copy.deepcopy(RU1)
-    RU2['mac_addr'] = '00:00:00:00:00:02'
     RU2['cpri_link']['sfp_port'] = 1
     RU2['tx_gain'] += 10
     RU2['rx_gain'] += 10
@@ -307,7 +305,6 @@ def iRU2_LOPCOMM_fLTE2(ienb):
     RU_0002 = {
         'ru_type':      'lopcomm',
         'ru_link_type': 'cpri',
-        'mac_addr':     '00:00:00:00:00:01',
         'cpri_link':    {
             'sdr_dev':  0,
             'sfp_port': 0,
@@ -325,7 +322,6 @@ def iRU2_LOPCOMM_fLTE2(ienb):
 
     # supports: 2110 - 2170 MHz
     RU_0004 = copy.deepcopy(RU_0002)
-    RU_0004['mac_addr'] = '00:00:00:00:00:04'
     RU_0004['cpri_link']['sfp_port'] = 1
 
     if 1:

software/ors-amarisoft/test/test.py

@@ -517,8 +517,7 @@ class Lopcomm4:
             'rx_delay': 40+i,
             'tx_delay': 50+i,
             'tx_dbm':   60+i
-        },
-        'mac_addr':     '00:0A:45:00:00:%02x' % i,
+        }
     }
 
   # radio units configuration in enb.cfg
@@ -682,8 +681,7 @@ class Sunwave4:
             'rx_delay': 140+i,
             'tx_delay': 150+i,
             'tx_dbm':   160+i
-        },
-        'mac_addr':     '00:FA:FE:00:00:%02x' % i,
+        }
     }
 
   # radio units configuration in enb.cfg