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 for BUG 410
[controller.git]
/
opendaylight
/
northbound
/
networkconfiguration
/
neutron
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
networkconfig
/
neutron
/
northbound
/
NeutronPortsNorthbound.java
diff --git
a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java
b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java
index 642b3bb197c1e0e9416967cbc71760ef79c64ecf..c26e0229d0271ed6a6a0a10f0e17755176f69595 100644
(file)
--- a/
opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java
+++ b/
opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java
@@
-60,6
+60,8
@@
import org.opendaylight.controller.sal.utils.ServiceHelper;
@Path("/ports")
public class NeutronPortsNorthbound {
@Path("/ports")
public class NeutronPortsNorthbound {
+ final String mac_regex="^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$";
+
private NeutronPort extractFields(NeutronPort o, List<String> fields) {
return o.extractFields(fields);
}
private NeutronPort extractFields(NeutronPort o, List<String> fields) {
return o.extractFields(fields);
}
@@
-207,7
+209,7
@@
public class NeutronPortsNorthbound {
return Response.status(404).build();
}
if (singleton.getMacAddress() == null ||
return Response.status(404).build();
}
if (singleton.getMacAddress() == null ||
- !singleton.getMacAddress().matches(
"^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$"
)) {
+ !singleton.getMacAddress().matches(
mac_regex
)) {
return Response.status(400).build();
}
if (portInterface.macInUse(singleton.getMacAddress())) {
return Response.status(400).build();
}
if (portInterface.macInUse(singleton.getMacAddress())) {
@@
-298,7
+300,7
@@
public class NeutronPortsNorthbound {
if (!networkInterface.networkExists(test.getNetworkUUID())) {
return Response.status(404).build();
}
if (!networkInterface.networkExists(test.getNetworkUUID())) {
return Response.status(404).build();
}
- if (!test.getMacAddress().matches(
"^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$"
)) {
+ if (!test.getMacAddress().matches(
mac_regex
)) {
return Response.status(400).build();
}
if (portInterface.macInUse(test.getMacAddress())) {
return Response.status(400).build();
}
if (portInterface.macInUse(test.getMacAddress())) {