From 323da64c83d95b2bb95225a8ee2368cee88faa6e Mon Sep 17 00:00:00 2001 From: demx8as6 Date: Fri, 21 Oct 2022 13:27:52 +0200 Subject: [PATCH] Add test script for o1NotifyPnfRegistration - update config.yml IssueID: OAM-302 Change-Id: If0448a4c043896592a2acacbb2a4ce31a8287761 Signed-off-by: demx8as6 --- code/client-scripts-ves-v7/config | 96 +++++++++++++++++------------------ code/client-scripts-ves-v7/config.yml | 74 +++++++++++++-------------- 2 files changed, 85 insertions(+), 85 deletions(-) diff --git a/code/client-scripts-ves-v7/config b/code/client-scripts-ves-v7/config index 500d28b..4604f66 100644 --- a/code/client-scripts-ves-v7/config +++ b/code/client-scripts-ves-v7/config @@ -4,9 +4,9 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # https://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,10 +15,10 @@ # ################################################################################ -# Configuration for interface tests +# Configuration for interface tests ################################################################################ -# DCAE VES Collector communication end point +# DCAE VES Collector communication end point urlVes=https://localhost:8443/eventListener/v7 basicAuthVes=sample1:sample1 @@ -33,7 +33,7 @@ eventType="O_RAN_COMPONENT" ################################################################################ # Information from document: SDN-R System Requirements # -# a. VendorA 1234 BestInClass (1234) +# a. VendorA pnf2 BestInClass (pnf2) # b. VendorA FancyNextGeneration (FYNG) # c. VendorB R2D2 NewFuture (R2D2) # d. VendorB 7200DEV (7DEV) @@ -42,7 +42,7 @@ eventType="O_RAN_COMPONENT" # g. VendorA PNF5G (NO5G) # h. VendorB PNF5G (VB5G) -# i. VendorC NGCell (NGCE) +# i. VendorC NGCell (NGCE) # j. VendorC O-RU (SCRU) # # z. SDN-R Controller itself (SDNR) @@ -54,80 +54,80 @@ declare -A vendorsByType; declare -A interfaceByType; pnfIdByType=( - [1234]=NSHMRIACQ01M01123401 - [fyng]=LKCYFL79Q01M01FYNG01 - [r2d2]=MMTSIL02Q01M01R2D201 - [7dev]=PRTNILACQ01M017DEV01 - [nsky]=O-RAN-FH-IPv6-01 + [pnf2]=NSHMRIACQ01M01pnf201 + [fyng]=LKCYFL79Q01M01FYNG01 + [r2d2]=MMTSIL02Q01M01R2D201 + [7dev]=PRTNILACQ01M017DEV01 + [nsky]=O-RAN-FH-IPv6-01 [1OSF]=SNSNFLR0Q01M011OSF01 - [no5g]=MMTSIL02Q01M01NO5G01 - [vb5g]=PRTNILACQ01M01VB5G01 - [ngce]=SEDNKSAHQ01M01NGCE01 + [no5g]=MMTSIL02Q01M01NO5G01 + [vb5g]=PRTNILACQ01M01VB5G01 + [ngce]=SEDNKSAHQ01M01NGCE01 [scru]=SNSNFLR0Q01M01SCRU01 [sdnr]=$(hostname --fqdn) ); modelByType=( - [1234]="1234 BestInClass" - [fyng]="FancyNextGeneration" - [r2d2]="R2D2 NewFuture" - [7dev]="7200DEV" - [nsky]="TheSkyIsTheLimit" + [pnf2]="pnf2 BestInClass" + [fyng]="FancyNextGeneration" + [r2d2]="R2D2 NewFuture" + [7dev]="7200DEV" + [nsky]="TheSkyIsTheLimit" [1OSF]="OpenSourceFirst" - [no5g]="PNF5G" - [vb5g]="PNF5G" - [ngce]="NGCell" + [no5g]="PNF5G" + [vb5g]="PNF5G" + [ngce]="NGCell" [scru]="O-RU" [sdnr]="ONAP Controller for Radio" ); oamIpByType=( - [1234]=10.10.10.11 - [fyng]=10.10.10.12 - [r2d2]=10.10.10.13 - [7dev]=10.10.10.14 - [nsky]=10.10.10.15 + [pnf2]=10.10.10.11 + [fyng]=10.10.10.12 + [r2d2]=10.10.10.13 + [7dev]=10.10.10.14 + [nsky]=10.10.10.15 [1OSF]=10.10.10.16 - [no5g]=10.10.10.17 - [vb5g]=10.10.10.18 - [ngce]=10.10.10.19 + [no5g]=10.10.10.17 + [vb5g]=10.10.10.18 + [ngce]=10.10.10.19 [scru]=10.10.10.20 [sdnr]=127.0.0.1 ); vendorsByType=( - [1234]=VendorA - [fyng]=VendorA - [r2d2]=VendorB - [7dev]=VendorB - [nsky]=VendorC + [pnf2]=VendorA + [fyng]=VendorA + [r2d2]=VendorB + [7dev]=VendorB + [nsky]=VendorC [1OSF]=VendorC - [no5g]=VendorA - [vb5g]=VendorB - [ngce]=VendorC + [no5g]=VendorA + [vb5g]=VendorB + [ngce]=VendorC [scru]=VendorC [sdnr]=ONAP ); interfaceByType=( - [1234]=LP-MWPS-RADIO - [fyng]=LP-MWPS-RADIO - [r2d2]=LP-MWPS-RADIO - [7dev]=LP-MWPS-RADIO - [nsky]=LP-MWPS-RADIO - [1OSF]=LP-MWPS-RADIO - [no5g]=LP-MWPS-RADIO - [vb5g]=LP-MWPS-RADIO - [ngce]=LP-MWPS-RADIO - [scru]=LP-MWPS-RADIO + [pnf2]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [fyng]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [r2d2]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [7dev]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [nsky]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [1OSF]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [no5g]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [vb5g]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [ngce]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 + [scru]=4af8681f-f2e4-4058-8052-4e9343ee7bf2 [sdnr]=northbound-interface ) diff --git a/code/client-scripts-ves-v7/config.yml b/code/client-scripts-ves-v7/config.yml index f7a4485..b7d0729 100644 --- a/code/client-scripts-ves-v7/config.yml +++ b/code/client-scripts-ves-v7/config.yml @@ -1,12 +1,12 @@ ################################################################################ -# Copyright 2021 highstreet technologies GmbH +# Copyright 2022 highstreet technologies GmbH # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # https://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,7 +15,7 @@ # ################################################################################ -# Configuration for interface tests +# Configuration for interface tests ################################################################################ # DCAE VES Collector communication end point @@ -35,7 +35,7 @@ settings: ################################################################################ # Information from document: SDN-R System Requirements # -# a. VendorA 1234 BestInClass (1234) +# a. VendorA pnf2 BestInClass (pnf2) # b. VendorA FancyNextGeneration (FYNG) # c. VendorB R2D2 NewFuture (R2D2) # d. VendorB 7200DEV (7DEV) @@ -44,66 +44,66 @@ settings: # g. VendorA PNF5G (NO5G) # h. VendorB PNF5G (VB5G) -# i. VendorC NGCell (NGCE) +# i. VendorC NGCell (NGCE) # j. VendorC O-RU (SCRU) # # z. SDN-R Controller itself (SDNR) pnfType: - a234: + pnf2: id: f2030d4a-8f0e-11eb-8dcd-0242ac130003 - model: "a234 BestInClass" + model: "pnf2 BestInClass" oamIpv4: 10.10.10.11 - vendor: VendorA - fyng: - id: f2030f70-8f0e-11eb-8dcd-0242ac130003 - model: FancyNextGeneration + vendor: VendorA + fyng: + id: f2030f70-8f0e-11eb-8dcd-0242ac130003 + model: FancyNextGeneration oamIpv4: 10.10.10.11 - vendor: VendorA - r2d2: - id: f203111e-8f0e-11eb-8dcd-0242ac130003 - model: R2D2 NewFuture + vendor: VendorA + r2d2: + id: f203111e-8f0e-11eb-8dcd-0242ac130003 + model: R2D2 NewFuture oamIpv4: 10.10.10.11 vendor: VendorB - 7dev: - id: f203136c-8f0e-11eb-8dcd-0242ac130003 - model: 7200DEV + 7dev: + id: f203136c-8f0e-11eb-8dcd-0242ac130003 + model: 7200DEV oamIpv4: 10.10.10.11 vendor: VendorB - nsky: - id: f203143e-8f0e-11eb-8dcd-0242ac130003 - model: TheSkyIsTheLimit + nsky: + id: f203143e-8f0e-11eb-8dcd-0242ac130003 + model: TheSkyIsTheLimit oamIpv4: 10.10.10.11 vendor: VendorC - 1OSF: + 1OSF: id: f20317e0-8f0e-11eb-8dcd-0242ac130003 - model: OpenSourceFirst + model: OpenSourceFirst oamIpv4: 10.10.10.11 vendor: VendorC - no5g: - id: f20318b2-8f0e-11eb-8dcd-0242ac130003 - model: PNF5G + no5g: + id: f20318b2-8f0e-11eb-8dcd-0242ac130003 + model: PNF5G oamIpv4: 10.10.10.11 - vendor: VendorA - vb5g: - id: f2031966-8f0e-11eb-8dcd-0242ac130003 - model: PNF5G + vendor: VendorA + vb5g: + id: f2031966-8f0e-11eb-8dcd-0242ac130003 + model: PNF5G oamIpv4: 10.10.10.11 vendor: VendorB - ngce: - id: f2031a2e-8f0e-11eb-8dcd-0242ac130003 + ngce: + id: f2031a2e-8f0e-11eb-8dcd-0242ac130003 model: NGCell oamIpv4: 10.10.10.11 vendor: VendorC - scru: + scru: id: 4365333e-8f0f-11eb-8dcd-0242ac130003 model: O-RU oamIpv4: 10.10.10.11 vendor: VendorC - interface: LP-MWPS-RADIO - sdnr: + interface: 4af8681f-f2e4-4058-8052-4e9343ee7bf2 + sdnr: id: 4365360e-8f0f-11eb-8dcd-0242ac130003 - model: "ONAP SDN Controller for Radio" + model: "ONAP SDN Controller for Radio" oamIpv4: 127.0.0.1 vendor: ONAP interface: northbound-interface -- 2.16.6