Skip to content

slapos
slapos
Commit 498f628f authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

ors-amarisoft: drop ru_type and ru_link_type 

  Use key/object structure instead const, since it provides better struture whenever render the form.

  It is required to still update instance for follow up the change
parent 38410da2
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 160 deletions
software/ors-amarisoft/ru/common.json
View file @ 498f628f
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
"type": "object", "type": "object",
"required": [ "required": [
"ru_type",
"ru_link_type",
"n_antenna_dl", "n_antenna_dl",
"n_antenna_ul", "n_antenna_ul",
"tx_gain", "tx_gain",
...@@ -14,15 +12,6 @@ ...@@ -14,15 +12,6 @@
], ],
"properties": { "properties": {
"ru_type": {
"type": "string",
"options": { "hidden": true }
},
"ru_link_type": {
"type": "string",
"options": { "hidden": true }
},
"n_antenna_dl": { "n_antenna_dl": {
"title": "Number of DL antennas", "title": "Number of DL antennas",
"type": "integer" "type": "integer"
......
software/ors-amarisoft/ru/input-schema.json
View file @ 498f628f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
"title": "Radio Unit", "title": "Radio Unit",
"type": "object", "type": "object",
"oneOf": [ "anyOf": [
{ "$ref": "sdr/input-schema.json" }, { "$ref": "sdr/input-schema.json" },
{ "$ref": "lopcomm/input-schema.json" }, { "$ref": "lopcomm/input-schema.json" },
{ "$ref": "sunwave/input-schema.json" } { "$ref": "sunwave/input-schema.json" }
......
software/ors-amarisoft/ru/lopcomm/input-schema.json
View file @ 498f628f
{ {
"$schema": "https://json-schema.org/draft/2020-12/schema", "$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Lopcomm ORAN", "title": "Lopcomm ORAN",
"type": "object", "type": "object",
"required": [
"ru_type",
"ru_link_type",
"n_antenna_dl",
"n_antenna_ul",
"tx_gain",
"rx_gain",
"cpri_link",
"mac_addr"
],
"properties": { "properties": {
"$ref": "../../ru/common.json#/properties", "loopcomm": {
"title": "Lopcomm ORAN",
"ru_type": {
"$ref": "#/properties/ru_type",
"const": "lopcomm",
"template": "lopcomm"
},
"ru_link_type": {
"$ref": "#/properties/ru_link_type",
"const": "cpri",
"template": "cpri"
},
"n_antenna_dl": {
"$ref": "#/properties/n_antenna_dl",
"default": 2
},
"n_antenna_ul": {
"$ref": "#/properties/n_antenna_ul",
"default": 2
},
"cpri_link": {
"$ref": "#/properties/cpri_link",
"properties": { "properties": {
"$ref": "#/properties/cpri_link/properties", "cpri": {
"mapping": { "title": "CPRI Link Type",
"$ref": "#/properties/cpri_link/properties/mapping", "required": [
"const": "hw", "n_antenna_dl",
"enum": ["hw"], "n_antenna_ul",
"options": { "hidden": true } "tx_gain",
}, "rx_gain",
"rx_delay": { "cpri_link",
"$ref": "#/properties/cpri_link/properties/rx_delay", "mac_addr"
"default": 25.11 ],
}, "properties": {
"tx_delay": { "$ref": "../../ru/common.json#/properties",
"$ref": "#/properties/cpri_link/properties/tx_delay", "n_antenna_dl": {
"default": 14.71 "$ref": "#/properties/n_antenna_dl",
"default": 2
},
"n_antenna_ul": {
"$ref": "#/properties/n_antenna_ul",
"default": 2
},
"cpri_link": {
"$ref": "#/properties/cpri_link",
"properties": {
"$ref": "#/properties/cpri_link/properties",
"mapping": {
"$ref": "#/properties/cpri_link/properties/mapping",
"const": "hw",
"enum": ["hw"],
"options": { "hidden": true }
},
"rx_delay": {
"$ref": "#/properties/cpri_link/properties/rx_delay",
"default": 25.11
},
"tx_delay": {
"$ref": "#/properties/cpri_link/properties/tx_delay",
"default": 14.71
},
"tx_dbm": {
"$ref": "#/properties/cpri_link/properties/tx_dbm",
"default": 63
}
}
},
"reset_schedule": {
"title": "Cron schedule for RRH reset",
"description": "Refer https://crontab.guru/ to make a reset schedule for RRH, for example, '0 1 * * *' means the RRH will reset every day at 1 am",
"type": "string"
}
}
}, },
"tx_dbm": { "type": "object"
"$ref": "#/properties/cpri_link/properties/tx_dbm", },
"default": 63 "type": "object"
}
}
}, },
"type": "object"
"reset_schedule": {
"title": "Cron schedule for RRH reset",
"description": "Refer https://crontab.guru/ to make a reset schedule for RRH, for example, '0 1 * * *' means the RRH will reset every day at 1 am",
"type": "string"
}
} }
} }
software/ors-amarisoft/ru/sdr/input-schema.json
View file @ 498f628f
...@@ -5,41 +5,43 @@ ...@@ -5,41 +5,43 @@
"description": "Radio Unit constituted of several SDR boards", "description": "Radio Unit constituted of several SDR boards",
"type": "object", "type": "object",
"required": [
"ru_type",
"ru_link_type",
"n_antenna_dl",
"n_antenna_ul",
"tx_gain",
"rx_gain",
"sdr_dev_list"
],
"properties": { "properties": {
"$ref": "../../ru/common.json#/properties", "sdr": {
"title": "SDR transiver",
"ru_type": { "properties": {
"$ref": "#/properties/ru_type", "sdr": {
"const": "sdr", "title": "SDR Link Type",
"template": "sdr" "required": [
}, "n_antenna_dl",
"ru_link_type": { "n_antenna_ul",
"$ref": "#/properties/ru_link_type", "tx_gain",
"const": "sdr", "rx_gain",
"template": "sdr" "sdr_dev_list"
}, ],
"properties": {
"sdr_dev_list": { "$ref": "../../ru/common.json#/properties",
"title": "SDR boards", "ru_link_type": {
"description": "Which SDR boards to use as combined RF port", "$ref": "#/properties/ru_link_type",
"type": "array", "const": "sdr",
"items": { "default": "sdr"
"title": "/dev/sdr # of SDR board", },
"type": "integer" "sdr_dev_list": {
"title": "SDR boards",
"description": "Which SDR boards to use as combined RF port",
"type": "array",
"items": {
"title": "/dev/sdr # of SDR board",
"type": "integer"
},
"minItems": 1,
"uniqueItems": true
}
}
},
"type": "object"
}, },
"minItems": 1, "type": "object"
"uniqueItems": true },
} "type": "object"
} }
} }
software/ors-amarisoft/ru/sunwave/input-schema.json
View file @ 498f628f
...@@ -4,59 +4,57 @@ ...@@ -4,59 +4,57 @@
"title": "Sunwave M2RU", "title": "Sunwave M2RU",
"type": "object", "type": "object",
"required": [
"ru_type",
"ru_link_type",
"n_antenna_dl",
"n_antenna_ul",
"tx_gain",
"rx_gain",
"cpri_link",
"mac_addr"
],
"properties": { "properties": {
"$ref": "../../ru/common.json#/properties", "sunwave": {
"title": "Sunwave M2RU",
"ru_type": {
"$ref": "#/properties/ru_type",
"const": "sunwave",
"template": "sunwave"
},
"ru_link_type": {
"$ref": "#/properties/ru_link_type",
"const": "cpri",
"template": "cpri"
},
"n_antenna_dl": {
"$ref": "#/properties/n_antenna_dl",
"default": 2
},
"n_antenna_ul": {
"$ref": "#/properties/n_antenna_ul",
"default": 1
},
"cpri_link": {
"$ref": "#/properties/cpri_link",
"properties": { "properties": {
"$ref": "#/properties/cpri_link/properties", "cpri": {
"mapping": { "title": "CPRI Link Type",
"$ref": "#/properties/cpri_link/properties/mapping", "required": [
"const": "bf1", "n_antenna_dl",
"enum": ["bf1"], "n_antenna_ul",
"options": { "hidden": true } "tx_gain",
}, "rx_gain",
"rx_delay": { "cpri_link",
"$ref": "#/properties/cpri_link/properties/rx_delay", "mac_addr"
"default": 11.0 ],
},
"tx_dbm": { "properties": {
"$ref": "#/properties/cpri_link/properties/tx_dbm", "$ref": "../../ru/common.json#/properties",
"default": 42.0 "n_antenna_dl": {
} "$ref": "#/properties/n_antenna_dl",
} "default": 2
} },
"n_antenna_ul": {
"$ref": "#/properties/n_antenna_ul",
"default": 1
},
"cpri_link": {
"$ref": "#/properties/cpri_link",
"properties": {
"$ref": "#/properties/cpri_link/properties",
"mapping": {
"$ref": "#/properties/cpri_link/properties/mapping",
"const": "bf1",
"enum": ["bf1"],
"options": { "hidden": true }
},
"rx_delay": {
"$ref": "#/properties/cpri_link/properties/rx_delay",
"default": 11.0
},
"tx_dbm": {
"$ref": "#/properties/cpri_link/properties/tx_dbm",
"default": 42.0
}
}
}
}
}.
"type": "object"
},
"type": "object"
},
"type": "object"
} }
} }
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