simpleran: publish MAC address

software/simpleran/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 6d1fed5e983ecf0f3f1f88ee32dddf75
+md5sum = 75057fd3fc8b1722b13163f020b196c0
 
 [template-ors]
 filename = instance-ors.cfg
@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 248c284cb8612034695e3bcec279e3a2
+md5sum = 915af421eb59f36f7145c404c88b24b0
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
@@ -72,11 +72,11 @@ md5sum = f4389a92fb111447e7976e452db78607
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 7c809fb0a885fcaf7206d8b22aab9fba
+md5sum = d568767018b1389a8e0acbf0bc808ef5
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
-md5sum = cc06ec740fb26e86830f1fdb773c1d17
+md5sum = 17b3324ed8554782456d30c888683f25
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg

software/simpleran/instance-core-network.jinja2.cfg

@@ -309,6 +309,7 @@ password = {{ slapparameter_dict['monitor-password'] | string }}
 recipe = slapos.cookbook:publish.serialised
 core-network-ipv6 = {{ my_ipv6 }}
 core-network-ipv4 = {{ lan_ipv4 }}
+core-network-mac = {{ mac }}
 amarisoft-version = {{ amarisoft['version']}}
 amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
 amarisoft-available-versions = {{ amarisoft['version_installed'] }}

software/simpleran/instance-enb.jinja2.cfg

@@ -323,6 +323,7 @@ websocket-port = 443
 websocket-password = ${websocket-password:passwd}
 enb-ipv6 = {{ my_ipv6 }}
 enb-ipv4 = {{ lan_ipv4 }}
+enb-mac = {{ mac }}
 amarisoft-version = {{ amarisoft['version'] }}
 amarisoft-host-id = {{ amarisoft['lteenb_host_id'] }}
 amarisoft-available-versions = {{ amarisoft['version_installed'] }}

software/simpleran/instance-ue.jinja2.cfg

@@ -139,6 +139,8 @@ iue_dict   = {{ dumps(iue_dict) }}
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
 rue_bind_addr = {{my_ipv6}}
+ue-ipv4 = {{ lan_ipv4 }}
+ue-mac = {{ mac }}
 websocket-address = ${request-slave-frontend:connection-domain}/${nginx-params:websocket-path}
 websocket-port = 443
 websocket-password = ${websocket-password:passwd}

software/simpleran/instance.cfg

@@ -39,7 +39,8 @@ context =
     raw pythonwitheggs ${buildout:bin-directory}/pythonwitheggs
     section slap_connection slap-connection
     key slapparameter_dict slap-configuration:configuration
-    key lan_ipv4 lan-ip:ipv4
+    key lan_ipv4 lan:ipv4
+    key mac lan:mac
     key my_ipv4  slap-configuration:ipv4-random
     key my_ipv6  slap-configuration:ipv6-random
     raw nginx_template   ${nginx_conf.in:target}
@@ -146,7 +147,7 @@ init =
   except FileNotFoundError:
     pass
 
-[lan-ip]
+[lan]
 recipe = slapos.recipe.build
 init =
   import netifaces
@@ -158,6 +159,10 @@ init =
                   options['ipv4'] = a[netifaces.AF_INET][0]['addr']
               except:
                   options['ipv4'] = "0.0.0.0"
+              try:
+                  options['mac'] = a[netifaces.AF_LINK][0]['addr']
+              except:
+                  options['mac'] = "00:00:00:00:00:00"
 
 [comp-id]
 recipe = slapos.recipe.build