CM SUBSCRIPTION: Update schemas
- updated the cm subscription schemas with proper case as agreed before
for the events
- fixed the tests to reflect the camelCase change
Issue-ID: CPS-2245
Change-Id: I64fb8b27a5f64280dfa19d86ae310e6b5309de39
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-dmi-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-dmi-in-event-schema-1.0.0.json
index dcba93c..3c23cd0 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-dmi-in-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-dmi-in-event-schema-1.0.0.json
@@ -22,7 +22,7 @@
"description": "Information about the targets and subscription",
"additionalProperties": false,
"properties": {
- "cmhandles": {
+ "cmHandles": {
"type": "array",
"items": {
"type": "object",
@@ -32,7 +32,7 @@
"cmhandleId": {
"type": "string"
},
- "private-properties": {
+ "privateProperties": {
"type": "object",
"existingJavaType": "java.util.Map<String,String>",
"items": {
@@ -63,7 +63,7 @@
"type": "string",
"enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"]
},
- "xpath-filter": {
+ "xpathFilter": {
"description": "Filter to be applied to the CM Handles through this event",
"type": "array",
"items": {
@@ -73,7 +73,7 @@
},
"additionalProperties": false,
"required": [
- "xpath-filter"
+ "xpathFilter"
]
}
},
@@ -86,7 +86,7 @@
}
},
"required": [
- "cmhandles",
+ "cmHandles",
"predicates"
]
}
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-in-event-schema-1.0.0.json
index 5576933..12de0da 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-in-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-in-event-schema-1.0.0.json
@@ -34,7 +34,7 @@
"type": "string",
"enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"]
},
- "xpath-filter": {
+ "xpathFilter": {
"description": "Filter to be applied to the CM Handles through this event",
"type": "array",
"items": {
@@ -44,7 +44,7 @@
},
"additionalProperties": false,
"required": [
- "xpath-filter"
+ "xpathFilter"
]
}
},
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-out-event-schema-1.0.0.json
index d9db3ff..d75e53c 100644
--- a/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-out-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/cmnotificationsubscription/cm-notification-subscription-ncmp-out-event-schema-1.0.0.json
@@ -27,21 +27,21 @@
"type": "string",
"description": "The unique subscription id"
},
- "accepted-targets": {
+ "acceptedTargets": {
"type": "array",
"description": "List of accepted targets",
"items": {
"type": "string"
}
},
- "rejected-targets": {
+ "rejectedTargets": {
"type": "array",
"description": "List of rejected targets",
"items": {
"type": "string"
}
},
- "pending-targets": {
+ "pendingTargets": {
"type": "array",
"description": "List of pending targets",
"items": {
@@ -50,9 +50,9 @@
}
},
"required": [
- "accepted-targets",
- "pending-targets",
- "rejected-targets",
+ "acceptedTargets",
+ "pendingTargets",
+ "rejectedTargets",
"subscriptionId"
],
"title": "Data"