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 <pm00501616@techmahindra.com>

4 files changed, 105 insertions, 98 deletions

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 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Created with Liquid Technologies Online Tools 1.0 (https://www.liquid-technologies.com) -->

 <smooks-resource-list xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd" xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.xsd" xmlns:json="http://www.milyn.org/xsd/smooks/json-1.1.xsd">

    <json:reader rootName="vesevent" keyWhitspaceReplacement="-">

       <json:keyMap>

          <json:key from="date&amp;time" to="date-and-time" />

       </json:keyMap>

    </json:reader>

-   <jb:bean class="org.onap.dcaegen2.ves.domain.ves5_4.VesEvent" beanId="vesEvent" createOnElement="vesevent">

+   <jb:bean class="org.onap.dcaegen2.ves.domain.ves54.VesEvent" beanId="vesEvent" createOnElement="vesevent">

       <jb:wiring property="event" beanIdRef="event" />

    </jb:bean>

-   <jb:bean class="org.onap.dcaegen2.ves.domain.ves5_4.Event" beanId="event" createOnElement="vesevent">

+   <jb:bean class="org.onap.dcaegen2.ves.domain.ves54.Event" beanId="event" createOnElement="vesevent">

       <jb:wiring property="commonEventHeader" beanIdRef="commonEventHeader" />

-      <jb:wiring property="faultFields" beanIdRef="faultFields"/>

+      <jb:wiring property="faultFields" beanIdRef="faultFields" />

    </jb:bean>

-   <jb:bean class="org.onap.dcaegen2.ves.domain.ves5_4.CommonEventHeader" beanId="commonEventHeader" createOnElement="vesevent">

-      <jb:expression property="version">"3.0"</jb:expression>

+   <jb:bean class="org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader" beanId="commonEventHeader" createOnElement="vesevent">

+      <jb:expression property="version">'3.0'</jb:expression>

       <jb:expression property="eventType">'FaultField'</jb:expression>

       <jb:expression property="eventId" execOnElement="vesevent">'XXXX'</jb:expression>

       <jb:expression property="reportingEntityName">'VESMapper'</jb:expression>

-      <jb:expression property="domain">org.onap.dcaegen2.ves.domain.ves5_4.CommonEventHeader.Domain.FAULT</jb:expression>

+      <jb:expression property="domain">org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULT</jb:expression>

       <jb:expression property="eventName" execOnElement="vesevent">commonEventHeader.domain</jb:expression>

       <jb:value property="sequence" data="0" default="0" decoder="Long" />

-      <jb:value property="lastEpochMicrosec" data="#/time-received"  />

-         <jb:value property="startEpochMicrosec" data="#/time-received" />

-      <jb:expression property="priority">org.onap.dcaegen2.ves.domain.ves5_4.CommonEventHeader.Priority.NORMAL</jb:expression>

-      <jb:expression property="sourceName">"VesAdapter"</jb:expression>

-

-	  </jb:bean>

-   <jb:bean class="org.onap.dcaegen2.ves.domain.ves5_4.FaultFields" beanId="faultFields" createOnElement="vesevent">

-          <jb:value property="faultFieldsVersion" data="2.0" default="2.0" decoder="Double" />

-<jb:value property="alarmCondition" data="#/trap-category" />

-          <jb:expression property="specificProblem">"SNMP Fault"</jb:expression>

-      <jb:expression property="vfStatus">org.onap.dcaegen2.ves.domain.ves5_4.FaultFields.VfStatus.ACTIVE</jb:expression>

-

-      <jb:expression property="eventSeverity">org.onap.dcaegen2.ves.domain.ves5_4.FaultFields.EventSeverity.MINOR</jb:expression>

-

-         <jb:wiring property="alarmAdditionalInformation" beanIdRef="alarmAdditionalInformationroot"/>

-

-	  </jb:bean>

-	  

-	  

-       <jb:bean class="java.util.ArrayList" beanId="alarmAdditionalInformationroot" createOnElement="vesevent">

-        <jb:wiring beanIdRef="alarmAdditionalInformation"/>

-     </jb:bean>

-

-       <jb:bean class="org.onap.dcaegen2.ves.domain.ves5_4.AlarmAdditionalInformation" beanId="alarmAdditionalInformation" createOnElement="varbinds/element">

-       <jb:value property="name" data="#/varbind_oid"/>

-        <jb:value property="value" data="#/varbind_value" />

-      </jb:bean>

+      <jb:value property="lastEpochMicrosec" data="#/time-received" />

+      <jb:value property="startEpochMicrosec" data="#/time-received" />

+      <jb:expression property="priority">org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL</jb:expression>

+      <jb:expression property="sourceName">'VesAdapter'</jb:expression>

+   </jb:bean>

+   <jb:bean class="org.onap.dcaegen2.ves.domain.ves54.FaultFields" beanId="faultFields" createOnElement="vesevent">

+      <jb:value property="faultFieldsVersion" data="2.0" default="2.0" decoder="Double" />

+      <jb:value property="alarmCondition" data="#/trap-category" />

+      <jb:expression property="specificProblem">'SNMP Fault'</jb:expression>

+      <jb:expression property="vfStatus">org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVE</jb:expression>

+      <jb:expression property="eventSeverity">org.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR</jb:expression>

+      <jb:wiring property="alarmAdditionalInformation" beanIdRef="alarmAdditionalInformationroot" />

+   </jb:bean>

+   <jb:bean class="java.util.ArrayList" beanId="alarmAdditionalInformationroot" createOnElement="vesevent">

+      <jb:wiring beanIdRef="alarmAdditionalInformation" />

+   </jb:bean>

+   <jb:bean class="org.onap.dcaegen2.ves.domain.ves54.AlarmAdditionalInformation" beanId="alarmAdditionalInformation" createOnElement="varbinds/element">

+      <jb:value property="name" data="#/varbind_oid" />

+      <jb:value property="value" data="#/varbind_value" />

+   </jb:bean>

 </smooks-resource-list>
\ 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":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"

+            "defaultMappingFile-rcc-notification":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /></json:keyMap></json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1</jb:expression><jb:expression property='eventType'>'pnfRegistration'</jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1</jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1</jb:expression><jb:expression property='reportingEntityName'>'VESMapper'</jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION</jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain</jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1</jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1</jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL</jb:expression><jb:expression property='sourceName' execOnElement='vesevent'>pnfRegistrationFields.vendorName+'-'+pnfRegistrationFields.serialNumber</jb:expression></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0</jb:expression><jb:value property='serialNumber' data='pnfRegistration/serialNumber' /><jb:value property='lastServiceDate' data='pnfRegistration/lastServiceDate' /><jb:value property='manufactureDate' data='pnfRegistration/manufactureDate' /><jb:value property='modelNumber' data='pnfRegistration/modelNumber' /><jb:value property='oamV4IpAddress' data='pnfRegistration/oamV4IpAddress' /><jb:value property='oamV6IpAddress' data='pnfRegistration/oamV6IpAddress' /><jb:value property='softwareVersion' data='pnfRegistration/softwareVersion' /><jb:value property='unitFamily' data='pnfRegistration/unitFamily' /><jb:value property='unitType' data='pnfRegistration/unitType' /><jb:value property='vendorName' data='pnfRegistration/vendorName' /><jb:wiring property='additionalFields' beanIdRef='alarmAdditionalInformation'/></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='vesevent'><jb:wiring property='additionalProperties' beanIdRef='additionalFields2'/></jb:bean><jb:bean beanId='additionalFields2' class='java.util.HashMap' createOnElement='vesevent/pnfRegistration/additionalFields'><jb:value data='pnfRegistration/additionalFields/*' /></jb:bean></smooks-resource-list>"

           }

-        ]

+        ],

+        "identifier":"notification-id",

+        "stream_publisher":"ves-pnfRegistration"

       },

-      {  

+	   {  

         "identifier":"notify OID",

-        "subscriberTopic":"ONAP-COLLECTOR-SNMPTRAP",

+        "stream_subscriber":"snmp-notification",

         "mapping-files":[  

           {  

-            "defaultMappingFile-ONAP-COLLECTOR-SNMPTRAP":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /></json:keyMap></json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='faultFields' beanIdRef='faultFields'/></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>'3.0'</jb:expression><jb:expression property='eventType'>'FaultField'</jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'XXXX'</jb:expression><jb:expression property='reportingEntityName'>'VESMapper'</jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULT</jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain</jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:value property='lastEpochMicrosec' data='#/time-received'  /><jb:value property='startEpochMicrosec' data='#/time-received' /><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL</jb:expression><jb:expression property='sourceName'>'VesAdapter'</jb:expression></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.FaultFields' beanId='faultFields' createOnElement='vesevent'><jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /><jb:value property='alarmCondition' data='#/trap-category' /><jb:expression property='specificProblem'>'SNMP Fault'</jb:expression><jb:expression property='vfStatus'>org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVE</jb:expression><jb:expression property='eventSeverity'>org.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR</jb:expression><jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/></jb:bean><jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'><jb:wiring beanIdRef='alarmAdditionalInformation'/></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'><jb:value property='name' data='#/varbind_oid'/><jb:value property='value' data='#/varbind_value' /></jb:bean></smooks-resource-list>"

+            "defaultMappingFile-snmp-notification":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /></json:keyMap></json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='faultFields' beanIdRef='faultFields'/></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>'3.0'</jb:expression><jb:expression property='eventType'>'FaultField'</jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'XXXX'</jb:expression><jb:expression property='reportingEntityName'>'VESMapper'</jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULT</jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain</jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:value property='lastEpochMicrosec' data='#/time-received'  /><jb:value property='startEpochMicrosec' data='#/time-received' /><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL</jb:expression><jb:expression property='sourceName'>'VesAdapter'</jb:expression></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.FaultFields' beanId='faultFields' createOnElement='vesevent'><jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /><jb:value property='alarmCondition' data='#/trap-category' /><jb:expression property='specificProblem'>'SNMP Fault'</jb:expression><jb:expression property='vfStatus'>org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVE</jb:expression><jb:expression property='eventSeverity'>org.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR</jb:expression><jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot'/></jb:bean><jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'><jb:wiring beanIdRef='alarmAdditionalInformation'/></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'><jb:value property='name' data='#/varbind_oid'/><jb:value property='value' data='#/varbind_value' /></jb:bean></smooks-resource-list>"

           }

-        ]

+        ],

+		"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":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/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