wip

software/ors-amarisoft/buildout.hash.cfg

@@ -100,7 +100,7 @@ md5sum = 601d6237059fa665d3f3ffb6a78ad9ca
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 04b7e41a04f6d74a7a78186e68e851b5
+md5sum = ad50c79083d6af93b13e4b60a9ebe97f
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
@@ -136,7 +136,7 @@ md5sum = 9dbd93036c15c87c6de74b88b34062b6
 
 [mme.jinja2.cfg]
 filename = config/mme.jinja2.cfg
-md5sum = 64b2edf5954eb3b2a63e5896e00d96ad
+md5sum = 1103594ca9c86bc40fb904e51b7a451c
 
 [dnsmasq-core-network.jinja2.cfg]
 filename = config/dnsmasq-core-network.jinja2.cfg

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

@@ -68,7 +68,7 @@
       pdn_type: "ipv4",
       dns_addr: "8.8.8.8",
 {% endif %}
-      tun_ifname: "{{ slap_configuration.get('tun-name', '') }}-1",
+      tun_ifname: "{{ slap_configuration.get('tun-name', '') }}",
       access_point_name: ["default", "internet", "sos"],
 {% if slap_configuration.get('tun-name', '') %}
       first_ip_addr: "{{ netaddr.IPAddress(tun_ipv4_start + 1)                       }}",
@@ -98,7 +98,7 @@
       pdn_type: "ipv4",
       dns_addr: "8.8.8.8",
 {% endif %}
-      tun_ifname: "{{ slap_configuration.get('tun-name', '') }}-2",
+      tun_ifname: "{{ slap_configuration.get('tun-name', '') }}-1",
       access_point_name: "ims",
 {% if slap_configuration.get('tun-name', '') %}
       first_ip_addr: "{{ netaddr.IPAddress((tun_ipv4_start + tun_ipv4_end) // 2 + 2) }}"

software/ors-amarisoft/instance-core-network.jinja2.cfg

@@ -281,7 +281,6 @@ context =
   section directory directory
   section slap_configuration slap-configuration
   section vtun1 vtun.{{ slap_configuration.get('tun-name', '') }}-1
-  section vtun2 vtun.{{ slap_configuration.get('tun-name', '') }}-2
   key slapparameter_dict slap-configuration:configuration
   raw gtp_addr_v6 {{ my_ipv6 }}
   raw gtp_addr_v4 {{ lan_ipv4 }}