Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix installInHw handling in FlowConfig
[controller.git]
/
opendaylight
/
forwardingrulesmanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
forwardingrulesmanager
/
FlowConfig.java
diff --git
a/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java
b/opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java
index 62d6855e109f77ac97baf5107fb2c0efbcaa603e..c57dca2a88c368185c81d8d2c82476e37dc4f968 100644
(file)
--- a/
opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java
+++ b/
opendaylight/forwardingrulesmanager/api/src/main/java/org/opendaylight/controller/forwardingrulesmanager/FlowConfig.java
@@
-22,6
+22,7
@@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.opendaylight.controller.forwardingrulesmanager.FlowEntry;
import org.opendaylight.controller.sal.action.Action;
import org.opendaylight.controller.sal.action.ActionType;
import org.opendaylight.controller.sal.action.Controller;
import org.opendaylight.controller.sal.action.Action;
import org.opendaylight.controller.sal.action.ActionType;
import org.opendaylight.controller.sal.action.Controller;
@@
-188,13
+189,13
@@
public class FlowConfig implements Serializable {
public boolean installInHw() {
if (installInHw == null) {
// backward compatibility
public boolean installInHw() {
if (installInHw == null) {
// backward compatibility
- installInHw =
"true"
;
+ installInHw =
Boolean.toString(true)
;
}
}
- return
installInHw.equals("true"
);
+ return
Boolean.valueOf(installInHw
);
}
public void setInstallInHw(boolean inHw) {
}
public void setInstallInHw(boolean inHw) {
- installInHw =
inHw ? "true" : "false"
;
+ installInHw =
String.valueOf(inHw)
;
}
public String getInstallInHw() {
}
public String getInstallInHw() {
@@
-656,11
+657,8
@@
public class FlowConfig implements Serializable {
}
public boolean isProtocolValid(String protocol) {
}
public boolean isProtocolValid(String protocol) {
- int protocol_number = IPProtocols.getProtocolNumberInt(protocol);
- if (protocol_number < 1 || protocol_number > 255) {
- return false;
- }
- return true;
+ IPProtocols proto = IPProtocols.fromString(protocol);
+ return (proto != null);
}
private Status conflictWithContainerFlow(IContainer container) {
}
private Status conflictWithContainerFlow(IContainer container) {
@@
-1033,7
+1031,7
@@
public class FlowConfig implements Serializable {
mask = NetUtils.getInetNetworkMask(maskLen, ip instanceof Inet6Address);
match.setField(MatchType.NW_DST, ip, mask);
}
mask = NetUtils.getInetNetworkMask(maskLen, ip instanceof Inet6Address);
match.setField(MatchType.NW_DST, ip, mask);
}
- if (
this.protocol != null
) {
+ if (
IPProtocols.fromString(this.protocol) != IPProtocols.ANY
) {
match.setField(MatchType.NW_PROTO, IPProtocols.getProtocolNumberByte(this.protocol));
}
if (this.tosBits != null) {
match.setField(MatchType.NW_PROTO, IPProtocols.getProtocolNumberByte(this.protocol));
}
if (this.tosBits != null) {
@@
-1075,7
+1073,7
@@
public class FlowConfig implements Serializable {
}
public void toggleInstallation() {
}
public void toggleInstallation() {
- installInHw = (installInHw == null) ?
"true" : (installInHw.equals("true")) ? "false" : "true"
;
+ installInHw = (installInHw == null) ?
Boolean.toString(false) : Boolean.toString(!Boolean.valueOf(installInHw))
;
}
/*
}
/*