X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcontainermanager%2Fapi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcontainermanager%2FContainerFlowConfig.java;h=9d65ad343c4c540e2d93d750524becac00a3e9b8;hp=c0b0a65270ef9184b23216e5e80ad7a725fe4c1e;hb=0ae12c54560ef14cb8c08beef4553f7523d41578;hpb=51e9be2b3aac6ea33bf21e5a3a978325d24e9e0e diff --git a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java index c0b0a65270..9d65ad343c 100644 --- a/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java +++ b/opendaylight/containermanager/api/src/main/java/org/opendaylight/controller/containermanager/ContainerFlowConfig.java @@ -15,7 +15,9 @@ import java.net.Inet6Address; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -55,6 +57,10 @@ public class ContainerFlowConfig implements Serializable { @XmlElement private String name; + /** The vlan. */ + @XmlElement + private String dlVlan; + /** The network Source. */ @XmlElement private String nwSrc; @@ -101,6 +107,7 @@ public class ContainerFlowConfig implements Serializable { public ContainerFlowConfig(String name, String srcIP, String dstIP, String proto, String srcPort, String dstPort) { this.name = name; + this.dlVlan = null; this.nwSrc = srcIP; this.nwDst = dstIP; this.protocol = proto; @@ -109,9 +116,21 @@ public class ContainerFlowConfig implements Serializable { //this.unidirectional = false; } + public ContainerFlowConfig(String name, String dlVlan, String srcIP, String dstIP, String proto, String srcPort, + String dstPort) { + this.name = name; + this.dlVlan = dlVlan; + this.nwSrc = srcIP; + this.nwDst = dstIP; + this.protocol = proto; + this.tpSrc = srcPort; + this.tpDst = dstPort; + } + public ContainerFlowConfig(ContainerFlowConfig containerFlowConfig) { this.name = containerFlowConfig.name; + this.dlVlan = containerFlowConfig.dlVlan; this.nwSrc = containerFlowConfig.nwSrc; this.nwDst = containerFlowConfig.nwDst; this.protocol = containerFlowConfig.protocol; @@ -130,6 +149,15 @@ public class ContainerFlowConfig implements Serializable { return name; } + /** + * Returns the vlan id. + * + * @return the Vlan Id + */ + public String getVlan() { + return (dlVlan == null || dlVlan.isEmpty()) ? null : dlVlan; + } + /** * Returns the Source IP Address. * @@ -192,6 +220,7 @@ public class ContainerFlowConfig implements Serializable { result = prime * result + ((protocol == null) ? 0 : protocol.hashCode()); result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((dlVlan == null) ? 0 : dlVlan.hashCode()); result = prime * result + ((nwDst == null) ? 0 : nwDst.hashCode()); result = prime * result + ((tpDst == null) ? 0 : tpDst.hashCode()); result = prime * result + ((nwSrc == null) ? 0 : nwSrc.hashCode()); @@ -221,7 +250,7 @@ public class ContainerFlowConfig implements Serializable { return false; } ContainerFlowConfig other = (ContainerFlowConfig) obj; - if (matchName(other) && matchSrcIP(other) + if (matchName(other) && matchDlVlan(other) && matchSrcIP(other) && matchDstIP(other) && matchProtocol(other) && matchSrcPort(other) && matchDstPort(other)) { return true; @@ -280,6 +309,23 @@ public class ContainerFlowConfig implements Serializable { return name.equals(flowSpec.name); } + /** + * Match the set of these vlans with that of flowSpec's vlans. + * + * @param flowSpec + * Flow Specification + * @return true, if successful + */ + private boolean matchDlVlan(ContainerFlowConfig flowSpec) { + if (dlVlan == flowSpec.dlVlan) { + return true; + } + if (dlVlan == null || flowSpec.dlVlan == null) { + return false; + } + + return this.getVlanList().equals(flowSpec.getVlanList()); + } /** * Match Source IP Address. @@ -361,6 +407,37 @@ public class ContainerFlowConfig implements Serializable { return this.tpDst.equals(flowSpec.tpDst); } + /** + * Returns the vlan id number for all vlans specified + * + * @return the vlan id number for all vlans specified + */ + public Set getVlanList() { + /* + * example: Vlan = "1,3,5-12" + * elemArray = ["1" "3" "5-12"] + * elem[2] = "5-12" --> limits = ["5" "12"] + * vlanList = [1 3 5 6 7 8 9 10 11 12] + */ + Set vlanList = new HashSet(); + try { + String[] elemArray = dlVlan.split(","); + for (String elem : elemArray) { + if (elem.contains("-")) { + String[] limits = elem.split("-"); + for (short j = Short.valueOf(limits[0]); j <= Short.valueOf(limits[1]); j++) { + vlanList.add(Short.valueOf(j)); + } + } else { + vlanList.add(Short.valueOf(elem)); + } + } + } catch (NumberFormatException e) { + + } + return vlanList; + } + /** * Returns the Source IP Address mask length. * @@ -479,12 +556,12 @@ public class ContainerFlowConfig implements Serializable { } /** - * Returns the protocol + * Get the IP protocol value * * @return the protocol */ public Short getProtoNum() { - return protocol == null ? IPProtocols.ANY.shortValue() : IPProtocols.getProtocolNumberShort(protocol); + return protocol == null ? null : IPProtocols.getProtocolNumberShort(protocol); } /** @@ -522,13 +599,20 @@ public class ContainerFlowConfig implements Serializable { if (!hasValidName()) { return new Status(StatusCode.BADREQUEST, "Invalid name"); } - Status status = validateIPs(); + Status status = validateVlan(); + if (!status.isSuccess()) { + return status; + } + status = validateIPs(); if (!status.isSuccess()) { return status; } if(!hasValidProtocol()) { return new Status(StatusCode.BADREQUEST, "Invalid IP protocol"); } + if (!hasValidPorts()) { + return new Status(StatusCode.BADREQUEST, "Invalid Source or Destination Port"); + } if (this.getMatches().get(0).getMatches() == 0) { return new Status(StatusCode.BADREQUEST, "Flow Spec is empty"); } @@ -544,6 +628,38 @@ public class ContainerFlowConfig implements Serializable { return (name != null && !name.isEmpty() && name.matches(regexName)); } + /** + * Validates the vlan number + * + * @return the result of the check as Status object + */ + private Status validateVlan() { + if (dlVlan != null) { + short vlanId = 0; + try { + String[] elemArray = dlVlan.split(","); + for (String elem : elemArray) { + if (elem.contains("-")) { + String[] limits = elem.split("-"); + if (Short.parseShort(limits[0]) < 0 + || Short.parseShort(limits[0]) >= Short.parseShort(limits[1]) + || Short.parseShort(limits[1]) > 0xfff) { + return new Status(StatusCode.BADREQUEST, "Invalid vlan id"); + } + } else { + vlanId = Short.parseShort(elem); + if (vlanId < 0 || vlanId > 0xfff) { + return new Status(StatusCode.BADREQUEST, "Invalid vlan id"); + } + } + } + } catch (NumberFormatException e) { + return new Status(StatusCode.BADREQUEST, "Invalid vlan id"); + } + } + return new Status(StatusCode.SUCCESS); + } + /** * Validates the network addresses, checks syntax and semantic * @@ -573,26 +689,96 @@ public class ContainerFlowConfig implements Serializable { return new Status(StatusCode.SUCCESS); } + /** + * Validate the protocol field. Either it can be a enum defined in IPProtocols.java + * or a valid IP proto value between 0 and 255, see: + * http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml + * for more details. + * + * @return true if a valid protocol value + */ private boolean hasValidProtocol() { - if (protocol != null && !protocol.isEmpty()) { - return (this.getProtoNum() != 0 || protocol.equalsIgnoreCase("any")); + IPProtocols p = IPProtocols.fromString(protocol); + return p != null; + } + + /** + * + * @param tpPort + * String representing the transport protocol port number + * @return true if tpPort contains a decimal value between 0 and 65535 + */ + private boolean hasValidPort(String tpPort) { + try { + int port = Integer.decode(tpPort); + return ((port >= 0) && (port <= 0xffff)); + } catch (NumberFormatException e) { + return false; + } + } + + /** + * Validate the transport protocol source and destination ports as + * entered by users. + * + * @return true if ports are defined and are in valid range + */ + private boolean hasValidPorts() { + if (tpSrc !=null && !tpSrc.isEmpty()) { + if (!hasValidPort(tpSrc)) { + return false; + } + } + + if (tpDst !=null && !tpDst.isEmpty()) { + return hasValidPort(tpDst); } return true; } + /** * Returns the matches. - * If unidirectional flag is set, there will be only one match in the list - * If unidirectional flag is unset there will be two matches in the list, + * If unidirectional flag is set, there will be only one match per vlan in the list + * If unidirectional flag is unset there will be two matches per vlan in the list, * only if the specified flow has an intrinsic direction. * For Ex. if the cFlow only has the protocol field configured, no matter - * if unidirectional flag is set or not, only one match will be returned + * if unidirectional flag is set or not, only one match per vlan will be returned * The client just has to iterate over the returned list * @return the matches */ public List getMatches() { List matches = new ArrayList(); + + if (this.dlVlan != null && !this.dlVlan.isEmpty()) { + for(Short vlan:getVlanList()){ + Match match = getMatch(vlan); + matches.add(match); + } + } + else{ + Match match = getMatch(null); + matches.add(match); + } + + if (!ContainerFlowConfig.unidirectional) { + List forwardMatches = new ArrayList(matches); + for (Match match : forwardMatches) { + Match reverse = match.reverse(); + if (!match.equals(reverse)) { + matches.add(reverse); + } + } + } + + return matches; + } + + private Match getMatch(Short vlan){ Match match = new Match(); + if (vlan != null) { + match.setField(MatchType.DL_VLAN, vlan); + } if (this.nwSrc != null && !this.nwSrc.trim().isEmpty()) { String parts[] = this.nwSrc.split("/"); InetAddress ip = NetUtils.parseInetAddress(parts[0]); @@ -619,37 +805,16 @@ public class ContainerFlowConfig implements Serializable { mask = NetUtils.getInetNetworkMask(maskLen, ip instanceof Inet6Address); match.setField(MatchType.NW_DST, ip, mask); } - if (this.protocol != null && !this.protocol.trim().isEmpty() && !this.protocol.equalsIgnoreCase("any")) { - match.setField(MatchType.NW_PROTO, IPProtocols - .getProtocolNumberByte(this.protocol)); + if (IPProtocols.fromString(this.protocol) != IPProtocols.ANY) { + match.setField(MatchType.NW_PROTO, IPProtocols.getProtocolNumberByte(this.protocol)); } if (this.tpSrc != null && !this.tpSrc.trim().isEmpty()) { - Short srcPort = 0; - try { - srcPort = Short.parseShort(tpSrc); - } catch (NumberFormatException e) { - throw e; - } - match.setField(MatchType.TP_SRC, srcPort); + match.setField(MatchType.TP_SRC, Integer.valueOf(tpSrc).shortValue()); } if (this.tpDst != null && !this.tpDst.trim().isEmpty()) { - Short dstPort = 0; - try { - dstPort = Short.parseShort(tpDst); - } catch (NumberFormatException e) { - throw e; - } - match.setField(MatchType.TP_DST, dstPort); - } - - matches.add(match); - if(!ContainerFlowConfig.unidirectional) { - Match reverse = match.reverse(); - if (!match.equals(reverse)) { - matches.add(reverse); - } + match.setField(MatchType.TP_DST, Integer.valueOf(tpDst).shortValue()); } - return matches; + return match; } /* @@ -659,7 +824,7 @@ public class ContainerFlowConfig implements Serializable { */ @Override public String toString() { - return "Container Flow={name:" + name + " nwSrc:" + nwSrc + " nwDst:" + nwDst + " " + "protocol:" + protocol + return "Container Flow={name:" + name + " dlVlan:" + dlVlan + " nwSrc:" + nwSrc + " nwDst:" + nwDst + " " + "protocol:" + protocol + " tpSrc:" + tpSrc + " tpDst:" + tpDst + "}"; } }