Commit 3ebceedb authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: enb/ors: Deduplicate schemas

Use $ref to share definitions taken from either generic enb or cell object.
parent 25a64ca2
......@@ -66,33 +66,15 @@
"$ref": "ru/sdr/input-schema.json#/properties/rx_gain"
},
"enb_id": {
"title": "eNB ID",
"description": "eNB ID",
"type": "string",
"$ref": "instance-enb-input-schema.json#/properties/enb_id",
"default": "0x1A2D0"
},
"gtp_addr": {
"title": "GTP Address",
"description": "String. Set the IP address (and optional port) on which the GTP-U packets are received. The default port is 2152. It is normally the IP address of the network interface connected to the core network.",
"type": "string",
"$ref": "instance-enb-input-schema.json#/properties/gtp_addr",
"default": "127.0.1.1"
},
"mme_list": {
"title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": {
".*": {
"properties": {
"mme_addr": {
"title": "MME Address",
"description": "IP address (and optional port) of S1AP SCTP connection to the MME. The default port is 36412.",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"$ref": "instance-enb-input-schema.json#/properties/mme_list",
"default": {
"1": {
"mme_addr": "127.0.1.100"
......@@ -100,34 +82,8 @@
}
},
"plmn_list": {
"title": "PLMN list",
"$ref": "instance-enb-input-schema.json#/properties/plmn_list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": {
".*": {
"properties": {
"plmn": {
"default": "00101",
"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.",
"type": "boolean"
},
"reserved": {
"default": false,
"title": "Reserved",
"description": "True if the cell is reserved for operator use.",
"type": "boolean"
}
},
"type": "object"
}
},
"type": "object",
"default": {
"1": {
"plmn": "00101"
......@@ -198,27 +154,17 @@
"default": {}
},
"websocket_password": {
"title": "Websocket password",
"description": "Activates websocket for remote control and sets password",
"type": "string"
"$ref": "instance-enb-input-schema.json#/properties/websocket_password"
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"$ref": "cell/common.json#/properties/inactivity_timer",
"default": 10000
},
"log_phy_debug": {
"title": "Physical layer log debug",
"description": "Enable debug mode for physical layer logs",
"type": "boolean",
"default": false
"$ref": "instance-enb-input-schema.json#/properties/log_phy_debug"
},
"gps_sync": {
"default": false,
"title": "GPS synchronisation",
"description": "True if GPS should be used for synchronisation",
"type": "boolean"
"$ref": "instance-enb-input-schema.json#/properties/gps_sync"
},
"disable_sdr": {
"default": false,
......@@ -227,49 +173,28 @@
"type": "boolean"
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
"description": "Set to true to use IPv4 for AMF / MME addresses",
"type": "boolean"
"$ref": "instance-enb-input-schema.json#/properties/use_ipv4"
},
"enb_stats_fetch_period": {
"title": "eNB statistics fetch period (seconds)",
"description": "Describes how often a call to Amarisoft remote API is made to get eNB statistics",
"type": "number",
"default": 60
"$ref": "instance-enb-input-schema.json#/properties/enb_stats_fetch_period"
},
"enb_drb_stats_enabled": {
"title": "Enable eNB drb statistics",
"description": "Enable eNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
"type": "boolean",
"default": true
"$ref": "instance-enb-input-schema.json#/properties/enb_drb_stats_enabled"
},
"max_rx_sample_db": {
"title": "Maximum RX sample value (dB)",
"description": "Maximum RX sample threshold above which RX saturated promise will fail",
"type": "number",
"default": 0
"$ref": "instance-enb-input-schema.json#/properties/max_rx_sample_db"
},
"min_rxtx_delay": {
"title": "Minimum available time for radio front end processing (ms)",
"description": "Baseband latency promise will fail if minimum TX/RX diff reaches threshold (lower than this value)",
"type": "number",
"default": 0
"$ref": "instance-enb-input-schema.json#/properties/min_rxtx_delay"
},
"xlog_fluentbit_forward_host": {
"title": "Address to Forward Xlog by Fluenbit",
"description": "Address of Remote Fluentd or Fluentbit Server to Forward Xlog",
"type": "string"
"$ref": "instance-enb-input-schema.json#/properties/xlog_fluentbit_forward_host"
},
"xlog_fluentbit_forward_port": {
"title": "Port to Forward Xlog by Fluentbit",
"description": "Optional Port of Remote Fluentd or Fluentbit Server to Forward Xlog",
"type": "string"
"$ref": "instance-enb-input-schema.json#/properties/xlog_fluentbit_forward_port"
},
"xlog_fluentbit_forward_shared_key": {
"title": "Shared Key to Forward Xlog by Fluentbit",
"description": "Secret Key Shared with Remote Fluentd or Fluentbit Server for Authentication when Forwarding Xlog",
"type": "string"
"$ref": "instance-enb-input-schema.json#/properties/xlog_fluentbit_forward_shared_key"
}
}
}
......@@ -8,24 +8,13 @@
"default": 40
},
"n_antenna_dl": {
"$ref": "ru/common.json#/properties/n_antenna_dl",
"enum": [
1,
2
],
"default": 2
"$ref": "instance-ors-enb-input-schema.json#/properties/n_antenna_dl"
},
"n_antenna_ul": {
"$ref": "ru/common.json#/properties/n_antenna_ul",
"enum": [
1,
2
],
"default": 2
"$ref": "instance-ors-enb-input-schema.json#/properties/n_antenna_ul"
},
"rf_mode": {
"$ref": "cell/common.json#/properties/rf_mode",
"default": "tdd"
"$ref": "instance-ors-enb-input-schema.json#/properties/rf_mode"
},
"tdd_ul_dl_config": {
"$ref": "cell/nr/input-schema.json#/properties/tdd_ul_dl_config"
......@@ -45,43 +34,24 @@
"default": 500
},
"cell_id": {
"$ref": "cell/common.json#/properties/cell_id",
"default": "0x01"
"$ref": "instance-ors-enb-input-schema.json#/properties/cell_id"
},
"tx_gain": {
"$ref": "ru/sdr/input-schema.json#/properties/tx_gain"
"$ref": "instance-ors-enb-input-schema.json#/properties/tx_gain"
},
"rx_gain": {
"$ref": "ru/sdr/input-schema.json#/properties/rx_gain"
"$ref": "instance-ors-enb-input-schema.json#/properties/rx_gain"
},
"gnb_id": {
"title": "gNB ID",
"description": "gNB ID",
"type": "string",
"$ref": "instance-gnb-input-schema.json#/properties/gnb_id",
"default": "0x12345"
},
"gnb_id_bits": {
"title": "gNB ID bits",
"description": "Number of bits for the gNodeB global identifier. (range 22 to 32)",
"type": "number",
"$ref": "instance-gnb-input-schema.json#/properties/gnb_id_bits",
"default": 28
},
"amf_list": {
"title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": {
".*": {
"properties": {
"amf_addr": {
"title": "AMF Address",
"description": "IP address (and optional port) of NGAP SCTP connection to the AMF. The default port is 38412.",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"$ref": "instance-gnb-input-schema.json#/properties/amf_list",
"default": {
"1": {
"amf_addr": "127.0.1.100"
......@@ -89,39 +59,8 @@
}
},
"plmn_list": {
"title": "PLMN list",
"$ref": "instance-gnb-input-schema.json#/properties/plmn_list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": {
".*": {
"properties": {
"plmn": {
"default": "00101",
"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)",
"type": "number"
},
"ranac": {
"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.",
"type": "boolean"
}
},
"type": "object"
}
},
"type": "object",
"default": {
"1": {
"plmn": "00101",
......@@ -130,29 +69,7 @@
}
},
"nssai": {
"title": "AMF slices configuration",
"description": "AMF slices configuration.",
"patternProperties": {
".*": {
"properties": {
"sst": {
"default": 1,
"title": "Slice Service Type",
"description": "Integer (range 1 to 255).",
"type": "number"
},
"sd": {
"default": "0x000032",
"title": "Slice Differentiator",
"description": "Optional integer (range 0 to 0xFFFFFE)",
"type": "string"
}
},
"type": "object"
}
},
"type": "object",
"default": {}
"$ref": "instance-gnb-input-schema.json#/properties/nssai"
},
"nr_handover_a3_offset": {
"title": "A3 offset for NR handover",
......@@ -251,78 +168,43 @@
"default": {}
},
"websocket_password": {
"title": "Websocket password",
"description": "Activates websocket for remote control and sets password",
"type": "string"
"$ref": "instance-ors-enb-input-schema.json#/properties/websocket_password"
},
"inactivity_timer": {
"title": "Inactivity Timer",
"description": "Send RRC connection release after this time (in ms) of network inactivity.",
"type": "number",
"default": 10000
"$ref": "instance-ors-enb-input-schema.json#/properties/inactivity_timer"
},
"log_phy_debug": {
"title": "Physical layer log debug",
"description": "Enable debug mode for physical layer logs",
"type": "boolean",
"default": false
"$ref": "instance-ors-enb-input-schema.json#/properties/log_phy_debug"
},
"gps_sync": {
"default": false,
"title": "GPS synchronisation",
"description": "True if GPS should be used for synchronisation",
"type": "boolean"
"$ref": "instance-ors-enb-input-schema.json#/properties/gps_sync"
},
"disable_sdr": {
"default": false,
"title": "Disable SDR",
"description": "Disables radio",
"type": "boolean"
"$ref": "instance-ors-enb-input-schema.json#/properties/disable_sdr"
},
"use_ipv4": {
"default": false,
"title": "Use IPv4",
"description": "Set to true to use IPv4 for AMF / MME addresses",
"type": "boolean"
"$ref": "instance-ors-enb-input-schema.json#/properties/use_ipv4"
},
"gnb_stats_fetch_period": {
"title": "gNB statistics fetch period (seconds)",
"description": "Describes how often a call to Amarisoft remote API is made to get gNB statistics",
"type": "number",
"default": 60
"$ref": "instance-gnb-input-schema.json#/properties/gnb_stats_fetch_period"
},
"gnb_drb_stats_enabled": {
"title": "Enable gNB drb statistics",
"description": "Enable gNB drb statistics through 100Hz polling, needed for E-UTRAN IP Throughput KPI",
"type": "boolean",
"default": true
"$ref": "instance-gnb-input-schema.json#/properties/gnb_drb_stats_enabled"
},
"max_rx_sample_db": {
"title": "Maximum RX sample value (dB)",
"description": "Maximum RX sample threshold above which RX saturated promise will fail",
"type": "number",
"default": 0
"$ref": "instance-ors-enb-input-schema.json#/properties/max_rx_sample_db"
},
"min_rxtx_delay": {
"title": "Minimum available time for radio front end processing (ms)",
"description": "Baseband latency promise will fail if minimum TX/RX diff reaches threshold (lower than this value)",
"type": "number",
"default": 0
"$ref": "instance-ors-enb-input-schema.json#/properties/min_rxtx_delay"
},
"xlog_fluentbit_forward_host": {
"title": "Address to Forward Xlog by Fluenbit",
"description": "Address of Remote Fluentd or Fluentbit Server to Forward Xlog",
"type": "string"
"$ref": "instance-ors-enb-input-schema.json#/properties/xlog_fluentbit_forward_host"
},
"xlog_fluentbit_forward_port": {
"title": "Port to Forward Xlog by Fluentbit",
"description": "Optional Port of Remote Fluentd or Fluentbit Server to Forward Xlog",
"type": "string"
"$ref": "instance-ors-enb-input-schema.json#/properties/xlog_fluentbit_forward_port"
},
"xlog_fluentbit_forward_shared_key": {
"title": "Shared Key to Forward Xlog by Fluentbit",
"description": "Secret Key Shared with Remote Fluentd or Fluentbit Server for Authentication when Forwarding Xlog",
"type": "string"
"$ref": "instance-ors-enb-input-schema.json#/properties/xlog_fluentbit_forward_shared_key"
}
}
}
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