aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Keenan <joseph.keenan@est.tech>2022-06-22 09:16:56 +0000
committerGerrit Code Review <gerrit@onap.org>2022-06-22 09:16:56 +0000
commit31cf29d21096ab7200658f586ecb9e40ee72249e (patch)
tree17fc18570d91cd42e324ed5ee7b497baad377656
parentb000d8915b371724869195ba0889f7082eecc9f1 (diff)
parent81d917dde44ea902b2ecf22e217e9551299f414e (diff)
Merge "Eliminate cmhandle-properties tag"
-rw-r--r--cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json1
-rw-r--r--cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy4
2 files changed, 3 insertions, 2 deletions
diff --git a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
index 4ddffea56a..05a0e93b31 100644
--- a/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/ncmp-event-schema-v1.json
@@ -72,6 +72,7 @@
"cmhandle-properties": {
"description": "cmHandle properties as json object.",
"type": "object",
+ "default": null,
"existingJavaType": "java.util.List<java.util.Map<String,String>>",
"additionalProperties": false
}
diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy
index 04eb0bf2bb..ae38714e25 100644
--- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy
+++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/event/NcmpEventsCreatorSpec.groovy
@@ -45,8 +45,8 @@ class NcmpEventsCreatorSpec extends Specification {
assert result.eventCorrelationId == cmHandleId
and: 'event payload is mapped correctly'
assert result.event.operation == operation
- assert result.event.cmhandleProperties.size() == cmHandlePropertiesListSize
- assert result.event.cmhandleProperties[0] == cmHandleProperties
+ assert (result.event.cmhandleProperties != null) ? result.event.cmhandleProperties.size() : 0 == cmHandlePropertiesListSize
+ assert (result.event.cmhandleProperties != null) ? result.event.cmhandleProperties[0] : null == cmHandleProperties
where: 'the following operations are used'
operation | cmHandlePropertiesListSize | cmHandleProperties
CREATE | 1 | ['publicProperty1': 'value1', 'publicProperty2': 'value2']