From b032eca98241d74f7aebda4fe20da504b14ccba6 Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 12 Jan 2022 12:32:54 +0100 Subject: [PATCH] Update Network simulators Update the DU/RU/topo sims with latest image for e-release Issue-ID: NONRTRIC-622 Signed-off-by: sebdet Change-Id: Ieed9a5c93a4feba71a831b5567a28f10050b5f67 --- .../network-simulators-topology-override.yaml | 194 ++++++++++++++------- .../du-simulator/resources/config/config.json | 21 ++- .../config/o-ran-sc-du-hello-world-operational.xml | 108 +++++++++++- .../config/o-ran-sc-du-hello-world-running.xml | 66 ++++++- smo-install/oran_oom/du-simulator/values.yaml | 101 +++++++---- smo-install/oran_oom/ru-simulator/values.yaml | 2 +- smo-install/oran_oom/topology-server/values.yaml | 2 +- 7 files changed, 375 insertions(+), 119 deletions(-) diff --git a/smo-install/helm-override/network-simulators-topology-override.yaml b/smo-install/helm-override/network-simulators-topology-override.yaml index b500b269..b9e9ee04 100644 --- a/smo-install/helm-override/network-simulators-topology-override.yaml +++ b/smo-install/helm-override/network-simulators-topology-override.yaml @@ -188,88 +188,158 @@ ru-simulator: du-simulator: dus: - name: o-du-1121 - rus: - - name: o-ru-11211 - administrativeState: LOCKED - operationalState: ENABLED - status: disconnected + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + cell: + name: cell-1 + trafficState: active + localId: 1 + physicalCellId: 1 + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + radioResourcePolicy: + name: rrm-pol-1 + resourceType: prb + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked simulatedFaults: - - name: o-ru-11211 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + - name: fault1 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: false - text: "O-RU Port Down" - - name: o-ru-11211 - condition: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-A" + - name: fault1-close + condition: "CPRI Port Down" severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR + cleared: true + text: "CPRI Port Down" + object: "Slot-0-Port-A" + + - name: fault2 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR + cleared: false + text: "CPRI Port Down" + object: "Slot-0-Port-C" + - name: fault2-close + condition: "CPRI Port Down" + severity: NORMAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR + cleared: true + text: "CPRI Port Down" + object: "Slot-0-Port-C" + + - name: fault3 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR + cleared: false + text: "CPRI Port Down" + object: "Slot-2-Port-B" + - name: fault3-close + condition: "CPRI Port Down" + severity: NORMAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: true - text: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-2-Port-B" - name: o-du-1122 - rus: - - name: o-ru-11221 - administrativeState: LOCKED - operationalState: ENABLED - status: disconnected - - name: o-ru-11222 - administrativeState: UNLOCKED - operationalState: ENABLED - status: connected - - name: o-ru-11223 - administrativeState: LOCKED - operationalState: DISABLED - status: unable-to-connect + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + cell: + name: cell-2 + trafficState: active + localId: 2 + physicalCellId: 2 + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + radioResourcePolicy: + name: rrm-pol-2 + resourceType: prb + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked simulatedFaults: - - name: o-ru-11221 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + - name: fault1 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: false - text: "O-RU Port Down" - - name: o-ru-11221 - condition: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-A" + - name: fault1-close + condition: "CPRI Port Down" severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: true - text: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-A" - - name: o-ru-11222 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + - name: fault2 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: false - text: "O-RU Port Down" - - name: o-ru-11222 - condition: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-C" + - name: fault2-close + condition: "CPRI Port Down" severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: true - text: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-C" - - name: o-ru-11223 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + - name: fault3 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: false - text: "O-RU Port Down" - - name: o-ru-11223 - condition: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-2-Port-B" + - name: fault3-close + condition: "CPRI Port Down" severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: true - text: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-2-Port-B" topology-server: simulatedFaults: diff --git a/smo-install/oran_oom/du-simulator/resources/config/config.json b/smo-install/oran_oom/du-simulator/resources/config/config.json index 290d21b6..172bff5f 100644 --- a/smo-install/oran_oom/du-simulator/resources/config/config.json +++ b/smo-install/oran_oom/du-simulator/resources/config/config.json @@ -13,6 +13,14 @@ "stderr": "log/netopeer-stderr.log" }, + "sshd": { + "path": "/usr/sbin/sshd", + "args": ["-D"], + "autorestart": true, + "stdout": "log/sshd-stdout.log", + "stderr": "log/sshd-stderr.log" + }, + "ntsim-network-function": { "path": "/opt/dev/ntsim-ng/ntsim-ng", "args": ["-w/opt/dev/ntsim-ng", "-f"], @@ -32,21 +40,22 @@ "ietf-truststore", "ietf-system", "ietf-netconf-server", - "nts-network-function" + "nts-network-function", + "o-ran-sc-du-hello-world" ], - "default-list-instances": 2, + "default-list-instances": 1, "custom-list-instances" : [] }, "datastore-populate-rules": { - "random-generation-enabled": true, + "random-generation-enabled": false, "pre-generated-operational-data": [ - "/opt/dev/deploy/data/o-ran-sc-du-hello-world-operational.xml" + "../deploy/data/o-ran-sc-du-hello-world-operational.xml" ], "pre-generated-running-data": [ - "/opt/dev/deploy/data/o-ran-sc-du-hello-world-running.xml" + "../deploy/data/o-ran-sc-du-hello-world-running.xml" ] }, @@ -58,7 +67,7 @@ {{ range $i, $fault := .du.simulatedFaults }} { "condition" : "{{ $fault.condition }}", - "object" : "/o-ran-sc-du-hello-world:network-function/du-to-ru-connection[name='{{$fault.name}}']", + "object" : "{{$fault.object}}", "severity" : "{{$fault.severity}}", "date-time" : "$$time$$", "specific-problem" : "{{$fault.specificProblem}}", diff --git a/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-operational.xml b/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-operational.xml index c3785ebf..19fdb891 100644 --- a/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-operational.xml +++ b/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-operational.xml @@ -1,10 +1,102 @@ -{{ range $i, $ru := .du.rus }} - - {{ $ru.name }} - {{ $ru.administrativeState }} - {{ $ru.operationalState }} - {{ $ru.status }} - -{{ end }} + {{ .du.name }} + {{ .du.operational.administrativeState }} + {{ .du.operational.operationalState }} + {{ .du.name }} + CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM + {{ .du.name }} + + {{ .du.name }} + {{ .du.operational.administrativeState }} + {{ .du.operational.operationalState }} + {{ .du.name }} + + {{ .du.cell.name }} + {{ .du.cell.operational.administrativeState }} + {{ .du.cell.operational.operationalState }} + {{ .du.cell.name }} + {{ .du.cell.trafficState }} + {{ .du.cell.localId }} + + 310 + 150 + 1 + 1 + + {{ .du.cell.physicalCellId }} + 10 + + 15000 + 14000 + 14500 + + + 80000 + 83000 + 84000 + + + 12 + 10 + 30 + 3 + 2 + + + user-equipment-average-throughput-downlink + + 1 + 1 + + + 1 + 2 + + + 2 + 1 + + + 2 + 2 + + + + user-equipment-average-throughput-uplink + + 1 + 1 + + + 1 + 2 + + + 2 + 1 + + + 2 + 2 + + + + + {{ .du.radioResourcePolicy.name }} + {{ .du.radioResourcePolicy.operational.administrativeState }} + {{ .du.radioResourcePolicy.operational.operationalState }} + {{ .du.radioResourcePolicy.name }} + {{ .du.radioResourcePolicy.resourceType }} + + 310 + 150 + 1 + 1 + + 20 + 10 + 15 + + + diff --git a/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-running.xml b/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-running.xml index 739d57d9..8019f65c 100644 --- a/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-running.xml +++ b/smo-install/oran_oom/du-simulator/resources/config/o-ran-sc-du-hello-world-running.xml @@ -1,10 +1,58 @@ -{{ range $ru := .du.rus }} - - - {{ $ru.name }} - {{ $ru.administrativeState }} - -{{ end }} - - + {{ .du.name }} + {{ .du.running.administrativeState }} + nf1 + CN=KarenBerge,CN=admin,DC=corp,DC=Fabrikam,DC=COM + + {{ .du.name }} + {{ .du.running.administrativeState }} + {{ .du.name }} + + {{ .du.cell.name }} + {{ .du.cell.running.administrativeState }} + {{ .du.cell.name }} + {{ .du.cell.localId }} + + 310 + 150 + 1 + 1 + + {{ .du.cell.physicalCellId }} + 10 + + 15000 + 14000 + 14500 + + + 80000 + 83000 + 84000 + + + 12 + 10 + 30 + 3 + 2 + + + + {{ .du.radioResourcePolicy.name }} + {{ .du.radioResourcePolicy.running.administrativeState }} + {{ .du.radioResourcePolicy.name }} + {{ .du.radioResourcePolicy.resourceType }} + + 310 + 150 + 1 + 1 + + 20 + 10 + 15 + + + + diff --git a/smo-install/oran_oom/du-simulator/values.yaml b/smo-install/oran_oom/du-simulator/values.yaml index 674de8d0..de8f2fb1 100644 --- a/smo-install/oran_oom/du-simulator/values.yaml +++ b/smo-install/oran_oom/du-simulator/values.yaml @@ -2,7 +2,7 @@ image: repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nts-ng-o-ran-du - tag: 1.3.7 + tag: 1.4.3 pullPolicy: IfNotPresent service: @@ -12,44 +12,81 @@ service: dus: - name: o-du-1122 - rus: - - name: o-ru-11221 - administrativeState: LOCKED - operationalState: ENABLED - status: disconnected - - name: o-ru-11222 - administrativeState: LOCKED - operationalState: ENABLED - status: disconnected + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + cell: + name: cell-1 + trafficState: active + localId: 1 + physicalCellId: 1 + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + radioResourcePolicy: + name: rrm-pol-1 + resourceType: prb + operational: + administrativeState: locked + operationalState: enabled + running: + administrativeState: unlocked + simulatedFaults: - - name: o-ru-11221 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + - name: fault1 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: false - text: "O-RU Port Down" - - name: o-ru-11221 - condition: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-A" + - name: fault1-close + condition: "CPRI Port Down" severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: true - text: "O-RU Port Down" - - name: o-ru-11222 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + text: "CPRI Port Down" + object: "Slot-0-Port-A" + + - name: fault2 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: false - text: "O-RU Port Down" - - name: o-ru-11222 - condition: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-C" + - name: fault2-close + condition: "CPRI Port Down" severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR cleared: true - text: "O-RU Port Down" + text: "CPRI Port Down" + object: "Slot-0-Port-C" + - name: fault3 + condition: "CPRI Port Down" + severity: MAJOR + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR + cleared: false + text: "CPRI Port Down" + object: "Slot-2-Port-B" + - name: fault3-close + condition: "CPRI Port Down" + severity: NORMAL + specificProblem: "CPRI Port Down" + faultSeverity: MAJOR + cleared: true + text: "CPRI Port Down" + object: "Slot-2-Port-B" + # NTS NG settings ntsimNg: diff --git a/smo-install/oran_oom/ru-simulator/values.yaml b/smo-install/oran_oom/ru-simulator/values.yaml index eb366cca..343c30e6 100644 --- a/smo-install/oran_oom/ru-simulator/values.yaml +++ b/smo-install/oran_oom/ru-simulator/values.yaml @@ -2,7 +2,7 @@ image: repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: nts-ng-o-ran-ru-fh - tag: 1.3.7 + tag: 1.4.3 pullPolicy: IfNotPresent service: diff --git a/smo-install/oran_oom/topology-server/values.yaml b/smo-install/oran_oom/topology-server/values.yaml index f76e5558..7e0f838a 100644 --- a/smo-install/oran_oom/topology-server/values.yaml +++ b/smo-install/oran_oom/topology-server/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: 'nexus3.o-ran-sc.org:10004/o-ran-sc' name: smo-nts-ng-topology-server - tag: 1.3.7 + tag: 1.4.3 pullPolicy: IfNotPresent service: -- 2.16.6