Skip to content

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

ors-amarisoft: Drop template/hidden and fixup ref to oneOf 

See merge request nexedi/slapos!1564
parents b56ede93 3de28fd5
Pipeline #34075 passed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 34 additions and 65 deletions
    software/ors-amarisoft/cell/common.json
    View file @ cb3cd7a7
    ...@@ -15,14 +15,11 @@ ...@@ -15,14 +15,11 @@
    "properties": { "properties": {
    "cell_type": { "cell_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    }, },
    "cell_kind": { "cell_kind": {
    "type": "string", "type": "string",
    "const": "enb", "const": "enb"
    "template": "enb",
    "options": { "hidden": true }
    }, },
    "rf_mode": { "rf_mode": {
    ...@@ -74,9 +71,8 @@ ...@@ -74,9 +71,8 @@
    "required": ["ru_type", "ru_ref"], "required": ["ru_type", "ru_ref"],
    "properties": { "properties": {
    "ru_type": { "ru_type": {
    "const": "ru_ref", "type": "string",
    "template": "ru_ref", "const": "ru_ref"
    "options": { "hidden": true }
    }, },
    "ru_ref": { "ru_ref": {
    "title": "RU Reference", "title": "RU Reference",
    ...@@ -92,9 +88,8 @@ ...@@ -92,9 +88,8 @@
    "required": ["ru_type", "ruincell_ref"], "required": ["ru_type", "ruincell_ref"],
    "properties": { "properties": {
    "ru_type": { "ru_type": {
    "const": "ruincell_ref", "type": "string",
    "template": "ruincell_ref", "const": "ruincell_ref"
    "options": { "hidden": true }
    }, },
    "ruincell_ref": { "ruincell_ref": {
    "title": "Cell Reference", "title": "Cell Reference",
    ...@@ -103,7 +98,9 @@ ...@@ -103,7 +98,9 @@
    } }
    } }
    }, },
    { "$ref": "../ru/input-schema.json" } { "$ref": "../ru/sdr/input-schema.json" },
    { "$ref": "../ru/lopcomm/input-schema.json" },
    { "$ref": "../ru/sunwave/input-schema.json" }
    ] ]
    } }
    } }
    ......
    software/ors-amarisoft/cell/lte/input-schema.json
    View file @ cb3cd7a7
    ...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
    "cell_type": { "cell_type": {
    "$ref": "#/properties/cell_type", "$ref": "#/properties/cell_type",
    "const": "lte", "const": "lte"
    "template": "lte"
    }, },
    "tdd_ul_dl_config": { "tdd_ul_dl_config": {
    ......
    software/ors-amarisoft/cell/nr/input-schema.json
    View file @ cb3cd7a7
    ...@@ -20,8 +20,7 @@ ...@@ -20,8 +20,7 @@
    "cell_type": { "cell_type": {
    "$ref": "#/properties/cell_type", "$ref": "#/properties/cell_type",
    "const": "nr", "const": "nr"
    "template": "nr"
    }, },
    "tdd_ul_dl_config": { "tdd_ul_dl_config": {
    ......
    software/ors-amarisoft/peer/cell/common.json
    View file @ cb3cd7a7
    ...@@ -12,14 +12,11 @@ ...@@ -12,14 +12,11 @@
    "properties": { "properties": {
    "cell_type": { "cell_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    }, },
    "cell_kind": { "cell_kind": {
    "type": "string", "type": "string",
    "const": "enb_peer", "const": "enb_peer"
    "template": "enb_peer",
    "options": { "hidden": true }
    } }
    } }
    } }
    software/ors-amarisoft/peer/cell/lte/input-schema.json
    View file @ cb3cd7a7
    ...@@ -17,8 +17,7 @@ ...@@ -17,8 +17,7 @@
    "properties": { "properties": {
    "cell_type": { "cell_type": {
    "$ref": "../../../peer/cell/common.json#/properties/cell_type", "$ref": "../../../peer/cell/common.json#/properties/cell_type",
    "const": "lte", "const": "lte"
    "template": "lte"
    }, },
    "e_cell_id": { "e_cell_id": {
    ......
    software/ors-amarisoft/peer/cell/nr/input-schema.json
    View file @ cb3cd7a7
    ...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
    "properties": { "properties": {
    "cell_type": { "cell_type": {
    "$ref": "../../../peer/cell/common.json#/properties/cell_type", "$ref": "../../../peer/cell/common.json#/properties/cell_type",
    "const": "nr", "const": "nr"
    "template": "nr"
    }, },
    "nr_cell_id": { "nr_cell_id": {
    ......
    software/ors-amarisoft/peer/common.json
    View file @ cb3cd7a7
    ...@@ -10,8 +10,7 @@ ...@@ -10,8 +10,7 @@
    "properties": { "properties": {
    "peer_type": { "peer_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    } }
    } }
    } }
    software/ors-amarisoft/peer/lte/input-schema.json
    View file @ cb3cd7a7
    ...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
    "properties": { "properties": {
    "peer_type": { "peer_type": {
    "$ref": "../../peer/common.json#/properties/peer_type", "$ref": "../../peer/common.json#/properties/peer_type",
    "const": "lte", "const": "lte"
    "template": "lte"
    }, },
    "x2_addr": { "x2_addr": {
    ......
    software/ors-amarisoft/peer/nr/input-schema.json
    View file @ cb3cd7a7
    ...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
    "properties": { "properties": {
    "peer_type": { "peer_type": {
    "$ref": "../../peer/common.json#/properties/peer_type", "$ref": "../../peer/common.json#/properties/peer_type",
    "const": "nr", "const": "nr"
    "template": "nr"
    }, },
    "xn_addr": { "xn_addr": {
    ......
    software/ors-amarisoft/ru/common.json
    View file @ cb3cd7a7
    ...@@ -15,12 +15,10 @@ ...@@ -15,12 +15,10 @@
    "properties": { "properties": {
    "ru_type": { "ru_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    }, },
    "ru_link_type": { "ru_link_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    }, },
    "n_antenna_dl": { "n_antenna_dl": {
    ......
    software/ors-amarisoft/ru/lopcomm/input-schema.json
    View file @ cb3cd7a7
    ...@@ -21,13 +21,11 @@ ...@@ -21,13 +21,11 @@
    "ru_type": { "ru_type": {
    "$ref": "#/properties/ru_type", "$ref": "#/properties/ru_type",
    "const": "lopcomm", "const": "lopcomm"
    "template": "lopcomm"
    }, },
    "ru_link_type": { "ru_link_type": {
    "$ref": "#/properties/ru_link_type", "$ref": "#/properties/ru_link_type",
    "const": "cpri", "const": "cpri"
    "template": "cpri"
    }, },
    "n_antenna_dl": { "n_antenna_dl": {
    ...@@ -45,8 +43,7 @@ ...@@ -45,8 +43,7 @@
    "mapping": { "mapping": {
    "$ref": "#/properties/cpri_link/properties/mapping", "$ref": "#/properties/cpri_link/properties/mapping",
    "const": "hw", "const": "hw",
    "enum": ["hw"], "enum": ["hw"]
    "options": { "hidden": true }
    }, },
    "rx_delay": { "rx_delay": {
    "$ref": "#/properties/cpri_link/properties/rx_delay", "$ref": "#/properties/cpri_link/properties/rx_delay",
    ......
    software/ors-amarisoft/ru/sdr/input-schema.json
    View file @ cb3cd7a7
    ...@@ -21,13 +21,11 @@ ...@@ -21,13 +21,11 @@
    "ru_type": { "ru_type": {
    "$ref": "#/properties/ru_type", "$ref": "#/properties/ru_type",
    "const": "sdr", "const": "sdr"
    "template": "sdr"
    }, },
    "ru_link_type": { "ru_link_type": {
    "$ref": "#/properties/ru_link_type", "$ref": "#/properties/ru_link_type",
    "const": "sdr", "const": "sdr"
    "template": "sdr"
    }, },
    "sdr_dev_list": { "sdr_dev_list": {
    ......
    software/ors-amarisoft/ru/sunwave/input-schema.json
    View file @ cb3cd7a7
    ...@@ -21,13 +21,11 @@ ...@@ -21,13 +21,11 @@
    "ru_type": { "ru_type": {
    "$ref": "#/properties/ru_type", "$ref": "#/properties/ru_type",
    "const": "sunwave", "const": "sunwave"
    "template": "sunwave"
    }, },
    "ru_link_type": { "ru_link_type": {
    "$ref": "#/properties/ru_link_type", "$ref": "#/properties/ru_link_type",
    "const": "cpri", "const": "cpri"
    "template": "cpri"
    }, },
    "n_antenna_dl": { "n_antenna_dl": {
    ...@@ -45,8 +43,7 @@ ...@@ -45,8 +43,7 @@
    "mapping": { "mapping": {
    "$ref": "#/properties/cpri_link/properties/mapping", "$ref": "#/properties/cpri_link/properties/mapping",
    "const": "bf1", "const": "bf1",
    "enum": ["bf1"], "enum": ["bf1"]
    "options": { "hidden": true }
    }, },
    "rx_delay": { "rx_delay": {
    "$ref": "#/properties/cpri_link/properties/rx_delay", "$ref": "#/properties/cpri_link/properties/rx_delay",
    ......
    software/ors-amarisoft/ue/cell/common.json
    View file @ cb3cd7a7
    ...@@ -13,14 +13,11 @@ ...@@ -13,14 +13,11 @@
    "properties": { "properties": {
    "cell_type": { "cell_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    }, },
    "cell_kind": { "cell_kind": {
    "type": "string", "type": "string",
    "const": "ue", "const": "ue"
    "template": "ue",
    "options": { "hidden": true }
    }, },
    "rf_mode": { "$ref": "../../cell/common.json#/properties/rf_mode" }, "rf_mode": { "$ref": "../../cell/common.json#/properties/rf_mode" },
    ......
    software/ors-amarisoft/ue/cell/lte/input-schema.json
    View file @ cb3cd7a7
    ...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
    "cell_type": { "cell_type": {
    "$ref": "../../../ue/cell/common.json#/properties/cell_type", "$ref": "../../../ue/cell/common.json#/properties/cell_type",
    "const": "lte", "const": "lte",
    "template": "lte"
    }, },
    "cell_kind": { "$ref": "../../../ue/cell/common.json#/properties/cell_kind" }, "cell_kind": { "$ref": "../../../ue/cell/common.json#/properties/cell_kind" },
    ......
    software/ors-amarisoft/ue/cell/nr/input-schema.json
    View file @ cb3cd7a7
    ...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
    "properties": { "properties": {
    "cell_type": { "cell_type": {
    "$ref": "../../../ue/cell/common.json#/properties/cell_type", "$ref": "../../../ue/cell/common.json#/properties/cell_type",
    "const": "nr", "const": "nr"
    "template": "nr"
    }, },
    "cell_kind": { "$ref": "../../../ue/cell/common.json#/properties/cell_kind" }, "cell_kind": { "$ref": "../../../ue/cell/common.json#/properties/cell_kind" },
    ......
    software/ors-amarisoft/ue/common.json
    View file @ cb3cd7a7
    ...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
    "$ref": "../sim/input-schema.json#/properties", "$ref": "../sim/input-schema.json#/properties",
    "ue_type": { "ue_type": {
    "type": "string", "type": "string"
    "options": { "hidden": true }
    }, },
    "rue_addr": { "rue_addr": {
    ......
    software/ors-amarisoft/ue/lte/input-schema.json
    View file @ cb3cd7a7
    ...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
    "ue_type": { "ue_type": {
    "$ref": "#/properties/ue_type", "$ref": "#/properties/ue_type",
    "const": "lte", "const": "lte"
    "template": "lte"
    } }
    } }
    } }
    software/ors-amarisoft/ue/nr/input-schema.json
    View file @ cb3cd7a7
    ...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
    "ue_type": { "ue_type": {
    "$ref": "#/properties/ue_type", "$ref": "#/properties/ue_type",
    "const": "nr", "const": "nr"
    "template": "nr"
    } }
    } }
    } }
    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