Added SetBot in GroupStats, Removed Pop from group, removed unwanted action from table stats, added Id filed in Router stats
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowStatsEntryModSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowStatsEntryModSerializer.java
index 6080cb4..f3bca85 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowStatsEntryModSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowStatsEntryModSerializer.java
@@ -142,7 +142,7 @@
else{
jGen.writeNumberField("output", ((OFActionOutput)action).getPort().getPortNumber());
}
- }
+ }/*
else if(action.getType().compareTo(OFActionType.POP_MPLS) == 0
|| action.getType().compareTo(OFActionType.COPY_TTL_IN) == 0
|| action.getType().compareTo(OFActionType.COPY_TTL_OUT) == 0
@@ -151,9 +151,9 @@
|| action.getType().compareTo(OFActionType.POP_PBB) == 0
|| action.getType().compareTo(OFActionType.POP_VLAN) == 0){
jGen.writeStringField(action.getType().name(), "True");
- }
- else if(action.getType().compareTo(OFActionType.COPY_TTL_IN) == 0){
- jGen.writeStringField("POP_MPLS", "True");
+ }*/
+ else if(action.getType().compareTo(OFActionType.POP_MPLS) == 0){
+ jGen.writeStringField("POP_MPLS", ((OFActionPopMpls)action).getEthertype().toString());
}
else if (action.getType().equals(OFActionType.SET_FIELD)){
//TODO Support for more setFields
diff --git a/src/main/java/net/floodlightcontroller/core/web/serializers/OFGroupDescStatsEntryModSerializer.java b/src/main/java/net/floodlightcontroller/core/web/serializers/OFGroupDescStatsEntryModSerializer.java
index dadf82f..ade65fa 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/OFGroupDescStatsEntryModSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFGroupDescStatsEntryModSerializer.java
@@ -49,15 +49,19 @@
jGen.writeStringField("SET_DL_DST", ((OFActionSetField)action).getField().getValue().toString());
}
else if (((OFActionSetField)action).getField().toString().contains("OFOxmMplsLabelVer13")){
- jGen.writeNumberField("PUSH_MPLS",
+ jGen.writeNumberField("PUSH_MPLS_LABEL",
Integer.decode(((OFActionSetField)action).getField().getValue().toString()));
}
+ else if (((OFActionSetField)action).getField().toString().contains("OFOxmMplsBosVer13")){
+ jGen.writeStringField("PUSH_MPLS_BOS",
+ ((OFActionSetField)action).getField().getValue().toString());
+ }
}
else if(action.getType().compareTo(OFActionType.OUTPUT) == 0){
jGen.writeNumberField("OUTPPUT", ((OFActionOutput)action).getPort().getPortNumber());
}
else if(action.getType().compareTo(OFActionType.POP_MPLS) == 0){
- jGen.writeStringField("POP_MPLS", "True");
+ jGen.writeStringField("POP_MPLS", ((OFActionPopMpls)action).getEthertype().toString());
}
else if(action.getType().compareTo(OFActionType.GROUP) == 0){
jGen.writeNumberField("goToGroup", ((OFActionGroup)action).getGroup().getGroupNumber());