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 "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 e989db4d1014dc41bd1d80508d8a76fbc051a0d9..00511bc74449adfac7c1d1f3bb0cc968ecb95162 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
@@
-7,14
+7,8
@@
*/
package org.opendaylight.controller.sal.compatibility;
*/
package org.opendaylight.controller.sal.compatibility;
-import java.math.BigInteger;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
+import com.google.common.base.Preconditions;
+import com.google.common.net.InetAddresses;
import org.opendaylight.controller.sal.action.Action;
import org.opendaylight.controller.sal.action.Controller;
import org.opendaylight.controller.sal.action.Drop;
import org.opendaylight.controller.sal.action.Action;
import org.opendaylight.controller.sal.action.Controller;
import org.opendaylight.controller.sal.action.Drop;
@@
-98,6
+92,7
@@
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.hw.path.action._case.HwPathActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.loopback.action._case.LoopbackActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.hw.path.action._case.HwPathActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.loopback.action._case.LoopbackActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.vlan.action._case.PopVlanActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.dst.action._case.SetDlDstActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.src.action._case.SetDlSrcActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.push.vlan.action._case.PushVlanActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.dst.action._case.SetDlDstActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.set.dl.src.action._case.SetDlSrcActionBuilder;
@@
-139,8
+134,13
@@
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.EtherTyp
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanPcp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanPcp;
-import com.google.common.base.Preconditions;
-import com.google.common.net.InetAddresses;
+import java.math.BigInteger;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public final class MDFlowMapping {
private MDFlowMapping() {
public final class MDFlowMapping {
private MDFlowMapping() {
@@
-264,17
+264,15
@@
public final class MDFlowMapping {
}
private static PopVlanActionCase _toAction(final PopVlan sourceAction) {
}
private static PopVlanActionCase _toAction(final PopVlan sourceAction) {
- return new PopVlanActionCaseBuilder().build();
+ PopVlanActionBuilder popVlanActionBuilder = new PopVlanActionBuilder();
+ return new PopVlanActionCaseBuilder().setPopVlanAction(popVlanActionBuilder.build()).build();
}
private static PushVlanActionCase _toAction(final PushVlan sourceAction) {
return new PushVlanActionCaseBuilder()
.setPushVlanAction(
new PushVlanActionBuilder()
}
private static PushVlanActionCase _toAction(final PushVlan sourceAction) {
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();
}
@@
-317,7
+315,7
@@
public final class MDFlowMapping {
private static SetNwTosActionCase _toAction(final SetNwTos sourceAction) {
return new SetNwTosActionCaseBuilder()
private static SetNwTosActionCase _toAction(final SetNwTos sourceAction) {
return new SetNwTosActionCaseBuilder()
- .setSetNwTosAction(new SetNwTosActionBuilder().setTos(
sourceAction.getNwTos(
)).build())
+ .setSetNwTosAction(new SetNwTosActionBuilder().setTos(
FromSalConversionsUtils.dscpToTos(sourceAction.getNwTos()
)).build())
.build();
}
.build();
}
@@
-356,7
+354,7
@@
public final class MDFlowMapping {
}
public static Uri toUri(final NodeConnector connector) {
}
public static Uri toUri(final NodeConnector connector) {
- return new NodeConnectorId(
((String)
connector.getID()));
+ return new NodeConnectorId(
NodeMapping.OPENFLOW_ID_PREFIX + connector.getNode().getID() + ":" + (
connector.getID()));
}
public static MacAddress toMacAddress(final byte[] bytes) {
}
public static MacAddress toMacAddress(final byte[] bytes) {