add ue-ifup

software/ors-amarisoft/buildout.hash.cfg

@@ -44,11 +44,11 @@ md5sum = 728f4d3ae248710c23e4b73eea4d628e
 
 [template-lte-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = ca9db7dd38cea0bab12c4f8f4f7028d0
+md5sum = 752de91bf49b5f0245462e5b164c81e8
 
 [template-lte-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = 15257aa42c7f9eb4eb8058591e6dfec4
+md5sum = 9e4a128e90e4f0b6308c52c775079114
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
@@ -80,7 +80,7 @@ md5sum = 36281b03597252cf75169417d02fc28c
 
 [ue-lte.jinja2.cfg]
 filename = config/ue-lte.jinja2.cfg
-md5sum = 3354eeb828bb6de3ce12487bb87badc7
+md5sum = a464d9cf58ee03636ff88e36b8fe1727
 
 [ue-nr.jinja2.cfg]
 filename = config/ue-nr.jinja2.cfg

software/ors-amarisoft/config/ue-lte.jinja2.cfg

@@ -33,7 +33,7 @@ rf_driver: {
     forced_cqi: 15,
     forced_ri: 2,
     ue_count: 1,
-    tun_setup_script: "ue-ifup",
+    tun_setup_script: "{{ ifup_empty }}",
     apn: "internet",
     }
   ],

software/ors-amarisoft/instance-ue-lte.jinja2.cfg

@@ -93,6 +93,7 @@ context =
   section directory directory
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
+  key ifup_empty lte-ue-ifup-empty:wrapper-path
 
 [lte-ue-lte-config]
 <= config-base
@@ -103,9 +104,32 @@ url = {{ ue_lte_template }}
 {% endif %}
 output = ${directory:etc}/ue.cfg
 
+### EMPTY ue-ifup script
+[lte-ue-ifup-empty]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:bin}/ue-ifup-empty
+command-line = echo Using interface
+mode = 775
+
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
+epc-ipv6 = ${slap-configuration:ipv6-random}
+epc-ipv4 = {{ epc_ipv4 }}
+
+# Add custom promise to check if /dev/sdr0 is busy
+[tun-up-promise]
+recipe = slapos.cookbook:promise.plugin
+eggs = slapos.core
+file = {{ interface_up_promise }}
+output = ${directory:plugins}/check-tun-up.py
+{% if not slapparameter_dict.get("testing", False) %}
+config-ifname = ${slap-configuration:tun-name}
+{% else %}
+config-ifname =
+{% endif %}
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+
 
 [monitor-instance-parameter]
 {% if slapparameter_dict.get("name", None) %}

software/ors-amarisoft/instance-ue-nr.jinja2.cfg

@@ -95,6 +95,7 @@ context =
   section directory directory
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
+  key ifup_empty lte-ue-ifup-empty:wrapper-path
 
 [lte-ue-nr-config]
 <= config-base
@@ -105,9 +106,32 @@ url = {{ ue_nr_template }}
 {% endif %}
 output = ${directory:etc}/ue.cfg
 
+### EMPTY mme-ifup script
+[lte-mme-ifup-empty]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:bin}/mme-ifup-empty
+command-line = echo Using interface
+mode = 775
+
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
+epc-ipv6 = ${slap-configuration:ipv6-random}
+epc-ipv4 = {{ epc_ipv4 }}
+
+# Add custom promise to check if /dev/sdr0 is busy
+[tun-up-promise]
+recipe = slapos.cookbook:promise.plugin
+eggs = slapos.core
+file = {{ interface_up_promise }}
+output = ${directory:plugins}/check-tun-up.py
+{% if not slapparameter_dict.get("testing", False) %}
+config-ifname = ${slap-configuration:tun-name}
+{% else %}
+config-ifname =
+{% endif %}
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+
 
 [monitor-instance-parameter]
 {% if slapparameter_dict.get("name", None) %}