<properties>
<app>org.onap.cps.ncmp.dmi.Application</app>
<base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image>
- <cps.version>3.3.5</cps.version>
+ <cps.version>3.3.6</cps.version>
<image.tag>${project.version}-${maven.build.timestamp}</image.tag>
<jacoco.minimum.coverage>0.98</jacoco.minimum.coverage>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+++ /dev/null
-/*
- * ============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.avcsubscription;
-
-import io.cloudevents.CloudEvent;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.Data;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionEventResponse;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.ncmp_to_dmi.CmHandle;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.ncmp_to_dmi.SubscriptionEvent;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class SubscriptionEventConsumer {
-
- @Value("${app.dmi.avc.subscription-response-topic}")
- private String cmAvcSubscriptionResponseTopic;
- @Value("${dmi.service.name}")
- private String dmiName;
- private final KafkaTemplate<String, CloudEvent> cloudEventKafkaTemplate;
-
- /**
- * Consume the specified event.
- *
- * @param subscriptionCloudEvent the event to be consumed
- */
- @KafkaListener(topics = "${app.dmi.avc.subscription-topic}",
- containerFactory = "cloudEventConcurrentKafkaListenerContainerFactory")
- public void consumeSubscriptionEvent(final ConsumerRecord<String, CloudEvent> subscriptionCloudEvent) {
- final SubscriptionEvent subscriptionEvent =
- SubscriptionEventResponseMapper.toSubscriptionEvent(subscriptionCloudEvent.value());
- if (subscriptionEvent != null) {
- final String eventKey = subscriptionCloudEvent.value().getId();
- final String subscriptionType = subscriptionCloudEvent.value().getType();
- if ("subscriptionCreated".equals(subscriptionType)) {
- sendSubscriptionResponseMessage(eventKey, "subscriptionCreatedStatus",
- formSubscriptionEventResponse(subscriptionEvent));
- } else if ("subscriptionDeleted".equals(subscriptionType)) {
- sendSubscriptionResponseMessage(eventKey, "subscriptionDeletedStatus",
- formSubscriptionEventResponse(subscriptionEvent));
- }
- }
- }
-
- /**
- * Sends message to the configured topic.
- *
- * @param eventKey is the kafka message key
- * @param subscriptionType is the type of subscription action
- * @param subscriptionEventResponse is the payload of the kafka message
- */
- public void sendSubscriptionResponseMessage(final String eventKey,
- final String subscriptionType,
- final SubscriptionEventResponse subscriptionEventResponse) {
- cloudEventKafkaTemplate.send(cmAvcSubscriptionResponseTopic, eventKey,
- SubscriptionEventResponseMapper.toCloudEvent(subscriptionEventResponse, subscriptionType, dmiName));
- }
-
- private SubscriptionEventResponse formSubscriptionEventResponse(final SubscriptionEvent subscriptionEvent) {
- final SubscriptionEventResponse subscriptionEventResponse = new SubscriptionEventResponse();
- final Data subscriptionResponseData = new Data();
- subscriptionResponseData.setClientId(subscriptionEvent.getData().getSubscription().getClientID());
- subscriptionResponseData.setSubscriptionName(subscriptionEvent.getData().getSubscription().getName());
- subscriptionResponseData.setDmiName(dmiName);
-
- final List<CmHandle> cmHandles = subscriptionEvent.getData()
- .getPredicates().getTargets();
- subscriptionResponseData
- .setSubscriptionStatus(
- populateSubscriptionStatus(
- extractCmHandleIds(cmHandles)));
- subscriptionEventResponse.setData(subscriptionResponseData);
- return subscriptionEventResponse;
- }
-
- private Set<String> extractCmHandleIds(final List<CmHandle> cmHandles) {
- final Set<String> cmHandleIds = new HashSet<>();
-
- for (final CmHandle cmHandle : cmHandles) {
- cmHandleIds.add(cmHandle.getId());
- }
- return cmHandleIds;
- }
-
- private List<SubscriptionStatus> populateSubscriptionStatus(final Set<String> cmHandleIds) {
- final List<SubscriptionStatus> subscriptionStatuses = new ArrayList<>();
- for (final String cmHandleId : cmHandleIds) {
- final SubscriptionStatus status = new SubscriptionStatus();
- status.setId(cmHandleId);
- status.setStatus(SubscriptionStatus.Status.ACCEPTED);
- subscriptionStatuses.add(status);
- }
- return subscriptionStatuses;
- }
-
-}
+++ /dev/null
-/*
- * ============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.avcsubscription;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.cloudevents.CloudEvent;
-import io.cloudevents.core.CloudEventUtils;
-import io.cloudevents.core.builder.CloudEventBuilder;
-import io.cloudevents.core.data.PojoCloudEventData;
-import io.cloudevents.jackson.PojoCloudEventDataMapper;
-import java.net.URI;
-import java.util.UUID;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.onap.cps.ncmp.dmi.exception.CloudEventConstructionException;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionEventResponse;
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.ncmp_to_dmi.SubscriptionEvent;
-
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-@Slf4j
-public class SubscriptionEventResponseMapper {
-
- private static final ObjectMapper objectMapper = new ObjectMapper();
-
- /**
- * Maps CloudEvent object to SubscriptionEvent object.
- *
- * @param cloudEvent object
- * @return SubscriptionEvent deserialized
- */
- public static SubscriptionEvent toSubscriptionEvent(final CloudEvent cloudEvent) {
- final PojoCloudEventData<SubscriptionEvent> deserializedCloudEvent =
- CloudEventUtils.mapData(cloudEvent,
- PojoCloudEventDataMapper.from(objectMapper, SubscriptionEvent.class));
- if (deserializedCloudEvent == null) {
- log.debug("No data found in the consumed subscription response event");
- return null;
- } else {
- final SubscriptionEvent subscriptionEvent = deserializedCloudEvent.getValue();
- log.debug("Consuming subscription response event {}", subscriptionEvent);
- return subscriptionEvent;
- }
- }
-
- /**
- * Maps SubscriptionEventResponse to a CloudEvent.
- *
- * @param subscriptionEventResponse object.
- * @param subscriptionType String of subscription type.
- * @param dmiName String of dmiName.
- * @return CloudEvent built.
- */
- public static CloudEvent toCloudEvent(
- final org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionEventResponse
- subscriptionEventResponse,
- final String subscriptionType,
- final String dmiName) {
- try {
- return CloudEventBuilder.v1()
- .withId(UUID.randomUUID().toString())
- .withSource(URI.create(dmiName))
- .withType(subscriptionType)
- .withDataSchema(URI.create("urn:cps:" + SubscriptionEventResponse.class.getName() + ":1.0.0"))
- .withExtension("correlationid", subscriptionEventResponse.getData().getClientId() + ":"
- + subscriptionEventResponse.getData().getSubscriptionName())
- .withData(objectMapper.writeValueAsBytes(subscriptionEventResponse))
- .build();
- } catch (final Exception ex) {
- throw new CloudEventConstructionException("The Cloud Event could not be constructed", "Invalid object to "
- + "serialize or required headers is missing", ex);
- }
- }
-
-
-}
--- /dev/null
+/*
+ * ============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 io.cloudevents.CloudEvent;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import lombok.RequiredArgsConstructor;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.onap.cps.ncmp.dmi.notifications.mapper.CloudEventMapper;
+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.springframework.beans.factory.annotation.Value;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class CmSubscriptionDmiInEventConsumer {
+
+ @Value("${app.dmi.avc.subscription-response-topic}")
+ private String cmAvcSubscriptionResponseTopic;
+ @Value("${dmi.service.name}")
+ private String dmiName;
+ private final KafkaTemplate<String, CloudEvent> cloudEventKafkaTemplate;
+
+ /**
+ * Consume the specified event.
+ *
+ * @param cmSubscriptionDmiInCloudEvent the event to be consumed
+ */
+ @KafkaListener(topics = "${app.dmi.avc.subscription-topic}",
+ containerFactory = "cloudEventConcurrentKafkaListenerContainerFactory")
+ public void consumeCmSubscriptionDmiInEvent(
+ final ConsumerRecord<String, CloudEvent> cmSubscriptionDmiInCloudEvent) {
+ final CmSubscriptionDmiInEvent cmSubscriptionDmiInEvent =
+ CloudEventMapper.toTargetEvent(cmSubscriptionDmiInCloudEvent.value(), CmSubscriptionDmiInEvent.class);
+ if (cmSubscriptionDmiInEvent != null) {
+ final String eventKey = cmSubscriptionDmiInCloudEvent.value().getId();
+ final String subscriptionType = cmSubscriptionDmiInCloudEvent.value().getType();
+ if ("subscriptionCreated".equals(subscriptionType)) {
+ sendCmSubscriptionDmiOutEvent(eventKey, "subscriptionCreatedStatus",
+ formCmSubscriptionDmiOutEvent(cmSubscriptionDmiInEvent));
+ } else if ("subscriptionDeleted".equals(subscriptionType)) {
+ sendCmSubscriptionDmiOutEvent(eventKey, "subscriptionDeletedStatus",
+ formCmSubscriptionDmiOutEvent(cmSubscriptionDmiInEvent));
+ }
+ }
+ }
+
+ /**
+ * Sends message to the configured topic.
+ *
+ * @param eventKey is the kafka message key
+ * @param subscriptionType is the type of subscription action
+ * @param cmSubscriptionDmiOutEvent is the payload of the kafka message
+ */
+ public void sendCmSubscriptionDmiOutEvent(final String eventKey, final String subscriptionType,
+ final CmSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent) {
+ cloudEventKafkaTemplate.send(cmAvcSubscriptionResponseTopic, eventKey,
+ CmSubscriptionDmiOutEventToCloudEventMapper.toCloudEvent(cmSubscriptionDmiOutEvent, subscriptionType,
+ dmiName));
+ }
+
+ private CmSubscriptionDmiOutEvent formCmSubscriptionDmiOutEvent(
+ final CmSubscriptionDmiInEvent cmSubscriptionDmiInEvent) {
+ final CmSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent = new CmSubscriptionDmiOutEvent();
+ final Data cmSubscriptionDmiOutEventData = new Data();
+ cmSubscriptionDmiOutEventData.setClientId(cmSubscriptionDmiInEvent.getData().getSubscription().getClientID());
+ cmSubscriptionDmiOutEventData.setSubscriptionName(
+ cmSubscriptionDmiInEvent.getData().getSubscription().getName());
+ cmSubscriptionDmiOutEventData.setDmiName(dmiName);
+
+ final List<CmHandle> cmHandles = cmSubscriptionDmiInEvent.getData().getPredicates().getTargets();
+ cmSubscriptionDmiOutEventData.setSubscriptionStatus(populateSubscriptionStatus(extractCmHandleIds(cmHandles)));
+ cmSubscriptionDmiOutEvent.setData(cmSubscriptionDmiOutEventData);
+ return cmSubscriptionDmiOutEvent;
+ }
+
+ private Set<String> extractCmHandleIds(final List<CmHandle> cmHandles) {
+ final Set<String> cmHandleIds = new HashSet<>();
+
+ for (final CmHandle cmHandle : cmHandles) {
+ cmHandleIds.add(cmHandle.getId());
+ }
+ return cmHandleIds;
+ }
+
+ private List<SubscriptionStatus> populateSubscriptionStatus(final Set<String> cmHandleIds) {
+ final List<SubscriptionStatus> subscriptionStatuses = new ArrayList<>();
+ for (final String cmHandleId : cmHandleIds) {
+ final SubscriptionStatus status = new SubscriptionStatus();
+ status.setId(cmHandleId);
+ status.setStatus(SubscriptionStatus.Status.ACCEPTED);
+ subscriptionStatuses.add(status);
+ }
+ return subscriptionStatuses;
+ }
+
+}
--- /dev/null
+/*
+ * ============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 java.net.URI;
+import java.util.UUID;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.onap.cps.ncmp.dmi.exception.CloudEventConstructionException;
+import org.onap.cps.ncmp.events.cmsubscription1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class CmSubscriptionDmiOutEventToCloudEventMapper {
+
+ private static final ObjectMapper objectMapper = new ObjectMapper();
+
+ /**
+ * Maps SubscriptionEventResponse to a CloudEvent.
+ *
+ * @param cmSubscriptionDmiOutEvent object.
+ * @param subscriptionType String of subscription type.
+ * @param dmiName String of dmiName.
+ * @return CloudEvent built.
+ */
+ public static CloudEvent toCloudEvent(final CmSubscriptionDmiOutEvent cmSubscriptionDmiOutEvent,
+ final String subscriptionType, final String dmiName) {
+ try {
+ return CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create(dmiName))
+ .withType(subscriptionType)
+ .withDataSchema(URI.create("urn:cps:" + CmSubscriptionDmiOutEvent.class.getName() + ":1.0.0"))
+ .withExtension("correlationid", cmSubscriptionDmiOutEvent.getData().getClientId() + ":"
+ + cmSubscriptionDmiOutEvent.getData().getSubscriptionName())
+ .withData(objectMapper.writeValueAsBytes(cmSubscriptionDmiOutEvent)).build();
+ } catch (final Exception ex) {
+ throw new CloudEventConstructionException("The Cloud Event could not be constructed",
+ "Invalid object to serialize or required headers is missing", ex);
+ }
+ }
+
+
+}
--- /dev/null
+/*
+ * ============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.mapper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.cloudevents.CloudEvent;
+import io.cloudevents.core.CloudEventUtils;
+import io.cloudevents.core.data.PojoCloudEventData;
+import io.cloudevents.jackson.PojoCloudEventDataMapper;
+import io.cloudevents.rw.CloudEventRWException;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class CloudEventMapper {
+
+ private static final ObjectMapper objectMapper = new ObjectMapper();
+
+ /**
+ * Generic method to map cloud event data to target event class object.
+ *
+ * @param cloudEvent input cloud event
+ * @param targetEventClass target event class
+ * @param <T> target event class type
+ * @return mapped target event
+ */
+ public static <T> T toTargetEvent(final CloudEvent cloudEvent, final Class<T> targetEventClass) {
+ PojoCloudEventData<T> mappedCloudEvent = null;
+
+ try {
+ mappedCloudEvent =
+ CloudEventUtils.mapData(cloudEvent, PojoCloudEventDataMapper.from(objectMapper, targetEventClass));
+
+ } catch (final CloudEventRWException cloudEventRwException) {
+ log.error("Unable to map cloud event to target event class type : {} with cause : {}", targetEventClass,
+ cloudEventRwException.getMessage());
+ }
+
+ return mappedCloudEvent == null ? null : mappedCloudEvent.getValue();
+ }
+
+}
+++ /dev/null
-/*
- * ============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.avcsubscription
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import io.cloudevents.core.builder.CloudEventBuilder
-import org.onap.cps.ncmp.dmi.TestUtils
-import org.onap.cps.ncmp.dmi.exception.CloudEventConstructionException
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.Data
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionEventResponse
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.ncmp_to_dmi.CmHandle
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.ncmp_to_dmi.SubscriptionEvent
-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 SubscriptionEventResponseMapperSpec extends Specification {
-
- @Autowired
- def objectMapper = new ObjectMapper()
-
- @SpringBean
- SubscriptionEventResponseMapper objectUnderTest = new SubscriptionEventResponseMapper()
-
- def 'Convert a SubscriptionResponseEvent to CloudEvent successfully.'() {
- given: 'a SubscriptionResponseEvent 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 subscriptionEventResponseData = new Data(subscriptionName: 'cm-subscription-001',
- clientId: 'SCO-9989752', dmiName: 'ncmp-dmi-plugin', subscriptionStatus: subscriptionStatuses)
- def subscriptionEventResponse =
- new SubscriptionEventResponse().withData(subscriptionEventResponseData)
- when: 'a SubscriptionResponseEvent is converted'
- def result = objectUnderTest.toCloudEvent(subscriptionEventResponse,"subscriptionCreatedStatus", dmiName)
- then: 'SubscriptionResponseEvent 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:" + SubscriptionEventResponse.class.getName() + ":1.0.0"))
- .withExtension("correlationid", subscriptionEventResponse.getData().getClientId() + ":"
- + subscriptionEventResponse.getData().getSubscriptionName())
- .withData(objectMapper.writeValueAsBytes(subscriptionEventResponse)).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 testSubscriptionEventResponse = new SubscriptionEventResponse()
- when: 'the subscription response event map to data of cloud event'
- objectUnderTest.toCloudEvent(testSubscriptionEventResponse, "subscriptionCreatedStatus", dmiName)
- then: 'a run time exception is thrown'
- thrown(CloudEventConstructionException)
- }
-
- def 'Convert a CloudEvent to SubscriptionEvent.'() {
- given: 'a CloudEvent'
- def eventKey = UUID.randomUUID().toString()
- def jsonData = TestUtils.getResourceFileContent('avcSubscriptionCreationEvent.json')
- def subscriptionEvent = objectMapper.readValue(jsonData, SubscriptionEvent.class)
- def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi'))
- .withType("subscriptionCreated")
- .withDataSchema(URI.create("urn:cps:" + SubscriptionEvent.class.getName() + ":1.0.0"))
- .withExtension("correlationid", eventKey)
- .withData(objectMapper.writeValueAsBytes(subscriptionEvent)).build()
- when: 'a SubscriptionEvent is formed'
- def result = objectUnderTest.toSubscriptionEvent(cloudEvent)
- then: 'Confirm SubscriptionEvent was formed as expected'
- assert result == subscriptionEvent
- }
-
- def 'Convert a CloudEvent with Null data to SubscriptionEvent.'() {
- given: 'a CloudEvent with null data'
- def eventKey = UUID.randomUUID().toString()
- def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi'))
- .withType("subscriptionCreated")
- .withDataSchema(URI.create("urn:cps:" + SubscriptionEvent.class.getName() + ":1.0.0"))
- .withExtension("correlationid", eventKey)
- .withData(null).build()
- when: 'a SubscriptionEvent is formed'
- def result = objectUnderTest.toSubscriptionEvent(cloudEvent)
- then: 'Confirm SubscriptionEventResponse was formed as expected'
- assert result == null
- }
-}
\ No newline at end of file
* ============LICENSE_END=========================================================
*/
-package org.onap.cps.ncmp.dmi.notifications.avcsubscription
+package org.onap.cps.ncmp.dmi.notifications.cmsubscription
import com.fasterxml.jackson.databind.ObjectMapper
import io.cloudevents.CloudEvent
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.avcsubscription1_0_0.ncmp_to_dmi.CmHandle
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.ncmp_to_dmi.SubscriptionEvent
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.Data
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionEventResponse
-import org.onap.cps.ncmp.events.avcsubscription1_0_0.dmi_to_ncmp.SubscriptionStatus
+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 java.time.OffsetDateTime
import java.time.ZoneId
-@SpringBootTest(classes = [SubscriptionEventConsumer])
+@SpringBootTest(classes = [CmSubscriptionDmiInEventConsumer])
@Testcontainers
@DirtiesContext
-class SubscriptionEventConsumerSpec extends MessagingBaseSpec {
+class CmSubscriptionDmiInEventConsumerSpec extends MessagingBaseSpec {
def objectMapper = new ObjectMapper()
def testTopic = 'dmi-ncmp-cm-avc-subscription'
@SpringBean
- SubscriptionEventConsumer objectUnderTest = new SubscriptionEventConsumer(cloudEventKafkaTemplate)
+ CmSubscriptionDmiInEventConsumer objectUnderTest = new CmSubscriptionDmiInEventConsumer(cloudEventKafkaTemplate)
def 'Sends subscription cloud event response successfully.'() {
given: 'an subscription event response'
def responseStatus = SubscriptionStatus.Status.ACCEPTED
def subscriptionStatuses = [new SubscriptionStatus(id: 'CmHandle1', status: responseStatus),
new SubscriptionStatus(id: 'CmHandle2', status: responseStatus)]
- def subscriptionEventResponseData = new Data(subscriptionName: 'cm-subscription-001',
+ def cmSubscriptionDmiOutEventData = new Data(subscriptionName: 'cm-subscription-001',
clientId: 'SCO-9989752', dmiName: 'ncmp-dmi-plugin', subscriptionStatus: subscriptionStatuses)
def subscriptionEventResponse =
- new SubscriptionEventResponse().withData(subscriptionEventResponseData)
+ 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.sendSubscriptionResponseMessage(eventKey, "subscriptionCreatedStatus", subscriptionEventResponse)
+ objectUnderTest.sendCmSubscriptionDmiOutEvent(eventKey, "subscriptionCreatedStatus", subscriptionEventResponse)
and: 'topic is polled'
def records = kafkaConsumer.poll(Duration.ofMillis(1500))
then: 'poll returns one record'
def eventKey = UUID.randomUUID().toString()
def timestamp = new Timestamp(1679521929511)
def jsonData = TestUtils.getResourceFileContent('avcSubscriptionCreationEvent.json')
- def subscriptionEvent = objectMapper.readValue(jsonData, SubscriptionEvent.class)
+ 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:" + SubscriptionEvent.class.getName() + ":1.0.0"))
- .withExtension("correlationid", eventKey)
- .withTime(OffsetDateTime.ofInstant(timestamp.toInstant(), ZoneId.of("UTC")))
- .withData(objectMapper.writeValueAsBytes(subscriptionEvent)).build()
+ .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.consumeSubscriptionEvent(testEventSent)
+ objectUnderTest.consumeCmSubscriptionDmiInEvent(testEventSent)
then: 'no exception is thrown'
noExceptionThrown()
where: 'given #senario'
objectUnderTest.cmAvcSubscriptionResponseTopic = testTopic
def cloudEvent = CloudEventBuilder.v1().withId(UUID.randomUUID().toString()).withSource(URI.create('test-ncmp-dmi'))
.withType("subscriptionCreated")
- .withDataSchema(URI.create("urn:cps:" + SubscriptionEventResponse.class.getName() + ":1.0.0"))
+ .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.consumeSubscriptionEvent(testEventSent)
+ 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, SubscriptionEvent.class)
+ def subscriptionEvent = objectMapper.readValue(jsonData, CmSubscriptionDmiInEvent.class)
when: 'a SubscriptionResponseEvent is formed'
- def result = objectUnderTest.formSubscriptionEventResponse(subscriptionEvent)
+ 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'])]
+ [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'
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]
+ def expectedStatus = [responseStatus, responseStatus]
expectedStatus == result
}
}
\ No newline at end of file
--- /dev/null
+/*
+ * ============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
--- /dev/null
+/*
+ * ============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.mapper
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.cloudevents.core.builder.CloudEventBuilder
+import org.onap.cps.ncmp.events.cmsubscription1_0_0.client_to_ncmp.CmSubscriptionNcmpInEvent
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import spock.lang.Specification
+
+@SpringBootTest(classes = [ObjectMapper])
+class CloudEventMapperSpec extends Specification {
+
+ @Autowired
+ ObjectMapper objectMapper
+
+ def 'Cloud event to Target event type when it is #scenario'() {
+ expect: 'Events mapped correctly'
+ assert mappedCloudEvent == (CloudEventMapper.toTargetEvent(testCloudEvent(), targetClass) != null)
+ where: 'below are the scenarios'
+ scenario | targetClass || mappedCloudEvent
+ 'valid concrete type' | CmSubscriptionNcmpInEvent.class || true
+ 'invalid concrete type' | ArrayList.class || false
+ }
+
+ def testCloudEvent() {
+ return CloudEventBuilder.v1().withData(objectMapper.writeValueAsBytes(new CmSubscriptionNcmpInEvent()))
+ .withId("cmhandle1")
+ .withSource(URI.create('test-source'))
+ .withDataSchema(URI.create('test'))
+ .withType('org.onap.cm.events.cm-subscription')
+ .build()
+ }
+}
+
Code Review / cps / ncmp-dmi-plugin.git / commitdiff