Make minimal core-network which returns a domain name for deltachat

server

software/ors-amarisoft/buildout.hash.cfg

@@ -16,120 +16,8 @@
 
 [template]
 filename = instance.cfg
-md5sum = 3919d261bdf366b7f7cc5149ab4c609d
-
-[amarisoft-stats.jinja2.py]
-_update_hash_filename_ = amarisoft-stats.jinja2.py
-md5sum = c4d5e9fcf460d88bc2b4bcfbdfe554f7
-
-[amarisoft-rf-info.jinja2.py]
-_update_hash_filename_ = amarisoft-rf-info.jinja2.py
-md5sum = ab666fdfadbfc7d8a16ace38d295c883
-
-[ncclient_common]
-_update_hash_filename_ = ncclient_common.py
-md5sum = 6f8d0592cc4b0b695cea5a0c25aafc4e
-
-[lopcomm-rrh-stats.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-stats.jinja2.py
-md5sum = b861ef43beba4a0a2904e8c2aee04723
-
-[lopcomm-rrh-config.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-config.jinja2.py
-md5sum = f2f550b68c8ab243ce1a4bb73a9abc1c
-
-[lopcomm-rrh-software.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-software.jinja2.py
-md5sum = 2cd8515253b75e2ab13cc77399762851
-
-[lopcomm-rrh-supervision.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-supervision.jinja2.py
-md5sum = 243d9fbf640b8dc8bf63d69b07b8afed
-
-[lopcomm-rrh-reset-info.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-reset-info.jinja2.py
-md5sum = e03d7fea24566aa8291f0dc4aaf09c67
-
-[lopcomm-rrh-reset.jinja2.py]
-_update_hash_filename_ = lopcomm-rrh-reset.jinja2.py
-md5sum = 63472d5dc9bd46923d3941b5189e2ccd
-
-[template-enb]
-_update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 6be204217dd3c4ce240184ec31332cd6
-
-[template-gnb]
-_update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = e4d8c66c00dc5c022e9208c10e37490e
+md5sum = bde2272fa5f354fc443cdc5d7eafbb06
 
 [template-core-network]
 _update_hash_filename_ = instance-core-network.jinja2.cfg
-md5sum = 919340a049d628a86838453354c9efa2
-
-[template-ue-lte]
-_update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 587531b7a43fecbcdc2f1bffac74a363
-
-[template-ue-nr]
-_update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = 3d6f3e864b6480a98c2699b11281182a
-
-[template-obsolete]
-_update_hash_filename_ = instance-obsolete.jinja2.cfg
-md5sum = c5f581ba01654b2aec46000abf8d0e35
-
-[ue_db.jinja2.cfg]
-filename = config/ue_db.jinja2.cfg
-md5sum = dcaac06553a3222b14c0013a13f4a149
-
-[enb.jinja2.cfg]
-filename = config/enb.jinja2.cfg
-md5sum = c1fef7cec616ba3594549090591a56d2
-
-[sib23.jinja2.asn]
-filename = config/sib23.jinja2.asn
-md5sum = a1973ba6e43d40e510d61d461c2d13ac
-
-[gnb.jinja2.cfg]
-filename = config/gnb.jinja2.cfg
-md5sum = 075df4848e08ef8a595b33164238a0e7
-
-[ltelogs.jinja2.sh]
-filename = ltelogs.jinja2.sh
-md5sum = 1ba2e065bdf14a6411e95e80db17dcfd
-
-[mme.jinja2.cfg]
-filename = config/mme.jinja2.cfg
-md5sum = 3d7833ddba3242cedcd74c7db52390c6
-
-[dnsmasq.jinja2.cfg]
-filename = config/dnsmasq.jinja2.cfg
-md5sum = ecf6081d1fc76a60ba57f042446bc161
-
-[ims.jinja2.cfg]
-filename = config/ims.jinja2.cfg
-md5sum = 36281b03597252cf75169417d02fc28c
-
-[ue-lte.jinja2.cfg]
-filename = config/ue-lte.jinja2.cfg
-md5sum = c0313f9d15543361f7c8e19af96c737a
-
-[ue-nr.jinja2.cfg]
-filename = config/ue-nr.jinja2.cfg
-md5sum = 824233ab4d53ec428d358fb67bca8ba2
-
-[CreateProcessingEle.jinja2.xml]
-filename = netconf/CreateProcessingEle.jinja2.xml
-md5sum = e435990eb0a0d4be41efa9bd16dce09b
-
-[cu_config.jinja2.xml]
-filename = netconf/cu_config.jinja2.xml
-md5sum = d10b063ad4edc760e154f7a8d63bea47
-
-[software.cfg.html]
-_update_hash_filename_ = gadget/software.cfg.html
-md5sum = 61a2f783fbf683a34aed3d13e00baca2
-
-[promise.gadget.js]
-_update_hash_filename_ = gadget/promise.gadget.js
-md5sum = 330f5f07806f1da11cd05bb8e4b52e55
+md5sum = 822e62441387163d86a0af5df36fb03a

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

 {%- set dns_slave_instance_list = [] %}
-{%- set sim_slave_instance_list = [] %}
 {%- for slave in slave_instance_list %}
 {%-   set slave_parameters = json_module.loads(slave['_']) %}
 {%-   if slave_parameters.get('subdomain', '') != '' %}
 {%-     do dns_slave_instance_list.append(slave) %}
-{%-   elif slave_parameters.get('imsi', '') != '' %}
-{%-     do sim_slave_instance_list.append(slave) %}
 {%-   endif %}
 {%- endfor %}
 
 {% set part_list = [] -%}
-{%- for slave in sim_slave_instance_list %}
-{%-   set slave_parameters = json_module.loads(slave['_']) %}
-{%    set slave_reference = slave.get('slave_reference', '') %}
-{%    set publish_section_title = 'publish-%s' % slave_reference %}
-{%    do part_list.append(publish_section_title) %}
-[{{ publish_section_title }}]
-recipe = slapos.cookbook:publish.serialised
--slave-reference = {{ slave_reference }}
-info = Your SIM card with IMSI {{ slave_parameters.get('imsi', '') }} has been attached to service ${slap-configuration:instance-title}.
-{%- endfor %}
 
 {%- for slave in dns_slave_instance_list %}
-{%-   set slave_parameters = json_module.loads(slave['_']) %}
 {%    set slave_reference = slave.get('slave_reference', '') %}
 {%    set publish_section_title = 'publish-%s' % slave_reference %}
 {%    do part_list.append(publish_section_title) %}
 [{{ publish_section_title }}]
 recipe = slapos.cookbook:publish.serialised
 -slave-reference = {{ slave_reference }}
-domain = {{ slave_parameters['subdomain'] }}.{{ slapparameter_dict.get('local_domain', '') }}
-ip = {{ slave_parameters.get('ip', '') }}
-info = DNS entry with has been attached to service ${slap-configuration:instance-title}.
+domain = nexedi.com
+ip = xxx
+info = XXX
 {%- endfor %}
 
 [buildout]
 parts =
   directory
-  ltelogs
-  mme-config
-  mme-service
-  monitor-base
-  check-interface-up.py
-  publish-connection-information
-{% if slapparameter_dict.get("iperf3", None) %}
-  iperf-service
-  iperf-listen-promise
-{% endif %}
-{% if slapparameter_dict.get("local_domain", '') %}
-  dnsmasq-service
-{% endif %}
 {% for part in part_list -%}
 {{ '  %s' % part }}
 {% endfor %}
 
-extends = {{ monitor_template }}
-
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
@@ -67,24 +38,6 @@ partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
 key = {{ slap_connection['key-file'] }}
 cert = {{ slap_connection['cert-file'] }}
-configuration.gtp_addr = 127.0.1.100
-configuration.ims_addr = 127.0.0.1
-configuration.ims_bind = 127.0.0.2
-ue_db_path = {{ ue_db_path }}
-
-[monitor-httpd-conf-parameter]
-httpd-include-file = {{ buildout_directory }}/etc/httpd-include-file.conf
-port = ${monitor-instance-parameter:monitor-httpd-port}
-url = https://[${monitor-instance-parameter:monitor-httpd-ipv6}]:${:port}
-
-[monitor-instance-parameter]
-monitor-httpd-port = ${monitor-address:port}
-
-[monitor-address]
-recipe = slapos.cookbook:free_port
-minimum = 8035
-maximum = 8055
-ip = ${monitor-instance-parameter:monitor-httpd-ipv6}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -99,166 +52,3 @@ script = ${:etc}/run
 service = ${:etc}/service
 promise = ${:etc}/promise
 log = ${:var}/log
-
-[ltelogs]
-recipe = slapos.recipe.template:jinja2
-url = {{ ltelogs_template }}
-output = ${directory:home}/ltelogs.sh
-extensions = jinja2.ext.do
-context =
-  section directory directory
-
-{% if slapparameter_dict.get("mme_config_link", None) %}
-[mme-config-dl]
-recipe = slapos.recipe.build:download
-url = {{ slapparameter_dict.get("mme_config_link") }}
-version = {{ slapparameter_dict.get("mme_config_version") }}
-offline = false
-{% endif %}
-
-### IMS
-[ims-service]
-recipe = slapos.cookbook:wrapper
-init = ${ltelogs:output} ${directory:log}/ims.log; sleep 1
-command-line = {{ mme }}/lteims ${directory:etc}/ims.cfg
-wrapper-path = ${directory:service}/ims
-mode = 0775
-pidfile = ${directory:run}/ims.pid
-hash-files =
-  ${ims-config:output}
-  {{ ue_db_path }}
-environment = AMARISOFT_PATH=/opt/amarisoft/.amarisoft
-
-[mme-sh-wrapper]
-recipe = slapos.recipe.template
-output = ${directory:bin}/${:_buildout_section_name_}
-mme-log = ${directory:log}/mme-output.log
-inline =
-  #!/bin/sh
-{% if not slapparameter_dict.get("testing", False) %}
-  rm -f ${directory:var}/lte_ue.db;
-  (echo && echo && date "+[%Y/%m/%d %T.%N %Z] Starting MME software..." && echo) >> ${:mme-log};
-  tail -c 1M ${:mme-log} > ${:mme-log}.tmp;
-  mv ${:mme-log}.tmp ${:mme-log};
-  {{ mme }}/ltemme ${directory:etc}/mme.cfg >> ${:mme-log} 2>> ${:mme-log};
-{% endif %}
-
-### MME
-[mme-service]
-recipe = slapos.cookbook:wrapper
-# When the machine shutdowns abruptly, lte_ue is not cleaned up which causes
-# amarisoft ltemme to fail. TODO: find a cleaner way to handle this
-init = ${ltelogs:output} ${directory:log}/mme.log
-command-line = ${mme-sh-wrapper:output}
-wrapper-path = ${directory:service}/mme
-mode = 0775
-pidfile = ${directory:run}/mme.pid
-hash-files =
-  ${mme-config:output}
-  {{ ue_db_path }}
-  ${mme-sh-wrapper:output}
-environment =
-  LD_LIBRARY_PATH={{ openssl_location }}/lib:{{ nghttp2_location }}/lib
-  AMARISOFT_PATH=/opt/amarisoft/.amarisoft
-
-### EMPTY mme-ifup script
-[mme-ifup-empty]
-recipe = slapos.cookbook:wrapper
-wrapper-path = ${directory:bin}/mme-ifup-empty
-command-line = echo Using interface
-mode = 775
-
-{% if slapparameter_dict.get("iperf3", None) %}
-### iperf3
-[iperf-service]
-recipe = slapos.cookbook:wrapper
-port = 5001
-ip = ${slap-configuration:tun-ipv4-addr}
-command-line = {{ iperf3_location }}/bin/iperf3 --server --interval 1 --port ${:port} --bind ${:ip}
-wrapper-path = ${directory:service}/iperf3
-mode = 0775
-pidfile = ${directory:run}/iperf3.pid
-
-[iperf-listen-promise]
-<= monitor-promise-base
-promise = check_socket_listening
-name = iperf3-port-listening.py
-config-host = ${iperf-service:ip}
-config-port = ${iperf-service:port}
-{% endif %}
-
-[config-base]
-recipe = slapos.recipe.template:jinja2
-extensions = jinja2.ext.do
-context =
-  section directory directory
-  section slap_configuration slap-configuration
-  key slapparameter_dict slap-configuration:configuration
-  key gtp_addr_v6 slap-configuration:ipv6-random
-  raw gtp_addr_v4 {{ lan_ipv4 }}
-  import  netaddr netaddr
-  key ifup_empty mme-ifup-empty:wrapper-path
-
-[ims-config]
-<= config-base
-url = {{ ims_template }}
-output = ${directory:etc}/ims.cfg
-
-[mme-config]
-<= config-base
-{% if slapparameter_dict.get("mme_config_link", None) %}
-url = ${mme-config-dl:target}
-{% else %}
-url = {{ mme_template }}
-{% endif %}
-output = ${directory:etc}/mme.cfg
-
-{% if slapparameter_dict.get("local_domain", '') %}
-[dnsmasq-service]
-recipe = slapos.cookbook:wrapper
-port = 5353
-ip = ${slap-configuration:tun-ipv4-addr}
-command-line = {{ dnsmasq_location }}/sbin/dnsmasq --conf-file={{ dnsmasq_config_path }} -x ${directory:run}/dnsmasq.pid --local-service --keep-in-foreground
-wrapper-path = ${directory:service}/dnsmasq
-mode = 0775
-hash-files =
-  {{ dnsmasq_config_path }}
-
-#[dnsmasq-listen-promise]
-#<= monitor-promise-base
-#promise = check_socket_listening
-#name = dnsmasq-port-listening.py
-#config-host = ${dnsmasq-service:ip}
-#config-port = ${dnsmasq-service:port}
-{% endif %}
-
-[monitor-instance-parameter]
-{% if slapparameter_dict.get("name", None) %}
-monitor-title = {{ slapparameter_dict['name'] | string }}
-{% endif %}
-{% if slapparameter_dict.get("monitor-password", None) %}
-password = {{ slapparameter_dict['monitor-password'] | string }}
-{% endif %}
-
-[publish-connection-information]
-<= monitor-publish
-recipe = slapos.cookbook:publish.serialised
-core-network-ipv6 = ${slap-configuration:ipv6-random}
-core-network-ipv4 = {{ lan_ipv4 }}
-amarisoft-version = {{ lte_version }}
-license-expiration = {{ lte_expiration }}
-monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
-
-[macro.promise]
-<= monitor-promise-base
-name = ${:_buildout_section_name_}
-
-[check-interface-up.py]
-<= macro.promise
-promise = check_interface_up
-config-testing = {{ slapparameter_dict.get("testing", False) }}
-{% if not slapparameter_dict.get("testing", False) %}
-config-ifname = ${slap-configuration:tun-name}
-{% else %}
-config-ifname =
-{% endif %}

software/ors-amarisoft/software.cfg

+[buildout]
+extends =
+  ../../stack/slapos.cfg
+  buildout.hash.cfg
+
+parts =
+  slapos-cookbook
+  template
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/${:filename}
+output = ${buildout:directory}/template.cfg
+
+[download-base]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/${:_update_hash_filename_}
+
+[template-core-network]
+<= download-base