Commit 7bacf71cd7859362b9a0195d8a03f885c4b56893

Authored by adumas
1 parent 437c086f

bandwidth in CAC export

src/main/java/net/floodlightcontroller/pelstats/rest/RESTExportStats.java
... ... @@ -149,14 +149,14 @@ public class RESTExportStats extends ServerResource{
149 149 out.println("Switch:\t"+entry.getKey());
150 150 out.println("Number of calls\tAverage iMOS");
151 151 for (double[] list:PELStats.cacStatsMap.get(entry.getKey())){
152   - if(list[1]!=0)out.println(list[2]+"\t"+list[0]+"\t"+list[1]);
  152 + if(list[1]!=0)out.println(list[0]+"\t"+list[1]+"\t"+list[2]+"\t"+list[3]);
153 153 }
154 154 out.println("\n");
155 155 }
156 156 }
157 157 else if (idVoip==1){//export stats for this switch only
158 158 for (double[] list:PELStats.cacStatsMap.get(mySwitch)){
159   - if(list[1]!=0)out.println(list[2]+"\t"+list[0]+"\t"+list[1]);
  159 + if(list[1]!=0)out.println(list[0]+"\t"+list[1]+"\t"+list[2]+"\t"+list[3]);
160 160 }
161 161 }
162 162  
... ...
src/main/java/org/openflow/protocol/Pel/statistics/StatisticVoIP_CAC.java
... ... @@ -42,10 +42,11 @@ public class StatisticVoIP_CAC extends Statistic{
42 42  
43 43 }
44 44 public double[] getStats(){
45   - double stats[]=new double[2];
46   - stats[0]=nbCalls;
47   - stats[1]=averageMos;
48   - stats[2]=date.getTime();
  45 + double stats[]=new double[4];
  46 + stats[1]=nbCalls;
  47 + stats[2]=averageMos;
  48 + stats[0]=date.getTime();
  49 + stats[3]=bandwidth;
49 50 return stats;
50 51 }
51 52  
... ...