package org.opendaylight.controller.sal.compability;
+import static org.opendaylight.controller.sal.compability.ProtocolConstants.ETHERNET_ARP;
+import static org.opendaylight.controller.sal.compability.ProtocolConstants.SCTP;
+import static org.opendaylight.controller.sal.compability.ProtocolConstants.TCP;
+import static org.opendaylight.controller.sal.compability.ProtocolConstants.UDP;
import static org.opendaylight.controller.sal.match.MatchType.DL_DST;
import static org.opendaylight.controller.sal.match.MatchType.DL_SRC;
import static org.opendaylight.controller.sal.match.MatchType.DL_TYPE;
import static org.opendaylight.controller.sal.match.MatchType.TP_SRC;
import java.net.InetAddress;
-import java.util.HashSet;
+import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
-import org.opendaylight.controller.sal.action.Controller;
-import org.opendaylight.controller.sal.action.Output;
+import org.opendaylight.controller.sal.action.*;
import org.opendaylight.controller.sal.core.NodeConnector;
import org.opendaylight.controller.sal.flowprogrammer.Flow;
import org.opendaylight.controller.sal.match.Match;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Dscp;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.*;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.NodeFlow;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.ControllerAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.OutputAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.PopMplsAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.PushMplsAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.PushPbbAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.PushVlanAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.SetMplsTtlAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.SetNwTtlAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.SetQueueAction;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.VlanCfi;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.action.*;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.address.Address;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.address.address.Ipv4;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.address.address.Ipv6;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.flow.Action;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.EtherType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanPcp;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.MacAddressFilter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.arp.match.fields.ArpSourceHardwareAddress;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.arp.match.fields.ArpTargetHardwareAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.ethernet.match.fields.EthernetType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.EthernetMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.IpMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.Layer3Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.Layer4Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.VlanMatch;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.*;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.layer._3.match.ArpMatch;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.layer._3.match.Ipv4Match;
import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev130819.match.layer._3.match.Ipv6Match;
}
- public static Flow flowFrom(NodeFlow source) {
+ public static Flow toFlow(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.Flow source) {
final Flow target = new Flow();
Integer hardTimeout = source.getHardTimeout();
target.setPriority(priority.shortValue());
}
- target.setMatch(matchFrom(source.getMatch()));
+ target.setMatch(toMatch(source.getMatch()));
List<Action> actions = source.getAction();
if (actions != null) {
- for (Action sourceAction : actions) {
- Set<org.opendaylight.controller.sal.action.Action> targetActions = actionFrom(sourceAction);
- for (org.opendaylight.controller.sal.action.Action targetAction : targetActions) {
- target.addAction(targetAction);
- }
- }
+ target.setActions(actionFrom(actions));
}
target.setId(source.getCookie().longValue());
return target;
}
- public static Set<org.opendaylight.controller.sal.action.Action> actionFrom(Action source) {
- org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.Action sourceAction = source
- .getAction();
- Set<org.opendaylight.controller.sal.action.Action> targetAction = new HashSet<>();
- if (sourceAction instanceof ControllerAction) {
- targetAction.add(new Controller());
- } else if (sourceAction instanceof OutputAction) {
-
- List<Uri> nodeConnectors = ((OutputAction) sourceAction).getOutputNodeConnector();
- for (Uri uri : nodeConnectors) {
- targetAction.add(new Output(fromNodeConnectorRef(uri)));
+ public static List<org.opendaylight.controller.sal.action.Action> actionFrom(List<Action> actions) {
+ List<org.opendaylight.controller.sal.action.Action> targetAction = new ArrayList<>();
+ for (Action action : actions) {
+ org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.action.Action sourceAction = action
+ .getAction();
+
+ if (sourceAction instanceof ControllerAction) {
+ targetAction.add(new Controller());
+ } else if (sourceAction instanceof OutputAction) {
+
+ List<Uri> nodeConnectors = ((OutputAction) sourceAction).getOutputNodeConnector();
+ if (nodeConnectors != null) {
+ for (Uri uri : nodeConnectors) {
+ targetAction.add(new Output(fromNodeConnectorRef(uri)));
+ }
+ }
+ } else if (sourceAction instanceof PopMplsAction) {
+ // TODO: define maping
+ } else if (sourceAction instanceof PushMplsAction) {
+ // TODO: define maping
+ } else if (sourceAction instanceof PushPbbAction) {
+ // TODO: define maping
+ } else if (sourceAction instanceof SetMplsTtlAction) {
+ // TODO: define maping
+ // targetAction = //no action to map
+ } else if (sourceAction instanceof SetNwTtlAction) {
+ // TODO: define maping
+ } else if (sourceAction instanceof SetQueueAction) {
+ // TODO: define maping
+ // targetAction = //no action to map
+ } else if (sourceAction instanceof DropAction) {
+ targetAction.add(new Drop());
+ } else if (sourceAction instanceof FloodAction) {
+ targetAction.add(new Flood());
+ } else if (sourceAction instanceof FloodAllAction) {
+ targetAction.add(new FloodAll());
+ } else if (sourceAction instanceof HwPathAction) {
+ targetAction.add(new HwPath());
+ } else if (sourceAction instanceof LoopbackAction) {
+ targetAction.add(new Loopback());
+ } else if (sourceAction instanceof PopVlanAction) {
+ targetAction.add(new PopVlan());
+ } else if (sourceAction instanceof PushVlanAction) {
+ PushVlanAction pushVlanAction = (PushVlanAction) sourceAction;
+ PushVlan pushVlan = pushVlanFrom(pushVlanAction);
+ if (pushVlan != null) {
+ targetAction.add(pushVlan);
+ }
+ } else if (sourceAction instanceof SetDlDstAction) {
+ MacAddress addressL2Dest = ((SetDlDstAction) sourceAction).getAddress();
+ if (addressL2Dest != null) {
+ targetAction.add(new SetDlDst(bytesFrom(addressL2Dest)));
+ }
+ } else if (sourceAction instanceof SetDlSrcAction) {
+ MacAddress addressL2Src = ((SetDlSrcAction) sourceAction).getAddress();
+ if (addressL2Src != null) {
+ targetAction.add(new SetDlSrc(bytesFrom(addressL2Src)));
+
+ }
+ } else if (sourceAction instanceof SetDlTypeAction) {
+ EtherType dlType = ((SetDlTypeAction) sourceAction).getDlType();
+ if (dlType != null) {
+ Long dlTypeValue = dlType.getValue();
+ if (dlTypeValue != null) {
+ targetAction.add(new SetDlType(dlTypeValue.intValue()));
+ }
+ }
+ } else if (sourceAction instanceof SetNextHopAction) {
+ Address addressL3 = ((SetNextHopAction) sourceAction).getAddress();
+
+ InetAddress inetAddress = inetAddressFrom(addressL3);
+ if (inetAddress != null) {
+ targetAction.add(new SetNextHop(inetAddress));
+ }
+ } else if (sourceAction instanceof SetNwDstAction) {
+ Address addressL3 = ((SetNwDstAction) sourceAction).getAddress();
+
+ InetAddress inetAddress = inetAddressFrom(addressL3);
+ if (inetAddress != null) {
+ targetAction.add(new SetNwDst(inetAddress));
+ }
+ } else if (sourceAction instanceof SetNwSrcAction) {
+ Address addressL3 = ((SetNwSrcAction) sourceAction).getAddress();
+
+ InetAddress inetAddress = inetAddressFrom(addressL3);
+ if (inetAddress != null) {
+ targetAction.add(new SetNwSrc(inetAddress));
+ }
+ } else if (sourceAction instanceof SetNwTosAction) {
+ Integer tos = ((SetNwTosAction) sourceAction).getTos();
+ if (tos != null) {
+ targetAction.add(new SetNwTos(tos));
+ }
+ } else if (sourceAction instanceof SetTpDstAction) {
+ PortNumber port = ((SetTpDstAction) sourceAction).getPort();
+ if (port != null) {
+ Integer portValue = port.getValue();
+ if (port.getValue() != null) {
+ targetAction.add(new SetTpDst(portValue));
+ }
+ }
+ } else if (sourceAction instanceof SetTpSrcAction) {
+ PortNumber port = ((SetTpSrcAction) sourceAction).getPort();
+ if (port != null) {
+ Integer portValue = port.getValue();
+ if (port.getValue() != null) {
+ targetAction.add(new SetTpSrc(portValue));
+ }
+ }
+ } else if (sourceAction instanceof SetVlanCfiAction) {
+ VlanCfi vlanCfi = ((SetVlanCfiAction) sourceAction).getVlanCfi();
+ if (vlanCfi != null) {
+ Integer vlanCfiValue = vlanCfi.getValue();
+ if (vlanCfiValue != null) {
+ targetAction.add(new SetVlanCfi(vlanCfiValue));
+ }
+ }
+ } else if (sourceAction instanceof SetVlanIdAction) {
+ org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId vlanID = ((SetVlanIdAction) sourceAction)
+ .getVlanId();
+ if (vlanID != null) {
+ Integer vlanIdValue = vlanID.getValue();
+ if (vlanIdValue != null) {
+ targetAction.add(new SetVlanId(vlanIdValue));
+ }
+ }
+ } else if (sourceAction instanceof SetVlanPcpAction) {
+ VlanPcp vlanPcp = ((SetVlanPcpAction) sourceAction).getVlanPcp();
+ if (vlanPcp != null) {
+ Short vlanPcpValue = vlanPcp.getValue();
+ if (vlanPcpValue != null) {
+ targetAction.add(new SetVlanPcp(vlanPcpValue));
+ }
+ }
+ } else if (sourceAction instanceof SwPathAction) {
+ targetAction.add(new SwPath());
}
- } else if (sourceAction instanceof PopMplsAction) {
- // TODO: define maping
- } else if (sourceAction instanceof PushMplsAction) {
- // TODO: define maping
- } else if (sourceAction instanceof PushPbbAction) {
- // TODO: define maping
- } else if (sourceAction instanceof PushVlanAction) {
- // TODO: define maping
- // PushVlanAction vlanAction = (PushVlanAction) sourceAction;
- // targetAction.add(new PushVlan(vlanAction., pcp, cfi, vlanId);
- } else if (sourceAction instanceof SetMplsTtlAction) {
- // TODO: define maping
- // targetAction = //no action to map
- } else if (sourceAction instanceof SetNwTtlAction) {
- // TODO: define maping
- } else if (sourceAction instanceof SetQueueAction) {
- // TODO: define maping
- // targetAction = //no action to map
}
return targetAction;
}
+ private static InetAddress inetAddressFrom(Address addressL3) {
+ if (addressL3 != null) {
+ if (addressL3 instanceof Ipv4) {
+ Ipv4Prefix addressL3Ipv4 = ((Ipv4) addressL3).getIpv4Address();
+ if (addressL3Ipv4 != null) {
+ return inetAddressFrom(addressL3Ipv4);
+ }
+ } else if (addressL3 instanceof Ipv6) {
+ Ipv6Prefix addressL3Ipv6 = ((Ipv6) addressL3).getIpv6Address();
+ if (addressL3Ipv6 != null) {
+ return inetAddressFrom(addressL3Ipv6);
+ }
+ }
+ }
+ return null;
+ }
+
+ private static PushVlan pushVlanFrom(PushVlanAction pushVlanAction) {
+ final int tag;
+ final int pcp;
+ final int cfi;
+ final int vlanId;
+
+ if (pushVlanAction.getTag() != null) {
+ tag = pushVlanAction.getTag();
+ if (pushVlanAction.getPcp() != null) {
+ pcp = pushVlanAction.getPcp();
+ if (pushVlanAction.getCfi() != null && pushVlanAction.getCfi().getValue() != null) {
+ cfi = pushVlanAction.getCfi().getValue();
+ if (pushVlanAction.getVlanId() != null && pushVlanAction.getVlanId().getValue() != null) {
+ vlanId = pushVlanAction.getVlanId().getValue();
+ return new PushVlan(tag, pcp, cfi, vlanId);
+ }
+ }
+ }
+ }
+ return null;
+ }
+
private static NodeConnector fromNodeConnectorRef(Uri uri) {
// TODO: Define mapping
return null;
}
- public static Match matchFrom(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.flow.Match source) {
+ public static Match toMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev130819.flow.Match source) {
Match target = new Match();
if (source != null) {
fillFrom(target, source.getVlanMatch());
private static void fillFrom(Match target, IpMatch ipMatch) {
if (ipMatch != null) {
Short ipProtocol = ipMatch.getIpProtocol();
- if (ipProtocol != null) {
+
+ if (ipProtocol != null && target.getField(NW_PROTO) == null) {
target.setField(NW_PROTO, ipProtocol.byteValue());
}
Dscp dscp = ipMatch.getIpDscp();
target.setField(TP_DST, udpDestPortValue.shortValue());
}
}
+
+ target.setField(NW_PROTO, UDP);
}
private static void fillTransportLayer(Match target, TcpMatch source) {
target.setField(TP_DST, tcpDestPortValue.shortValue());
}
}
+
+ target.setField(NW_PROTO, TCP);
}
private static void fillTransportLayer(Match target, SctpMatch source) {
target.setField(TP_DST, sctpDestPortValue.shortValue());
}
}
+
+ target.setField(NW_PROTO, SCTP);
+
}
private static void fillFrom(Match target, Layer3Match source) {
if (sourceAddress != null) {
target.setField(NW_SRC, (InetAddress) inetAddressFrom(sourceAddress), null);
}
- Ipv4Prefix destAddress = source.getArpSourceTransportAddress();
+ Ipv4Prefix destAddress = source.getArpTargetTransportAddress();
if (destAddress != null) {
target.setField(NW_DST, (InetAddress) inetAddressFrom(destAddress), null);
}
+ ArpSourceHardwareAddress sourceHwAddress = source.getArpSourceHardwareAddress();
+ if (sourceHwAddress != null) {
+ target.setField(DL_SRC, bytesFrom(sourceHwAddress.getAddress()));
+ }
+ ArpTargetHardwareAddress targetHwAddress = source.getArpTargetHardwareAddress();
+ if (targetHwAddress != null) {
+ target.setField(DL_DST, bytesFrom(targetHwAddress.getAddress()));
+ }
+
+ target.setField(DL_TYPE, new Short(ETHERNET_ARP));
+
}
private static void fillFromIpv6(Match target, Ipv6Match source) {
if (sourceAddress != null) {
target.setField(NW_SRC, (InetAddress) inetAddressFrom(sourceAddress), null);
}
- Ipv6Prefix destAddress = source.getIpv6Source();
+ Ipv6Prefix destAddress = source.getIpv6Destination();
if (destAddress != null) {
target.setField(NW_DST, (InetAddress) inetAddressFrom(destAddress), null);
}
if (sourceAddress != null) {
target.setField(NW_SRC, (InetAddress) inetAddressFrom(sourceAddress), null);
}
- Ipv4Prefix destAddress = source.getIpv4Source();
+ Ipv4Prefix destAddress = source.getIpv4Destination();
if (destAddress != null) {
target.setField(NW_DST, (InetAddress) inetAddressFrom(destAddress), null);
}
EthernetType ethType = source.getEthernetType();
if (ethType != null) {
EtherType ethInnerType = ethType.getType();
- if (ethInnerType != null) {
+ if (ethInnerType != null && target.getField(DL_TYPE) == null) {
Long value = ethInnerType.getValue();
target.setField(DL_TYPE, value.shortValue());
}
}
private static byte[] bytesFrom(MacAddress address) {
- if (address != null) {
- return address.getValue().getBytes();
+ String[] mac = address.getValue().split(":");
+ byte[] macAddress = new byte[6]; // mac.length == 6 bytes
+ for(int i = 0; i < mac.length; i++) {
+ macAddress[i] = Integer.decode("0x" + mac[i]).byteValue();
}
- return null;
+ return macAddress;
}
}
Code Review / controller.git / blobdiff