- 13 Feb, 2024 20 commits
-
-
Kirill Smelkov authored
For LTE tdd_ul_dl_config is enum [ "[Configuration 2] 5ms 2UL 6DL (default)", "[Configuration 6] 5ms 5UL 3DL (maximum uplink)" ], but default was outside of that enum. The code in enb.jinja2.cfg actually uses the first option from the enum as the default. -> Fix default in schema. tdd_ul_dl_config in NR seems to be already correct.
-
Kirill Smelkov authored
There is cell_list.*.cpri_port_number that is used insted from the beginning. -> Remove unused cpri_port from scheamas.
-
Kirill Smelkov authored
Previously type of emulated UE was static parameter of particular software release - it was possible to simulate UE and attach to cells only of the RAT of particular template. In MultiRU it will be possible to generally emulate all kind of UEs - both LTE and NR all at the same time, and attach them to LTE and NR cells simultaneously. -> Switch type of UE to be runtime parameter as a preparatory step for that. URLs of software releases changes (we remove lte and nr in names), but here we do not care about backward compatibility because currently there are just a few UEsim deployments and migration should be easy.
-
Kirill Smelkov authored
Less code duplication
-
Kirill Smelkov authored
SIM card object is useful to have not only for Core Network - we will also use it for UE configutation. Move SIM schema into common place as a preparatory step.
-
Kirill Smelkov authored
K and IMSI are orthogonal to RAT and, similarly to how we keep default n_antenna_dl/ul independent of RAT we can do so with this default UE parameters.
-
Kirill Smelkov authored
ORS does not support UEsim as indicated by `if bbu != ors` in software.cfg.json.jinja2. Amends f3f1cb46 (software/ors-amarisoft: Start to introduce ORS mode) because that patch started to really reject instantiating ue-* on ORS.
-
Kirill Smelkov authored
Those were unused because software.cfg.json.jinja2 explicitly enables UEsim only for bbu != 'ors'.
-
Kirill Smelkov authored
Soon we are going to make rf_mode a runtime parameter and so there won't be TDD and FDD in software names anymore. Prepare to that and make --delete to remove the exact set of files that render-template actually generates instead of becoming a noop after "runtime rf_mode" restructuring.
-
Kirill Smelkov authored
We are currently querying it in instance.cfg and later, once again, in e.g. instance-enb.jinja2.cfg . However ORS mode will need to adjust slapparameter_dict with ORS defaults and pass it further to generic enb. So it won't work if we use slapparameter_dict obtained the second time because the second query will return unadjusted original slapparameter_dict. In this patch we are only doing preparatory step - redo the code not query the master from instance-{enb,ue}.jinja2.cfg and work with slapparameter_dict and slap_configuration already queried by instance.cfg For UE the change is trivial. For eNB instance-enb.jinja2.cfg used to set the defaults for com, mme, amf and gtp in the same section used for the second query. We rework those defaults to be applied to slapparameter_dict via jinja2 - via the same way we are going to later use in ORS mode. Handling defaults for everything besides gtp_addr is straightforward. For gtp_addr it has the semantic difference when explicitly given, and given only implicitly. In the latter case the intent of original code is to autodetect whether to use an address on loopback, or externally-visible address. Original code used the check for emptiness of mme_list/amf_list as the condition for "use loopback". Since now those lists, after applying their defaults, are never empty we rework the code to see if core address is on the loopback or not, and use auto-GTP-on-loopback only if core is also on loopback. This should, hopefully, be more convenient as it also works ok out of the box if core is on loopback, but its address was explicitly specified. Previously for such cases gtp_addr was also needed to be specified, and now it should work without that. No change to rendered enb.cfg and gnb.cfg besides whitespace. Adjust ipv6-random usage in core-network for consistency with enb as well.
-
Kirill Smelkov authored
For example it is the port that is setup in ru/dnsmasq.jinja2.cfg that is used, not :port and there it is 5354, i.e. different. :ip is also not used anywhere. -> Remove them to avoid confusion.
-
Kirill Smelkov authored
That data structure is really a dict, not list. It is more clear to name it appropriately. -> Do the renaming but keep cell_list intact as described in JSON schemas so that external interface remains unchanged. Rendered enb.cfg and gnb.cfg remain the same.
-
Kirill Smelkov authored
Not only inside rendered enb.jinja2.cfg and ue.jinja2.cfg because we will need that information in slaplte and slaplte is imported by instance-enb and instance-ue.
-
Kirill Smelkov authored
instance-enb and instance-ue currently setup that slap_configuration with LTE/NR defaults to be accessible from enb.jinja2.cfg and ue.jinja2.cfg. But we will soon need to have access to those defaults from slaplte.jinja2 as well, and it will break if left as is because when slaplte is imported from e.g. enb.jinja2 - it will work, but when slaplte is imported from instance-enb it will break because parent of instance-enb (instance.cfg) does not setup defaults in slap_configuration at that level. The fix is to either duplicate slap_configuration at instance.cfg level, or to switch access to the defaults to go via original default_* parameters. We go the second way for simplicity.
-
Kirill Smelkov authored
software/ors-amarisoft: enb.jinja2.cfg: Switch internal ru.ru_type to be 'sunwave' for Sunwave M2RU Radio Unit ru/libinstance and everything inside there already refer to that unit as 'sunwave'. Do the same for uniformity in enb.cfg and because we already refer to Lopcomm ORAN Radio Unit as just 'lopcomm'. In the future, if we will need to distinguish different models of one manufacturer, we could extend ru type to be e.g. manufacturer/model or do something similar. Template rendering is still done with ru='m2ru' coming from outside but internally it is now ru.ru_type='sunwave' instead of ru.ru_type='m2ru'.
-
Kirill Smelkov authored
Even though I introduced cell object in 79370ebf (software/ors-amarisoft: enb.jinja2.cfg: Stop using C Preprocessor and switch to Jinja2 completely) it is currently only cell.bandwidth that is living there, while all other cell parameters are still fetched from slapparameter_dict directly. We will soon introduce cell variable - that will iterate over cell_dict, and also keeping global cell won't work due to name shadowing. On the other hand we are not yet ready to start migrating all cell parameters to be accessible via cell object. -> So inline code for lte bandwidth parameter until the time comes to rework all cell parameters to be accessible via cell object. Rendered enb.cfg and gnb.cfg stay the same.
-
Kirill Smelkov authored
To handle multiple radio units we will need to rework this code significantly. Move this to a dedicated routine as a preparatory step. The code moves out of enb.cfg because later it will be also used in UEsim to configure simulator radio units as well. No non-whitespace changes in rendered enb.cfg and gnb.cfg . /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus
-
Kirill Smelkov authored
In f3f1cb46 I've made a mistake in "inject ORS defaults" code - there it should be RF.dl_earfcn and RF.dl_nr_arfcn instead of RF.earfcn and RF.nr_arfcn.
-
Lu Xu authored
-
Ivan Tyagov authored
(irrelevant for the coupler application).
-
- 09 Feb, 2024 1 commit
-
-
Jérome Perrin authored
-
- 08 Feb, 2024 1 commit
-
-
Thomas Gambier authored
(cherry picked from commit d1ec306a575f4dd0702aec64873794b4f822cfee)
-
- 07 Feb, 2024 3 commits
-
-
Lu Xu authored
-
Lu Xu authored
-
Jérome Perrin authored
-
- 05 Feb, 2024 2 commits
-
-
Jérome Perrin authored
See merge request nexedi/slapos!1531
-
Jérome Perrin authored
See merge request nexedi/slapos!1529
-
- 03 Feb, 2024 1 commit
-
-
Jérome Perrin authored
-
- 01 Feb, 2024 4 commits
-
-
Jérome Perrin authored
-
Jérome Perrin authored
These are already defined in stack/slapos.cfg
-
Jérome Perrin authored
jupyter-py2 used an old version not py3 compatible pygolang/test used the same version as in stack/slapos.cfg
-
Jérome Perrin authored
-
- 31 Jan, 2024 1 commit
-
-
Jérome Perrin authored
-
- 30 Jan, 2024 7 commits
-
-
Kirill Smelkov authored
Don't repeat slapparameter_dict['ncell_list'][k] - we can introduce a name for current neighbour cell, and use that name in the loop. And align entries to that they read more clearly. No non-whitespace changes in rendered enb.cfg and gnb.cfg . /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on !1526 /reviewed-by TrustMe
-
Kirill Smelkov authored
We currently have LTE-specific handover configuration in under cell_list and NR-specific handover configuration in under nr_cell_list. Those configuration are different. However in upcoming MultiRU we will need to handle LTE->NR handover, NR->LTE handover, and also Intra-ENB handover in addition to Inter-ENB handover we currently do. -> Move handover code into common function as a preparatory step for that. In the future the handover code for LTE and NR cells will be the same, so it makes sense to move that code to common place to avoid duplication. For rendered enb.cfg this unification introduces only space and trivial changes as shown in the appendix. /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on nexedi/slapos!1528 /reviewed-by TrustMe Appendix. Diff for rendered enb.cfg and gnb.cfg before and after this patch ``` $ git diff -w --no-index config/{old,out} ``` ```diff diff --git a/config/old/enb.cfg b/config/out/enb.cfg index 43301ee13..9dcca16c7 100644 --- a/config/old/enb.cfg +++ b/config/out/enb.cfg @@ -45,16 +45,18 @@ root_sequence_index: 204, dl_earfcn: 36100, inactivity_timer: 10000, + // Handover ncell_list: [ // Inter-ENB HO { + rat: "eutra", n_id_cell: 35, dl_earfcn: 700, cell_id: 0x12345, tac: 123, - }], - + }, + ], // Carrier Aggregation scell_list: [ diff --git a/config/old/gnb.cfg b/config/out/gnb.cfg index 2127a2f6b..23b07d6e1 100644 --- a/config/old/gnb.cfg +++ b/config/out/gnb.cfg @@ -57,6 +57,7 @@ ssb_pos_bitmap: "10000000", inactivity_timer: 10000, + // Handover ncell_list: [ // Inter-ENB HO @@ -74,8 +75,8 @@ ssb_period: 20, ssb_offset: 0, ssb_duration: 1, - }], - + }, + ], // tune NR parameters for the cell manual_ref_signal_power: true, ```
-
Kirill Smelkov authored
Useful to have while doing handover-related changes. /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on nexedi/slapos!1528 /reviewed-by TrustMe Appendix. Diff for rendered enb.cfg and gnb.cfg before and after this patch ``` $ git diff --no-index config/{old,out} ``` ```diff diff --git a/config/old/enb.cfg b/config/out/enb.cfg index 1843e0f24..43301ee13 100644 --- a/config/old/enb.cfg +++ b/config/out/enb.cfg @@ -45,6 +45,16 @@ root_sequence_index: 204, dl_earfcn: 36100, inactivity_timer: 10000, + // Handover + ncell_list: [ + // Inter-ENB HO + { + n_id_cell: 35, + dl_earfcn: 700, + cell_id: 0x12345, + tac: 123, + }], + // Carrier Aggregation scell_list: [ diff --git a/config/old/gnb.cfg b/config/out/gnb.cfg index d76b45d3c..2127a2f6b 100644 --- a/config/old/gnb.cfg +++ b/config/out/gnb.cfg @@ -57,6 +57,25 @@ ssb_pos_bitmap: "10000000", inactivity_timer: 10000, + // Handover + ncell_list: [ + // Inter-ENB HO + { + rat: "nr", + dl_nr_arfcn: 520000, + ssb_nr_arfcn: , + ul_nr_arfcn: 520000, + n_id_cell: 75, + gnb_id_bits: 22, + nr_cell_id: 0x77712, + tac: 321, + band: 38, + ssb_subcarrier_spacing: 30, + ssb_period: 20, + ssb_offset: 0, + ssb_duration: 1, + }], + ```
-
Kirill Smelkov authored
1. Currently we have separate log_options for LTE and NR cases with listing different subsystems in each. But in MultiRU one enb will be driving both LTE and NR cells at the same time, so we will need to define both LTE- and NR-related levels. -> Merge all log settings into one log_options as a preparatory step For current state it does not hurt for an LTE if we set e.g. ngap.level, and it does not hurt for NR if we set e.g. s1ap.level - since those layers will be unused. This way merging log settings for both LTE and NR subsystems is ok. -------- 2. Factorize log_phy_debug handling: instead of duplicating whole log_options line and changing only phy.level settings there, construct the log_options line programmatically and handle phy.level on its own. -------- 3. Use log/enb.log log_filename for both LTE and NR cases. In the upcoming MultiRU there might be several cells activated at the same time and in general it will be not possible to say are we doing "enb" or "gnb" now - for example if there will be two cells - one LTE and one NR. -> Use enb.log for log filename uniformly similarly to how the software is named (lteenb) even though it can work as both enb and gnb. For the reference we do the same with enb.xlog in nexedi/slapos!1522 . /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on nexedi/slapos!1527 /reviewed-by TrustMe Appendix. Diff for rendered enb.cfg and gnb.cfg before and after this patch ``` $ git diff --no-index config/{old,out} ``` ```diff diff --git a/config/old/enb.cfg b/config/out/enb.cfg index 467bb6364..1843e0f24 100644 --- a/config/old/enb.cfg +++ b/config/out/enb.cfg @@ -3,9 +3,7 @@ { - - 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", - + 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,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null", log_filename: "log/enb.log", diff --git a/config/old/gnb.cfg b/config/out/gnb.cfg index 18523818a..d76b45d3c 100644 --- a/config/old/gnb.cfg +++ b/config/out/gnb.cfg @@ -3,10 +3,8 @@ { - - log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null", - - log_filename: "log/gnb.log", + 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,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null", + log_filename: "log/enb.log", rf_driver: { ```
-
Kirill Smelkov authored
Current enb config is already quite complex and with MultiRU it will be growing more - both with added features and with more sections emitted because there will be multiple radio units, multiple cells and cross cell interactions. So for clarity we will want to annotate with a comment to which cell or ru object a section belongs, or to which cell-cell pair a particular interaction belongs. Amarisoft supports C-style comments and preprocessor directives out of the box, but if we use them in the configuration files, yaml.load, that we use in the test to load generated configs, will break, because // and /* ... */ is not valid YAML. It looks like Amarisoft does preprocessing as a separate step before further loading given configuration via yaml. So to be able to use the comments and still have tests working we need to do the same - in the tests preprocess the files before feeding them to yaml loader. -> Do that with the help of https://pypi.org/project/pcpp/ In my view that library has good quality and in my experience it worked flawlessly. Anyway we need it to only handle comments, not sophisticated CPP features, and for that it works just ok. Add some comments to existing enb.cfg and ue.cfg to make sure it really works. Those are simple comments, and in current state it they might seem as not 100% necessary, but with more upcoming config changes it would be good to have those descriptionary anchors present in the generated configs, so I suggest we add them. Anyway they should not do any harm at all. /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on nexedi/slapos!1526 /reviewed-by TrustMe
-
Kirill Smelkov authored
Currently on every test yaml.load issues a warning that using it without explicitly specifying loader is deprecated, for example: test_enb_conf (testTDD.TestENBParameters) .../slapos/software/ors-amarisoft/test/test.py:29: YAMLLoadWarning: calling yaml.load() without Loader=... is deprecated, as the default Loader is unsafe. Please read https://msg.pyyaml.org/load for full details. -> Fix the warning by using appropriate loader explicitly. Use FullLoader since msg.pyyaml.org/load describes it as Loads the full YAML language. Avoids arbitrary code execution. This is currently (PyYAML 5.1+) the default loader called by yaml.load(input) (after issuing the warning). i.e. we get support for full YAML feature set, do not get code execution and make sure that the behaviour stays exactly the same as before, but without the warning. /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on nexedi/slapos!1526 /reviewed-by TrustMe
-
Kirill Smelkov authored
We are going to do fixes and enhancements to YAML loading processes. Move corresponding code to one place before that as the preparatory step. Place new utility in new test/test.py file - with MultiRU that will be the place for tests of generic mode and test.jinja2.py, which will be renamed to test_ors.py, will be using utilities from there. So place the utility into new place from the start. /cc @jhuge, @lu.xu, @tomo, @xavier_thompson, @Daetalus /proposed-for-review-on nexedi/slapos!1526 /reviewed-by TrustMe
-