Commit 96011ec3 authored by Kirill Smelkov's avatar Kirill Smelkov

software/ors-amarisoft: software.cfg.json: Start index from 1, not 0

Previously, e.g. for ORS it was:

    enb                 index=0
    gnb                 index=1
    core-network        index=2
    core-network-slave  index=3

which resulted in the following appearance order on SlapOS Master UI:

    gnb
    core-network
    core-network-slave
    enb

Note that enb comes last instead of being first as originally intended.

That happens because SlapOS Master treats index=0 as being unset and puts all
items with unset index in the end.

-> Fix this by starting explicitly-set indices from 1.

Now, for ORS, the order on UI is

    enb
    gnb
    core-network
    core-network-slave
parent 3cf7a509
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"description": "eNodeB Configuration", "description": "eNodeB Configuration",
"request": "instance-ors-enb-input-schema.json", "request": "instance-ors-enb-input-schema.json",
"response": "instance-ors-enb-schema.json", "response": "instance-ors-enb-schema.json",
"index": 0 "index": 1
}, },
"gnb": { "gnb": {
"title": "gNB", "title": "gNB",
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"description": "gNodeB Configuration", "description": "gNodeB Configuration",
"request": "instance-ors-gnb-input-schema.json", "request": "instance-ors-gnb-input-schema.json",
"response": "instance-ors-gnb-schema.json", "response": "instance-ors-gnb-schema.json",
"index": 1 "index": 2
}, },
"core-network": { "core-network": {
"title": "Core Network", "title": "Core Network",
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"description": "Core Network Configuration", "description": "Core Network Configuration",
"request": "instance-core-network-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-core-network-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 3
}, },
"core-network-slave": { "core-network-slave": {
"title": "Core Network Sim Card", "title": "Core Network Sim Card",
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"request": "sim/input-schema.json", "request": "sim/input-schema.json",
"response": "sim/schema.json", "response": "sim/schema.json",
"shared": true, "shared": true,
"index": 3 "index": 4
} }
} }
} }
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"software-type": "ue", "software-type": "ue",
"request": "instance-ue-input-schema.json", "request": "instance-ue-input-schema.json",
"response": "instance-ue-schema.json", "response": "instance-ue-schema.json",
"index": 4 "index": 5
}, },
"enb": { "enb": {
"title": "eNB", "title": "eNB",
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"description": "eNodeB Configuration", "description": "eNodeB Configuration",
"request": "instance-enb-input-schema.json", "request": "instance-enb-input-schema.json",
"response": "instance-enb-schema.json", "response": "instance-enb-schema.json",
"index": 0 "index": 1
}, },
"gnb": { "gnb": {
"title": "gNB", "title": "gNB",
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
"description": "gNodeB Configuration", "description": "gNodeB Configuration",
"request": "instance-gnb-input-schema.json", "request": "instance-gnb-input-schema.json",
"response": "instance-gnb-schema.json", "response": "instance-gnb-schema.json",
"index": 1 "index": 2
}, },
"core-network": { "core-network": {
"title": "Core Network", "title": "Core Network",
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"description": "Core Network Configuration", "description": "Core Network Configuration",
"request": "instance-core-network-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-core-network-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 3
}, },
"core-network-slave": { "core-network-slave": {
"title": "Core Network Sim Card", "title": "Core Network Sim Card",
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
"request": "sim/input-schema.json", "request": "sim/input-schema.json",
"response": "sim/schema.json", "response": "sim/schema.json",
"shared": true, "shared": true,
"index": 3 "index": 4
} }
} }
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
"software-type": "ue", "software-type": "ue",
"request": "instance{{ v }}-ue-input-schema.json", "request": "instance{{ v }}-ue-input-schema.json",
"response": "instance{{ v }}-ue-schema.json", "response": "instance{{ v }}-ue-schema.json",
"index": 4 "index": 5
}, },
{%- endif %} {%- endif %}
"enb": { "enb": {
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
"description": "eNodeB Configuration", "description": "eNodeB Configuration",
"request": "instance{{ v }}-enb-input-schema.json", "request": "instance{{ v }}-enb-input-schema.json",
"response": "instance{{ v }}-enb-schema.json", "response": "instance{{ v }}-enb-schema.json",
"index": 0 "index": 1
}, },
"gnb": { "gnb": {
"title": "gNB", "title": "gNB",
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
"description": "gNodeB Configuration", "description": "gNodeB Configuration",
"request": "instance{{ v }}-gnb-input-schema.json", "request": "instance{{ v }}-gnb-input-schema.json",
"response": "instance{{ v }}-gnb-schema.json", "response": "instance{{ v }}-gnb-schema.json",
"index": 1 "index": 2
}, },
"core-network": { "core-network": {
"title": "Core Network", "title": "Core Network",
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"description": "Core Network Configuration", "description": "Core Network Configuration",
"request": "instance-core-network-input-schema.json", "request": "instance-core-network-input-schema.json",
"response": "instance-core-network-schema.json", "response": "instance-core-network-schema.json",
"index": 2 "index": 3
}, },
"core-network-slave": { "core-network-slave": {
"title": "Core Network Sim Card", "title": "Core Network Sim Card",
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
"request": "sim/input-schema.json", "request": "sim/input-schema.json",
"response": "sim/schema.json", "response": "sim/schema.json",
"shared": true, "shared": true,
"index": 3 "index": 4
} }
} }
} }
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