new bw export

adumas
1 parent cd8cfb96
Showing 5 changed files with 53 additions and 9 deletions
src/main/java/net/floodlightcontroller/pelstats/PELStats.java
src/main/java/net/floodlightcontroller/pelstats/rest/RESTExportStats.java
src/main/java/net/floodlightcontroller/pelstats/rest/RESTQueue.java
src/main/java/org/openflow/protocol/Pel/statistics/StatisticVoIP_CAC.java
src/main/java/org/openflow/protocol/Pel/statistics/StatisticVoIP_Queue.java
@@ -262,7 +262,10 @@ public class PELStats implements IFloodlightModule, IOFMessageListener, RestAPIP
 									if(cacStatsMap.get(sw)!=null){
 										ArrayList<double[]> cacStats = new ArrayList<double[]>(cacStatsMap.get(sw));
 										double[] stats =cacStats.get(cacStats.size()-1);
-										stats[4]=((StatisticVoIP_Queue)srb.getStatistic()).getVoipBandwidth();
+										double[] bw=((StatisticVoIP_Queue)srb.getStatistic()).getBandwidth();
+										stats[4]=bw[0];
+										stats[5]=bw[1];
+										stats[6]=bw[2];
 										cacStats.set(cacStats.size()-1, stats);
 										cacStatsMap.put(sw,cacStats);
 									}
@@ -171,13 +171,15 @@ public class RESTExportStats extends ServerResource{
 					    //out.println("Switch:\t"+entry.getKey());
 						//out.println("Number of calls\tBandwidth\tVoIP Bandwidth");
 						for (double[] list:PELStats.cacStatsMap.get(entry.getKey())){
-							if(list[1]!=0)out.println(list[0]+"\t"+list[3]+"\t"+list[4]);
+							if(list[1]!=0)out.println(list[0]+"\t"+list[3]+"\t"+list[4]+"\t"+list[5]+"\t"+list[6]);
+							//						  date	   	   total bw		voip bw		web bw		  mail bw
 						}
 						out.println("\n");
 					}
+					System.out.println("-> stats export successful");
 				}
  
-				System.out.println("-> stats export successful");
+				//System.out.println("-> stats export successful");
 			}
  
 		}catch (FileNotFoundException e) {
@@ -15,8 +15,10 @@ import net.floodlightcontroller.pelstats.rest.RESTCallAdmissionControl.StatEnabl
  
 import org.openflow.protocol.OFFlowMod;
 import org.openflow.protocol.OFMatch;
+import org.openflow.protocol.OFPacketQueue;
 import org.openflow.protocol.OFPort;
 import org.openflow.protocol.OFQueueGetConfigRequest;
+import org.openflow.protocol.OFQueueProp;
 import org.openflow.protocol.OFStatisticsRequest;
 import org.openflow.protocol.OFType;
 import org.openflow.protocol.Pel.IPAddress;
@@ -231,6 +233,32 @@ public class RESTQueue extends ServerResource{
 					PELStats.portsCallsMap.put(mySwitch, new ArrayList<Integer>());
  
 				}
+				/*if (action==0 && protocol==1){
+					OFQueueGetConfigRequest ofmessage=new OFQueueGetConfigRequest();
+					ofmessage.setPortNumber((short)1);
+					
+					/*OFPacketQueue ofmessage = new OFPacketQueue();
+					OFQueueProp property = new OFQueueProp();
+					List<OFQueueProp> lProperty= new ArrayList<OFQueueProp>();
+					
+					property.setType(OFQueueProp.OFQueuePropType.OFPQT_MIN_RATE);
+					property.setRate((short)700);
+					lProperty.add(property);
+					
+					ofmessage.setProperties(lProperty);
+					ofmessage.setQueueId(idQueue);//
+					
+					try {
+						mySwitch.write(ofmessage, null);
+						mySwitch.flush();
+						//System.out.println("@RESTQueue message sent: "+OFmessage);
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+					
+					
+					
+				}//*/
 				if (protocol!=1){
 					 //OpenFlow message for flow tables modifications
 					//
@@ -42,11 +42,15 @@ public class StatisticVoIP_CAC extends Statistic{
  
 	}
 	public double[] getStats(){
-		double stats[]=new double[5];//the 5th value is the voipBandwidth, added in the PELStats class when a Queue packet is detected
-		stats[1]=nbCalls;
-		stats[2]=averageMos;
+		double stats[]=new double[7];//the 5th-7th values are the Bandwidths of protocols, added in the PELStats class when a Queue packet is detected
 		stats[0]=date.getTime();
+		stats[1]=nbCalls;
+		stats[2]=averageMos;		
 		stats[3]=bandwidth;
+		//stats[4]=VoIP bandwidth;
+		//stats[5]=WEB bandwidth;
+		//stats[6]=Mail bandwidth;
+		
 		return stats;
 	}
  
@@ -44,13 +44,20 @@ public class StatisticVoIP_Queue extends Statistic{
 		}
  
 	}
-	public double getVoipBandwidth(){
-		double bw = 0;
+	public double[] getBandwidth(){
+		double[] bw = new double[3];
  
 		for (int i=0;i<nbQueues;i++){
 			if (protocol[i]==1){
-				bw+=bandwidth[i];
+				bw[0]+=bandwidth[i];
 			}
+			else if (protocol[i]==2){
+				bw[1]+=bandwidth[i];
+			}
+			else if (protocol[i]==3){
+				bw[2]+=bandwidth[i];
+			}
+			
 		}
  
 		return bw;