Continue VES 5.4 support as well in VES Mapper

Adding Support for 5.4 ves version along with ves 7.0

Change-Id: I44b15ff5017a968b1df6b57be0a2af1759e740d4
Issue-ID: DCAEGEN2-1326
Signed-off-by: Pooja03 <pm00501616@techmahindra.com>

2 files changed, 59 insertions, 63 deletions

diff --git a/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml b/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml
index d36f854..5f31fab 100644
--- a/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml
+++ b/UniversalVesAdapter/src/main/resources/defaultSnmpMappingFile.xml
@@ -1,64 +1,51 @@
-<?xml version="1.0"?>
-<smooks-resource-list
-	 xmlns="http://www.milyn.org/xsd/smooks-1.1.xsd"
-	 xmlns:json="http://www.milyn.org/xsd/smooks/json-1.1.xsd"
-	 xmlns:jb="http://www.milyn.org/xsd/smooks/javabean-1.4.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.VesEvent" beanId="vesEvent" createOnElement="vesevent">
-    	<jb:wiring property="event" beanIdRef="event"/>
-    </jb:bean>
- 
-     <jb:bean class="org.onap.dcaegen2.ves.domain.Event" beanId="event" createOnElement="vesevent">
-    	<jb:wiring property="commonEventHeader" beanIdRef="commonEventHeader"/>
-    	<jb:wiring property="faultFields" beanIdRef="faultFields"/>    	
-    	<!--<jb:wiring property="measurementsForVfScalingFields" beanIdRef="measurementsForVfScalingFields"/> -->   	
-    </jb:bean>   
-    <!--<jb:bean class="org.onap.dcaegen2.ves.domain.MeasurementsForVfScalingFields" beanId="measurementsForVfScalingFields" createOnElement="simple">
-    	<jb:wiring property="additionalMeasurements" beanIdRef="additionalMeasurements"/>
-    </jb:bean>-->
-    
-    <jb:bean class="org.onap.dcaegen2.ves.domain.CommonEventHeader" beanId="commonEventHeader" createOnElement="vesevent">
-		<jb:expression property="version">"3.0"</jb:expression>
-		<jb:expression property="eventId">"XXXX"</jb:expression>
-		<jb:expression property="reportingEntityName">"VesAdapter"</jb:expression>
-	 	<jb:expression property="domain">"fault"</jb:expression>
-		<jb:expression property="eventName" execOnElement="vesevent" >commonEventHeader.domain+"_"+"_"+ faultFields.alarmCondition;</jb:expression>
-    	<jb:value property="sequence" data="0" default="0" decoder="Long"/>
-    	<jb:value property="lastEpochMicrosec" data="#/time-received"  decoder="Double" />
-    	<jb:value property="startEpochMicrosec" data="#/time-received"  decoder="Double"/>
-		<jb:expression property="priority">"Medium"</jb:expression>
-    	<jb:expression property="sourceName">"VesAdapter"</jb:expression>
-    </jb:bean>   
-    
-    <jb:bean class="org.onap.dcaegen2.ves.domain.FaultFields" beanId="faultFields" createOnElement="vesevent">
-    	<jb:value property="alarmCondition" data="#/trap-category" />
-		<jb:expression property="eventSeverity">"MINOR"</jb:expression>
-		<jb:expression property="eventSourceType">"SNMP Agent"</jb:expression>
-    	<jb:expression property="specificProblem">"SNMP Fault"</jb:expression>
-    	<jb:value property="faultFieldsVersion" data="2.0" default="2.0" decoder="Double" />
-    	<jb:wiring property="alarmAdditionalInformation" beanIdRef="alarmAdditionalInformationroot"/>   
-		<jb:expression property="vfStatus">"Active"</jb:expression>
-    	
-    </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.AlarmAdditionalInformation" beanId="alarmAdditionalInformation" createOnElement="varbinds/element">
-    	<jb:value property="name" data="#/varbind_oid"/>
-        <jb:value property="value" data="#/varbind_value" />
-    </jb:bean>
-	<!--<jb:bean class="java.util.ArrayList" beanId="additionalMeasurements" createOnElement="simple">
-    	<jb:wiring beanIdRef="additionalMeasurement"/>
-    </jb:bean>    
-    
-    <jb:bean class="org.onap.dcaegen2.ves.domain.AdditionalMeasurement" beanId="additionalMeasurement" createOnElement="varbinds/element">
-    	<jb:value property="name" data="#/varbind_value" />
-    </jb:bean>  -->  
-    
+<?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:wiring property="event" beanIdRef="event" />

+   </jb:bean>

+   <jb:bean class="org.onap.dcaegen2.ves.domain.ves5_4.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.ves5_4.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="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>

 </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 c4231cb..9e245d1 100644
--- a/UniversalVesAdapter/src/main/resources/kv.json
+++ b/UniversalVesAdapter/src/main/resources/kv.json
@@ -9,6 +9,15 @@
             "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>"

           }

         ]

+      },

+      {  

+        "identifier":"notify OID",

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

+        "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>"

+          }

+        ]

       }

     ]

   }