Update Release Candidate

component/apache-php/buildout.cfg

@@ -74,7 +74,6 @@ configure-options =
   --with-mysql=${mariadb:location}
   --with-zlib-dir=${zlib:location}
   --with-bz2=${bzip2:location}
-  --with-mcrypt=${libmcrypt:location}
   --with-gd
   --with-jpeg-dir=${libjpeg:location}
   --with-png-dir=${libpng:location}
@@ -113,16 +112,10 @@ environment =
   PKG_CONFIG_PATH=${libxml2:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig:${libzip:location}/lib/pkgconfig
   PATH=${pkgconfig:location}/bin:${bzip2:location}/bin:${libxml2:location}/bin:%(PATH)s
   CPPFLAGS=-I${libzip:location}/include
-  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libmcrypt:location}/lib -Wl,-rpath -Wl,${libmcrypt:location}/libblkid -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib 
+  LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -Wl,-rpath -Wl,${curl:location}/lib -L${libtool:location}/lib -Wl,-rpath -Wl,${libtool:location}/lib -L${mariadb:location}/lib -Wl,-rpath -Wl,${mariadb:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${libzip:location}/lib -Wl,-rpath -Wl,${libzip:location}/lib -L${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${argon2:location}/lib/x86_64-linux-gnu -Wl,-rpath -Wl,${zstd:location}/lib -L${libnsl:location}/lib -Wl,-rpath -Wl,${libnsl:location}/lib
   TMPDIR=${buildout:parts-directory}/${:_buildout_section_name_}
   HOME=${apache:location}
 
-
-[libmcrypt]
-recipe = slapos.recipe.cmmi
-url = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.bz2
-md5sum = c4f491dd411a09e9de3b8702ea6f73eb
-
 [xml-rpc]
 recipe = slapos.recipe.cmmi
 url = http://downloads.sourceforge.net/project/phpxmlrpc/phpxmlrpc/2.2.2/xmlrpc-2.2.2.tar.gz

component/dropbear/buildout.cfg

@@ -9,6 +9,7 @@ extends =
   ../zlib/buildout.cfg
   ../coreutils/buildout.cfg
   ../patch/buildout.cfg
+  ../gnu-config/buildout.cfg
 
 parts =
   dropbear-output
@@ -20,6 +21,8 @@ md5sum = 0284ea239083f04c8b874e08e1aca243
 #      in order have all patches working.
 url = https://matt.ucc.asn.au/dropbear/releases/dropbear-0.53.1.tar.bz2
 
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
+
 configure-options =
   --with-zlib=${zlib:location}
   CFLAGS="-DENABLE_SINGLEUSER -D__DIRTY_NO_SHELL_CHECKING"

component/groff/buildout.cfg

@@ -4,14 +4,15 @@ parts =
 
 extends =
   ../perl/buildout.cfg
+  ../texinfo/buildout.cfg
 
 [groff]
 recipe = slapos.recipe.cmmi
 shared = true
-url = http://ftp.gnu.org/gnu/groff/groff-1.21.tar.gz
-md5sum = 8b8cd29385b97616a0f0d96d0951c5bf
+url = http://ftp.gnu.org/gnu/groff/groff-1.22.4.tar.gz
+md5sum = 08fb04335e2f5e73f23ea4c3adbf0c5f
 configure-options =
   --disable-static
   --without-x
 environment =
-  PATH=${perl:location}/bin:%(PATH)s
+  PATH=${perl:location}/bin:${texinfo7:location}/bin:%(PATH)s

component/jasper/buildout.cfg

 [buildout]
 extends =
+  ../gnu-config/buildout.cfg
   ../libjpeg/buildout.cfg
   ../patch/buildout.cfg
+
 parts =
   jasper
 
@@ -13,6 +15,7 @@ md5sum = a342b2b4495b3e1394e161eb5d85d754
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/jasper_1.900.1-debian1-2.4+deb8u3.patch#1cf61d1ebc87d355523d3484169671f7
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess acaux
 configure-options =
   --disable-static
   --enable-shared

component/openldap/buildout.cfg

@@ -2,6 +2,7 @@
 parts =
   openldap
 extends =
+  ../gnu-config/buildout.cfg
   ../groff/buildout.cfg
   ../openssl/buildout.cfg
   ../cyrus-sasl/buildout.cfg
@@ -11,6 +12,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.tgz
 md5sum = e508f97bfd778fec7799f286e5c07176
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess build
 configure-options =
   --disable-static
   --disable-slapd

component/readline/buildout.cfg

 [buildout]
 extends =
+  ../gnu-config/buildout.cfg
   ../ncurses/buildout.cfg
   ../patch/buildout.cfg
 
@@ -28,6 +29,7 @@ patches =
   http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-013#3e2e5f543ed268a68fd1fa839faade1a
   http://ftp.gnu.org/gnu/readline/readline-5.2-patches/readline52-014#a1be30e1c6f1099bb5fcef00a2631fb8
 md5sum = e39331f32ad14009b9ff49cc10c5e751
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess support
 configure-options =
   --enable-multibyte
   --disable-static

component/sed/buildout.cfg

@@ -5,7 +5,7 @@ parts =
 [sed]
 recipe = slapos.recipe.cmmi
 shared = true
-url = ftp://ftp.gnu.org/gnu/sed/sed-4.2.1.tar.gz
-md5sum = f0fd4d7da574d4707e442285fd2d3b86
+url = ftp://ftp.gnu.org/gnu/sed/sed-4.9.tar.gz
+md5sum = a50000a406f767bfa35db319704ef7b5
 environment =
   LDFLAGS =-Wl,--as-needed

component/texinfo/buildout.cfg

@@ -17,3 +17,14 @@ configure-options =
 environment =
   CFLAGS=-I${ncurses:location}/include
   LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib
+
+[texinfo7]
+recipe = slapos.recipe.cmmi
+shared = true
+url = http://ftp.gnu.org/gnu/texinfo/texinfo-7.0.tar.gz
+md5sum = 49fccd9fb0ae12a2b0fa2a23ee2ade4d
+configure-options =
+  --disable-static
+environment =
+  CFLAGS=-I${ncurses:location}/include
+  LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib

component/xorg/buildout.cfg

@@ -6,6 +6,7 @@ extends =
   ../bzip2/buildout.cfg
   ../dash/buildout.cfg
   ../freetype/buildout.cfg
+  ../gnu-config/buildout.cfg
   ../gnutls/buildout.cfg
   ../icu/buildout.cfg
   ../intltool/buildout.cfg
@@ -46,6 +47,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/xproto-7.0.31.tar.gz
 md5sum = 04b925bf9e472c80f9212615cd684f1e
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-specs
   --without-xmlto
@@ -59,6 +61,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/individual/proto/xextproto-7.3.0.tar.gz
 md5sum = 37b700baa8c8ea7964702d948dd13821
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 configure-options =
   --disable-specs
   --without-xmlto
@@ -263,6 +266,7 @@ recipe = slapos.recipe.cmmi
 shared = true
 url = https://www.x.org/releases/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
 md5sum = a914ccc1de66ddeb4b611c6b0686e274
+pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess .
 environment =
   PKG_CONFIG_PATH=${xorg-util-macros:location}/share/pkgconfig
   PATH=${pkgconfig:location}/bin:%(PATH)s

software/metabase/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = e0f4847f08e0062ea5a6ba492318afc7
+md5sum = 0e109afd93153ecf062ad5e76bc86ea4

software/metabase/instance-metabase-input-schema.json

+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "mb_password_complexity": {
+      "title": "Password complexity",
+      "description": "Check Metabase documentation for more details.",
+      "type": "string",
+      "default": "normal",	
+      "enum": [
+        "weak",
+        "normal",
+        "strong",
+      ]
+    },
+    "mb_password_length": {
+      "title": "Password length",
+      "description": "Password length",
+      "type": "integer",
+      "default": 6,
+    }
+  }
+}

software/metabase/instance.cfg.in

@@ -25,6 +25,15 @@ fonts =
 includes =
     ${fontconfig:location}/etc/fonts/conf.d
 
+[slap-parameter]
+recipe = slapos.recipe.build
+slapparameter-dict = $${slap-configuration:configuration}
+home = $${buildout:directory}
+init =
+  default_parameters = options.get('slapparameter-dict')
+  options['mb_password_complexity'] = default_parameters.get('mb_password_complexity', 'normal')
+  options['mb_password_length'] = default_parameters.get('mb_password_length', 6)
+
 [metabase-instance]
 recipe = slapos.cookbook:wrapper
 wrapper-path = $${directory:service}/$${:_buildout_section_name_}
@@ -46,6 +55,8 @@ environment =
   MB_DB_USER=$${postgresql:superuser}
   MB_DB_PASS=$${postgresql:password}
   MB_DB_HOST=$${postgresql:ipv4}
+  MB_PASSWORD_COMPLEXITY=$${slap-parameter:mb_password_complexity}
+  MB_PASSWORD_LENGTH=$${slap-parameter:mb_password_length}
   FONTCONFIG_FILE=$${fontconfig-conf:output}
   JAVA_ARGS=-Dorg.quartz.scheduler.instanceId=$${slap-connection:computer-id}.$${slap-connection:partition-id} -Djava.io.tmpdir="$${directory:tmp}"
 hash-existing-files =

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 61e9685d6aa973ae0c45c45ca357458a
+md5sum = ed72fb7c36b0bc046df177e4d6f3bf12
 
 [amarisoft-stats.jinja2.py]
 _update_hash_filename_ = amarisoft-stats.jinja2.py
@@ -28,7 +28,7 @@ md5sum = 833667743c693b8d5f78a2527b275a9e
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = afd8867c4dec5c5c68a4005dec502ebb
+md5sum = c4584b338d26f57d5c9384956be36677
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -40,7 +40,7 @@ md5sum = 99c05a34678adb5a70aa64ecf2ee4e35
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = cd0527037b7cb0ae53f2f822fcf551ac
+md5sum = 954dd1409b0256874f9524a40b880e47
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
@@ -60,7 +60,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 1c9909f691b5bb00d3fc30d41613e26a
+md5sum = 68ac87c7e3d2d3fb0e0601f83f949915
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -68,7 +68,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 16698f0b4ea3e6cf40e9f070af2439e5
+md5sum = 374a1943e400a908e1aee8e123683f6f
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

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

-#define TDD                 1
 #define N_RB_DL             {{ slapparameter_dict.get('n_rb_dl', slap_configuration['configuration.default_lte_n_rb_dl']) }}
-#define N_ANTENNA_DL        2
-#define N_ANTENNA_UL        2
+#define N_ANTENNA_DL        {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}
+#define N_ANTENNA_UL        {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_ul']) }}
 
 {
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",

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

 #define FR2                  0  // Values: 0 (FR1), 1 (FR2)
 #define NR_TDD_CONFIG        2  // Values: FR1: 1, 2, 3, 4 (compatible with LTE TDD config 2) FR2: 10
-#define N_ANTENNA_DL         2  // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4)
+#define N_ANTENNA_DL         {{ slapparameter_dict.get('n_antenna_dl', slap_configuration['configuration.default_n_antenna_dl']) }}  // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4)
 {% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
-#define N_ANTENNA_UL         1  // Values: 1, 2, 4
+#define N_ANTENNA_UL         {{ slapparameter_dict.get('n_antenna_ul', 1) }}  // Values: 1, 2, 4
 {% else %}
-#define N_ANTENNA_UL         2  // Values: 1, 2, 4
+#define N_ANTENNA_UL         {{ slapparameter_dict.get('n_antenna_ul', slap_configuration['configuration.default_n_antenna_dl']) }} // Values: 1, 2, 4
 {% endif %}
 #define NR_BANDWIDTH         {{ slapparameter_dict.get('nr_bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }} // NR cell bandwidth
 #define NR_LONG_PUCCH_FORMAT 2  // Values: 2, 3, 4

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

@@ -161,6 +161,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_dl }}
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_ul }}
     }
   }
 }

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

@@ -45,6 +45,8 @@ configuration.default_lte_n_rb_dl = {{ default_lte_n_rb_dl }}
 configuration.default_lte_tx_gain = {{ default_lte_tx_gain }}
 configuration.default_lte_rx_gain = {{ default_lte_rx_gain }}
 configuration.default_lte_inactivity_timer = {{ default_lte_inactivity_timer }}
+configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
+configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

software/ors-amarisoft/instance-gnb-input-schema.json.jinja2

@@ -213,6 +213,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_dl }}
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": {{ default_n_antenna_ul }}
     }
   }
 }

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

@@ -45,6 +45,8 @@ configuration.default_nr_tx_gain = {{ default_nr_tx_gain }}
 configuration.default_nr_inactivity_timer = {{ default_nr_inactivity_timer }}
 configuration.default_nr_rx_gain = {{ default_nr_rx_gain }}
 configuration.default_nr_ssb_pos_bitmap = {{ default_nr_ssb_pos_bitmap }}
+configuration.default_n_antenna_dl = {{ default_n_antenna_dl }}
+configuration.default_n_antenna_ul = {{ default_n_antenna_ul }}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory

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

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -159,6 +159,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

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

@@ -141,6 +141,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json

@@ -211,6 +211,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -193,6 +193,18 @@
       "description": "Duration during which average temperature should not exceed specified threshold",
       "type": "number",
       "default": 600
+    },
+    "n_antenna_dl": {
+      "title": "Number of DL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of DL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
+    },
+    "n_antenna_ul": {
+      "title": "Number of UL antennas",
+      "description": "Enumeration: 1, 2, 4 or 8. Number of UL antennas. It must be the same for all NB-IoT and LTE cells sharing the same RF port.",
+      "type": "number",
+      "default": 2
     }
   }
 }

software/ors-amarisoft/instance.cfg

@@ -124,6 +124,8 @@ extra-context =
     raw default_lte_tx_gain ${default-params:default-lte-tx-gain}
     raw default_lte_rx_gain ${default-params:default-lte-rx-gain}
     raw default_lte_inactivity_timer ${default-params:default-lte-inactivity-timer}
+    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw min_frequency ${default-params:min-frequency}
     raw max_frequency ${default-params:max-frequency}
 
@@ -154,6 +156,8 @@ extra-context =
     raw default_nr_rx_gain ${default-params:default-nr-rx-gain}
     raw default_nr_ssb_pos_bitmap ${default-params:default-nr-ssb-pos-bitmap}
     raw default_nr_inactivity_timer ${default-params:default-nr-inactivity-timer}
+    raw default_n_antenna_dl ${default-params:default-n-antenna-dl}
+    raw default_n_antenna_ul ${default-params:default-n-antenna-ul}
     raw min_frequency ${default-params:min-frequency}
     raw max_frequency ${default-params:max-frequency}
     raw python_path ${python3:location}

stack/slapos.cfg

@@ -290,7 +290,7 @@ sgmllib3k = 1.0.0
 simplegeneric = 0.8.1
 singledispatch = 3.4.0.3
 six = 1.16.0
-slapos.cookbook = 1.0.297
+slapos.cookbook = 1.0.305
 slapos.core = 1.8.6
 slapos.extension.shared = 1.0
 slapos.libnetworkcache = 0.25