Commit 2b2ddd126e520babf5a766fe0400051299ea7e39

Authored by adumas
1 parent 195655a6

less text in export

src/main/java/net/floodlightcontroller/pelstats/rest/RESTExportStats.java
... ... @@ -115,8 +115,8 @@ public class RESTExportStats extends ServerResource{
115 115  
116 116 if (idVoip==0){//If we want to export all the switch calls stats
117 117 for (Map.Entry<Double, List<double[]>> entry : callsStatsMap.entrySet()){
118   - out.println("Call:\t"+entry.getKey());
119   - out.println("Elapsed Time (s)\tSSRC0\tiMOS0\tLoss0 (%)\tJitter0 (ms)\tDelay0 (ms)\tSSRC1\tiMOS1\tLoss1 (%)\tJitter1 (ms)\tDelay1 (ms)");
  118 + //out.println("Call:\t"+entry.getKey());
  119 + //out.println("Elapsed Time (s)\tSSRC0\tiMOS0\tLoss0 (%)\tJitter0 (ms)\tDelay0 (ms)\tSSRC1\tiMOS1\tLoss1 (%)\tJitter1 (ms)\tDelay1 (ms)");
120 120 for (double[] statLine : entry.getValue()){
121 121 String line=new String();
122 122 for (int i=1;i<12;i++){
... ... @@ -128,8 +128,8 @@ public class RESTExportStats extends ServerResource{
128 128 }
129 129 }
130 130 else{//If we want to export only the stats for a call
131   - out.println("Call:\t"+idVoip);
132   - out.println("Elapsed Time (s)\tSSRC0\tiMOS0\tLoss0 (%)\tJitter0 (ms)\tDelay0 (ms)\tSSRC1\tiMOS1\tLoss1 (%)\tJitter1 (ms)\tDelay1 (ms)");
  131 + //out.println("Call:\t"+idVoip);
  132 + //out.println("Elapsed Time (s)\tSSRC0\tiMOS0\tLoss0 (%)\tJitter0 (ms)\tDelay0 (ms)\tSSRC1\tiMOS1\tLoss1 (%)\tJitter1 (ms)\tDelay1 (ms)");
133 133 for (double[] statLine : callsStatsMap.get(new Double(idVoip))){
134 134 String line=new String();
135 135 for (int i=0;i<12;i++){
... ... @@ -146,8 +146,8 @@ public class RESTExportStats extends ServerResource{
146 146 out = new PrintWriter("CACStatsExport.txt");
147 147 if (idVoip==0){//export stats for all switches
148 148 for (Map.Entry<IOFSwitch, List<double[]>> entry : PELStats.cacStatsMap.entrySet()){
149   - out.println("Switch:\t"+entry.getKey());
150   - out.println("Date\tNumber of calls\tAverage iMOS\tBandwidth");
  149 + //out.println("Switch:\t"+entry.getKey());
  150 + //out.println("Date\tNumber of calls\tAverage iMOS\tBandwidth");
151 151 for (double[] list:PELStats.cacStatsMap.get(entry.getKey())){
152 152 if(list[1]!=0)out.println(list[0]+"\t"+list[1]+"\t"+list[2]+"\t"+list[3]);
153 153 }
... ... @@ -155,8 +155,8 @@ public class RESTExportStats extends ServerResource{
155 155 }
156 156 }
157 157 else if (idVoip==1){//export stats for this switch only
158   - out.println("Switch:\t"+mySwitch);
159   - out.println("Date\tNumber of calls\tAverage iMOS\tBandwidth");
  158 + //out.println("Switch:\t"+mySwitch);
  159 + //out.println("Date\tNumber of calls\tAverage iMOS\tBandwidth");
160 160 for (double[] list:PELStats.cacStatsMap.get(mySwitch)){
161 161 if(list[1]!=0)out.println(list[0]+"\t"+list[1]+"\t"+list[2]+"\t"+list[3]);
162 162 }
... ... @@ -168,8 +168,8 @@ public class RESTExportStats extends ServerResource{
168 168 out = new PrintWriter("BandwidthStatsExport.txt");
169 169 if (idVoip==0){//export stats for all switches
170 170 for (Map.Entry<IOFSwitch, List<double[]>> entry : PELStats.cacStatsMap.entrySet()){
171   - out.println("Switch:\t"+entry.getKey());
172   - out.println("Number of calls\tBandwidth\tVoIP Bandwidth");
  171 + //out.println("Switch:\t"+entry.getKey());
  172 + //out.println("Number of calls\tBandwidth\tVoIP Bandwidth");
173 173 for (double[] list:PELStats.cacStatsMap.get(entry.getKey())){
174 174 if(list[1]!=0)out.println(list[0]+"\t"+list[3]+"\t"+list[4]);
175 175 }
... ...