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 "Improve iteration over subnets map by using entrySet instead of keyset. It...
[controller.git]
/
opendaylight
/
switchmanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
switchmanager
/
SubnetConfig.java
diff --git
a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
b/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
index b0d586152ca28f3df77ba55c37d6db3fb7599e86..189476a5d1bb1c1420c683bf4ea6a6c2a07b3d7b 100644
(file)
--- a/
opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
+++ b/
opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
@@
-104,6
+104,9
@@
public class SubnetConfig implements Cloneable, Serializable {
if (!NetUtils.isIPAddressValid(subnet)) {
return new Status(StatusCode.BADREQUEST, String.format("Invalid Subnet configuration: Invalid address: %s", subnet));
}
if (!NetUtils.isIPAddressValid(subnet)) {
return new Status(StatusCode.BADREQUEST, String.format("Invalid Subnet configuration: Invalid address: %s", subnet));
}
+ if((this.getIPMaskLen() == 0) || (this.getIPMaskLen() == 32)) {
+ return new Status(StatusCode.BADREQUEST, String.format("Invalid Subnet configuration: Invalid mask: /%s", this.getIPMaskLen()));
+ }
byte[] bytePrefix = NetUtils.getSubnetPrefix(this.getIPAddress(), this.getIPMaskLen()).getAddress();
long prefix = BitBufferHelper.getLong(bytePrefix);
if (prefix == 0) {
byte[] bytePrefix = NetUtils.getSubnetPrefix(this.getIPAddress(), this.getIPMaskLen()).getAddress();
long prefix = BitBufferHelper.getLong(bytePrefix);
if (prefix == 0) {
@@
-124,10
+127,20
@@
public class SubnetConfig implements Cloneable, Serializable {
return new Status(StatusCode.SUCCESS);
}
return new Status(StatusCode.SUCCESS);
}
+ private Status validateName() {
+ if (name == null || name.trim().isEmpty()) {
+ return new Status(StatusCode.BADREQUEST, "Invalid name");
+ }
+ return new Status(StatusCode.SUCCESS);
+ }
+
public Status validate() {
public Status validate() {
- Status status = validate
SubnetAddress
();
+ Status status = validate
Name
();
if (status.isSuccess()) {
if (status.isSuccess()) {
- status = validatePorts(this.nodeConnectors);
+ status = validateSubnetAddress();
+ if (status.isSuccess()) {
+ status = validatePorts(this.nodeConnectors);
+ }
}
return status;
}
}
return status;
}