Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lu Xu
slapos
Commits
897c4a29
Commit
897c4a29
authored
Jan 11, 2024
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
X also quote *_ref in drb.cfg and sib23.asn
parent
36ff57fa
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
8 deletions
+13
-8
software/ors-amarisoft/config/drb_lte.jinja2.cfg
software/ors-amarisoft/config/drb_lte.jinja2.cfg
+2
-1
software/ors-amarisoft/config/drb_nr.jinja2.cfg
software/ors-amarisoft/config/drb_nr.jinja2.cfg
+2
-1
software/ors-amarisoft/config/out/CELL__a-drb.cfg
software/ors-amarisoft/config/out/CELL__a-drb.cfg
+1
-1
software/ors-amarisoft/config/out/CELL__a-sib23.asn
software/ors-amarisoft/config/out/CELL__a-sib23.asn
+1
-1
software/ors-amarisoft/config/out/CELL__b-drb.cfg
software/ors-amarisoft/config/out/CELL__b-drb.cfg
+1
-1
software/ors-amarisoft/config/out/CELL__b-sib23.asn
software/ors-amarisoft/config/out/CELL__b-sib23.asn
+1
-1
software/ors-amarisoft/config/sib23.jinja2.asn
software/ors-amarisoft/config/sib23.jinja2.asn
+2
-1
software/ors-amarisoft/ru/dnsmasq.jinja2.cfg
software/ors-amarisoft/ru/dnsmasq.jinja2.cfg
+3
-1
No files found.
software/ors-amarisoft/config/drb_lte.jinja2.cfg
View file @
897c4a29
// DRB configuration for LTE cell {{ cell_ref }} @ {{ ru_ref }}.
{%- set B = xbuildout.encode -%}
// DRB configuration for LTE cell {{ B(cell_ref) }} @ {{ B(ru_ref) }}.
// DRB configuration vary in beteen FDD and TDD modes.
// DRB configuration vary in beteen FDD and TDD modes.
{% set T_REORDERING = {'fdd': 35, 'tdd': 65} [cell.rf_mode] %}
{% set T_REORDERING = {'fdd': 35, 'tdd': 65} [cell.rf_mode] %}
...
...
software/ors-amarisoft/config/drb_nr.jinja2.cfg
View file @
897c4a29
// DRB configuration for NR cell {{ cell_ref }} @ {{ ru_ref }}.
{%- set B = xbuildout.encode -%}
// DRB configuration for NR cell {{ B(cell_ref) }} @ {{ B(ru_ref) }}.
[
[
{
{
...
...
software/ors-amarisoft/config/out/CELL__a-drb.cfg
View file @
897c4a29
// DRB configuration for LTE cell CELL_a @ RU1.
// DRB configuration for LTE cell CELL_
_
a @ RU1.
// DRB configuration vary in beteen FDD and TDD modes.
// DRB configuration vary in beteen FDD and TDD modes.
...
...
software/ors-amarisoft/config/out/CELL__a-sib23.asn
View file @
897c4a29
/* SIB2/SIB3 for LTE cell CELL_a @ RU1. */
/* SIB2/SIB3 for LTE cell CELL_
_
a @ RU1. */
{
{
message c1: systemInformation: {
message c1: systemInformation: {
criticalExtensions systemInformation-r8: {
criticalExtensions systemInformation-r8: {
...
...
software/ors-amarisoft/config/out/CELL__b-drb.cfg
View file @
897c4a29
// DRB configuration for NR cell CELL_b @ RU2.
// DRB configuration for NR cell CELL_
_
b @ RU2.
[
[
{
{
...
...
software/ors-amarisoft/config/out/CELL__b-sib23.asn
View file @
897c4a29
/* SIB2/SIB3 for NR cell CELL_b @ RU2. */
/* SIB2/SIB3 for NR cell CELL_
_
b @ RU2. */
{
{
message c1: systemInformation: {
message c1: systemInformation: {
criticalExtensions systemInformation-r8: {
criticalExtensions systemInformation-r8: {
...
...
software/ors-amarisoft/config/sib23.jinja2.asn
View file @
897c4a29
/* SIB2/SIB3 for {{ cell.cell_type | upper }} cell {{ cell_ref }} @ {{ ru_ref }}. */
{%- set B = xbuildout.encode -%}
/* SIB2/SIB3 for {{ cell.cell_type | upper }} cell {{ B(cell_ref) }} @ {{ B(ru_ref) }}. */
{
{
message c1: systemInformation: {
message c1: systemInformation: {
criticalExtensions systemInformation-r8: {
criticalExtensions systemInformation-r8: {
...
...
software/ors-amarisoft/ru/dnsmasq.jinja2.cfg
View file @
897c4a29
{%- set B = xbuildout.encode -%}
dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
dhcp-leasefile={{ directory['etc'] }}/dnsmasq.leases
port=5354
port=5354
...
@@ -7,7 +9,7 @@ port=5354
...
@@ -7,7 +9,7 @@ port=5354
{%- set vtap = json_module.loads(vtap_jdict[ru_tap]) %}
{%- set vtap = json_module.loads(vtap_jdict[ru_tap]) %}
{%- set plen = netaddr.IPNetwork(vtap.network).prefixlen %}
{%- set plen = netaddr.IPNetwork(vtap.network).prefixlen %}
# {{
ru_ref
}} @ {{ ru_tap }}
# {{
B(ru_ref)
}} @ {{ ru_tap }}
dhcp-range=tag:{{ ru_tap }},{{ vtap.gateway }},{{ vtap.gateway }},static,{{ plen }},5m
dhcp-range=tag:{{ ru_tap }},{{ vtap.gateway }},{{ vtap.gateway }},static,{{ plen }},5m
dhcp-host={{ ru.mac_addr }},tag:{{ ru_tap }},[{{ vtap.gateway }}]
dhcp-host={{ ru.mac_addr }},tag:{{ ru_tap }},[{{ vtap.gateway }}]
# option 17 used for RU callhome
# option 17 used for RU callhome
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment