From 62a5ef06900be497ca8b19bbd287ffc4b0a4929b Mon Sep 17 00:00:00 2001 From: Alex Stancu Date: Tue, 11 Jul 2023 18:06:43 +0300 Subject: [PATCH] Update pre-loaded data for ietf-hardware Issue-ID: OAM-348 Change-Id: Iacd113e46c7f548de6aebdb94fddcdcd6e3b1bf8 Signed-off-by: Alex Stancu --- solution/network/.env | 2 +- .../network/ntsim-ng-o-ru/o-ru-11221/config.json | 13 +- .../o-ru-11221/ietf-hardware-operational.json | 509 +++++++++++++-------- .../o-ru-11221/ietf-hardware-running.json | 268 +++++------ .../network/ntsim-ng-o-ru/o-ru-11222/config.json | 10 +- .../o-ru-11222/ietf-hardware-operational.json | 509 +++++++++++++-------- .../o-ru-11222/ietf-hardware-running.json | 268 +++++------ .../network/ntsim-ng-o-ru/o-ru-11223/config.json | 10 +- .../o-ru-11223/ietf-hardware-operational.json | 509 +++++++++++++-------- .../o-ru-11223/ietf-hardware-running.json | 268 +++++------ .../network/ntsim-ng-o-ru/o-ru-11224/config.json | 18 +- .../o-ru-11224/ietf-hardware-operational.json | 509 +++++++++++++-------- .../o-ru-11224/ietf-hardware-running.json | 268 +++++------ 13 files changed, 1850 insertions(+), 1311 deletions(-) diff --git a/solution/network/.env b/solution/network/.env index c61b04e..757e1fd 100644 --- a/solution/network/.env +++ b/solution/network/.env @@ -46,7 +46,7 @@ VES_ENDPOINT_PASSWORD=sample1 NEXUS3_DOCKER_REPO=nexus3.o-ran-sc.org:10004/o-ran-sc/ LOCAL_DOCKER_REPO=o-ran-sc/ NTS_MANAGER_PORT=8300 -NTS_BUILD_VERSION=1.8.0 +NTS_BUILD_VERSION=1.8.1 IPv6_ENABLED=true SSH_CONNECTIONS=1 diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json index 0374876..76ede7a 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11221/config.json @@ -12,7 +12,7 @@ "stdout": "log/netopeer-stdout.log", "stderr": "log/netopeer-stderr.log" }, - + "ntsim-network-function": { "path": "/opt/dev/ntsim-ng/ntsim-ng", "args": ["-w/opt/dev/ntsim-ng", "-f"], @@ -45,7 +45,7 @@ "o-ran-shared-cell", "nts-network-function" ], - + "default-list-instances": 2, "custom-list-instances" : [ {"/ietf-interfaces:interfaces/interface": 4} @@ -59,7 +59,7 @@ }, "datastore-populate-rules": { - "random-generation-enabled": true, + "random-generation-enabled": false, "pre-generated-operational-data": [ "../deploy/data/ietf-hardware-operational.json", @@ -67,8 +67,7 @@ ], "pre-generated-running-data": [ "../deploy/data/ietf-hardware-running.json", - "../deploy/data/ietf-interfaces-running.xml", - "/opt/dev/deploy/data/nts-network-function-running.xml" + "../deploy/data/ietf-interfaces-running.xml" ] }, @@ -82,7 +81,7 @@ "severity" : "CRITICAL", "date-time" : "$$time$$", "specific-problem" : "Interface Fault", - + "fault-id": "30", "fault-severity" : "CRITICAL", "affected-object" : "$$hostname$$", @@ -133,4 +132,4 @@ } ] } -} \ No newline at end of file +} diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json index 18c83c9..b0a474c 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-operational.json @@ -1,306 +1,441 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "serial-num": "23412", - "software-rev": "3.8.1 (2029-10-30 11:47:59)", - "mfg-name": "NTS", - "model-name": "O1-O-RU-Simulator", - "description": "O-RAN O-RU O1 Simulator", - "state": { - "oper-state": "enabled" - }, - "contains-child": [ - "chassis-temperature-exhaust", - "chassis-temperature-inlet", - "chassis-fan0", - "chassis-fan1", - "chassis-fan2", - "chassis-fan3", - "cpu", - "slot0", - "slot2" - ] - }, { "name": "chassis-temperature-exhaust", + "alias": "chassis-temperature-exhaust", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis" + }, + { + "name": "slot2-logical2", + "alias": "Slot3-B", + "description": "SLOT3-B", + "class": "iana-hardware:module", + "state": { + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 3, + "parent": "slot2" }, { "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", "sensor-data": { "value": 29, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-rrh-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "serial-num": "AGNF714S", + "mfg-name": "ACME GMBH.", + "parent-rel-pos": 1, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1", + "alias": "chassis-fan1", + "class": "iana-hardware:fan", "contains-child": [ - "chassis-fan0-speed" - ] + "chassis-fan1-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "sensor-data": { - "value": 4100, + "value": 1000, "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan1", + "name": "slot0-logical1", + "alias": "Slot0-B", + "description": "SLOT0-B", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan1-speed" - ] + "parent-rel-pos": 2, + "parent": "slot0" }, { - "name": "chassis-fan1-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis-fan0", + "alias": "chassis-fan0", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan0-speed" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2", + "name": "slot0-logical0", + "alias": "Slot0-A", + "description": "SLOT0-AZ", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical0-bbu", + "slot0-logical0-rrh" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan2-speed" - ] + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan2-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis", + "alias": "chassis", + "description": "O-RAN O-RU O1 Simulator", + "class": "iana-hardware:chassis", + "contains-child": [ + "cpu", + "chassis-temperature-inlet", + "chassis-temperature-exhaust", + "chassis-fan1", + "slot0", + "chassis-fan2", + "chassis-fan3", + "slot2", + "chassis-fan0" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "23412", + "mfg-name": "NTS", + "software-rev": "3.8.1 (2029-10-30 11:47:59)", + "model-name": "O1-O-RU-Simulator" }, { - "name": "chassis-fan3", + "name": "slot0-logical2", + "alias": "Slot0-C", + "description": "SLOT0-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan3-speed" - ] + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "sensor-data": { - "value": 1000, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 37, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan3-speed" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", "contains-child": [ - "cpu-temperature" - ] + "chassis-fan2-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", + "alias": "cpu-temperature", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot0", - "serial-num": "7220530", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "385A-SFP-2P-40-FHL-JC3", - "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-temperature", - "slot0-logical0", - "slot0-logical1", - "slot0-logical2" - ] + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0-temperature", - "sensor-data": { - "value": 51, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "slot2-logical0", + "alias": "Slot2-C", + "description": "SLOT2-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" - } + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "description": "SLOT0-AZ", + "name": "slot2-logical1", + "alias": "Slot3-A", + "description": "SLOT3-A", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "slot0-logical0-bbu", - "slot0-logical0-rrh" - ] + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", + "alias": "Slot0-A-bbu", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-bbu-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, "serial-num": "AGNN214S", "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "parent-rel-pos": 0, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-logical0-bbu-temperature" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-bbu-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "sensor-data": { - "value": 37, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical0-rrh", - "serial-num": "AGNF714S", - "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "name": "slot0", + "alias": "slot0", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical1", + "slot0-logical2", + "slot0-logical0", + "slot0-temperature" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, + "serial-num": "7220530", + "parent-rel-pos": 7, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "385A-SFP-2P-40-FHL-JC3" + }, + { + "name": "slot2", + "alias": "slot2", + "class": "iana-hardware:module", "contains-child": [ - "slot0-logical0-rrh-temperature" - ] + "slot2-temperature", + "slot2-logical0", + "slot2-logical2", + "slot2-logical1" + ], + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "2522642", + "parent-rel-pos": 9, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "339B-SFP-2P-75-FHL-JC3" }, { "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", "sensor-data": { "value": 35, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot0-logical1", - "description": "SLOT0-B", + "name": "slot0-temperature", + "alias": "slot0-temperature", + "sensor-data": { + "value": 51, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot0-logical2", - "description": "SLOT0-C", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", + "contains-child": [ + "cpu-temperature" + ], "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2", - "serial-num": "2522642", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "339B-SFP-2P-75-FHL-JC3", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot2-temperature", - "slot2-logical0", - "slot2-logical1", - "slot2-logical2" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { "name": "slot2-temperature", + "alias": "slot2-temperature", "sensor-data": { "value": 49, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot2-logical0", - "description": "SLOT2-C", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical1", - "description": "SLOT3-A", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical2", - "description": "SLOT3-B", - "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json index ab757fa..4800c35 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11221/ietf-hardware-running.json @@ -1,14 +1,6 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "alias": "chassis", - "class": "iana-hardware:chassis", - "state": { - "admin-state": "unlocked" - } - }, { "name": "chassis-temperature-exhaust", "alias": "chassis-temperature-exhaust", @@ -16,38 +8,39 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis" }, { - "name": "chassis-temperature-inlet", - "alias": "chassis-temperature-inlet", - "class": "iana-hardware:sensor", + "name": "slot2-logical2", + "alias": "Slot3-B", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 1 + "parent-rel-pos": 3, + "parent": "slot2" }, { - "name": "chassis-fan0", - "alias": "chassis-fan0", - "class": "iana-hardware:fan", + "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", + "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 2 + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", - "alias": "chassis-fan0-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { "admin-state": "locked" }, - "parent": "chassis-fan0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0-logical0" }, { "name": "chassis-fan1", @@ -56,68 +49,96 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 3 + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan1-speed", - "alias": "chassis-fan1-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan1", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan2", - "alias": "chassis-fan2", + "name": "slot0-logical1", + "alias": "Slot0-B", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" + }, + "parent-rel-pos": 2, + "parent": "slot0" + }, + { + "name": "chassis-fan0", + "alias": "chassis-fan0", "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 4 + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2-speed", - "alias": "chassis-fan2-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0", + "alias": "Slot0-A", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis-fan2", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan3", - "alias": "chassis-fan3", - "class": "iana-hardware:fan", + "name": "chassis", + "alias": "chassis", + "class": "iana-hardware:chassis", "state": { - "admin-state": "locked" + "admin-state": "unlocked" + } + }, + { + "name": "slot0-logical2", + "alias": "Slot0-C", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 5 + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", - "alias": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan3", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", - "alias": "cpu", - "class": "iana-hardware:cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 6 + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", + "state": { + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", @@ -126,150 +147,129 @@ "state": { "admin-state": "locked" }, - "parent": "cpu", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0", - "alias": "slot0", + "name": "slot2-logical0", + "alias": "Slot2-C", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 7 - }, - { - "name": "slot0-temperature", - "alias": "slot0-temperature", - "class": "iana-hardware:sensor", - "state": { - "admin-state": "locked" - }, - "parent": "slot0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "alias": "Slot0-A", + "name": "slot2-logical1", + "alias": "Slot3-A", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 1 + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", "alias": "Slot0-A-bbu", "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", "state": { "admin-state": "unlocked" }, - "parent": "slot0-logical0", "parent-rel-pos": 0, - "o-ran-hardware:o-ran-name": "slot0-logical0-bbu" + "parent": "slot0-logical0" }, { - "name": "slot0-logical0-bbu-temperature", - "alias": "Slot0-A-bbu-temperature", + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-bbu", - "parent-rel-pos": 0 - }, - { - "name": "slot0-logical0-rrh", - "alias": "Slot0-A-rrh", - "class": "iana-hardware:port", - "state": { - "admin-state": "unlocked" - }, - "parent": "slot0-logical0", - "parent-rel-pos": 1, - "o-ran-hardware:o-ran-name": "slot0-logical0-rrh" + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-rrh-temperature", - "alias": "Slot0-A-rrh-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-rrh", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical1", - "alias": "Slot0-B", + "name": "slot0", + "alias": "slot0", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 2 + "parent-rel-pos": 7, + "parent": "chassis" }, { - "name": "slot0-logical2", - "alias": "Slot0-C", + "name": "slot2", + "alias": "slot2", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 3 + "parent-rel-pos": 9, + "parent": "chassis" }, { - "name": "slot2", - "alias": "slot2", - "class": "iana-hardware:module", + "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 9 + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot2-temperature", - "alias": "slot2-temperature", + "name": "slot0-temperature", + "alias": "slot0-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot2-logical0", - "alias": "Slot2-C", - "class": "iana-hardware:module", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 1 + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2-logical1", - "alias": "Slot3-A", - "class": "iana-hardware:module", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 2 + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { - "name": "slot2-logical2", - "alias": "Slot3-B", - "class": "iana-hardware:module", + "name": "slot2-temperature", + "alias": "slot2-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 3 + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json index a4ba808..76ede7a 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11222/config.json @@ -12,7 +12,7 @@ "stdout": "log/netopeer-stdout.log", "stderr": "log/netopeer-stderr.log" }, - + "ntsim-network-function": { "path": "/opt/dev/ntsim-ng/ntsim-ng", "args": ["-w/opt/dev/ntsim-ng", "-f"], @@ -45,7 +45,7 @@ "o-ran-shared-cell", "nts-network-function" ], - + "default-list-instances": 2, "custom-list-instances" : [ {"/ietf-interfaces:interfaces/interface": 4} @@ -59,7 +59,7 @@ }, "datastore-populate-rules": { - "random-generation-enabled": true, + "random-generation-enabled": false, "pre-generated-operational-data": [ "../deploy/data/ietf-hardware-operational.json", @@ -81,7 +81,7 @@ "severity" : "CRITICAL", "date-time" : "$$time$$", "specific-problem" : "Interface Fault", - + "fault-id": "30", "fault-severity" : "CRITICAL", "affected-object" : "$$hostname$$", @@ -132,4 +132,4 @@ } ] } -} \ No newline at end of file +} diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json index 18c83c9..b0a474c 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-operational.json @@ -1,306 +1,441 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "serial-num": "23412", - "software-rev": "3.8.1 (2029-10-30 11:47:59)", - "mfg-name": "NTS", - "model-name": "O1-O-RU-Simulator", - "description": "O-RAN O-RU O1 Simulator", - "state": { - "oper-state": "enabled" - }, - "contains-child": [ - "chassis-temperature-exhaust", - "chassis-temperature-inlet", - "chassis-fan0", - "chassis-fan1", - "chassis-fan2", - "chassis-fan3", - "cpu", - "slot0", - "slot2" - ] - }, { "name": "chassis-temperature-exhaust", + "alias": "chassis-temperature-exhaust", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis" + }, + { + "name": "slot2-logical2", + "alias": "Slot3-B", + "description": "SLOT3-B", + "class": "iana-hardware:module", + "state": { + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 3, + "parent": "slot2" }, { "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", "sensor-data": { "value": 29, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-rrh-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "serial-num": "AGNF714S", + "mfg-name": "ACME GMBH.", + "parent-rel-pos": 1, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1", + "alias": "chassis-fan1", + "class": "iana-hardware:fan", "contains-child": [ - "chassis-fan0-speed" - ] + "chassis-fan1-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "sensor-data": { - "value": 4100, + "value": 1000, "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan1", + "name": "slot0-logical1", + "alias": "Slot0-B", + "description": "SLOT0-B", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan1-speed" - ] + "parent-rel-pos": 2, + "parent": "slot0" }, { - "name": "chassis-fan1-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis-fan0", + "alias": "chassis-fan0", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan0-speed" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2", + "name": "slot0-logical0", + "alias": "Slot0-A", + "description": "SLOT0-AZ", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical0-bbu", + "slot0-logical0-rrh" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan2-speed" - ] + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan2-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis", + "alias": "chassis", + "description": "O-RAN O-RU O1 Simulator", + "class": "iana-hardware:chassis", + "contains-child": [ + "cpu", + "chassis-temperature-inlet", + "chassis-temperature-exhaust", + "chassis-fan1", + "slot0", + "chassis-fan2", + "chassis-fan3", + "slot2", + "chassis-fan0" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "23412", + "mfg-name": "NTS", + "software-rev": "3.8.1 (2029-10-30 11:47:59)", + "model-name": "O1-O-RU-Simulator" }, { - "name": "chassis-fan3", + "name": "slot0-logical2", + "alias": "Slot0-C", + "description": "SLOT0-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan3-speed" - ] + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "sensor-data": { - "value": 1000, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 37, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan3-speed" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", "contains-child": [ - "cpu-temperature" - ] + "chassis-fan2-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", + "alias": "cpu-temperature", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot0", - "serial-num": "7220530", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "385A-SFP-2P-40-FHL-JC3", - "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-temperature", - "slot0-logical0", - "slot0-logical1", - "slot0-logical2" - ] + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0-temperature", - "sensor-data": { - "value": 51, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "slot2-logical0", + "alias": "Slot2-C", + "description": "SLOT2-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" - } + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "description": "SLOT0-AZ", + "name": "slot2-logical1", + "alias": "Slot3-A", + "description": "SLOT3-A", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "slot0-logical0-bbu", - "slot0-logical0-rrh" - ] + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", + "alias": "Slot0-A-bbu", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-bbu-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, "serial-num": "AGNN214S", "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "parent-rel-pos": 0, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-logical0-bbu-temperature" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-bbu-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "sensor-data": { - "value": 37, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical0-rrh", - "serial-num": "AGNF714S", - "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "name": "slot0", + "alias": "slot0", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical1", + "slot0-logical2", + "slot0-logical0", + "slot0-temperature" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, + "serial-num": "7220530", + "parent-rel-pos": 7, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "385A-SFP-2P-40-FHL-JC3" + }, + { + "name": "slot2", + "alias": "slot2", + "class": "iana-hardware:module", "contains-child": [ - "slot0-logical0-rrh-temperature" - ] + "slot2-temperature", + "slot2-logical0", + "slot2-logical2", + "slot2-logical1" + ], + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "2522642", + "parent-rel-pos": 9, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "339B-SFP-2P-75-FHL-JC3" }, { "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", "sensor-data": { "value": 35, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot0-logical1", - "description": "SLOT0-B", + "name": "slot0-temperature", + "alias": "slot0-temperature", + "sensor-data": { + "value": 51, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot0-logical2", - "description": "SLOT0-C", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", + "contains-child": [ + "cpu-temperature" + ], "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2", - "serial-num": "2522642", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "339B-SFP-2P-75-FHL-JC3", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot2-temperature", - "slot2-logical0", - "slot2-logical1", - "slot2-logical2" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { "name": "slot2-temperature", + "alias": "slot2-temperature", "sensor-data": { "value": 49, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot2-logical0", - "description": "SLOT2-C", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical1", - "description": "SLOT3-A", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical2", - "description": "SLOT3-B", - "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json index ab757fa..4800c35 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11222/ietf-hardware-running.json @@ -1,14 +1,6 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "alias": "chassis", - "class": "iana-hardware:chassis", - "state": { - "admin-state": "unlocked" - } - }, { "name": "chassis-temperature-exhaust", "alias": "chassis-temperature-exhaust", @@ -16,38 +8,39 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis" }, { - "name": "chassis-temperature-inlet", - "alias": "chassis-temperature-inlet", - "class": "iana-hardware:sensor", + "name": "slot2-logical2", + "alias": "Slot3-B", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 1 + "parent-rel-pos": 3, + "parent": "slot2" }, { - "name": "chassis-fan0", - "alias": "chassis-fan0", - "class": "iana-hardware:fan", + "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", + "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 2 + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", - "alias": "chassis-fan0-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { "admin-state": "locked" }, - "parent": "chassis-fan0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0-logical0" }, { "name": "chassis-fan1", @@ -56,68 +49,96 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 3 + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan1-speed", - "alias": "chassis-fan1-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan1", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan2", - "alias": "chassis-fan2", + "name": "slot0-logical1", + "alias": "Slot0-B", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" + }, + "parent-rel-pos": 2, + "parent": "slot0" + }, + { + "name": "chassis-fan0", + "alias": "chassis-fan0", "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 4 + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2-speed", - "alias": "chassis-fan2-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0", + "alias": "Slot0-A", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis-fan2", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan3", - "alias": "chassis-fan3", - "class": "iana-hardware:fan", + "name": "chassis", + "alias": "chassis", + "class": "iana-hardware:chassis", "state": { - "admin-state": "locked" + "admin-state": "unlocked" + } + }, + { + "name": "slot0-logical2", + "alias": "Slot0-C", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 5 + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", - "alias": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan3", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", - "alias": "cpu", - "class": "iana-hardware:cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 6 + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", + "state": { + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", @@ -126,150 +147,129 @@ "state": { "admin-state": "locked" }, - "parent": "cpu", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0", - "alias": "slot0", + "name": "slot2-logical0", + "alias": "Slot2-C", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 7 - }, - { - "name": "slot0-temperature", - "alias": "slot0-temperature", - "class": "iana-hardware:sensor", - "state": { - "admin-state": "locked" - }, - "parent": "slot0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "alias": "Slot0-A", + "name": "slot2-logical1", + "alias": "Slot3-A", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 1 + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", "alias": "Slot0-A-bbu", "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", "state": { "admin-state": "unlocked" }, - "parent": "slot0-logical0", "parent-rel-pos": 0, - "o-ran-hardware:o-ran-name": "slot0-logical0-bbu" + "parent": "slot0-logical0" }, { - "name": "slot0-logical0-bbu-temperature", - "alias": "Slot0-A-bbu-temperature", + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-bbu", - "parent-rel-pos": 0 - }, - { - "name": "slot0-logical0-rrh", - "alias": "Slot0-A-rrh", - "class": "iana-hardware:port", - "state": { - "admin-state": "unlocked" - }, - "parent": "slot0-logical0", - "parent-rel-pos": 1, - "o-ran-hardware:o-ran-name": "slot0-logical0-rrh" + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-rrh-temperature", - "alias": "Slot0-A-rrh-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-rrh", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical1", - "alias": "Slot0-B", + "name": "slot0", + "alias": "slot0", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 2 + "parent-rel-pos": 7, + "parent": "chassis" }, { - "name": "slot0-logical2", - "alias": "Slot0-C", + "name": "slot2", + "alias": "slot2", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 3 + "parent-rel-pos": 9, + "parent": "chassis" }, { - "name": "slot2", - "alias": "slot2", - "class": "iana-hardware:module", + "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 9 + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot2-temperature", - "alias": "slot2-temperature", + "name": "slot0-temperature", + "alias": "slot0-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot2-logical0", - "alias": "Slot2-C", - "class": "iana-hardware:module", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 1 + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2-logical1", - "alias": "Slot3-A", - "class": "iana-hardware:module", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 2 + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { - "name": "slot2-logical2", - "alias": "Slot3-B", - "class": "iana-hardware:module", + "name": "slot2-temperature", + "alias": "slot2-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 3 + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json index a4ba808..76ede7a 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11223/config.json @@ -12,7 +12,7 @@ "stdout": "log/netopeer-stdout.log", "stderr": "log/netopeer-stderr.log" }, - + "ntsim-network-function": { "path": "/opt/dev/ntsim-ng/ntsim-ng", "args": ["-w/opt/dev/ntsim-ng", "-f"], @@ -45,7 +45,7 @@ "o-ran-shared-cell", "nts-network-function" ], - + "default-list-instances": 2, "custom-list-instances" : [ {"/ietf-interfaces:interfaces/interface": 4} @@ -59,7 +59,7 @@ }, "datastore-populate-rules": { - "random-generation-enabled": true, + "random-generation-enabled": false, "pre-generated-operational-data": [ "../deploy/data/ietf-hardware-operational.json", @@ -81,7 +81,7 @@ "severity" : "CRITICAL", "date-time" : "$$time$$", "specific-problem" : "Interface Fault", - + "fault-id": "30", "fault-severity" : "CRITICAL", "affected-object" : "$$hostname$$", @@ -132,4 +132,4 @@ } ] } -} \ No newline at end of file +} diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json index 18c83c9..b0a474c 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-operational.json @@ -1,306 +1,441 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "serial-num": "23412", - "software-rev": "3.8.1 (2029-10-30 11:47:59)", - "mfg-name": "NTS", - "model-name": "O1-O-RU-Simulator", - "description": "O-RAN O-RU O1 Simulator", - "state": { - "oper-state": "enabled" - }, - "contains-child": [ - "chassis-temperature-exhaust", - "chassis-temperature-inlet", - "chassis-fan0", - "chassis-fan1", - "chassis-fan2", - "chassis-fan3", - "cpu", - "slot0", - "slot2" - ] - }, { "name": "chassis-temperature-exhaust", + "alias": "chassis-temperature-exhaust", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis" + }, + { + "name": "slot2-logical2", + "alias": "Slot3-B", + "description": "SLOT3-B", + "class": "iana-hardware:module", + "state": { + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 3, + "parent": "slot2" }, { "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", "sensor-data": { "value": 29, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-rrh-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "serial-num": "AGNF714S", + "mfg-name": "ACME GMBH.", + "parent-rel-pos": 1, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1", + "alias": "chassis-fan1", + "class": "iana-hardware:fan", "contains-child": [ - "chassis-fan0-speed" - ] + "chassis-fan1-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "sensor-data": { - "value": 4100, + "value": 1000, "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan1", + "name": "slot0-logical1", + "alias": "Slot0-B", + "description": "SLOT0-B", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan1-speed" - ] + "parent-rel-pos": 2, + "parent": "slot0" }, { - "name": "chassis-fan1-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis-fan0", + "alias": "chassis-fan0", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan0-speed" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2", + "name": "slot0-logical0", + "alias": "Slot0-A", + "description": "SLOT0-AZ", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical0-bbu", + "slot0-logical0-rrh" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan2-speed" - ] + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan2-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis", + "alias": "chassis", + "description": "O-RAN O-RU O1 Simulator", + "class": "iana-hardware:chassis", + "contains-child": [ + "cpu", + "chassis-temperature-inlet", + "chassis-temperature-exhaust", + "chassis-fan1", + "slot0", + "chassis-fan2", + "chassis-fan3", + "slot2", + "chassis-fan0" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "23412", + "mfg-name": "NTS", + "software-rev": "3.8.1 (2029-10-30 11:47:59)", + "model-name": "O1-O-RU-Simulator" }, { - "name": "chassis-fan3", + "name": "slot0-logical2", + "alias": "Slot0-C", + "description": "SLOT0-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan3-speed" - ] + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "sensor-data": { - "value": 1000, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 37, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan3-speed" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", "contains-child": [ - "cpu-temperature" - ] + "chassis-fan2-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", + "alias": "cpu-temperature", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot0", - "serial-num": "7220530", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "385A-SFP-2P-40-FHL-JC3", - "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-temperature", - "slot0-logical0", - "slot0-logical1", - "slot0-logical2" - ] + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0-temperature", - "sensor-data": { - "value": 51, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "slot2-logical0", + "alias": "Slot2-C", + "description": "SLOT2-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" - } + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "description": "SLOT0-AZ", + "name": "slot2-logical1", + "alias": "Slot3-A", + "description": "SLOT3-A", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "slot0-logical0-bbu", - "slot0-logical0-rrh" - ] + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", + "alias": "Slot0-A-bbu", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-bbu-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, "serial-num": "AGNN214S", "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "parent-rel-pos": 0, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-logical0-bbu-temperature" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-bbu-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "sensor-data": { - "value": 37, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical0-rrh", - "serial-num": "AGNF714S", - "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "name": "slot0", + "alias": "slot0", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical1", + "slot0-logical2", + "slot0-logical0", + "slot0-temperature" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, + "serial-num": "7220530", + "parent-rel-pos": 7, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "385A-SFP-2P-40-FHL-JC3" + }, + { + "name": "slot2", + "alias": "slot2", + "class": "iana-hardware:module", "contains-child": [ - "slot0-logical0-rrh-temperature" - ] + "slot2-temperature", + "slot2-logical0", + "slot2-logical2", + "slot2-logical1" + ], + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "2522642", + "parent-rel-pos": 9, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "339B-SFP-2P-75-FHL-JC3" }, { "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", "sensor-data": { "value": 35, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot0-logical1", - "description": "SLOT0-B", + "name": "slot0-temperature", + "alias": "slot0-temperature", + "sensor-data": { + "value": 51, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot0-logical2", - "description": "SLOT0-C", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", + "contains-child": [ + "cpu-temperature" + ], "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2", - "serial-num": "2522642", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "339B-SFP-2P-75-FHL-JC3", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot2-temperature", - "slot2-logical0", - "slot2-logical1", - "slot2-logical2" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { "name": "slot2-temperature", + "alias": "slot2-temperature", "sensor-data": { "value": 49, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot2-logical0", - "description": "SLOT2-C", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical1", - "description": "SLOT3-A", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical2", - "description": "SLOT3-B", - "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json index ab757fa..4800c35 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11223/ietf-hardware-running.json @@ -1,14 +1,6 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "alias": "chassis", - "class": "iana-hardware:chassis", - "state": { - "admin-state": "unlocked" - } - }, { "name": "chassis-temperature-exhaust", "alias": "chassis-temperature-exhaust", @@ -16,38 +8,39 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis" }, { - "name": "chassis-temperature-inlet", - "alias": "chassis-temperature-inlet", - "class": "iana-hardware:sensor", + "name": "slot2-logical2", + "alias": "Slot3-B", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 1 + "parent-rel-pos": 3, + "parent": "slot2" }, { - "name": "chassis-fan0", - "alias": "chassis-fan0", - "class": "iana-hardware:fan", + "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", + "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 2 + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", - "alias": "chassis-fan0-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { "admin-state": "locked" }, - "parent": "chassis-fan0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0-logical0" }, { "name": "chassis-fan1", @@ -56,68 +49,96 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 3 + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan1-speed", - "alias": "chassis-fan1-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan1", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan2", - "alias": "chassis-fan2", + "name": "slot0-logical1", + "alias": "Slot0-B", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" + }, + "parent-rel-pos": 2, + "parent": "slot0" + }, + { + "name": "chassis-fan0", + "alias": "chassis-fan0", "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 4 + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2-speed", - "alias": "chassis-fan2-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0", + "alias": "Slot0-A", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis-fan2", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan3", - "alias": "chassis-fan3", - "class": "iana-hardware:fan", + "name": "chassis", + "alias": "chassis", + "class": "iana-hardware:chassis", "state": { - "admin-state": "locked" + "admin-state": "unlocked" + } + }, + { + "name": "slot0-logical2", + "alias": "Slot0-C", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 5 + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", - "alias": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan3", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", - "alias": "cpu", - "class": "iana-hardware:cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 6 + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", + "state": { + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", @@ -126,150 +147,129 @@ "state": { "admin-state": "locked" }, - "parent": "cpu", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0", - "alias": "slot0", + "name": "slot2-logical0", + "alias": "Slot2-C", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 7 - }, - { - "name": "slot0-temperature", - "alias": "slot0-temperature", - "class": "iana-hardware:sensor", - "state": { - "admin-state": "locked" - }, - "parent": "slot0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "alias": "Slot0-A", + "name": "slot2-logical1", + "alias": "Slot3-A", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 1 + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", "alias": "Slot0-A-bbu", "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", "state": { "admin-state": "unlocked" }, - "parent": "slot0-logical0", "parent-rel-pos": 0, - "o-ran-hardware:o-ran-name": "slot0-logical0-bbu" + "parent": "slot0-logical0" }, { - "name": "slot0-logical0-bbu-temperature", - "alias": "Slot0-A-bbu-temperature", + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-bbu", - "parent-rel-pos": 0 - }, - { - "name": "slot0-logical0-rrh", - "alias": "Slot0-A-rrh", - "class": "iana-hardware:port", - "state": { - "admin-state": "unlocked" - }, - "parent": "slot0-logical0", - "parent-rel-pos": 1, - "o-ran-hardware:o-ran-name": "slot0-logical0-rrh" + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-rrh-temperature", - "alias": "Slot0-A-rrh-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-rrh", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical1", - "alias": "Slot0-B", + "name": "slot0", + "alias": "slot0", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 2 + "parent-rel-pos": 7, + "parent": "chassis" }, { - "name": "slot0-logical2", - "alias": "Slot0-C", + "name": "slot2", + "alias": "slot2", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 3 + "parent-rel-pos": 9, + "parent": "chassis" }, { - "name": "slot2", - "alias": "slot2", - "class": "iana-hardware:module", + "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 9 + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot2-temperature", - "alias": "slot2-temperature", + "name": "slot0-temperature", + "alias": "slot0-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot2-logical0", - "alias": "Slot2-C", - "class": "iana-hardware:module", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 1 + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2-logical1", - "alias": "Slot3-A", - "class": "iana-hardware:module", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 2 + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { - "name": "slot2-logical2", - "alias": "Slot3-B", - "class": "iana-hardware:module", + "name": "slot2-temperature", + "alias": "slot2-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 3 + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json b/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json index 35071e8..76ede7a 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11224/config.json @@ -12,7 +12,7 @@ "stdout": "log/netopeer-stdout.log", "stderr": "log/netopeer-stderr.log" }, - + "ntsim-network-function": { "path": "/opt/dev/ntsim-ng/ntsim-ng", "args": ["-w/opt/dev/ntsim-ng", "-f"], @@ -45,7 +45,7 @@ "o-ran-shared-cell", "nts-network-function" ], - + "default-list-instances": 2, "custom-list-instances" : [ {"/ietf-interfaces:interfaces/interface": 4} @@ -59,7 +59,7 @@ }, "datastore-populate-rules": { - "random-generation-enabled": true, + "random-generation-enabled": false, "pre-generated-operational-data": [ "../deploy/data/ietf-hardware-operational.json", @@ -77,11 +77,11 @@ "faults" : [ { "condition" : "Interface Fault", - "object" : "09a95e08-5b53-4734-815f-a9c12300fc64", + "object" : "09a95e08-5b53-4734-815f-a9c12300fc62", "severity" : "CRITICAL", "date-time" : "$$time$$", "specific-problem" : "Interface Fault", - + "fault-id": "30", "fault-severity" : "CRITICAL", "affected-object" : "$$hostname$$", @@ -91,7 +91,7 @@ { "condition" : "Interface Fault", - "object" : "09a95e08-5b53-4734-815f-a9c12300fc64", + "object" : "09a95e08-5b53-4734-815f-a9c12300fc62", "severity" : "NORMAL", "date-time" : "$$time$$", "specific-problem" : "Interface Fault", @@ -105,7 +105,7 @@ { "condition" : "C/U-plane logical Connection faulty", - "object" : "09a95e08-5b53-4734-815f-a9c12300fc64", + "object" : "09a95e08-5b53-4734-815f-a9c12300fc62", "severity" : "CRITICAL", "date-time" : "$$time$$", "specific-problem" : "C/U-plane logical Connection faulty", @@ -119,7 +119,7 @@ { "condition" : "C/U-plane logical Connection faulty", - "object" : "09a95e08-5b53-4734-815f-a9c12300fc64", + "object" : "09a95e08-5b53-4734-815f-a9c12300fc62", "severity" : "NORMAL", "date-time" : "$$time$$", "specific-problem" : "C/U-plane logical Connection faulty", @@ -132,4 +132,4 @@ } ] } -} \ No newline at end of file +} diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json index 18c83c9..b0a474c 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-operational.json @@ -1,306 +1,441 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "serial-num": "23412", - "software-rev": "3.8.1 (2029-10-30 11:47:59)", - "mfg-name": "NTS", - "model-name": "O1-O-RU-Simulator", - "description": "O-RAN O-RU O1 Simulator", - "state": { - "oper-state": "enabled" - }, - "contains-child": [ - "chassis-temperature-exhaust", - "chassis-temperature-inlet", - "chassis-fan0", - "chassis-fan1", - "chassis-fan2", - "chassis-fan3", - "cpu", - "slot0", - "slot2" - ] - }, { "name": "chassis-temperature-exhaust", + "alias": "chassis-temperature-exhaust", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis" + }, + { + "name": "slot2-logical2", + "alias": "Slot3-B", + "description": "SLOT3-B", + "class": "iana-hardware:module", + "state": { + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 3, + "parent": "slot2" }, { "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", "sensor-data": { "value": 29, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-rrh-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "serial-num": "AGNF714S", + "mfg-name": "ACME GMBH.", + "parent-rel-pos": 1, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1", + "alias": "chassis-fan1", + "class": "iana-hardware:fan", "contains-child": [ - "chassis-fan0-speed" - ] + "chassis-fan1-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "sensor-data": { - "value": 4100, + "value": 1000, "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan1", + "name": "slot0-logical1", + "alias": "Slot0-B", + "description": "SLOT0-B", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan1-speed" - ] + "parent-rel-pos": 2, + "parent": "slot0" }, { - "name": "chassis-fan1-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis-fan0", + "alias": "chassis-fan0", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan0-speed" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2", + "name": "slot0-logical0", + "alias": "Slot0-A", + "description": "SLOT0-AZ", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical0-bbu", + "slot0-logical0-rrh" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan2-speed" - ] + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan2-speed", - "sensor-data": { - "value": 4100, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "chassis", + "alias": "chassis", + "description": "O-RAN O-RU O1 Simulator", + "class": "iana-hardware:chassis", + "contains-child": [ + "cpu", + "chassis-temperature-inlet", + "chassis-temperature-exhaust", + "chassis-fan1", + "slot0", + "chassis-fan2", + "chassis-fan3", + "slot2", + "chassis-fan0" + ], "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "23412", + "mfg-name": "NTS", + "software-rev": "3.8.1 (2029-10-30 11:47:59)", + "model-name": "O1-O-RU-Simulator" }, { - "name": "chassis-fan3", + "name": "slot0-logical2", + "alias": "Slot0-C", + "description": "SLOT0-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "chassis-fan3-speed" - ] + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "sensor-data": { - "value": 1000, - "value-type": "rpm", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 37, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", + "contains-child": [ + "chassis-fan3-speed" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", "contains-child": [ - "cpu-temperature" - ] + "chassis-fan2-speed" + ], + "state": { + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", + "alias": "cpu-temperature", "sensor-data": { "value": 30, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot0", - "serial-num": "7220530", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "385A-SFP-2P-40-FHL-JC3", - "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-temperature", - "slot0-logical0", - "slot0-logical1", - "slot0-logical2" - ] + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0-temperature", - "sensor-data": { - "value": 51, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" - }, + "name": "slot2-logical0", + "alias": "Slot2-C", + "description": "SLOT2-C", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" - } + "oper-state": "disabled", + "admin-state": "unlocked" + }, + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "description": "SLOT0-AZ", + "name": "slot2-logical1", + "alias": "Slot3-A", + "description": "SLOT3-A", + "class": "iana-hardware:module", "state": { - "oper-state": "enabled" + "oper-state": "disabled", + "admin-state": "unlocked" }, - "contains-child": [ - "slot0-logical0-bbu", - "slot0-logical0-rrh" - ] + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", + "alias": "Slot0-A-bbu", + "class": "iana-hardware:port", + "contains-child": [ + "slot0-logical0-bbu-temperature" + ], + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, "serial-num": "AGNN214S", "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "parent-rel-pos": 0, + "parent": "slot0-logical0", + "model-name": "ANSHEONXH-E7" + }, + { + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot0-logical0-bbu-temperature" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-bbu-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "sensor-data": { - "value": 37, - "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical0-rrh", - "serial-num": "AGNF714S", - "mfg-name": "ACME GMBH.", - "model-name": "ANSHEONXH-E7", + "name": "slot0", + "alias": "slot0", + "class": "iana-hardware:module", + "contains-child": [ + "slot0-logical1", + "slot0-logical2", + "slot0-logical0", + "slot0-temperature" + ], "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "unlocked" }, + "serial-num": "7220530", + "parent-rel-pos": 7, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "385A-SFP-2P-40-FHL-JC3" + }, + { + "name": "slot2", + "alias": "slot2", + "class": "iana-hardware:module", "contains-child": [ - "slot0-logical0-rrh-temperature" - ] + "slot2-temperature", + "slot2-logical0", + "slot2-logical2", + "slot2-logical1" + ], + "state": { + "oper-state": "enabled", + "admin-state": "unlocked" + }, + "serial-num": "2522642", + "parent-rel-pos": 9, + "software-rev": "0", + "parent": "chassis", + "firmware-rev": "12.00.42-S (0F7F1001)", + "model-name": "339B-SFP-2P-75-FHL-JC3" }, { "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", "sensor-data": { "value": 35, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot0-logical1", - "description": "SLOT0-B", + "name": "slot0-temperature", + "alias": "slot0-temperature", + "sensor-data": { + "value": 51, + "value-type": "celsius", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot0-logical2", - "description": "SLOT0-C", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", + "contains-child": [ + "cpu-temperature" + ], "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2", - "serial-num": "2522642", - "firmware-rev": "12.00.42-S (0F7F1001)", - "software-rev": "0", - "model-name": "339B-SFP-2P-75-FHL-JC3", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "sensor-data": { + "value": 4100, + "value-type": "rpm", + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" + }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" + "oper-state": "enabled", + "admin-state": "locked" }, - "contains-child": [ - "slot2-temperature", - "slot2-logical0", - "slot2-logical1", - "slot2-logical2" - ] + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { "name": "slot2-temperature", + "alias": "slot2-temperature", "sensor-data": { "value": 49, "value-type": "celsius", - "value-timestamp": "2021-03-18T19:51:50.3Z", - "oper-status": "ok" + "oper-status": "ok", + "value-timestamp": "2021-03-18T19:51:50.3Z" }, + "class": "iana-hardware:sensor", "state": { - "oper-state": "enabled" - } - }, - { - "name": "slot2-logical0", - "description": "SLOT2-C", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical1", - "description": "SLOT3-A", - "state": { - "oper-state": "disabled" - } - }, - { - "name": "slot2-logical2", - "description": "SLOT3-B", - "state": { - "oper-state": "disabled" - } + "oper-state": "enabled", + "admin-state": "locked" + }, + "parent-rel-pos": 0, + "parent": "slot2" } ] } diff --git a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json index ab757fa..4800c35 100644 --- a/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json +++ b/solution/network/ntsim-ng-o-ru/o-ru-11224/ietf-hardware-running.json @@ -1,14 +1,6 @@ { "ietf-hardware:hardware": { "component": [ - { - "name": "chassis", - "alias": "chassis", - "class": "iana-hardware:chassis", - "state": { - "admin-state": "unlocked" - } - }, { "name": "chassis-temperature-exhaust", "alias": "chassis-temperature-exhaust", @@ -16,38 +8,39 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis" }, { - "name": "chassis-temperature-inlet", - "alias": "chassis-temperature-inlet", - "class": "iana-hardware:sensor", + "name": "slot2-logical2", + "alias": "Slot3-B", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 1 + "parent-rel-pos": 3, + "parent": "slot2" }, { - "name": "chassis-fan0", - "alias": "chassis-fan0", - "class": "iana-hardware:fan", + "name": "chassis-temperature-inlet", + "alias": "chassis-temperature-inlet", + "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 2 + "parent-rel-pos": 1, + "parent": "chassis" }, { - "name": "chassis-fan0-speed", - "alias": "chassis-fan0-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0-rrh", + "alias": "Slot0-A-rrh", + "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-rrh", "state": { "admin-state": "locked" }, - "parent": "chassis-fan0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0-logical0" }, { "name": "chassis-fan1", @@ -56,68 +49,96 @@ "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 3 + "parent-rel-pos": 3, + "parent": "chassis" }, { - "name": "chassis-fan1-speed", - "alias": "chassis-fan1-speed", + "name": "chassis-fan3-speed", + "alias": "chassis-fan3-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan1", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan3" }, { - "name": "chassis-fan2", - "alias": "chassis-fan2", + "name": "slot0-logical1", + "alias": "Slot0-B", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" + }, + "parent-rel-pos": 2, + "parent": "slot0" + }, + { + "name": "chassis-fan0", + "alias": "chassis-fan0", "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 4 + "parent-rel-pos": 2, + "parent": "chassis" }, { - "name": "chassis-fan2-speed", - "alias": "chassis-fan2-speed", - "class": "iana-hardware:sensor", + "name": "slot0-logical0", + "alias": "Slot0-A", + "class": "iana-hardware:module", "state": { - "admin-state": "locked" + "admin-state": "unlocked" }, - "parent": "chassis-fan2", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot0" }, { - "name": "chassis-fan3", - "alias": "chassis-fan3", - "class": "iana-hardware:fan", + "name": "chassis", + "alias": "chassis", + "class": "iana-hardware:chassis", "state": { - "admin-state": "locked" + "admin-state": "unlocked" + } + }, + { + "name": "slot0-logical2", + "alias": "Slot0-C", + "class": "iana-hardware:module", + "state": { + "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 5 + "parent-rel-pos": 3, + "parent": "slot0" }, { - "name": "chassis-fan3-speed", - "alias": "chassis-fan3-speed", + "name": "slot0-logical0-bbu-temperature", + "alias": "Slot0-A-bbu-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "chassis-fan3", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0-logical0-bbu" }, { - "name": "cpu", - "alias": "cpu", - "class": "iana-hardware:cpu", + "name": "chassis-fan3", + "alias": "chassis-fan3", + "class": "iana-hardware:fan", "state": { "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 6 + "parent-rel-pos": 5, + "parent": "chassis" + }, + { + "name": "chassis-fan2", + "alias": "chassis-fan2", + "class": "iana-hardware:fan", + "state": { + "admin-state": "locked" + }, + "parent-rel-pos": 4, + "parent": "chassis" }, { "name": "cpu-temperature", @@ -126,150 +147,129 @@ "state": { "admin-state": "locked" }, - "parent": "cpu", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "cpu" }, { - "name": "slot0", - "alias": "slot0", + "name": "slot2-logical0", + "alias": "Slot2-C", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "chassis", - "parent-rel-pos": 7 - }, - { - "name": "slot0-temperature", - "alias": "slot0-temperature", - "class": "iana-hardware:sensor", - "state": { - "admin-state": "locked" - }, - "parent": "slot0", - "parent-rel-pos": 0 + "parent-rel-pos": 1, + "parent": "slot2" }, { - "name": "slot0-logical0", - "alias": "Slot0-A", + "name": "slot2-logical1", + "alias": "Slot3-A", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 1 + "parent-rel-pos": 2, + "parent": "slot2" }, { "name": "slot0-logical0-bbu", "alias": "Slot0-A-bbu", "class": "iana-hardware:port", + "o-ran-hardware:o-ran-name": "slot0-logical0-bbu", "state": { "admin-state": "unlocked" }, - "parent": "slot0-logical0", "parent-rel-pos": 0, - "o-ran-hardware:o-ran-name": "slot0-logical0-bbu" + "parent": "slot0-logical0" }, { - "name": "slot0-logical0-bbu-temperature", - "alias": "Slot0-A-bbu-temperature", + "name": "chassis-fan1-speed", + "alias": "chassis-fan1-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-bbu", - "parent-rel-pos": 0 - }, - { - "name": "slot0-logical0-rrh", - "alias": "Slot0-A-rrh", - "class": "iana-hardware:port", - "state": { - "admin-state": "unlocked" - }, - "parent": "slot0-logical0", - "parent-rel-pos": 1, - "o-ran-hardware:o-ran-name": "slot0-logical0-rrh" + "parent-rel-pos": 0, + "parent": "chassis-fan1" }, { - "name": "slot0-logical0-rrh-temperature", - "alias": "Slot0-A-rrh-temperature", + "name": "chassis-fan0-speed", + "alias": "chassis-fan0-speed", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot0-logical0-rrh", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "chassis-fan0" }, { - "name": "slot0-logical1", - "alias": "Slot0-B", + "name": "slot0", + "alias": "slot0", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 2 + "parent-rel-pos": 7, + "parent": "chassis" }, { - "name": "slot0-logical2", - "alias": "Slot0-C", + "name": "slot2", + "alias": "slot2", "class": "iana-hardware:module", "state": { "admin-state": "unlocked" }, - "parent": "slot0", - "parent-rel-pos": 3 + "parent-rel-pos": 9, + "parent": "chassis" }, { - "name": "slot2", - "alias": "slot2", - "class": "iana-hardware:module", + "name": "slot0-logical0-rrh-temperature", + "alias": "Slot0-A-rrh-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "chassis", - "parent-rel-pos": 9 + "parent-rel-pos": 0, + "parent": "slot0-logical0-rrh" }, { - "name": "slot2-temperature", - "alias": "slot2-temperature", + "name": "slot0-temperature", + "alias": "slot0-temperature", "class": "iana-hardware:sensor", "state": { "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 0 + "parent-rel-pos": 0, + "parent": "slot0" }, { - "name": "slot2-logical0", - "alias": "Slot2-C", - "class": "iana-hardware:module", + "name": "cpu", + "alias": "cpu", + "class": "iana-hardware:cpu", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 1 + "parent-rel-pos": 6, + "parent": "chassis" }, { - "name": "slot2-logical1", - "alias": "Slot3-A", - "class": "iana-hardware:module", + "name": "chassis-fan2-speed", + "alias": "chassis-fan2-speed", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 2 + "parent-rel-pos": 0, + "parent": "chassis-fan2" }, { - "name": "slot2-logical2", - "alias": "Slot3-B", - "class": "iana-hardware:module", + "name": "slot2-temperature", + "alias": "slot2-temperature", + "class": "iana-hardware:sensor", "state": { - "admin-state": "unlocked" + "admin-state": "locked" }, - "parent": "slot2", - "parent-rel-pos": 3 + "parent-rel-pos": 0, + "parent": "slot2" } ] } -- 2.16.6