Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix for Bug 3"
[controller.git]
/
opendaylight
/
md-sal
/
compatibility
/
sal-compatibility
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
compatibility
/
MDFlowMapping.xtend
diff --git
a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
index b0f6065bac751a25ceb57d6d1bde65ed9550f6cb..5a91e919dd0e2667dafaad0a6a166a730df94ae2 100644
(file)
--- a/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
+++ b/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.xtend
@@
-135,7
+135,7
@@
public class MDFlowMapping {
}
}
- public static def toMDFlow(Flow sourceFlow) {
+ public static def toMDFlow(Flow sourceFlow
, String flowId
) {
if (sourceFlow == null)
throw new IllegalArgumentException();
val it = new FlowBuilder();
if (sourceFlow == null)
throw new IllegalArgumentException();
val it = new FlowBuilder();
@@
-143,7
+143,7
@@
public class MDFlowMapping {
idleTimeout = sourceFlow.idleTimeout as int
cookie = BigInteger.valueOf(sourceFlow.id)
priority = sourceFlow.priority as int
idleTimeout = sourceFlow.idleTimeout as int
cookie = BigInteger.valueOf(sourceFlow.id)
priority = sourceFlow.priority as int
- id = new FlowId(
sourceFlow.i
d)
+ id = new FlowId(
flowI
d)
val sourceActions = sourceFlow.actions;
val targetActions = new ArrayList<Action>();
val sourceActions = sourceFlow.actions;
val targetActions = new ArrayList<Action>();