[ONOS-4931] fix doc of FlowEntry.life(), add life(TimeUnit)
Fix the doc: life() returns the time in seconds, not milliseconds.
Add new method life(TimeUnit) that allows specifying the timeunit to
receive the life value as as seconds might not be enough for
all applications and OpenFlow can provide this value to nanoseconds resolution
(in its spec).
Change-Id: Ia6a7573797249e0edc04e03c7204a550a2823742
diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
index 8c3cb92..7a2edc2 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/util/FlowEntryBuilder.java
@@ -94,6 +94,8 @@
import java.util.List;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.onosproject.net.flow.criteria.Criteria.*;
import static org.onosproject.net.flow.instructions.Instructions.modL0Lambda;
import static org.onosproject.net.flow.instructions.Instructions.modL1OduSignalId;
@@ -170,7 +172,8 @@
}
return new DefaultFlowEntry(builder.build(), FlowEntryState.ADDED,
- stat.getDurationSec(),
+ SECONDS.toNanos(stat.getDurationSec())
+ + stat.getDurationNsec(), NANOSECONDS,
stat.getPacketCount().getValue(),
stat.getByteCount().getValue());
case REMOVED:
@@ -185,7 +188,8 @@
}
return new DefaultFlowEntry(builder.build(), FlowEntryState.REMOVED,
- removed.getDurationSec(),
+ SECONDS.toNanos(removed.getDurationSec())
+ + removed.getDurationNsec(), NANOSECONDS,
removed.getPacketCount().getValue(),
removed.getByteCount().getValue());
case MOD: