From 0e1a4c9360a118d97dd3206de0dbf4b4f35a4188 Mon Sep 17 00:00:00 2001 From: mpriyank Date: Fri, 6 Jun 2025 12:13:10 +0100 Subject: [PATCH] Add eg of Pnf registration event - as per suggestion , adding one more example from open air interface physical network function registration event Issue-ID: CPS-2710 Change-Id: Ib2e7a1246cc8caa9bca784ab8293bf6a89d9e2aa Signed-off-by: mpriyank --- .../dmi/cmstack/ves/VesEventConsumerSpec.groovy | 20 +++++---- .../resources/sampleVesEvent-openairinterface.json | 49 ++++++++++++++++++++++ ...Event.json => sampleVesEvent-pynts-odu-o1.json} | 0 3 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 dmi-service/src/test/resources/sampleVesEvent-openairinterface.json rename dmi-service/src/test/resources/{sampleVesEvent.json => sampleVesEvent-pynts-odu-o1.json} (100%) diff --git a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/cmstack/ves/VesEventConsumerSpec.groovy b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/cmstack/ves/VesEventConsumerSpec.groovy index 4a65c113..b1b54cf2 100644 --- a/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/cmstack/ves/VesEventConsumerSpec.groovy +++ b/dmi-service/src/test/groovy/org/onap/cps/ncmp/dmi/cmstack/ves/VesEventConsumerSpec.groovy @@ -49,13 +49,7 @@ class VesEventConsumerSpec extends MessagingBaseSpec { def logger = Spy(ListAppender) - def vesEvent - void setup() { - - def jsonData = TestUtils.getResourceFileContent('sampleVesEvent.json') - vesEvent = objectMapper.readValue(jsonData, VesEventSchema.class) - ((Logger) LoggerFactory.getLogger(VesEventConsumer.class)).addAppender(logger) logger.start() } @@ -66,15 +60,25 @@ class VesEventConsumerSpec extends MessagingBaseSpec { def 'Consume a VES event'() { + given: 'sample PNF registration events [VES Events]' + def jsonData = TestUtils.getResourceFileContent(fileName) + def vesEvent = objectMapper.readValue(jsonData, VesEventSchema.class) when: 'event is consumed' objectUnderTest.consumeVesEvent(vesEvent) then: 'cm handle(s) is registered with the dmi service' - 1 * dmiService.registerCmHandles(['pynts-o-du-o1']) + 1 * dmiService.registerCmHandles(expectedCmhandles) + where: 'we use the sample events' + fileName || expectedCmhandles + 'sampleVesEvent-pynts-odu-o1.json' || ['pynts-o-du-o1'] + 'sampleVesEvent-openairinterface.json' || ['gNB-Eurecom-5GNRBox-00001'] } def 'Consume create event with error during registration'() { - given: 'an error occured during registration' + given: 'sample PNF registration event' + def jsonData = TestUtils.getResourceFileContent('sampleVesEvent-pynts-odu-o1.json') + def vesEvent = objectMapper.readValue(jsonData, VesEventSchema.class) + and: 'an error occured during registration' dmiService.registerCmHandles(_) >> { throw new CmHandleRegistrationException('some error for test') } when: 'event is consumed' objectUnderTest.consumeVesEvent(vesEvent) diff --git a/dmi-service/src/test/resources/sampleVesEvent-openairinterface.json b/dmi-service/src/test/resources/sampleVesEvent-openairinterface.json new file mode 100644 index 00000000..ab605764 --- /dev/null +++ b/dmi-service/src/test/resources/sampleVesEvent-openairinterface.json @@ -0,0 +1,49 @@ +{ + "event": { + "commonEventHeader": { + "domain": "pnfRegistration", + "eventId": "ManagedElement=gNB-Eurecom-5GNRBox-00001_pnfRegistration", + "eventName": "pnfRegistration_OAI_pnfRegistration", + "eventType": "OAI_pnfRegistration", + "sequence": 0, + "priority": "Low", + "reportingEntityId": "", + "reportingEntityName": "ManagedElement=gNB-Eurecom-5GNRBox-00001", + "sourceId": "3584", + "sourceName": "gNB-Eurecom-5GNRBox-00001", + "startEpochMicrosec": 1748957443348743, + "lastEpochMicrosec": 1748957443348743, + "nfNamingCode": "001", + "nfVendorName": "OpenAirInterface", + "timeZoneOffset": "+00:00", + "version": "4.1", + "vesEventListenerVersion": "7.2.1" + }, + "pnfRegistrationFields": { + "pnfRegistrationFieldsVersion": "2.1", + "lastServiceDate": "2021-03-26", + "macAddress": "00:00:00:00:00:00", + "manufactureDate": "2021-01-16", + "modelNumber": "nr-softmodem", + "oamV4IpAddress": "10.2.1.10", + "serialNumber": "OpenAirInterface-gNB-10.2.1.10-nr-softmodem", + "softwareVersion": "2.3.5", + "unitFamily": "OpenAirInterface-gNB", + "unitType": "gNB", + "vendorName": "OpenAirInterface", + "additionalFields": { + "oamPort": "1830", + "protocol": "SSH", + "username": "netconf", + "password": "netconf!", + "reconnectOnChangedSchema": "false", + "sleep-factor": "1.5", + "tcpOnly": "false", + "connectionTimeout": "20000", + "maxConnectionAttempts": "100", + "betweenAttemptsTimeout": "2000", + "keepaliveDelay": "120" + } + } + } +} \ No newline at end of file diff --git a/dmi-service/src/test/resources/sampleVesEvent.json b/dmi-service/src/test/resources/sampleVesEvent-pynts-odu-o1.json similarity index 100% rename from dmi-service/src/test/resources/sampleVesEvent.json rename to dmi-service/src/test/resources/sampleVesEvent-pynts-odu-o1.json -- 2.16.6