Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Better handle remove interface from router for unknown port uuid
[controller.git]
/
opendaylight
/
northbound
/
networkconfiguration
/
neutron
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
networkconfig
/
neutron
/
northbound
/
NeutronRoutersNorthbound.java
diff --git
a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
index 17b2fcfcf9ef43437903f499dc4da2aceb61983b..0c02adad8a0d4d4ddf499efca66d39b05aff513c 100644
(file)
--- a/
opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
+++ b/
opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
@@
-422,7
+422,9
@@
public class NeutronRoutersNorthbound {
if (instances != null) {
for (Object instance : instances) {
INeutronRouterAware service = (INeutronRouterAware) instance;
if (instances != null) {
for (Object instance : instances) {
INeutronRouterAware service = (INeutronRouterAware) instance;
- service.canAttachInterface(target, input);
+ int status = service.canAttachInterface(target, input);
+ if (status < 200 || status > 299)
+ return Response.status(status).build();
}
}
}
}
@@
-498,7
+500,9
@@
public class NeutronRoutersNorthbound {
if (instances != null) {
for (Object instance : instances) {
INeutronRouterAware service = (INeutronRouterAware) instance;
if (instances != null) {
for (Object instance : instances) {
INeutronRouterAware service = (INeutronRouterAware) instance;
- service.canDetachInterface(target, input);
+ int status = service.canDetachInterface(target, input);
+ if (status < 200 || status > 299)
+ return Response.status(status).build();
}
}
}
}
@@
-523,6
+527,9
@@
public class NeutronRoutersNorthbound {
if (input.getPortUUID() != null &&
input.getSubnetUUID() == null) {
NeutronRouter_Interface targetInterface = target.getInterfaces().get(input.getPortUUID());
if (input.getPortUUID() != null &&
input.getSubnetUUID() == null) {
NeutronRouter_Interface targetInterface = target.getInterfaces().get(input.getPortUUID());
+ if (targetInterface == null) {
+ throw new ResourceNotFoundException("Router interface not found for given Port UUID");
+ }
input.setSubnetUUID(targetInterface.getSubnetUUID());
input.setID(target.getID());
input.setTenantID(target.getTenantID());
input.setSubnetUUID(targetInterface.getSubnetUUID());
input.setID(target.getID());
input.setTenantID(target.getTenantID());
@@
-550,7
+557,7
@@
public class NeutronRoutersNorthbound {
throw new ResourceNotFoundException("Port UUID not found");
}
if (port.getFixedIPs() == null) {
throw new ResourceNotFoundException("Port UUID not found");
}
if (port.getFixedIPs() == null) {
- throw new ResourceNotFoundException("Port UUID
j
as no fixed IPs");
+ throw new ResourceNotFoundException("Port UUID
h
as no fixed IPs");
}
NeutronSubnet subnet = subnetInterface.getSubnet(input.getSubnetUUID());
if (subnet == null) {
}
NeutronSubnet subnet = subnetInterface.getSubnet(input.getSubnetUUID());
if (subnet == null) {