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