Skip to content

slapos
slapos
Commit b40469cd authored by Xavier Thompson's avatar Xavier Thompson
Browse files
Options

Update Release Candidate

parents c1423136 8aa48865
Hide whitespace changes
Inline Side-by-side
Showing with 590 additions and 314 deletions
component/apache-php/buildout.cfg
View file @ b40469cd
......@@ -29,7 +29,7 @@ extends =
recipe = slapos.recipe.cmmi
url = https://github.com/phpredis/phpredis/archive/5.0.0.tar.gz
md5sum = 4f11e0567a10c29394aae52a4fa8bb40
configure-command =
configure-command =
phpize && ./configure
environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${m4:location}/bin:${apache-php:location}/bin:%(PATH)s
......@@ -38,7 +38,7 @@ environment =
recipe = slapos.recipe.cmmi
url = https://github.com/Imagick/imagick/archive/3.4.4.tar.gz
md5sum = ef6cbadd834eb306bd91874a8f5dea03
configure-command =
configure-command =
phpize && ./configure
configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
......@@ -51,7 +51,7 @@ environment =
recipe = slapos.recipe.cmmi
url = https://github.com/krakjoe/apcu/archive/v5.1.17.tar.gz
md5sum = f64b6cd5108aea63df2d5cc301c58b2b
configure-command =
configure-command =
phpize && ./configure
configure-options =
--with-php-config=${apache-php:location}/bin/php-config
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
[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
View file @ b40469cd
......@@ -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
View file @ b40469cd
[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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
[instance-profile]
filename = instance.cfg.in
md5sum = e0f4847f08e0062ea5a6ba492318afc7
md5sum = 0e109afd93153ecf062ad5e76bc86ea4
software/metabase/instance-metabase-input-schema.json 0 → 100644
View file @ b40469cd
{
"$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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
#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",
......@@ -77,7 +76,7 @@
cell_default: {
n_antenna_dl: N_ANTENNA_DL,
n_antenna_ul: N_ANTENNA_UL,
uldl_config: 2,
sp_config: 7,
......@@ -93,7 +92,7 @@
q_rx_lev_min: -70,
p_max: 10,
si_window_length: 40,
sib_sched_list: [
sib_sched_list: [
{
filename: "{{ sib23 }}",
si_periodicity: 16,
......@@ -158,7 +157,7 @@
dl_256qam: true,
ul_64qam: true,
sr_period: 20,
sr_period: 20,
cqi_period: 40,
......@@ -225,24 +224,24 @@
#define T_REORDERING 65
drb_config: [
{
qci: 1,
qci: 1,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 7,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
restrict_to_ng_enb: true,
},
rlc_config: {
......@@ -251,28 +250,28 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 2,
qci: 2,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -286,26 +285,26 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 9,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 3,
qci: 3,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -319,26 +318,26 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 8,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 4,
qci: 4,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -347,43 +346,43 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 10,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 65,
qci: 65,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 7,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
restrict_to_ng_enb: true,
},
rlc_config: {
......@@ -392,28 +391,28 @@
},
dl_um: {
sn_FieldLength: 5,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 5,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 66,
qci: 66,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -427,28 +426,28 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 67,
qci: 67,
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -462,27 +461,27 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 5,
qci: 5,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -491,33 +490,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 6,
qci: 6,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -526,33 +525,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 12,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 7,
qci: 7,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_Size: 12,
},
nr_pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -566,26 +565,26 @@
},
dl_um: {
sn_FieldLength: 10,
t_Reordering: T_REORDERING,
t_Reordering: T_REORDERING,
},
},
logical_channel_config: {
priority: 13,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 8,
qci: 8,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -594,33 +593,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 14,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 9,
qci: 9,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -632,33 +631,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 15,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 3,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 69,
qci: 69,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -667,33 +666,33 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 4,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
},
},
{
qci: 70,
qci: 70,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
statusReportRequired: true,
},
nr_pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -702,20 +701,20 @@
},
rlc_config: {
ul_am: {
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 32,
},
dl_am: {
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
t_Reordering: T_REORDERING,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 11,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
logicalChannelSR_Mask: false,
logicalChannelSR_Prohibit: false,
......
software/ors-amarisoft/config/gnb.jinja2.cfg
View file @ b40469cd
#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
......@@ -29,14 +29,14 @@
{% else %}
rf_driver: {
name: "sdr",
args: "dev0=/dev/sdr0",
// sync: "gps",
rx_antenna: "tx_rx",
},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }},
rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }},
{% endif %}
com_addr: "127.0.1.2:9001",
......@@ -57,7 +57,7 @@
},
{% endif %}
],
{% if slapparameter_dict.get('amf_list', '') %}
{% if slapparameter_dict.get('use_ipv4', False) %}
gtp_addr: "{{ gtp_addr_v4 }}",
......@@ -75,18 +75,18 @@
rf_ports: [
{
#if FR2
rf_dl_freq: 3500,
rf_ul_freq: 3500,
// rx_to_tx_latency: 1,
#if FR2
rf_dl_freq: 3500,
rf_ul_freq: 3500,
// rx_to_tx_latency: 1,
#endif
},
],
cell_list: [],
nr_cell_list: [
......@@ -95,21 +95,21 @@
cell_id: 0x01,
band: {{ slapparameter_dict.get('nr_band', slap_configuration['configuration.default_nr_band']) }},
dl_nr_arfcn: {{ slapparameter_dict.get('dl_nr_arfcn', slap_configuration['configuration.default_dl_nr_arfcn']) }},
subcarrier_spacing: 30,
subcarrier_spacing: 30,
ssb_pos_bitmap: "{{ slapparameter_dict.get('ssb_pos_bitmap', slap_configuration['configuration.default_nr_ssb_pos_bitmap']) }}",
},
],
],
nr_cell_default: {
bandwidth: NR_BANDWIDTH,
bandwidth: NR_BANDWIDTH,
n_antenna_dl: N_ANTENNA_DL,
n_antenna_ul: N_ANTENNA_UL,
tdd_ul_dl_config: {
#if NR_TDD_CONFIG == 1
pattern1: {
period: 5,
period: 5,
dl_slots: 7,
dl_symbols: 2,
ul_slots: 2,
......@@ -117,7 +117,7 @@
},
#elif NR_TDD_CONFIG == 2
pattern1: {
period: 5,
period: 5,
dl_slots: 7,
dl_symbols: 6,
ul_slots: 2,
......@@ -125,7 +125,7 @@
},
#elif NR_TDD_CONFIG == 3
pattern1: {
period: 5,
period: 5,
dl_slots: 6,
dl_symbols: 2,
ul_slots: 3,
......@@ -133,23 +133,23 @@
},
#elif NR_TDD_CONFIG == 4
pattern1: {
period: 3,
period: 3,
dl_slots: 3,
dl_symbols: 6,
ul_symbols: 4,
ul_slots: 2,
},
pattern2: {
period: 2,
period: 2,
dl_slots: 4,
dl_symbols: 0,
ul_symbols: 0,
ul_slots: 0,
},
#elif NR_TDD_CONFIG == 10
pattern1: {
period: 0.625,
period: 0.625,
dl_slots: 3,
dl_symbols: 10,
ul_slots: 1,
......@@ -157,7 +157,7 @@
},
#endif
},
ssb_period: 20,
ssb_period: 20,
n_id_cell: {{ slapparameter_dict.get('pci', 500) }},
plmn_list: [
......@@ -225,32 +225,32 @@
{%- endif %}
],
si_window_length: 40,
cell_barred: false,
intra_freq_reselection: true,
q_rx_lev_min: -70,
q_qual_min: -20,
p_max: 10,
p_max: 10,
root_sequence_index: 1,
root_sequence_index: 1,
sr_period: 40,
dmrs_type_a_pos: 2,
//pdsch_harq_ack_max: 2,
prach: {
#if NR_TDD_CONFIG == 4
prach_config_index: 156,
prach_config_index: 156,
#else
prach_config_index: 160,
prach_config_index: 160,
#endif
msg1_subcarrier_spacing: 30,
msg1_subcarrier_spacing: 30,
msg1_fdm: 1,
{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
msg1_frequency_start: 0,
......@@ -258,12 +258,12 @@
msg1_frequency_start: -1,
{% endif %}
zero_correlation_zone_config: 15,
preamble_received_target_power: -110,
preamble_received_target_power: -110,
preamble_trans_max: 7,
power_ramping_step: 4,
ra_response_window: 20,
power_ramping_step: 4,
ra_response_window: 20,
restricted_set_config: "unrestricted_set",
ra_contention_resolution_timer: 64,
ra_contention_resolution_timer: 64,
ssb_per_prach_occasion: 1,
cb_preambles_per_ssb: 8,
},
......@@ -276,12 +276,12 @@
search_space0_index: 0,
dedicated_coreset: {
rb_start: -1,
l_crb: -1,
rb_start: -1,
l_crb: -1,
{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
duration: 1,
{% else %}
duration: 0,
duration: 0,
{% endif %}
precoder_granularity: "sameAsREG_bundle",
},
......@@ -343,18 +343,18 @@
density: 1,
first_symb: 4,
rb_start: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
period: 80,
offset: 1,
offset: 1,
qcl_info_periodic_csi_rs: 0,
},
#if FR2 == 0
#define USE_TRS
#endif
#ifdef USE_TRS
{
csi_rs_id: 1,
n_ports: 1,
......@@ -364,9 +364,9 @@
density: 3,
first_symb: 4,
rb_start: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
period: 40,
offset: 11,
qcl_info_periodic_csi_rs: 0,
......@@ -380,9 +380,9 @@
density: 3,
first_symb: 8,
rb_start: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
period: 40,
offset: 11,
qcl_info_periodic_csi_rs: 0,
......@@ -396,9 +396,9 @@
density: 3,
first_symb: 4,
rb_start: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
period: 40,
offset: 12,
qcl_info_periodic_csi_rs: 0,
......@@ -412,9 +412,9 @@
density: 3,
first_symb: 8,
rb_start: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
l_crb: -1,
power_control_offset: 0,
power_control_offset_ss: 0,
period: 40,
offset: 12,
qcl_info_periodic_csi_rs: 0,
......@@ -436,7 +436,7 @@
},
#endif
],
csi_im_resource: [
{
csi_im_id: 0,
......@@ -444,9 +444,9 @@
subcarrier_location: 8,
symbol_location: 8,
rb_start: 0,
l_crb: -1,
l_crb: -1,
period: 80,
offset: 1,
offset: 1,
},
],
csi_im_resource_set: [
......@@ -455,7 +455,7 @@
csi_im_resources: [ 0 ],
}
],
zp_csi_rs_resource: [
{
csi_rs_id: 0,
......@@ -466,7 +466,7 @@
first_symb: 8,
density: 1,
rb_start: 0,
l_crb: -1,
l_crb: -1,
period: 80,
offset: 1,
},
......@@ -503,7 +503,7 @@
report_config_type: "periodic",
period: 80,
report_quantity: "CRI_RI_PMI_CQI",
#if N_ANTENNA_DL > 1
#if N_ANTENNA_DL > 1
codebook_config: {
codebook_type: "type1",
sub_type: "typeI_SinglePanel",
......@@ -524,10 +524,10 @@
},
],
},
pucch: {
pucch_group_hopping: "neither",
hopping_id: -1,
hopping_id: -1,
p0_nominal: -90,
#if 0
pucch0: {
......@@ -577,8 +577,8 @@
dmrs_type: 1,
dmrs_max_len: 1,
tf_precoding: false,
mcs_table: "qam256",
mcs_table_tp: "qam256",
mcs_table: "qam256",
mcs_table_tp: "qam256",
ldpc_max_its: 5,
{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
k2: 4,
......@@ -586,23 +586,23 @@
{% endif %}
p0_nominal_with_grant: -76,
msg3_mcs: 4,
msg3_delta_power: 0,
msg3_delta_power: 0,
beta_offset_ack_index: 9,
},
mac_config: {
msg3_max_harq_tx: 5,
ul_max_harq_tx: 5,
dl_max_harq_tx: 5,
ul_max_consecutive_retx: 30,
dl_max_consecutive_retx: 30,
ul_max_harq_tx: 5,
dl_max_harq_tx: 5,
ul_max_consecutive_retx: 30,
dl_max_consecutive_retx: 30,
periodic_bsr_timer: 20,
retx_bsr_timer: 320,
periodic_phr_timer: 500,
prohibit_phr_timer: 200,
phr_tx_power_factor_change: "dB3",
sr_prohibit_timer: 0,
sr_prohibit_timer: 0,
sr_trans_max: 64,
},
......@@ -617,23 +617,23 @@
drb_config: [
{
qci: 1,
qci: 1,
use_for_en_dc: false,
#if EPS_FALLBACK > 0
trigger_eps_fallback: true,
#endif
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
},
rlc_config: {
ul_um: {
......@@ -646,20 +646,20 @@
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
},
},
{
qci: 2,
qci: 2,
use_for_en_dc: false,
#if EPS_FALLBACK > 0
trigger_eps_fallback: true,
#endif
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -677,15 +677,15 @@
},
logical_channel_config: {
priority: 8,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 1,
},
},
{
qci: 3,
qci: 3,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -703,15 +703,15 @@
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 2,
},
},
{
qci: 4,
qci: 4,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -720,40 +720,40 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 9,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 3,
},
},
{
qci: 65,
qci: 65,
use_for_en_dc: false,
#if EPS_FALLBACK > 0
trigger_eps_fallback: true,
#endif
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 12,
pdcp_SN_SizeDL: 12,
statusReportRequired: false,
outOfOrderDelivery: false,
t_Reordering: 0,
},
rlc_config: {
ul_um: {
......@@ -766,20 +766,20 @@
},
logical_channel_config: {
priority: 5,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 4,
},
},
{
qci: 66,
qci: 66,
use_for_en_dc: false,
#if EPS_FALLBACK > 0
trigger_eps_fallback: true,
#endif
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 150,
discardTimer: 150,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -797,20 +797,20 @@
},
logical_channel_config: {
priority: 7,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 4,
},
},
{
qci: 67,
qci: 67,
use_for_en_dc: false,
#if EPS_FALLBACK > 0
trigger_eps_fallback: true,
#endif
ims_dedicated_bearer: true,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -828,17 +828,17 @@
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 5,
},
},
{
qci: 5,
qci: 5,
use_for_en_dc: false,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -847,28 +847,28 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 6,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 4,
},
},
{
qci: 6,
qci: 6,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -877,28 +877,28 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 10,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 5,
},
},
{
qci: 7,
qci: 7,
pdcp_config: {
discardTimer: 100,
discardTimer: 100,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: false,
......@@ -916,15 +916,15 @@
},
logical_channel_config: {
priority: 11,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
prioritisedBitRate: 0,
bucketSizeDuration: 100,
logicalChannelGroup: 6,
},
},
{
qci: 8,
qci: 8,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -933,28 +933,28 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 12,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 7,
},
},
{
qci: 9,
qci: 9,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -963,29 +963,29 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 13,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 7,
},
},
{
qci: 69,
qci: 69,
use_for_en_dc: false,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -994,28 +994,28 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 4,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 4,
},
},
{
qci: 70,
qci: 70,
pdcp_config: {
discardTimer: 0,
discardTimer: 0,
pdcp_SN_SizeUL: 18,
pdcp_SN_SizeDL: 18,
statusReportRequired: true,
......@@ -1024,21 +1024,21 @@
rlc_config: {
ul_am: {
sn_FieldLength: 18,
t_PollRetransmit: 80,
t_PollRetransmit: 80,
pollPDU: 64,
pollByte: 125,
pollByte: 125,
maxRetxThreshold: 4,
},
dl_am: {
sn_FieldLength: 18,
t_Reassembly: 80,
t_StatusProhibit: 10,
t_Reassembly: 80,
t_StatusProhibit: 10,
},
},
logical_channel_config: {
priority: 11,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
prioritisedBitRate: 8,
bucketSizeDuration: 100,
logicalChannelGroup: 5,
},
},
......
software/ors-amarisoft/instance-enb-input-schema.json.jinja2
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
View file @ b40469cd
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7