Skip to content

slapos
slapos
Commit b7d638e3 authored by Joanne Hugé's avatar Joanne Hugé
Browse files
Options

ors-amarisoft: fix json formatting and slave description

parent 59ff0e3b
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 61 deletions
software/ors-amarisoft/instance-enb-input-schema.jinja2.json
View file @ b7d638e3
......@@ -44,7 +44,7 @@
"mme_list": {
"title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": {
"patternProperties": {
".*": {
"properties": {
"mme_addr": {
......@@ -68,25 +68,25 @@
"plmn_list": {
"title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": {
"patternProperties": {
".*": {
"properties": {
"plmn": {
"default": "00101",
"title": "Public Land Mobile Network",
"description": "Public Land Mobile Network",
"title": "Public Land Mobile Network",
"description": "Public Land Mobile Network",
"type": "string"
},
"attach_without_pdn": {
"default": false,
"title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean"
},
"reserved": {
"default": false,
"title": "Reserved",
"description": "True if the cell is reserved for operator use.",
"title": "Reserved",
"description": "True if the cell is reserved for operator use.",
"type": "boolean"
}
},
......
software/ors-amarisoft/instance-gnb-input-schema.jinja2.json
View file @ b7d638e3
......@@ -50,7 +50,7 @@
"amf_list": {
"title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": {
"patternProperties": {
".*": {
"properties": {
"amf_addr": {
......@@ -80,30 +80,30 @@
"plmn_list": {
"title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": {
"patternProperties": {
".*": {
"properties": {
"plmn": {
"default": "00101",
"title": "Public Land Mobile Network",
"description": "Public Land Mobile Network",
"title": "Public Land Mobile Network",
"description": "Public Land Mobile Network",
"type": "string"
},
"tac": {
"default": 100,
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
"title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)",
"type": "number"
},
"ranac": {
"title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code",
"title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code",
"type": "number"
},
"reserved": {
"default": false,
"title": "Reserved",
"description": "True if the cell is reserved for operator use.",
"title": "Reserved",
"description": "True if the cell is reserved for operator use.",
"type": "boolean"
}
},
......@@ -116,7 +116,7 @@
"nssai": {
"title": "AMF slices configuration",
"description": "AMF slices configuration.",
"patternProperties": {
"patternProperties": {
".*": {
"properties": {
"sst": {
......
software/ors-amarisoft/render-templates
View file @ b7d638e3
......@@ -112,16 +112,16 @@ with open('software.jinja2.cfg', 'r') as f:
for rf_mode_context in rf_mode_context_list:
with open('software-{}.cfg.json'.format(rf_mode_context['rf_mode']),
'w+') as f:
f.write(software_json_template.render(**rf_mode_context, **global_context))
f.write(software_json_template.render(**rf_mode_context, **global_context) + '\n')
with open('software-{}.cfg'.format(rf_mode_context['rf_mode']),
'w+') as f:
f.write(software_template.render(**rf_mode_context, **global_context))
f.write(software_template.render(**rf_mode_context, **global_context) + '\n')
for software_type in ['enb', 'enb-epc', 'gnb', 'gnb-epc']:
with open('instance-{}-{}-input-schema.json'.format(
rf_mode_context['rf_mode'],
software_type),
'w+') as f:
if software_type in ['enb', 'enb-epc']:
f.write(instance_enb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type))
f.write(instance_enb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type) + '\n')
else:
f.write(instance_gnb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type))
f.write(instance_gnb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type) + '\n')
software/ors-amarisoft/software-tdd1900.cfg
View file @ b7d638e3
......@@ -20,4 +20,4 @@ default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 1000
min-frequency = 1880.0
max-frequency = 1920
\ No newline at end of file
max-frequency = 1920
software/ors-amarisoft/software-tdd1900.cfg.json
View file @ b7d638e3
......@@ -44,8 +44,8 @@
"index": 4
},
"gnb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "gNB-EPC Sim Card",
"description": "gNB-EPC Sim Card Configuration",
"software-type": "gnb-epc",
"request": "instance-gnb-epc-slave-input-schema.json",
"response": "instance-gnb-epc-slave-schema.json",
......@@ -53,8 +53,8 @@
"index": 5
},
"enb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "eNB-EPC Sim Card",
"description": "eNB-EPC Sim Card Configuration",
"software-type": "enb-epc",
"request": "instance-enb-epc-slave-input-schema.json",
"response": "instance-enb-epc-slave-schema.json",
......@@ -62,8 +62,8 @@
"index": 6
},
"epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "EPC Sim Card",
"description": "EPC Sim Card Configuration",
"software-type": "epc",
"request": "instance-epc-slave-input-schema.json",
"response": "instance-epc-slave-schema.json",
......@@ -71,4 +71,4 @@
"index": 7
}
}
}
\ No newline at end of file
}
software/ors-amarisoft/software-tdd2600.cfg
View file @ b7d638e3
......@@ -20,4 +20,4 @@ default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 2570
max-frequency = 2620
\ No newline at end of file
max-frequency = 2620
software/ors-amarisoft/software-tdd2600.cfg.json
View file @ b7d638e3
......@@ -44,8 +44,8 @@
"index": 4
},
"gnb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "gNB-EPC Sim Card",
"description": "gNB-EPC Sim Card Configuration",
"software-type": "gnb-epc",
"request": "instance-gnb-epc-slave-input-schema.json",
"response": "instance-gnb-epc-slave-schema.json",
......@@ -53,8 +53,8 @@
"index": 5
},
"enb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "eNB-EPC Sim Card",
"description": "eNB-EPC Sim Card Configuration",
"software-type": "enb-epc",
"request": "instance-enb-epc-slave-input-schema.json",
"response": "instance-enb-epc-slave-schema.json",
......@@ -62,8 +62,8 @@
"index": 6
},
"epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "EPC Sim Card",
"description": "EPC Sim Card Configuration",
"software-type": "epc",
"request": "instance-epc-slave-input-schema.json",
"response": "instance-epc-slave-schema.json",
......@@ -71,4 +71,4 @@
"index": 7
}
}
}
\ No newline at end of file
}
software/ors-amarisoft/software-tdd3500.cfg
View file @ b7d638e3
......@@ -20,4 +20,4 @@ default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 3400
max-frequency = 3600
\ No newline at end of file
max-frequency = 3600
software/ors-amarisoft/software-tdd3500.cfg.json
View file @ b7d638e3
......@@ -44,8 +44,8 @@
"index": 4
},
"gnb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "gNB-EPC Sim Card",
"description": "gNB-EPC Sim Card Configuration",
"software-type": "gnb-epc",
"request": "instance-gnb-epc-slave-input-schema.json",
"response": "instance-gnb-epc-slave-schema.json",
......@@ -53,8 +53,8 @@
"index": 5
},
"enb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "eNB-EPC Sim Card",
"description": "eNB-EPC Sim Card Configuration",
"software-type": "enb-epc",
"request": "instance-enb-epc-slave-input-schema.json",
"response": "instance-enb-epc-slave-schema.json",
......@@ -62,8 +62,8 @@
"index": 6
},
"epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "EPC Sim Card",
"description": "EPC Sim Card Configuration",
"software-type": "epc",
"request": "instance-epc-slave-input-schema.json",
"response": "instance-epc-slave-schema.json",
......@@ -71,4 +71,4 @@
"index": 7
}
}
}
\ No newline at end of file
}
software/ors-amarisoft/software-tdd3700.cfg
View file @ b7d638e3
......@@ -20,4 +20,4 @@ default-nr-rx-gain = 40
default-nr-ssb-pos-bitmap = 10000000
min-frequency = 3600
max-frequency = 3800
\ No newline at end of file
max-frequency = 3800
software/ors-amarisoft/software-tdd3700.cfg.json
View file @ b7d638e3
......@@ -44,8 +44,8 @@
"index": 4
},
"gnb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "gNB-EPC Sim Card",
"description": "gNB-EPC Sim Card Configuration",
"software-type": "gnb-epc",
"request": "instance-gnb-epc-slave-input-schema.json",
"response": "instance-gnb-epc-slave-schema.json",
......@@ -53,8 +53,8 @@
"index": 5
},
"enb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "eNB-EPC Sim Card",
"description": "eNB-EPC Sim Card Configuration",
"software-type": "enb-epc",
"request": "instance-enb-epc-slave-input-schema.json",
"response": "instance-enb-epc-slave-schema.json",
......@@ -62,8 +62,8 @@
"index": 6
},
"epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "EPC Sim Card",
"description": "EPC Sim Card Configuration",
"software-type": "epc",
"request": "instance-epc-slave-input-schema.json",
"response": "instance-epc-slave-schema.json",
......@@ -71,4 +71,4 @@
"index": 7
}
}
}
\ No newline at end of file
}
software/ors-amarisoft/software.cfg.jinja2.json
View file @ b7d638e3
......@@ -44,8 +44,8 @@
"index": 4
},
"gnb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "gNB-EPC Sim Card",
"description": "gNB-EPC Sim Card Configuration",
"software-type": "gnb-epc",
"request": "instance-gnb-epc-slave-input-schema.json",
"response": "instance-gnb-epc-slave-schema.json",
......@@ -53,8 +53,8 @@
"index": 5
},
"enb-epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "eNB-EPC Sim Card",
"description": "eNB-EPC Sim Card Configuration",
"software-type": "enb-epc",
"request": "instance-enb-epc-slave-input-schema.json",
"response": "instance-enb-epc-slave-schema.json",
......@@ -62,8 +62,8 @@
"index": 6
},
"epc-slave": {
"title": "Sim Card",
"description": "Sim Card Configuration",
"title": "EPC Sim Card",
"description": "EPC Sim Card Configuration",
"software-type": "epc",
"request": "instance-epc-slave-input-schema.json",
"response": "instance-epc-slave-schema.json",
......
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