Prefix with CmNotificationSubscription refactoring

- event schemas are now suffixed with CmNotificationSubscription
- testware updated appropriately

Issue-ID: CPS-2091
Change-Id: I9d0c4bdfaf7ea94812d35b071824d0fb083aa845
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

4 files changed, 0 insertions, 274 deletions

diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json
deleted file mode 100644
index 4d4d504ec8..0000000000
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-in-event-schema-1.0.0.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-dmi-in-event-schema:1.0.0",
-  "$ref": "#/definitions/CmSubscriptionDmiInEvent",
-  "definitions": {
-    "CmSubscriptionDmiInEvent": {
-      "description": "The payload for cm subscription merge event incoming message from NCMP.",
-      "type": "object",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_dmi.CmSubscriptionDmiInEvent",
-      "additionalProperties": false,
-      "properties": {
-        "data": {
-          "$ref": "#/definitions/data"
-        }
-      },
-      "required": [
-        "data"
-      ]
-    },
-    "data": {
-      "type": "object",
-      "description": "Information about the targets and subscription",
-      "additionalProperties": false,
-      "properties": {
-        "cmhandles": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "description": "Details for the target cmhandles",
-            "additionalProperties": false,
-            "properties": {
-              "cmhandleId": {
-                "type": "string"
-              },
-              "private-properties": {
-                "type": "object",
-                "existingJavaType": "java.util.Map<String,String>",
-                "items": {
-                  "type": "string"
-                }
-              }
-            }
-          }
-        },
-        "predicates": {
-          "type": "array",
-          "description": "Additional values to be added into the subscription",
-          "items": {
-            "type": "object",
-            "properties": {
-              "targetFilter": {
-                "description": "CM Handles to be targeted by the subscription",
-                "type": "array",
-                "items": {
-                  "type": "string"
-                }
-              },
-              "scopeFilter": {
-                "type": "object",
-                "properties": {
-                  "datastore": {
-                    "description": "Datastore which is to be used by the subscription",
-                    "type": "string",
-                    "enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"]
-                  },
-                  "xpath-filter": {
-                    "description": "Filter to be applied to the CM Handles through this event",
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  }
-                },
-                "additionalProperties": false,
-                "required": [
-                  "xpath-filter"
-                ]
-              }
-            },
-            "additionalProperties": false,
-            "required": [
-              "targetFilter"
-            ]
-          },
-          "additionalProperties": false
-        }
-      },
-      "required": [
-        "cmhandles",
-        "predicates"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json
deleted file mode 100644
index 5ae6225be6..0000000000
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-dmi-out-event-schema-1.0.0.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-dmi-out-event-schema:1.0.0",
-  "$ref": "#/definitions/CmSubscriptionDmiOutEvent",
-  "definitions": {
-    "CmSubscriptionDmiOutEvent": {
-      "description": "The payload for cm subscription merge event coming out from DMI Plugin.",
-      "type": "object",
-      "additionalProperties": false,
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.dmi_to_ncmp.CmSubscriptionDmiOutEvent",
-      "properties": {
-        "data": {
-          "$ref": "#/definitions/Data"
-        }
-      },
-      "required": [
-        "data"
-      ],
-      "title": "CmSubscriptionDmiOutEvent"
-    },
-    "Data": {
-      "type": "object",
-      "description": "Information about the targets and subscription",
-      "additionalProperties": false,
-      "properties": {
-        "statusCode": {
-          "type": "string",
-          "format": "integer",
-          "description": "The common status as defined in CPS"
-        },
-        "statusMessage": {
-          "type": "string",
-          "description": "The common status message as defined in CPS"
-        }
-      },
-      "required": [
-        "statusCode",
-        "statusMessage"
-      ],
-      "title": "Data"
-    }
-  }
-}
\ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json
deleted file mode 100644
index ffdc2e36b7..0000000000
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-in-event-schema-1.0.0.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-ncmp-in-event:1.0.0",
-  "$ref": "#/definitions/CmSubscriptionNcmpInEvent",
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "definitions": {
-    "CmSubscriptionNcmpInEvent": {
-      "description": "The payload for subscription merge event.",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.client_to_ncmp.CmSubscriptionNcmpInEvent",
-      "properties": {
-        "data": {
-          "properties": {
-            "subscriptionId": {
-              "description": "The subscription details.",
-              "type": "string"
-            },
-            "predicates": {
-              "type": "array",
-              "description": "Additional values to be added into the subscription",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "targetFilter": {
-                    "description": "CM Handles to be targeted by the subscription",
-                    "type": "array",
-                    "items": {
-                      "type": "string"
-                    }
-                  },
-                  "scopeFilter": {
-                    "type": "object",
-                    "properties": {
-                      "datastore": {
-                        "description": "Datastore which is to be used by the subscription",
-                        "type": "string",
-                        "enum": ["ncmp-datastore:passthrough-operational", "ncmp-datastore:passthrough-running"]
-                      },
-                      "xpath-filter": {
-                        "description": "Filter to be applied to the CM Handles through this event",
-                        "type": "array",
-                        "items": {
-                          "type": "string"
-                        }
-                      }
-                    },
-                    "additionalProperties": false,
-                    "required": [
-                      "xpath-filter"
-                    ]
-                  }
-                },
-                "additionalProperties": false,
-                "required": [
-                  "targetFilter"
-                ]
-              },
-              "additionalProperties": false
-            }
-          },
-          "required": [
-            "subscriptionId",
-            "predicates"
-          ],
-          "type": "object",
-          "additionalProperties": false
-        }
-      },
-      "type": "object",
-      "additionalProperties": false,
-      "required": [
-        "data"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
deleted file mode 100644
index e5659a7b61..0000000000
--- a/cps-ncmp-events/src/main/resources/schemas/cmsubscription/cm-subscription-ncmp-out-event-schema-1.0.0.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2019-09/schema",
-  "$id": "urn:cps:org.onap.cps.ncmp.events:cm-subscription-ncmp-out-event-schema:1.0.0",
-  "$ref": "#/definitions/CmSubscriptionNcmpOutEvent",
-  "definitions": {
-    "CmSubscriptionNcmpOutEvent": {
-      "type": "object",
-      "description": "The payload applied cm subscription merge event coming out from NCMP.",
-      "javaType": "org.onap.cps.ncmp.events.cmsubscription_merge1_0_0.ncmp_to_client.CmSubscriptionNcmpOutEvent",
-      "additionalProperties": false,
-      "properties": {
-        "data": {
-          "$ref": "#/definitions/Data"
-        }
-      },
-      "required": [
-        "data"
-      ],
-      "title": "CmSubscriptionNcmpOutEvent"
-    },
-    "Data": {
-      "type": "object",
-      "description": "Information about the targets and subscription",
-      "additionalProperties": false,
-      "properties": {
-        "subscriptionId": {
-          "type": "string",
-          "description": "The unique subscription id"
-        },
-        "accepted-targets": {
-          "type": "array",
-          "description": "List of accepted targets",
-          "items": {
-            "type": "string"
-          }
-        },
-        "rejected-targets": {
-          "type": "array",
-          "description": "List of rejected targets",
-          "items": {
-            "type": "string"
-          }
-        },
-        "pending-targets": {
-          "type": "array",
-          "description": "List of pending targets",
-          "items": {
-            "type": "string"
-          }
-        }
-      },
-      "required": [
-        "accepted-targets",
-        "pending-targets",
-        "rejected-targets",
-        "subscriptionId"
-      ],
-      "title": "Data"
-    }
-  }
-
-
-}
\ No newline at end of file