1 files changed, 50 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