Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-1393 Fix ignoring module based capabilities in sal-netconf-connector
[controller.git]
/
opendaylight
/
md-sal
/
compatibility
/
sal-compatibility
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
compatibility
/
MDFlowMapping.java
diff --git
a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.java
b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.java
index 9b5d0e887541da50e9a802811b84e046f3573b7d..5837e35b3a65b7bb4a7b8fc7c0ae2517cbe07db6 100644
(file)
--- a/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.java
+++ b/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/MDFlowMapping.java
@@
-1,4
+1,4
@@
-/*
*
+/*
* Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
* Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
@@
-272,10
+272,7
@@
public final class MDFlowMapping {
return new PushVlanActionCaseBuilder()
.setPushVlanAction(
new PushVlanActionBuilder()
return new PushVlanActionCaseBuilder()
.setPushVlanAction(
new PushVlanActionBuilder()
- .setCfi(new VlanCfi(sourceAction.getCfi()))
- .setPcp(sourceAction.getPcp())
- .setTag(sourceAction.getTag())
- .setVlanId(new VlanId(sourceAction.getVlanId()))
+ .setEthernetType(Integer.valueOf(sourceAction.getTag()))
.build()
).build();
}
.build()
).build();
}