From: sebdet Date: Mon, 22 Nov 2021 13:15:53 +0000 (+0100) Subject: Fix simulator faults and onap override X-Git-Tag: f-release~25^2~2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=it%2Fdep.git;a=commitdiff_plain;h=bcbc77d3fc895aeae9350111427a46e30439657b Fix simulator faults and onap override Fix typo in fault definition + change onap override according to Onap OOM PR for Ves collector config. Issue-ID: NONRTRIC-609 Signed-off-by: sebdet Change-Id: Iccdf0a73d0a5a98b95ea2ec5938611915786aa89 --- diff --git a/smo-install/helm-override/network-simulators-topology-override.yaml b/smo-install/helm-override/network-simulators-topology-override.yaml index 3738a82e..b500b269 100644 --- a/smo-install/helm-override/network-simulators-topology-override.yaml +++ b/smo-install/helm-override/network-simulators-topology-override.yaml @@ -28,128 +28,162 @@ ru-simulator: - name: o-ru-11211 simulatedFaults: - name: fault1 + condition: "Interface Fault" + severity: CRITICAL + specificProblem: "Interface Fault" + faultSeverity: CRITICAL + cleared: false + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + - name: fault1-close + condition: "Interface Fault" + severity: NORMAL + specificProblem: "Interface Fault" + faultSeverity: CRITICAL + cleared: true + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + + - name: fault2 condition: "C/U-plane logical Connection faulty" severity: CRITICAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: false - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12301fc66" - - name: fault1-close + text: "C/U-plane logical Connection faulty" + faultId: 28 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + - name: fault2-close condition: "C/U-plane logical Connection faulty" severity: NORMAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: true - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12301fc66" + text: "C/U-plane logical Connection faulty" + faultId: 28 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" - name: o-ru-11221 simulatedFaults: - name: fault1 + condition: "Interface Fault" + severity: CRITICAL + specificProblem: "Interface Fault" + faultSeverity: CRITICAL + cleared: false + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + - name: fault1-close + condition: "Interface Fault" + severity: NORMAL + specificProblem: "Interface Fault" + faultSeverity: CRITICAL + cleared: true + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + + - name: fault2 condition: "C/U-plane logical Connection faulty" severity: CRITICAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: false - text: "O-RU Port Down" - faultId: 28, + text: "C/U-plane logical Connection faulty" + faultId: 28 object: "09a95e08-5b53-4734-815f-a9c12300fc62" - - name: fault1-close + - name: fault2-close condition: "C/U-plane logical Connection faulty" severity: NORMAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: true - text: "O-RU Port Down" - faultId: 28, + text: "C/U-plane logical Connection faulty" + faultId: 28 object: "09a95e08-5b53-4734-815f-a9c12300fc62" - name: o-ru-11222 simulatedFaults: - name: fault1 - condition: "C/U-plane logical Connection faulty" + condition: "Interface Fault" severity: CRITICAL - specificProblem: "C/U-plane logical Connection faulty" + specificProblem: "Interface Fault" faultSeverity: CRITICAL cleared: false - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc63" + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" - name: fault1-close - condition: "C/U-plane logical Connection faulty" + condition: "Interface Fault" severity: NORMAL - specificProblem: "C/U-plane logical Connection faulty" + specificProblem: "Interface Fault" faultSeverity: CRITICAL cleared: true - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc63" + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" - - name: o-ru-11223 - simulatedFaults: - - name: fault1 + - name: fault2 condition: "C/U-plane logical Connection faulty" severity: CRITICAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: false - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc64" - - name: fault1-close + text: "C/U-plane logical Connection faulty" + faultId: 28 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + - name: fault2-close condition: "C/U-plane logical Connection faulty" severity: NORMAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: true - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc64" + text: "C/U-plane logical Connection faulty" + faultId: 28 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" - - name: o-ru-11224 + - name: o-ru-11223 simulatedFaults: - name: fault1 - condition: "C/U-plane logical Connection faulty" + condition: "Interface Fault" severity: CRITICAL - specificProblem: "C/U-plane logical Connection faulty" + specificProblem: "Interface Fault" faultSeverity: CRITICAL cleared: false - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc65" + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" - name: fault1-close - condition: "C/U-plane logical Connection faulty" + condition: "Interface Fault" severity: NORMAL - specificProblem: "C/U-plane logical Connection faulty" + specificProblem: "Interface Fault" faultSeverity: CRITICAL cleared: true - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc65" + text: "Interface Fault" + faultId: 30 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" - - name: o-ru-11225 - simulatedFaults: - - name: fault1 + - name: fault2 condition: "C/U-plane logical Connection faulty" severity: CRITICAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: false - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc66" - - name: fault1-close + text: "C/U-plane logical Connection faulty" + faultId: 28 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" + - name: fault2-close condition: "C/U-plane logical Connection faulty" severity: NORMAL specificProblem: "C/U-plane logical Connection faulty" faultSeverity: CRITICAL cleared: true - text: "O-RU Port Down" - faultId: 28, - object: "09a95e08-5b53-4734-815f-a9c12300fc66" + text: "C/U-plane logical Connection faulty" + faultId: 28 + object: "09a95e08-5b53-4734-815f-a9c12300fc62" du-simulator: dus: @@ -183,21 +217,13 @@ du-simulator: operationalState: ENABLED status: disconnected - name: o-ru-11222 - administrativeState: LOCKED + administrativeState: UNLOCKED operationalState: ENABLED - status: disconnected + status: connected - name: o-ru-11223 administrativeState: LOCKED - operationalState: ENABLED - status: disconnected - - name: o-ru-11224 - administrativeState: LOCKED - operationalState: ENABLED - status: disconnected - - name: o-ru-11225 - administrativeState: LOCKED - operationalState: ENABLED - status: disconnected + operationalState: DISABLED + status: unable-to-connect simulatedFaults: - name: o-ru-11221 @@ -245,39 +271,9 @@ du-simulator: cleared: true text: "O-RU Port Down" - - name: o-ru-11224 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL - cleared: false - text: "O-RU Port Down" - - name: o-ru-11224 - condition: "O-RU Port Down" - severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL - cleared: true - text: "O-RU Port Down" - - - name: o-ru-11225 - condition: "O-RU Port Down" - severity: CRITICAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL - cleared: false - text: "O-RU Port Down" - - name: o-ru-11225 - condition: "O-RU Port Down" - severity: NORMAL - specificProblem: "O-RU Port Down" - faultSeverity: CRITICAL - cleared: true - text: "O-RU Port Down" - topology-server: simulatedFaults: - - name: o-ru-11221 + - name: fault1 condition: "CPRI Port Down" severity: MAJOR object: "Slot-0-Port-A" @@ -285,7 +281,7 @@ topology-server: faultSeverity: MAJOR cleared: false text: "CPRI Port Down" - - name: o-ru-11221 + - name: fault1-close condition: "CPRI Port Down" severity: NORMAL object: "Slot-0-Port-A" @@ -293,7 +289,8 @@ topology-server: faultSeverity: MAJOR cleared: true text: "CPRI Port Down" - - name: o-ru-11221 + + - name: fault2 condition: "CPRI Port Down" severity: MAJOR object: "Slot-0-Port-C" @@ -301,7 +298,7 @@ topology-server: faultSeverity: MAJOR cleared: false text: "CPRI Port Down" - - name: o-ru-11221 + - name: fault2-close condition: "CPRI Port Down" severity: NORMAL object: "Slot-0-Port-C" @@ -309,7 +306,8 @@ topology-server: faultSeverity: MAJOR cleared: true text: "CPRI Port Down" - - name: o-ru-11221 + + - name: fault3 condition: "CPRI Port Down" severity: MAJOR object: "Slot-2-Port-B" @@ -317,7 +315,7 @@ topology-server: faultSeverity: MAJOR cleared: false text: "CPRI Port Down" - - name: o-ru-11221 + - name: fault3-close condition: "CPRI Port Down" severity: NORMAL object: "Slot-2-Port-B" @@ -327,14 +325,14 @@ topology-server: text: "CPRI Port Down" nodes: - name: o-du-1121 - uuid: ac089635-7a85-4198-9310-9b14f476b4a9 - nodeEdgePointUuid: 539f24cb-a5e9-454f-b06d-6307be419afe + uuid: bc089635-7a85-4197-9310-9b14f476a4b9 + nodeEdgePointUuid: 639f24cb-a5e9-454f-b05d-6307be419aff interfaceName: "O-DU-interface-1" interfaceDescription: "Simulated interface for O-DU" - name: o-ru-11211 uuid: 6b0d3930-100b-466c-9f44-2748ffb6baa2 - nodeEdgePointUuid: bb7e5882-6e4a-46a7-a95b-0bb7310ede22 - interfaceName: "09a95e08-5b53-4834-815f-a9c12300fc62" + nodeEdgePointUuid: bb7e5882-6e4a-46a7-a95b-0bb7310ede24 + interfaceName: "09a95e08-5b53-4834-815f-a9c12300fc63" interfaceDescription: "Simulated interface for O-RU" - name: o-du-1122 @@ -348,45 +346,28 @@ topology-server: interfaceName: "09a95e08-5b53-4734-815f-a9c12300fc62" interfaceDescription: "Simulated interface for O-RU" - name: o-ru-11222 - uuid: 6b0d3930-100b-466c-9f44-2748ffb6aaa2 - nodeEdgePointUuid: bb7e5882-6e3a-46a7-a95b-0bb7310ede23 - interfaceName: "09a95e08-5b53-4734-815f-a9c12300fc63" + uuid: 69a8fdf0-2bdd-44a2-9bc4-8813640fa02c + nodeEdgePointUuid: 124488fc-05d0-421b-8a16-4eaf86cbc89b + interfaceName: "0d242150-33a6-4e7c-9988-ae3b01e8a7ea" interfaceDescription: "Simulated interface for O-RU" - name: o-ru-11223 - uuid: 6b0d3930-100b-466c-9f44-2748ffb6aaa3 - nodeEdgePointUuid: bb7e5882-6e3a-46a7-a95b-0bb7310ede24 - interfaceName: "09a95e08-5b53-4734-815f-a9c12300fc64" - interfaceDescription: "Simulated interface for O-RU" - - name: o-ru-11224 - uuid: 6b0d3930-100b-466c-9f44-2748ffb6aaa4 - nodeEdgePointUuid: bb7e5882-6e3a-46a7-a95b-0bb7310ede25 - interfaceName: "09a95e08-5b53-4734-815f-a9c12300fc65" - interfaceDescription: "Simulated interface for O-RU" - - name: o-ru-11225 - uuid: 6b0d3930-100b-466c-9f44-2748ffb6aaa5 - nodeEdgePointUuid: bb7e5882-6e3a-46a7-a95b-0bb7310ede26 - interfaceName: "09a95e08-5b53-4734-815f-a9c12300fc66" + uuid: c8499a83-211e-4cef-be30-a1cc2208bbb6 + nodeEdgePointUuid: 5f01a4c2-9067-4b05-a1a5-7d8998f4f11f + interfaceName: "d3ea2f17-a841-4e71-9ef9-9549159aabe7" interfaceDescription: "Simulated interface for O-RU" - topologyUuid: 7adfee73-44be-4813-a0dc-89f657f0a436 links: - duNode: o-du-1121 ruNode: o-ru-11211 - uuid: ac78b69f-22df-46fd-ae76-cc989bc30abb + uuid: ac78b69f-22df-46fd-ae76-cc989bc30bbd - duNode: o-du-1122 ruNode: o-ru-11221 uuid: ac78b69f-22df-46fd-ae76-cc989bc30abc - duNode: o-du-1122 ruNode: o-ru-11222 - uuid: ac78b69f-22df-46fd-ae76-cc989bc30abd + uuid: ac78b69f-22df-46fd-ae76-cc989bc30ae9 - duNode: o-du-1122 ruNode: o-ru-11223 - uuid: ac78b69f-22df-46fd-ae76-cc989bc30abe - - duNode: o-du-1122 - ruNode: o-ru-11224 - uuid: ac78b69f-22df-46fd-ae76-cc989bc30abf - - duNode: o-du-1122 - ruNode: o-ru-11225 - uuid: ac78b69f-22df-46fd-ae76-cc989bc30ace + uuid: bc98b69f-22df-46fd-ae76-cc989bc30ae9 diff --git a/smo-install/helm-override/onap-override.yaml b/smo-install/helm-override/onap-override.yaml index 2a5d9da3..670cb053 100644 --- a/smo-install/helm-override/onap-override.yaml +++ b/smo-install/helm-override/onap-override.yaml @@ -356,15 +356,6 @@ sdnc: enabled: true cds: enabled: false - vesCollector: - enabled: true - tls: - enabled: true - trustAllCertificates: true - username: sample1 - password: sample1 - address: dcae-ves-collector.onap - port: 8443 sdnc-web: config: topologyserver: @@ -383,6 +374,16 @@ sdnc: mountpointStateProviderEnabled: true netconfCallHome: enabled: true + vesCollector: + enabled: true + tls: + enabled: true + trustAllCertificates: true + username: sample1 + password: sample1 + address: dcae-ves-collector.onap + port: 8443 + eventLogMsgDetail: LONG sniro-emulator: enabled: false so: diff --git a/smo-install/helm-override/oran-override.yaml b/smo-install/helm-override/oran-override.yaml index 189877a2..1cd48f4a 100644 --- a/smo-install/helm-override/oran-override.yaml +++ b/smo-install/helm-override/oran-override.yaml @@ -75,6 +75,19 @@ kong: admin: enabled: true +oru-app: + simulators: + - simRu: o-ru-11221 + simDu: o-du-1122 + - simRu: o-ru-11222 + simDu: o-du-1122 + - simRu: o-ru-11223 + simDu: o-du-1122 + - simRu: o-ru-11211 + simDu: o-du-1121 + + + ######### RIC_AUX ######### dashboard: cipher: @@ -101,3 +114,4 @@ dashboard: caasUrlPrefix: http://caas-ingress-is-REC-only pltUrlPrefix: http://ric-entry + diff --git a/smo-install/oran_oom/ru-simulator/values.yaml b/smo-install/oran_oom/ru-simulator/values.yaml index 1b8a650c..eb366cca 100644 --- a/smo-install/oran_oom/ru-simulator/values.yaml +++ b/smo-install/oran_oom/ru-simulator/values.yaml @@ -20,7 +20,7 @@ rus: faultSeverity: CRITICAL cleared: false text: "O-RU Port Down" - faultId: 28, + faultId: 28 object: "09a95e08-5b53-4734-815f-a9c12300fc62" - name: fault1-close condition: "C/U-plane logical Connection faulty" @@ -29,7 +29,7 @@ rus: faultSeverity: CRITICAL cleared: true text: "O-RU Port Down" - faultId: 28, + faultId: 28 object: "09a95e08-5b53-4734-815f-a9c12300fc62" - name: o-ru-11222 @@ -41,7 +41,7 @@ rus: faultSeverity: CRITICAL cleared: false text: "O-RU Port Down" - faultId: 28, + faultId: 28 object: "09a95e08-5b53-4734-815f-a9c12300fc63" - name: fault1-close condition: "C/U-plane logical Connection faulty" @@ -50,7 +50,7 @@ rus: faultSeverity: CRITICAL cleared: true text: "O-RU Port Down" - faultId: 28, + faultId: 28 object: "09a95e08-5b53-4734-815f-a9c12300fc63"