software/ors-amarisoft: Forward eNB logs to Wendelin Telecom by default

See merge request nexedi/slapos!1650

software/ors-amarisoft/buildout.hash.cfg

@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 140cce72eb04768abbe87ea4982f36bd
+md5sum = 7e7a0443f42c033285eb6871f6083ffb
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg

software/ors-amarisoft/instance-enb-input-schema.json

@@ -197,19 +197,27 @@
       "type": "number",
       "default": 0
     },
+    "wendelin_telecom_software_release_url": {
+      "title": "Wendelin Telecom Software Release URL",
+      "description": "URL of the Wendelin Telecom Software Release to use to request a shared instance",
+      "type": "string",
+      "default": "wendelin-telecom-enb-shared-instance"
+    },
     "xlog_fluentbit_forward_host": {
       "title": "Fluentbit Xlog forwarding address",
       "description": "Address of remote Fluentd or Fluentbit server to which Fluentbit should forward Xlog data",
-      "type": "string"
+      "type": "string",
+      "default": "fluentd.rapid.space"
     },
     "xlog_fluentbit_forward_port": {
       "title": "Fluentbit Xlog forwarding port",
-      "description": "(Optional) Port of remote Fluentd or Fluentbit server to which Fluentbit should forward Xlog data",
-      "type": "string"
+      "description": "Port of remote Fluentd or Fluentbit server to which Fluentbit should forward Xlog data",
+      "type": "integer",
+      "default": 24224
     },
     "xlog_fluentbit_forward_shared_key": {
       "title": "Fluentbit Xlog forwarding shared key",
-      "description": "Secret Key shared with remote Fluentd or Fluentbit server for authentication when forwarding Xlog data",
+      "description": "Secret key shared with remote Fluentd or Fluentbit server for authentication when forwarding Xlog data",
       "type": "string"
     }
   }

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

@@ -8,6 +8,9 @@
   'use_ipv4':     False,
   'gnb_id_bits':  28,
   'nssai':        {'1': {'sst': 1}},
+  'wendelin_telecom_software_release_url': 'wendelin-telecom-enb-shared-instance',
+  'xlog_fluentbit_forward_host': 'fluentd.rapid.space',
+  'xlog_fluentbit_forward_port': 24224,
 } %}
 {%- set gtp_addr_lo = '127.0.1.1' %}
 {%- for k,v in enb_defaults|dictsort %}
@@ -21,9 +24,8 @@ parts =
   enb-config
   enb-service
   xamari-xlog-service
-{% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
   xlog-fluentbit-service
-{% endif %}
+  request-wendelin-telecom-shared
   check-baseband-latency.py
   monitor-base
   publish-connection-information
@@ -149,12 +151,11 @@ wrapper-path = ${directory:service}/${:_buildout_section_name_}
 command-line = ${xamari-xlog-script:output}
 hash-files = ${:command-line}
 
-{% if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
 [xlog-fluentbit-tag]
 recipe = slapos.recipe.build
 computer = ${slap-connection:computer-id}
-enb-id = {{ slapparameter_dict.get("enb_id", "") }}
-gnb-id = {{ slapparameter_dict.get("gnb_id", "") }}
+enb-id = {{ slapparameter_dict.get("enb_id") }}
+gnb-id = {{ slapparameter_dict.get("gnb_id") }}
 init =
   import socket
 
@@ -174,8 +175,8 @@ init =
 recipe = slapos.recipe.template
 output = ${directory:etc}/${:_buildout_section_name_}.cfg
 logfile = ${xamari-xlog-script:logfile}
-forward-host = {{ slapparameter_dict.get('xlog_fluentbit_forward_host', '') }}
-forward-port = {{ slapparameter_dict.get('xlog_fluentbit_forward_port', '') }}
+forward-host = {{ slapparameter_dict.xlog_fluentbit_forward_host }}
+forward-port = {{ slapparameter_dict.xlog_fluentbit_forward_port }}
 forward-shared-key = {{ slapparameter_dict.get('xlog_fluentbit_forward_shared_key', '') }}
 forward-self-hostname = {{ comp_id['comp-id'] }}
 inline =
@@ -191,9 +192,7 @@ inline =
       name            forward
       match           *
       Host            ${:forward-host}
-{%- if slapparameter_dict.get('xlog_fluentbit_forward_port') %}
       Port            ${:forward-port}
-{%- endif %}
 {%- if slapparameter_dict.get('xlog_fluentbit_forward_shared_key') %}
       Shared_Key      ${:forward-shared-key}
 {%- endif %}
@@ -208,7 +207,14 @@ fluentbit-config = ${xlog-fluentbit-config:output}
 command-line = ${:fluentbit} -c ${:fluentbit-config}
 wrapper-path = ${directory:service}/${:_buildout_section_name_}
 hash-files = ${:fluentbit-config}
-{% endif %}
+
+[request-wendelin-telecom-shared]
+<= slap-connection
+recipe = slapos.cookbook:requestoptional
+name = Wendelin Telecom Registration
+software-url = {{ slapparameter_dict.wendelin_telecom_software_release_url }}
+shared = true
+config-fluentbit-tag = ${xlog-fluentbit-tag:xlog-fluentbit-tag}
 
 [config-base]
 recipe = slapos.recipe.template:jinja2
@@ -263,9 +269,7 @@ ru-list   = {{ dumps(rulib.iru_dict.keys()   | sort) }}
 cell-list = {{ dumps(rulib.icell_dict.keys() | sort) }}
 peer-list = {{ dumps(ipeer_dict.keys()       | sort) }}
 peer-cell-list = {{ dumps(ipeercell_dict.keys() | sort) }}
-{%- if slapparameter_dict.get('xlog_fluentbit_forward_host') %}
 fluentbit-tag = ${xlog-fluentbit-tag:xlog-fluentbit-tag}
-{%- endif %}
 
 
 [monitor-instance-parameter]

software/ors-amarisoft/instance-ors-enb-input-schema.json

@@ -196,6 +196,9 @@
     "min_rxtx_delay": {
       "$ref": "instance-enb-input-schema.json#/properties/min_rxtx_delay"
     },
+    "wendelin_telecom_software_release_url": {
+      "$ref": "instance-enb-input-schema.json#/properties/wendelin_telecom_software_release_url"
+    },
     "xlog_fluentbit_forward_host": {
       "$ref": "instance-enb-input-schema.json#/properties/xlog_fluentbit_forward_host"
     },