From 8aa9abf52d06288025735d922d6f984c5b30d9e1 Mon Sep 17 00:00:00 2001 From: Pooja03 Date: Mon, 15 Apr 2019 20:40:26 +0530 Subject: Cloudify blueprint for VES mapper Adding Cloudify blueprint for VES mapper and some updates on code Change-Id: Idcbd9ec080717a80d04263a4baa6e4de9ce143c9 Issue-ID: DCAEGEN2-1176 Signed-off-by: Pooja03 --- .../src/main/resources/defaultSnmpMappingFile.xml | 60 +++++++--------- UniversalVesAdapter/src/main/resources/kv.json | 46 +++++++++--- UniversalVesAdapter/src/main/resources/kvTest.json | 15 ---- .../src/main/resources/mapper.properties | 82 +++++++++++----------- 4 files changed, 105 insertions(+), 98 deletions(-) delete mode 100644 UniversalVesAdapter/src/main/resources/kvTest.json (limited to 'UniversalVesAdapter/src/main/resources') diff --git a/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml b/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml index 5f31fab..4263137 100644 --- a/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml +++ b/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml @@ -1,51 +1,43 @@ - - + - + - + - - "3.0" + + '3.0' 'FaultField' 'XXXX' 'VESMapper' - org.onap.dcaegen2.ves.domain.ves5_4.CommonEventHeader.Domain.FAULT + org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULT commonEventHeader.domain - - - org.onap.dcaegen2.ves.domain.ves5_4.CommonEventHeader.Priority.NORMAL - "VesAdapter" - - - - - - "SNMP Fault" - org.onap.dcaegen2.ves.domain.ves5_4.FaultFields.VfStatus.ACTIVE - - org.onap.dcaegen2.ves.domain.ves5_4.FaultFields.EventSeverity.MINOR - - - - - - - - - - - - - - + + + org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL + 'VesAdapter' + + + + + 'SNMP Fault' + org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVE + org.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR + + + + + + + + + \ No newline at end of file diff --git a/UniversalVesAdapter/src/main/resources/kv.json b/UniversalVesAdapter/src/main/resources/kv.json index 9e245d1..03c87e9 100644 --- a/UniversalVesAdapter/src/main/resources/kv.json +++ b/UniversalVesAdapter/src/main/resources/kv.json @@ -2,23 +2,53 @@ "app_preferences":{ "collectors":[ { - "identifier":"notification-id", - "subscriberTopic":"ONAP-COLLECTOR-RESTCONFTRAP", + "stream_subscriber":"rcc-notification", "mapping-files":[ { - "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<\/json:keyMap><\/json:reader><\/jb:bean><\/jb:bean>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1<\/jb:expression>'pnfRegistration'<\/jb:expression>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression>'registration_'+commonEventHeader.ts1<\/jb:expression>'VESMapper'<\/jb:expression>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression>commonEventHeader.domain<\/jb:expression>commonEventHeader.ts1<\/jb:expression>commonEventHeader.ts1<\/jb:expression>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL<\/jb:expression><\/jb:bean>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><\/jb:bean><\/smooks-resource-list>" + "defaultMappingFile-rcc-notification":"org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1'pnfRegistration'org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1'registration_'+commonEventHeader.ts1'VESMapper'org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATIONcommonEventHeader.domaincommonEventHeader.ts1commonEventHeader.ts1org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMALpnfRegistrationFields.vendorName+'-'+pnfRegistrationFields.serialNumberorg.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0" } - ] + ], + "identifier":"notification-id", + "stream_publisher":"ves-pnfRegistration" }, - { + { "identifier":"notify OID", - "subscriberTopic":"ONAP-COLLECTOR-SNMPTRAP", + "stream_subscriber":"snmp-notification", "mapping-files":[ { - "defaultMappingFile-ONAP-COLLECTOR-SNMPTRAP":"'3.0''FaultField''XXXX''VESMapper'org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULTcommonEventHeader.domainorg.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL'VesAdapter''SNMP Fault'org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVEorg.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR" + "defaultMappingFile-snmp-notification":"'3.0''FaultField''XXXX''VESMapper'org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULTcommonEventHeader.domainorg.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL'VesAdapter''SNMP Fault'org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVEorg.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR" } - ] + ], + "stream_publisher":"ves-fault" } ] + }, + "streams_publishes":{ + "ves-fault":{ + "type":"message_router", + "dmaap_info":{ + "topic_url":"http://10.53.172.156:3904/events/unauthenticated.SEC_FAULT_OUTPUT" + } + }, + "ves-pnfRegistration":{ + "type":"message_router", + "dmaap_info":{ + "topic_url":"http://10.53.172.156:3904/events/unauthenticated.VES_PNFREG_OUTPUT" + } + } + }, + "streams_subscribes":{ + "snmp-notification":{ + "type":"message_router", + "dmaap_info":{ + "topic_url":"http://10.53.172.156:3904/events/ONAP-COLLECTOR-SNMPTRAP" + } + }, + "rcc-notification":{ + "type":"message_router", + "dmaap_info":{ + "topic_url":"http://10.53.172.156:3904/events/ONAP-COLLECTOR-RESTCONFTRAP" + } + } } } \ No newline at end of file diff --git a/UniversalVesAdapter/src/main/resources/kvTest.json b/UniversalVesAdapter/src/main/resources/kvTest.json deleted file mode 100644 index c4231cb..0000000 --- a/UniversalVesAdapter/src/main/resources/kvTest.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "app_preferences":{ - "collectors":[ - { - "identifier":"notification-id", - "subscriberTopic":"ONAP-COLLECTOR-RESTCONFTRAP", - "mapping-files":[ - { - "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<\/json:keyMap><\/json:reader><\/jb:bean><\/jb:bean>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1<\/jb:expression>'pnfRegistration'<\/jb:expression>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression>'registration_'+commonEventHeader.ts1<\/jb:expression>'VESMapper'<\/jb:expression>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression>commonEventHeader.domain<\/jb:expression>commonEventHeader.ts1<\/jb:expression>commonEventHeader.ts1<\/jb:expression>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL<\/jb:expression><\/jb:bean>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><\/jb:bean><\/smooks-resource-list>" - } - ] - } - ] - } -} \ No newline at end of file diff --git a/UniversalVesAdapter/src/main/resources/mapper.properties b/UniversalVesAdapter/src/main/resources/mapper.properties index d85010f..76751a9 100644 --- a/UniversalVesAdapter/src/main/resources/mapper.properties +++ b/UniversalVesAdapter/src/main/resources/mapper.properties @@ -1,41 +1,41 @@ - # ///////////////// DMaaP Config Constants - - # defaults to no username -mr.DEFAULT_USER_NAME=null - # defaults to no userPassword -mr.DEFAULT_USER_PASSWORD=null - #d efaults to using https protocol -mr.DEFAULT_PROTOCOL=http - # defaults to json content type -mr.DEFAULT_CONTENT_TYPE=application/json - -mr.DMAAP_URI_PATH_PREFIX=/events/ -mr.DMAAP_DEFAULT_CONSUMER_ID=con2 -mr.DMAAP_GROUP_PREFIX=grp2 - -#DMaaP MR subscriber thread's polling interval in milli second -mr.POLLING_INTERVAL=10000 - -# ///////////////// Publisher Constants - -#Dmaap Publisher Topic -mr.publisher.topic=unauthenticated.SEC_FAULT_OUTPUT -#disable batching by default -mr.publisher.DEFAULT_PUBLISHER_MAX_BATCH_SIZE=1 -# default recovery messages size -mr.publisher.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE=100000 -#number of retries when flushing messages -mr.publisher.PUBLISHER_MAX_FLUSH_RETRIES_ON_CLOSE=5 -#delay in retrying for flushing messages -mr.publisher.PUBLISHER_DELAY_MS_ON_RETRIES_ON_CLOSE=5000 - - -#////////////////// Subscriber Constants -mr.subscriber.DEFAULT_SUBSCRIBER_TIMEOUT_MS=-1 -mr.subscriber.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT=-1 -mr.subscriber.DEFAULT_SUBSCRIBER_GROUP_PREFIX=grp2 -mr.subscriber.SUBSCRIBER_TIMEOUT_QUERY_PARAM_NAME=timeout -mr.subscriber.SUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME=limit -mr.mr_URI_PATH_PREFIX = /events/ -mr.mr_GROUP_PREFIX = grp2 -mr.mr_DEFAULT_CONSUMER_ID = con2 + # ///////////////// DMaaP Config Constants + + # defaults to no username +mr.DEFAULT_USER_NAME=null + # defaults to no userPassword +mr.DEFAULT_USER_PASSWORD=null + #d efaults to using https protocol +mr.DEFAULT_PROTOCOL=http + # defaults to json content type +mr.DEFAULT_CONTENT_TYPE=application/json + +mr.DMAAP_URI_PATH_PREFIX=/events/ +mr.DMAAP_DEFAULT_CONSUMER_ID=con2 +mr.DMAAP_GROUP_PREFIX=grp2 + +#DMaaP MR subscriber thread's polling interval in milli second +mr.POLLING_INTERVAL=10000 + +# ///////////////// Publisher Constants + +#Dmaap Publisher Topic +mr.publisher.topic=unauthenticated.VES_PNFREG_OUTPUT +#disable batching by default +mr.publisher.DEFAULT_PUBLISHER_MAX_BATCH_SIZE=1 +# default recovery messages size +mr.publisher.DEFAULT_PUBLISHER_MAX_RECOVERY_QUEUE_SIZE=100000 +#number of retries when flushing messages +mr.publisher.PUBLISHER_MAX_FLUSH_RETRIES_ON_CLOSE=5 +#delay in retrying for flushing messages +mr.publisher.PUBLISHER_DELAY_MS_ON_RETRIES_ON_CLOSE=5000 + + +#////////////////// Subscriber Constants +mr.subscriber.DEFAULT_SUBSCRIBER_TIMEOUT_MS=-1 +mr.subscriber.DEFAULT_SUBSCRIBER_MESSAGE_LIMIT=-1 +mr.subscriber.DEFAULT_SUBSCRIBER_GROUP_PREFIX=grp2 +mr.subscriber.SUBSCRIBER_TIMEOUT_QUERY_PARAM_NAME=timeout +mr.subscriber.SUBSCRIBER_MSG_LIMIT_QUERY_PARAM_NAME=limit +mr.mr_URI_PATH_PREFIX = /events/ +mr.mr_GROUP_PREFIX = grp2 +mr.mr_DEFAULT_CONSUMER_ID = con2 -- cgit 1.2.3-korg