summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsourabh_sourabh <sourabh.sourabh@est.tech>2023-08-16 13:16:25 +0100
committerSourabh Sourabh <sourabh.sourabh@est.tech>2023-08-16 13:03:42 +0000
commit0373f194c665e21fcc73babdad3da66a691251a1 (patch)
treeb2b0bd45e761291d245b64bc1327201d000a2e44
parent8a369358cd7c6f20bbfd70bbe409cc7f5cc3ae23 (diff)
Modify data operation schema to accommodate additional information
- Data operation schema is updated to add resourceIdentifier and options. - dmi plugin stub is modified to add both the attributes into kafka response message. Issue-ID:CPS-1837 Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech> Change-Id: I624c32d07ccf396f3090766049622f43f5c3f44f
-rw-r--r--cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json8
-rw-r--r--dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java2
-rw-r--r--docs/schemas/data-operation-event-schema-1.0.0.json8
3 files changed, 18 insertions, 0 deletions
diff --git a/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json b/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json
index f82e481415..c2915187c7 100644
--- a/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json
+++ b/cps-ncmp-events/src/main/resources/schemas/async/data-operation-event-schema-1.0.0.json
@@ -29,6 +29,14 @@
"type": "string"
}
},
+ "resourceIdentifier": {
+ "description": "The format of resource identifier depend on the associated DMI Plugin implementation. For ONAP DMI Plugin it will be RESTConf paths but it can really be anything.",
+ "type": "string"
+ },
+ "options": {
+ "description": "It is mandatory to add as key(s)=value(s)'. The format of options parameter depend on the associated DMI Plugin implementation.",
+ "type": "string"
+ },
"statusCode": {
"description": "which says success or failure (0-99) are for success and (100-199) are for failure",
"type": "string"
diff --git a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
index 275331e186..987436febc 100644
--- a/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
+++ b/dmi-plugin-demo-and-csit-stub/dmi-plugin-demo-and-csit-stub-service/src/main/java/org/onap/cps/ncmp/dmi/rest/stub/controller/DmiRestStubController.java
@@ -164,6 +164,8 @@ public class DmiRestStubController {
response.setStatusCode(NcmpEventResponseCode.SUCCESS.getStatusCode());
response.setStatusMessage(NcmpEventResponseCode.SUCCESS.getStatusMessage());
response.setIds(dataOperationRequest.getCmHandles().stream().map(CmHandle::getId).collect(Collectors.toList()));
+ response.setResourceIdentifier(dataOperationRequest.getResourceIdentifier());
+ response.setOptions(dataOperationRequest.getOptions());
final String ietfNetworkTopologySample = ResourceFileReaderUtil
.getResourceFileContent(applicationContext.getResource(
ResourceLoader.CLASSPATH_URL_PREFIX
diff --git a/docs/schemas/data-operation-event-schema-1.0.0.json b/docs/schemas/data-operation-event-schema-1.0.0.json
index f82e481415..c2915187c7 100644
--- a/docs/schemas/data-operation-event-schema-1.0.0.json
+++ b/docs/schemas/data-operation-event-schema-1.0.0.json
@@ -29,6 +29,14 @@
"type": "string"
}
},
+ "resourceIdentifier": {
+ "description": "The format of resource identifier depend on the associated DMI Plugin implementation. For ONAP DMI Plugin it will be RESTConf paths but it can really be anything.",
+ "type": "string"
+ },
+ "options": {
+ "description": "It is mandatory to add as key(s)=value(s)'. The format of options parameter depend on the associated DMI Plugin implementation.",
+ "type": "string"
+ },
"statusCode": {
"description": "which says success or failure (0-99) are for success and (100-199) are for failure",
"type": "string"