IP addr

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = b65347ea7c1936c2926ef11258cea602
+md5sum = 504a5f4d0b09e038c2e4df4cd50930a8
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
@@ -24,7 +24,7 @@ md5sum = 0883225f978255ecd343416759c1c5a4
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = b97de2b1f60059e2a1b394597123672d
+md5sum = 6fa927552c7f441f3165d409cabd626f
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -32,7 +32,7 @@ md5sum = 5f8a4d85b26a7181fc8b16e588b88e1e
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 535a41b726c132dcf0135150e5470660
+md5sum = d53bee687504302b08dcd7f8d0dcf630
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg

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

@@ -102,6 +102,7 @@ rendered = ${directory:etc}/enb.cfg
 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised
 monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
+ipv4 = {{ ip }}
 
 [monitor-instance-parameter]
 monitor-title = {{ slapparameter_dict['name'] | string }}

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

@@ -102,6 +102,7 @@ rendered = ${directory:etc}/gnb.cfg
 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised
 monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
+ipv4 = {{ ip }}
 
 [monitor-instance-parameter]
 monitor-title = {{ slapparameter_dict['name'] | string }}

software/ors-amarisoft/instance.cfg

@@ -36,6 +36,20 @@ gnb = dynamic-template-lte-gnb:rendered
 epc = dynamic-template-lte-epc:rendered
 RootSoftwareInstance = $${:enb-epc}
 
+[ipv4-address]
+recipe = slapos.recipe.build
+init = 
+  import socket
+  s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+  try:
+      s.connect(('1.1.1.1', 1))
+      ip = s.getsockname()[0]
+  except Exception:
+      ip = '127.0.0.1'
+  finally:
+      s.close()
+  options['ip'] = ip
+
 [dynamic-template-lte-enb-epc]
 < = jinja2-template-base
 template = ${template-lte-enb-epc:target}
@@ -43,6 +57,7 @@ filename = instance-lte-enb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:rendered}
+    key ip ipv4-address:ip
  
 [dynamic-template-lte-gnb-epc]
 < = jinja2-template-base
@@ -51,6 +66,7 @@ filename = instance-lte-gnb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:rendered}
+    key ip ipv4-address:ip
  
 [dynamic-template-lte-enb]
 < = jinja2-template-base
@@ -72,6 +88,7 @@ extra-context =
     raw default_lte_rx_gain ${enb:default-lte-rx-gain}
     raw min_frequency ${enb:min-frequency}
     raw max_frequency ${enb:max-frequency}
+    key ip ipv4-address:ip
 
 [dynamic-template-lte-gnb]
 < = jinja2-template-base
@@ -93,6 +110,7 @@ extra-context =
     raw default_nr_rx_gain ${enb:default-nr-rx-gain}
     raw min_frequency ${enb:min-frequency}
     raw max_frequency ${enb:max-frequency}
+    key ip ipv4-address:ip
 
 [dynamic-template-lte-epc]
 < = jinja2-template-base