Skip to content
Snippets Groups Projects
Commit 21e16d72 authored by hwchiu's avatar hwchiu
Browse files

1. Create new type StatsReply to encapsulate the return value of the

method retrieve on SwitchStatisticsResource.java
2. Adding a custom serializer to serilize the StatsReply.
3. It only supports statistic_flow type and OF1.3 format now.
parent f71ebe0b
No related branches found
No related tags found
No related merge requests found
package net.floodlightcontroller.core.web;
import net.floodlightcontroller.core.web.serializers.StatsReplySerializer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@JsonSerialize(using=StatsReplySerializer.class)
public class StatsReply {
private String datapath;
private Object values;
private String statType;
public StatsReply() {}
public StatsReply(String dpid,Object values,String type){
this.datapath = dpid;
this.values = values;
this.statType = type;
}
public void setDatapathId(String dpid){
this.datapath = dpid;
}
public void setValues(Object values){
this.values = values;
}
public void setStatType(String type){
this.statType = type;
}
public String getDatapathId(){
return datapath;
}
public Object getValues(){
return values;
}
public String getStatType(){
return statType;
}
}
...@@ -19,13 +19,16 @@ package net.floodlightcontroller.core.web; ...@@ -19,13 +19,16 @@ package net.floodlightcontroller.core.web;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.List;
import net.floodlightcontroller.core.web.serializers.StatsReplySerializer;
import net.floodlightcontroller.core.web.StatsReply;
import org.projectfloodlight.openflow.protocol.OFStatsType; import org.projectfloodlight.openflow.protocol.OFStatsType;
import org.projectfloodlight.openflow.types.DatapathId; import org.projectfloodlight.openflow.types.DatapathId;
import org.restlet.resource.Get; import org.restlet.resource.Get;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.projectfloodlight.openflow.protocol.OFStatsReply;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
/** /**
* Return switch statistics information for specific switches * Return switch statistics information for specific switches
* @author readams * @author readams
...@@ -35,10 +38,9 @@ public class SwitchStatisticsResource extends SwitchResourceBase { ...@@ -35,10 +38,9 @@ public class SwitchStatisticsResource extends SwitchResourceBase {
LoggerFactory.getLogger(SwitchStatisticsResource.class); LoggerFactory.getLogger(SwitchStatisticsResource.class);
@Get("json") @Get("json")
public Map<String, Object> retrieve() { public StatsReply retrieve(){
HashMap<String,Object> result = new HashMap<String,Object>(); StatsReply result = new StatsReply();
Object values = null; Object values = null;
String switchId = (String) getRequestAttributes().get("switchId"); String switchId = (String) getRequestAttributes().get("switchId");
String statType = (String) getRequestAttributes().get("statType"); String statType = (String) getRequestAttributes().get("statType");
...@@ -57,8 +59,10 @@ public class SwitchStatisticsResource extends SwitchResourceBase { ...@@ -57,8 +59,10 @@ public class SwitchStatisticsResource extends SwitchResourceBase {
} else if (statType.equals("features")) { } else if (statType.equals("features")) {
values = getSwitchFeaturesReply(switchId); values = getSwitchFeaturesReply(switchId);
} }
result.put(switchId, values); result.setDatapathId(switchId);
result.setValues(values);
result.setStatType(statType);
return result; return result;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment