Commit 2808521c authored by Ivan Tyagov's avatar Ivan Tyagov

Merge remote-tracking branch 'origin/master' into fix-publish-params

parents 7374b263 cb3cd7a7
......@@ -15,14 +15,11 @@
"properties": {
"cell_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
},
"cell_kind": {
"type": "string",
"const": "enb",
"template": "enb",
"options": { "hidden": true }
"const": "enb"
},
"rf_mode": {
......@@ -74,9 +71,8 @@
"required": ["ru_type", "ru_ref"],
"properties": {
"ru_type": {
"const": "ru_ref",
"template": "ru_ref",
"options": { "hidden": true }
"type": "string",
"const": "ru_ref"
},
"ru_ref": {
"title": "RU Reference",
......@@ -92,9 +88,8 @@
"required": ["ru_type", "ruincell_ref"],
"properties": {
"ru_type": {
"const": "ruincell_ref",
"template": "ruincell_ref",
"options": { "hidden": true }
"type": "string",
"const": "ruincell_ref"
},
"ruincell_ref": {
"title": "Cell Reference",
......@@ -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" }
]
}
}
......
......@@ -20,8 +20,7 @@
"cell_type": {
"$ref": "#/properties/cell_type",
"const": "lte",
"template": "lte"
"const": "lte"
},
"tdd_ul_dl_config": {
......
......@@ -20,8 +20,7 @@
"cell_type": {
"$ref": "#/properties/cell_type",
"const": "nr",
"template": "nr"
"const": "nr"
},
"tdd_ul_dl_config": {
......
......@@ -12,14 +12,11 @@
"properties": {
"cell_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
},
"cell_kind": {
"type": "string",
"const": "enb_peer",
"template": "enb_peer",
"options": { "hidden": true }
"const": "enb_peer"
}
}
}
......@@ -17,8 +17,7 @@
"properties": {
"cell_type": {
"$ref": "../../../peer/cell/common.json#/properties/cell_type",
"const": "lte",
"template": "lte"
"const": "lte"
},
"e_cell_id": {
......
......@@ -19,8 +19,7 @@
"properties": {
"cell_type": {
"$ref": "../../../peer/cell/common.json#/properties/cell_type",
"const": "nr",
"template": "nr"
"const": "nr"
},
"nr_cell_id": {
......
......@@ -10,8 +10,7 @@
"properties": {
"peer_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
}
}
}
......@@ -13,8 +13,7 @@
"properties": {
"peer_type": {
"$ref": "../../peer/common.json#/properties/peer_type",
"const": "lte",
"template": "lte"
"const": "lte"
},
"x2_addr": {
......
......@@ -13,8 +13,7 @@
"properties": {
"peer_type": {
"$ref": "../../peer/common.json#/properties/peer_type",
"const": "nr",
"template": "nr"
"const": "nr"
},
"xn_addr": {
......
......@@ -15,12 +15,10 @@
"properties": {
"ru_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
},
"ru_link_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
},
"n_antenna_dl": {
......
......@@ -21,13 +21,11 @@
"ru_type": {
"$ref": "#/properties/ru_type",
"const": "lopcomm",
"template": "lopcomm"
"const": "lopcomm"
},
"ru_link_type": {
"$ref": "#/properties/ru_link_type",
"const": "cpri",
"template": "cpri"
"const": "cpri"
},
"n_antenna_dl": {
......@@ -45,8 +43,7 @@
"mapping": {
"$ref": "#/properties/cpri_link/properties/mapping",
"const": "hw",
"enum": ["hw"],
"options": { "hidden": true }
"enum": ["hw"]
},
"rx_delay": {
"$ref": "#/properties/cpri_link/properties/rx_delay",
......
......@@ -21,13 +21,11 @@
"ru_type": {
"$ref": "#/properties/ru_type",
"const": "sdr",
"template": "sdr"
"const": "sdr"
},
"ru_link_type": {
"$ref": "#/properties/ru_link_type",
"const": "sdr",
"template": "sdr"
"const": "sdr"
},
"sdr_dev_list": {
......
......@@ -21,13 +21,11 @@
"ru_type": {
"$ref": "#/properties/ru_type",
"const": "sunwave",
"template": "sunwave"
"const": "sunwave"
},
"ru_link_type": {
"$ref": "#/properties/ru_link_type",
"const": "cpri",
"template": "cpri"
"const": "cpri"
},
"n_antenna_dl": {
......@@ -45,8 +43,7 @@
"mapping": {
"$ref": "#/properties/cpri_link/properties/mapping",
"const": "bf1",
"enum": ["bf1"],
"options": { "hidden": true }
"enum": ["bf1"]
},
"rx_delay": {
"$ref": "#/properties/cpri_link/properties/rx_delay",
......
......@@ -13,14 +13,11 @@
"properties": {
"cell_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
},
"cell_kind": {
"type": "string",
"const": "ue",
"template": "ue",
"options": { "hidden": true }
"const": "ue"
},
"rf_mode": { "$ref": "../../cell/common.json#/properties/rf_mode" },
......
......@@ -18,7 +18,6 @@
"cell_type": {
"$ref": "../../../ue/cell/common.json#/properties/cell_type",
"const": "lte",
"template": "lte"
},
"cell_kind": { "$ref": "../../../ue/cell/common.json#/properties/cell_kind" },
......
......@@ -18,8 +18,7 @@
"properties": {
"cell_type": {
"$ref": "../../../ue/cell/common.json#/properties/cell_type",
"const": "nr",
"template": "nr"
"const": "nr"
},
"cell_kind": { "$ref": "../../../ue/cell/common.json#/properties/cell_kind" },
......
......@@ -13,8 +13,7 @@
"$ref": "../sim/input-schema.json#/properties",
"ue_type": {
"type": "string",
"options": { "hidden": true }
"type": "string"
},
"rue_addr": {
......
......@@ -9,8 +9,7 @@
"ue_type": {
"$ref": "#/properties/ue_type",
"const": "lte",
"template": "lte"
"const": "lte"
}
}
}
......@@ -9,8 +9,7 @@
"ue_type": {
"$ref": "#/properties/ue_type",
"const": "nr",
"template": "nr"
"const": "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