display of voipBandwidth debug, sip codec, better logs in PelStats

adumas
1 parent cf750dfc
Showing 4 changed files with 90 additions and 13 deletions
src/main/java/net/floodlightcontroller/pelstats/PELStats.java
src/main/java/net/floodlightcontroller/pelstats/rest/RESTExportStats.java
src/main/java/org/openflow/protocol/Pel/statistics/StatisticVoIP_SIP.java
src/main/resources/web/js/models/voipmodel.js
@@ -192,16 +192,25 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP
  
 								}
 								if (srb.getStatistic().getType()==7){
+									System.out.println("@PELStats stat7");
 									double mos= ((StatisticVoIP_CAC)srb.getStatistic()).getMos();
 									sendThreshold(sw,mos,cntx);
+									System.out.println("@PELStats \tthreshold sent");
  
 									List<double[]> cacStats = new ArrayList<double[]>();
+									System.out.println("@PELStats \tcacStat created");
 									double[] stats = ((StatisticVoIP_CAC)srb.getStatistic()).getStats();
+									System.out.println("@PELStats \tstats retrieved");
 									if(cacStatsMap.get(sw)!=null){
+										System.out.println("@PELStats \tcacstatsmap!=null");
 										cacStats =new ArrayList<double[]>(cacStatsMap.get(sw));
+										System.out.println("@PELStats \tcacstats retrieved");
 									}
+									System.out.println("@PELStats \tadding stats");
 									cacStats.add(stats);
+									System.out.println("@PELStats \tputting switch");
 									cacStatsMap.put(sw,cacStats);
+									System.out.println("@PELStats \tOK");
  
  
 								}
@@ -123,7 +123,6 @@ public class RESTExportStats extends ServerResource{
 						    	line+=statLine[i]+"\t";
 						    } 
 					    	out.println(line);
-					    	System.out.println(line);
 					    }
 					    out.println("\n");
 					}
@@ -137,7 +136,6 @@ public class RESTExportStats extends ServerResource{
 					    	line+=statLine[i]+"\t";
 					    } 
 				    	out.println(line);
-				    	System.out.println(line);
 				    }
  
  
@@ -146,9 +144,7 @@ public class RESTExportStats extends ServerResource{
 			}
 			else if(type==7){
 				out = new PrintWriter("CACstatsExport.txt");
-				System.out.println("type7");
 				if (idVoip==0){//export stats for all switches
-					System.out.println("voip0");
 					for (Map.Entry<IOFSwitch, List<double[]>> entry : PELStats.cacStatsMap.entrySet()){
 					    out.println("Switch:\t"+entry.getKey());
 						out.println("Number of calls\tAverage iMOS");
@@ -159,9 +155,6 @@ public class RESTExportStats extends ServerResource{
 					}
 				}
 				else if (idVoip==1){//export stats for this switch only
-					System.out.println("voip1");
-					out.println("Switch:\t"+mySwitch);
-					out.println("Number of calls\tAverage iMOS");
 					for (double[] list:PELStats.cacStatsMap.get(mySwitch)){
 						if(list[1]!=0)out.println(list[0]+"\t"+list[1]);
 					}	
@@ -371,16 +371,90 @@ public class StatisticVoIP_SIP extends Statistic{
 	private String codecString(int i) {
 		String returnString = new String();
 		switch(i){
-			case 124:
-				returnString="Opus";
+			case 0:
+				returnString="PCMU";
 				break;
  
-			case 127:
-				returnString="Opus";
+			case 1:
+				returnString="1106";
+				break;
+				
+			case 2:
+				returnString="G721";
+				break;
+				
+			case 3:
+				returnString="GSM";
+				break;
+				
+			case 4:
+				returnString="G723";
+				break;
+				
+			case 5:
+				returnString="DVI4";
+				break;
+				
+			case 6:
+				returnString="DVI4";
+				break;
+				
+			case 7:
+				returnString="LPC";
+				break;
+				
+			case 8:
+				returnString="PCMA";
+				break;
+				
+			case 9:
+				returnString="G722";
 				break;
+				
+			case 10:
+				returnString="L16";
+				break;
+				
+			case 11:
+				returnString="L16";
+				break;
+				
+			case 12:
+				returnString="QCELP";
+				break;
+				
+			case 13:
+				returnString="CN";
+				break;
+			
+			case 14:
+				returnString="MPA";
+				break;
+			
+			case 15:
+				returnString="G728";
+				break;
+			
+			case 16:
+				returnString="DVI4";
+				break;
+				
+			case 17:
+				returnString="DVI4";
+				break;
+				
+			case 18:
+				returnString="G729";
+				break;
+			
+			case 33:
+				returnString="MP2T";
+				break;		
  
 			default:
-				returnString="default ("+i+")";
+				if (i<0) returnString="error";
+				else if(i<34) returnString="Video Codec ("+i+")";
+				else if(i>=34) returnString="Dynamic ("+i+")";
 				break;
 		}
  
@@ -285,11 +285,12 @@ window.VoIP = Backbone.Model.extend({
             dataType:"json",
             success:function (data) {
 				//console.log("Json9 success for "+vl.idswitch);
+				v.voipBandwidth=0;
 			    _.each(data['stats'], function(t) {
 					_.each(t.enabled, function(s) {
 						_.each(s.values, function(q) {
 							if (q.protocol=="VoIP"){
-								v.voipBandwidth+= parseFloat(q.bandwidth);
+								v.voipBandwidth+= parseFloat(q.bandwidth.replace(/,/,'.'));
 							}	
 						});
 					});