debug

adumas
1 parent 98f24711
Showing 3 changed files with 5 additions and 22 deletions
src/main/java/net/floodlightcontroller/pelstats/rest/RESTExportStats.java
src/main/java/org/openflow/protocol/Pel/statistics/StatisticVoIP_CAC.java
src/main/resources/web/js/views/voip.js
@@ -153,7 +153,7 @@ public class RESTExportStats extends ServerResource{
 					    out.println("Switch:\t"+entry.getKey());
 						out.println("Number of calls\tAverage iMOS");
 						for (double[] list:PELStats.cacStatsMap.get(entry.getKey())){
-							out.println(list[0]+"\t"+list[1]);
+							if(list[1]!=0)out.println(list[0]+"\t"+list[1]);
 						}
 						out.println("\n");
 					}
@@ -163,7 +163,7 @@ public class RESTExportStats extends ServerResource{
 					out.println("Switch:\t"+mySwitch);
 					out.println("Number of calls\tAverage iMOS");
 					for (double[] list:PELStats.cacStatsMap.get(mySwitch)){
-						out.println(list[0]+"\t"+list[1]);
+						if(list[1]!=0)out.println(list[0]+"\t"+list[1]);
 					}	
 				}
  
@@ -27,7 +27,8 @@ public class StatisticVoIP_CAC extends Statistic{
 		averageMos=getDoubleBytes(b,1)/50;
 		bandwidth=((double)b.getInt())*8/1000;
  
-		if (nbCalls>0){
+		//TODO Change the condition
+		if (nbCalls>100 || (averageMos<3 &&nbCalls>50)){
 			cacStatus="Too much calls";
 		}
 		else
@@ -148,7 +148,6 @@ window.VoIPView = Backbone.View.extend({
  
     initialize:function () {
 		//console.log("VoIPView init" )
-		//this.eraseView();view=this;
         this.template = _.template(tpl.get('voip'));
         views[views.length]=this;
         this.model.bind("add", this.render, this);
@@ -161,14 +160,7 @@ window.VoIPView = Backbone.View.extend({
         return this;
 	},
  
-	/*eraseView:function(){
-    	//////view.undelegateEvents();			
-		view$el.removeData().unbind(); 
-		view.remove();  
-		Backbone.View.prototype.remove.call(view);
-    },*/
-	
-	Export:function(e){
+	ExportVoIP:function(e){
        var self=this;
         console.log("Export on "+self.model.idswitch);
         $.ajax({
@@ -389,7 +381,6 @@ window.VoIPSwitchQueueListItemView = Backbone.View.extend({
     initialize:function () {
 		//console.log("VSQLVI init" );
         this.template = _.template(tpl.get('voip-switch-queue-list-item'));
-        //views[views.length]=this;
         this.bind("change", this.render, this);
     },
     render:function (eventName) {
@@ -427,8 +418,6 @@ window.VoIPSwitchListView = Backbone.View.extend({
     },
     initialize:function () {
 		//console.log("SLV init" );
-		//this.eraseView();
-		//view=this;console.log("view: "+view);
         this.template = _.template(tpl.get('voip-switch-list'));
         views[views.length]=this;
         this.model.bind("change", this.render, this);
@@ -454,12 +443,6 @@ window.VoIPSwitchListView = Backbone.View.extend({
         }, this);
         return this;
     },
-    /*eraseView:function(){
-    	view.undelegateEvents();			
-		view$el.removeData().unbind(); 
-		view.remove();  
-		Backbone.View.prototype.remove.call(view);
-    },*/
     addAllSIP:function(){
     	var self=this;
     	$(this.el).parent().find(".popupStats").each(function( i ) {
@@ -520,7 +503,6 @@ window.VoIPSwitchListItemView = Backbone.View.extend({
     initialize:function () {
 		//console.log("VSLVI init" );
 		this.template = _.template(tpl.get('voip-switch-list-item'));
-		//views[views.length]=this;
         this.model.bind("change", this.render, this);