Added TTL actions in group, etherType with '0x', Added tunnelInfo in 'show policy', removed |breif, details| from groups
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 8756c05..02da751 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowStatsEntryModSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFFlowStatsEntryModSerializer.java
@@ -143,8 +143,7 @@
jGen.writeNumberField("output", ((OFActionOutput)action).getPort().getPortNumber());
}
}
- else if(action.getType().compareTo(OFActionType.POP_MPLS) == 0
- || action.getType().compareTo(OFActionType.COPY_TTL_IN) == 0
+ else if(action.getType().compareTo(OFActionType.COPY_TTL_IN) == 0
|| action.getType().compareTo(OFActionType.COPY_TTL_OUT) == 0
|| action.getType().compareTo(OFActionType.DEC_MPLS_TTL) == 0
|| action.getType().compareTo(OFActionType.DEC_NW_TTL) == 0
@@ -152,9 +151,9 @@
|| action.getType().compareTo(OFActionType.POP_VLAN) == 0){
jGen.writeStringField(action.getType().name(), "True");
}
- /*else if(action.getType().compareTo(OFActionType.POP_MPLS) == 0){
+ 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
if (((OFActionSetField)action).getField().toString().contains("OFOxmEthSrcVer13")){
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 ade65fa..46a01f7 100644
--- a/src/main/java/net/floodlightcontroller/core/web/serializers/OFGroupDescStatsEntryModSerializer.java
+++ b/src/main/java/net/floodlightcontroller/core/web/serializers/OFGroupDescStatsEntryModSerializer.java
@@ -66,6 +66,14 @@
else if(action.getType().compareTo(OFActionType.GROUP) == 0){
jGen.writeNumberField("goToGroup", ((OFActionGroup)action).getGroup().getGroupNumber());
}
+ else if(action.getType().compareTo(OFActionType.COPY_TTL_IN) == 0
+ || action.getType().compareTo(OFActionType.COPY_TTL_OUT) == 0
+ || action.getType().compareTo(OFActionType.DEC_MPLS_TTL) == 0
+ || action.getType().compareTo(OFActionType.DEC_NW_TTL) == 0
+ || action.getType().compareTo(OFActionType.POP_PBB) == 0
+ || action.getType().compareTo(OFActionType.POP_VLAN) == 0){
+ jGen.writeStringField(action.getType().name(), "True");
+ }
}
jGen.writeEndObject();
}