Avc Event compliant with RFC8641
- The event section of the payload will be now in the format of RFC8641.
- Once this event is updated , the corresponding code in the dmi plugin
will be changed
- Schema is present in cps-ncmp codebase so we will create a release and
then it will be used in the dmi plugin
Issue-ID: CPS-1668
Change-Id: Ibd811f318658d8b510b42575fad5d21357af9047
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
diff --git a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json
index 407551f..7e975c9 100644
--- a/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json
+++ b/cps-ncmp-events/src/main/resources/schemas/dmidataavc/avc-event-schema-v1.json
@@ -3,16 +3,99 @@
"$id": "urn:cps:org.onap.cps.ncmp.events:avc-event-schema:v1",
"$ref": "#/definitions/AvcEvent",
"definitions": {
+ "Edit": {
+ "javaType": "org.onap.cps.ncmp.events.avc.v1.Edit",
+ "additionalProperties": false,
+ "properties": {
+ "edit-id": {
+ "type": "string"
+ },
+ "operation": {
+ "type": "string"
+ },
+ "target": {
+ "type": "string"
+ },
+ "value": {
+ "$ref": "#/definitions/Value"
+ }
+ },
+ "required": [
+ "edit-id",
+ "operation",
+ "target"
+ ]
+ },
+ "Value": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "attributes": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "existingJavaType": "java.util.Map<String,Object>",
+ "additionalProperties": false,
+ "properties": {
+ "isHoAllowed": {
+ "type": "boolean"
+ }
+ }
+ }
+ }
+ }
+ },
"AvcEvent": {
"description": "The payload for AVC event.",
"type": "object",
- "javaType" : "org.onap.cps.ncmp.events.avc.v1.AvcEvent",
+ "javaType": "org.onap.cps.ncmp.events.avc.v1.AvcEvent",
"properties": {
"event": {
- "description": "The AVC event content.",
+ "description": "The AVC event content compliant with RFC8641 format",
"type": "object",
- "existingJavaType": "java.lang.Object",
- "additionalProperties": false
+ "additionalProperties": false,
+ "properties": {
+ "push-change-update": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "datastore-changes": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "ietf-yang-patch:yang-patch": {
+ "type": "object",
+ "additionalProperties": false,
+ "properties": {
+ "patch-id": {
+ "type": "string"
+ },
+ "edit": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/Edit"
+ }
+ }
+ },
+ "required": [
+ "patch-id",
+ "edit"
+ ]
+ }
+ },
+ "required": [
+ "ietf-yang-patch:yang-patch"
+ ]
+ }
+ },
+ "required": [
+ "datastore-changes"
+ ]
+ }
+ },
+ "required": [
+ "push-change-update"
+ ]
}
},
"required": [
diff --git a/cps-ncmp-service/src/test/resources/sampleAvcInputEvent.json b/cps-ncmp-service/src/test/resources/sampleAvcInputEvent.json
index de8a523..569343f 100644
--- a/cps-ncmp-service/src/test/resources/sampleAvcInputEvent.json
+++ b/cps-ncmp-service/src/test/resources/sampleAvcInputEvent.json
@@ -1,5 +1,42 @@
{
- "event": {
- "payload": "Hello world!"
+ "event":{
+ "push-change-update":{
+ "datastore-changes":{
+ "ietf-yang-patch:yang-patch":{
+ "patch-id":"34534ffd98",
+ "edit":[
+ {
+ "edit-id":"ded43434-1",
+ "operation":"replace",
+ "target":"ran-network:ran-network/NearRTRIC[@id='22']/GNBCUCPFunction[@id='cucpserver2']/NRCellCU[@id='15549']/NRCellRelation[@id='14427']",
+ "value":{
+ "attributes":[
+ {
+ "isHoAllowed":true
+ }
+ ]
+ }
+ },
+ {
+ "edit-id":"ded43434-2",
+ "operation":"create",
+ "target":"ran-network:ran-network/NearRTRIC[@id='22']/GNBCUCPFunction[@id='cucpserver1']/NRCellCU[@id='15548']/NRCellRelation[@id='14426']",
+ "value":{
+ "attributes":[
+ {
+ "isHoAllowed":false
+ }
+ ]
+ }
+ },
+ {
+ "edit-id":"ded43434-3",
+ "operation":"delete",
+ "target":"ran-network:ran-network/NearRTRIC[@id='22']/GNBCUCPFunction[@id='cucpserver1']/NRCellCU[@id='15548']/NRCellRelation[@id='14426']"
+ }
+ ]
+ }
+ }
+ }
}
}
\ No newline at end of file