VES 7.1 JAVA Lib-Agent Enhancements

HB-Fault-Measurement-Syslog-2Collector enhancement Issue-ID: VNFSDK-362

Change-Id: Ica2f1b43f66087ddea1ac2e7e00b7b8456e54334
Signed-off-by: SrikanthN <sn00469487@techmahindra.com>

5 files changed, 11 insertions, 23 deletions

diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelHeader.java b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelHeader.java
index d2c2930..1b4da80 100644
--- a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelHeader.java
+++ b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/EvelHeader.java
@@ -775,7 +775,7 @@ public class EvelHeader {
 	    String domain = evel_event_domain(event_domain);

 	    String prity = evel_event_priority(priority);

 	  //  double version = major_version+(double)minor_version/10;

-	    String version = "4.0.2";

+	    String version = "4.1";

 	    EVEL_ENTER();

 	    

 	    /***************************************************************************/

diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/FaultData.java b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/FaultData.java
index 6329ee7..135838e 100644
--- a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/FaultData.java
+++ b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/FaultData.java
@@ -528,7 +528,7 @@ public class FaultData{
 	
 	public static HashMap<String, String> readFalutConfig() throws IOException, ParseException {
 		
-		System.out.println("readFalutConfig calling out lo:");
+		
 		
 		List<String> list = new ArrayList<String>();
 		JSONParser jsonParser = new JSONParser();
@@ -645,7 +645,7 @@ public class FaultData{
 	        alarmConditionClear = tempAlaramClearParameter.get("alarmCondition").toString();
 	        specificProblemClear = tempAlaramClearParameter.get("specificProblem").toString();
 	        eventSeverityClear =   tempAlaramClearParameter.get("eventSeverity").toString();
-	        System.out.println("specificProblemClear data:"+ specificProblemClear);
+	        
 	        
 	        //tmp_faultInstance02
 	        Map.Entry faultInstance02Pair = null;
@@ -1217,7 +1217,7 @@ public static void main(String[] args) {
                     "pill",
                     Level.TRACE); 
 		 }catch(Exception e) {
-			 e.printStackTrace();
+			 
 			 return;
 		 }
 		FaultData flDataThread = new FaultData();	
diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/HeartBeatData.java b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/HeartBeatData.java
index 59667ab..52ddaea 100644
--- a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/HeartBeatData.java
+++ b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/HeartBeatData.java
@@ -182,7 +182,7 @@ public static String hostName() {
       }
     } catch (SocketException e) {
 		// TODO Auto-generated catch block
-		e.printStackTrace();
+		
 	}
 
 	return hostname;
@@ -201,7 +201,7 @@ public static void main(String[] args) {
                     "pill",
                     Level.TRACE); 
 		 }catch(Exception e) {
-			 e.printStackTrace();
+			 
 			 return;
 		 }
 		HeartBeatData hbDataThread = new HeartBeatData();		
diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/MeasureData.java b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/MeasureData.java
index 9fa537e..d3c0d5f 100644
--- a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/MeasureData.java
+++ b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/MeasureData.java
@@ -140,16 +140,6 @@ public class MeasureData  extends Thread{
 				int transmittedOctetsDeltaLo = 0;
 				int transmittedTotalPacketsDeltaLo = 0;
 								
-				System.out.println("Data Array T0 "+vNic+" , "+ currentMetrics.get(vNic).getT0bytesIn()+" "
-						+ currentMetrics.get(vNic).getT0bytesOut()+" "
-								+ currentMetrics.get(vNic).getT0packetIn()+" "
-										+ currentMetrics.get(vNic).getT0packetOut());
-				System.out.println("Data Array T1 "+vNic+" , "+ currentMetrics.get(vNic).getT1Bytesin()+" "
-						+ currentMetrics.get(vNic).getT1Bytesout()+" "
-								+ currentMetrics.get(vNic).getT1Packetsin()+" "
-										+ currentMetrics.get(vNic).getT1Packetsout());
-				
-				
 				
 				    if (Integer.parseInt((currentMetrics.get(vNic).getT1Bytesin()))
 							- Integer.parseInt((lastMetrics.get(vNic).getT0bytesIn()) ) > 0) {
@@ -288,7 +278,7 @@ public class MeasureData  extends Thread{
 	      }
 	    } catch (SocketException e) {
 			// TODO Auto-generated catch block
-			e.printStackTrace();
+			
 		}
 
 		return hostname;
@@ -536,8 +526,6 @@ public class MeasureData  extends Thread{
 		    		packetsOutchild.getInputStream())); 
 		    String readMetrics3= readerpacketsOut.readLine();
 		    
-		 //   System.out.println(device+" , T1 command data: "+ readMetrics+"," + readMetrics1+"," + readMetrics2+"," + readMetrics3);
-		 //   System.out.println(device+" , T0 command data: "+ readinitMetrics+"," + readinitMetrics2+"," + readinitMetrics3+"," + readinitMetrics4);
 		    
 		    //t1
 		    mddata.setT1Bytesin(readMetrics);
@@ -561,7 +549,7 @@ public class MeasureData  extends Thread{
 			}
 		    
 		        }catch (Exception e) {
-					e.printStackTrace();
+					
 				}   						
 		}		
 		return vppMetrics;
@@ -584,7 +572,7 @@ public class MeasureData  extends Thread{
                     "pill",
                     Level.TRACE); 
 		 }catch(Exception e) {
-			 e.printStackTrace();
+			 
 			 return;
 		 }
 		MeasureData mdataThread = new MeasureData();
diff --git a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/syslogData.java b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/syslogData.java
index 89fc89d..a323675 100644
--- a/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/syslogData.java
+++ b/veslibrary/ves_javalibrary/evel_javalib2/src/main/java/evel_javalibrary/att/com/loadbalance/syslogData.java
@@ -202,7 +202,7 @@ public class syslogData extends Thread{
 	      }
 	    } catch (SocketException e) {
 			// TODO Auto-generated catch block
-			e.printStackTrace();
+			
 		}
 
 		return hostname;
@@ -261,7 +261,7 @@ public class syslogData extends Thread{
                     "pill",
                     Level.TRACE); 
 		 }catch(Exception e) {
-			 e.printStackTrace();
+			 
 			 return;
 		 }
 		syslogData syslogDataThread = new syslogData();