diff options
author | mpriyank <priyank.maheshwari@est.tech> | 2024-03-06 12:52:47 +0000 |
---|---|---|
committer | Priyank Maheshwari <priyank.maheshwari@est.tech> | 2024-03-06 15:25:00 +0000 |
commit | 351f39126899711dd0ec4fcee35b1f5fbd295bbb (patch) | |
tree | 90e3a59e3d0515635ef21b7ed59fe3b65f701ae4 /src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription | |
parent | 344e546241667dddc80f5296398780d09ed48009 (diff) |
Remove old subscription code and other fixes
- removed old subscription related dummy code.
- updated cps version to 3.4.6 to use the latest released version
- added six dependency for the RTD fix
- Removing the CloudEventMapper for now. Can be brought back when
somebody uses it
- added missing test for InvalidDatastoreException which was failing on
coverage check locally
Issue-ID: CPS-2149
Change-Id: I60e9036398fea82bb0162ab5524a1cc45dedb611
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
Diffstat (limited to 'src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription')
2 files changed, 0 insertions, 231 deletions
diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmSubscriptionDmiInEventConsumerSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmSubscriptionDmiInEventConsumerSpec.groovy deleted file mode 100644 index bf15f00c..00000000 --- a/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmSubscriptionDmiInEventConsumerSpec.groovy +++ /dev/null @@ -1,158 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2023 Nordix Foundation - * ================================================================================ - * 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 - * - * http://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. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.cps.ncmp.dmi.notifications.cmsubscription - -import com.fasterxml.jackson.databind.ObjectMapper -import io.cloudevents.CloudEvent -import io.cloudevents.core.builder.CloudEventBuilder -import org.apache.kafka.clients.consumer.ConsumerRecord -import org.onap.cps.ncmp.dmi.TestUtils -import org.onap.cps.ncmp.dmi.api.kafka.MessagingBaseSpec -import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent -import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.Data -import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus -import org.onap.cps.ncmp.events.cmsubscription1_0_0.ncmp_to_dmi.CmHandle -import org.onap.cps.ncmp.events.cmsubscription1_0_0.ncmp_to_dmi.CmSubscriptionDmiInEvent -import org.spockframework.spring.SpringBean -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.test.annotation.DirtiesContext -import org.testcontainers.spock.Testcontainers - -import java.sql.Timestamp -import java.time.Duration -import java.time.OffsetDateTime -import java.time.ZoneId - -@SpringBootTest(classes = [CmSubscriptionDmiInEventConsumer]) -@Testcontainers -@DirtiesContext -class CmSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec { - - def objectMapper = new ObjectMapper() - def testTopic = 'dmi-ncmp-cm-avc-subscription' - - @SpringBean - CmSubscriptionDmiInEventConsumer objectUnderTest = new CmSubscriptionDmiInEventConsumer(cloudEventKafkaTemplate) - - def 'Sends subscription cloud event response successfully.'() { - given: 'an subscription event response' - objectUnderTest.dmiName = 'test-ncmp-dmi' - objectUnderTest.cmAvcSubscriptionResponseTopic = testTopic - def responseStatus = SubscriptionStatus.Status.ACCEPTED - def subscriptionStatuses = [new SubscriptionStatus(id: 'CmHandle1', status: responseStatus), - new SubscriptionStatus(id: 'CmHandle2', status: responseStatus)] - def cmSubscriptionDmiOutEventData = new Data(subscriptionName: 'cm-subscription-001', - clientId: 'SCO-9989752', dmiName: 'ncmp-dmi-plugin', subscriptionStatus: subscriptionStatuses) - def subscriptionEventResponse = - new CmSubscriptionDmiOutEvent().withData(cmSubscriptionDmiOutEventData) - and: 'consumer has a subscription' - kafkaConsumer.subscribe([testTopic] as List<String>) - when: 'an event is published' - def eventKey = UUID.randomUUID().toString() - objectUnderTest.sendCmSubscriptionDmiOutEvent(eventKey, "subscriptionCreatedStatus", subscriptionEventResponse) - and: 'topic is polled' - def records = kafkaConsumer.poll(Duration.ofMillis(1500)) - then: 'poll returns one record' - assert records.size() == 1 - def record = records.iterator().next() - and: 'the record value matches the expected event value' - def expectedValue = objectMapper.writeValueAsString(subscriptionEventResponse) - assert expectedValue == record.value - assert eventKey == record.key - } - - def 'Consume valid message.'() { - given: 'an event' - objectUnderTest.dmiName = 'test-ncmp-dmi' - def eventKey = UUID.randomUUID().toString() - def timestamp = new Timestamp(1679521929511) - def jsonData = TestUtils.getResourceFileContent('avcSubscriptionCreationEvent.json') - def subscriptionEvent = objectMapper.readValue(jsonData, CmSubscriptionDmiInEvent.class) - objectUnderTest.cmAvcSubscriptionResponseTopic = testTopic - def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi')) - .withType(subscriptionType) - .withDataSchema(URI.create("urn:cps:" + CmSubscriptionDmiInEvent.class.getName() + ":1.0.0")) - .withExtension("correlationid", eventKey) - .withTime(OffsetDateTime.ofInstant(timestamp.toInstant(), ZoneId.of("UTC"))) - .withData(objectMapper.writeValueAsBytes(subscriptionEvent)).build() - def testEventSent = new ConsumerRecord<String, CloudEvent>('topic-name', 0, 0, eventKey, cloudEvent) - when: 'the valid event is consumed' - objectUnderTest.consumeCmSubscriptionDmiInEvent(testEventSent) - then: 'no exception is thrown' - noExceptionThrown() - where: 'given #senario' - scenario | subscriptionType - 'Subscription Create Event' | "subscriptionCreated" - 'Subscription Delete Event' | "subscriptionDeleted" - } - - def 'Consume invalid message.'() { - given: 'an invalid event type' - objectUnderTest.dmiName = 'test-ncmp-dmi' - def eventKey = UUID.randomUUID().toString() - def timestamp = new Timestamp(1679521929511) - objectUnderTest.cmAvcSubscriptionResponseTopic = testTopic - def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi')) - .withType("subscriptionCreated") - .withDataSchema(URI.create("urn:cps:" + CmSubscriptionDmiOutEvent.class.getName() + ":1.0.0")) - .withTime(OffsetDateTime.ofInstant(timestamp.toInstant(), ZoneId.of("UTC"))) - .withExtension("correlationid", eventKey).build() - def testEventSent = new ConsumerRecord<String, CloudEvent>('topic-name', 0, 0, eventKey, cloudEvent) - when: 'the invalid event is consumed' - objectUnderTest.consumeCmSubscriptionDmiInEvent(testEventSent) - then: 'no exception is thrown and event is logged' - noExceptionThrown() - } - - def 'Form a SubscriptionEventResponse from a SubscriptionEvent.'() { - given: 'a SubscriptionEvent' - def jsonData = TestUtils.getResourceFileContent('avcSubscriptionCreationEvent.json') - def subscriptionEvent = objectMapper.readValue(jsonData, CmSubscriptionDmiInEvent.class) - when: 'a SubscriptionResponseEvent is formed' - def result = objectUnderTest.formCmSubscriptionDmiOutEvent(subscriptionEvent) - then: 'Confirm SubscriptionEventResponse was formed as expected' - assert result.data.clientId == "SCO-9989752" - assert result.data.subscriptionName == "cm-subscription-001" - } - - def 'Extract cm handle ids from cm handle successfully.'() { - given: 'a list of cm handles' - def cmHandleIds = - [new CmHandle(id: 'CmHandle1', additionalProperties: ['prop-x': 'prop-valuex']), - new CmHandle(id: 'CmHandle2', additionalProperties: ['prop-y': 'prop-valuey'])] - when: 'extract the cm handle ids' - def result = objectUnderTest.extractCmHandleIds(cmHandleIds) - then: 'cm handle ids are extracted as expected' - def expectedCmHandleIds = ['CmHandle1', 'CmHandle2'] as Set - assert expectedCmHandleIds == result - } - - def 'Populate cm handle id to subscriptionStatus successfully.'() { - given: 'a set of cm handle id' - def cmHandleIds = ['CmHandle1', 'CmHandle2'] as Set - def responseStatus = SubscriptionStatus.Status.ACCEPTED - when: 'populate cm handle id to subscriptionStatus' - def result = objectUnderTest.populateSubscriptionStatus(cmHandleIds).status - then: 'cm handle id to subscriptionStatus populated as expected' - def expectedStatus = [responseStatus, responseStatus] - expectedStatus == result - } -}
\ No newline at end of file diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmSubscriptionDmiOutEventToCloudEventMapperSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmSubscriptionDmiOutEventToCloudEventMapperSpec.groovy deleted file mode 100644 index 4d0363c7..00000000 --- a/src/test/groovy/org/onap/cps/ncmp/dmi/notifications/cmsubscription/CmSubscriptionDmiOutEventToCloudEventMapperSpec.groovy +++ /dev/null @@ -1,73 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2023 Nordix Foundation - * ================================================================================ - * 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 - * - * http://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. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * SPDX-License-Identifier: Apache-2.0 - * ============LICENSE_END========================================================= - */ - -package org.onap.cps.ncmp.dmi.notifications.cmsubscription - -import com.fasterxml.jackson.databind.ObjectMapper -import io.cloudevents.core.builder.CloudEventBuilder -import org.onap.cps.ncmp.dmi.exception.CloudEventConstructionException -import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent -import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.Data -import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus -import org.spockframework.spring.SpringBean -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest -import spock.lang.Specification - -@SpringBootTest(classes = [ObjectMapper]) -class CmSubscriptionDmiOutEventToCloudEventMapperSpec extends Specification { - - @Autowired - def objectMapper = new ObjectMapper() - - @SpringBean - CmSubscriptionDmiOutEventToCloudEventMapper objectUnderTest = new CmSubscriptionDmiOutEventToCloudEventMapper() - - def 'Convert a Cm Subscription DMI Out Event to CloudEvent successfully.'() { - given: 'a Cm Subscription DMI Out Event and an event key' - def dmiName = 'test-ncmp-dmi' - def responseStatus = SubscriptionStatus.Status.ACCEPTED - def subscriptionStatuses = [new SubscriptionStatus(id: 'CmHandle1', status: responseStatus), - new SubscriptionStatus(id: 'CmHandle2', status: responseStatus)] - def cmSubscriptionDmiOutEventData = new Data(subscriptionName: 'cm-subscription-001', - clientId: 'SCO-9989752', dmiName: 'ncmp-dmi-plugin', subscriptionStatus: subscriptionStatuses) - def cmSubscriptionDmiOutEvent = - new CmSubscriptionDmiOutEvent().withData(cmSubscriptionDmiOutEventData) - when: 'a Cm Subscription DMI Out Event is converted' - def result = objectUnderTest.toCloudEvent(cmSubscriptionDmiOutEvent, "subscriptionCreatedStatus", dmiName) - then: 'Cm Subscription DMI Out Event is converted as expected' - def expectedCloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi')) - .withType("subscriptionCreated") - .withDataSchema(URI.create("urn:cps:" + CmSubscriptionDmiOutEvent.class.getName() + ":1.0.0")) - .withExtension("correlationid", cmSubscriptionDmiOutEvent.getData().getClientId() + ":" + cmSubscriptionDmiOutEvent.getData().getSubscriptionName()) - .withData(objectMapper.writeValueAsBytes(cmSubscriptionDmiOutEvent)).build() - assert expectedCloudEvent.data == result.data - } - - def 'Map the Cloud Event to data of the subscription event with incorrect content causes an exception'() { - given: 'an empty subscription response event and event key' - def dmiName = 'test-ncmp-dmi' - def cmSubscriptionDmiOutEvent = new CmSubscriptionDmiOutEvent() - when: 'the cm subscription dmi out Event map to data of cloud event' - objectUnderTest.toCloudEvent(cmSubscriptionDmiOutEvent, "subscriptionCreatedStatus", dmiName) - then: 'a run time exception is thrown' - thrown(CloudEventConstructionException) - } -}
\ No newline at end of file |