Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Simplify boolean expressions
[netvirt.git]
/
vpnservice
/
neutronvpn
/
neutronvpn-impl
/
src
/
main
/
java
/
org
/
opendaylight
/
netvirt
/
neutronvpn
/
NeutronvpnManager.java
diff --git
a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
index fcb91005eb8be734e48bba552d7f97b4bd2275ce..ac52bcd9e7f7d950610883683005a044a0b16bcf 100644
(file)
--- a/
vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
+++ b/
vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java
@@
-47,6
+47,7
@@
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev15060
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map.router.interfaces.InterfacesBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map.router.interfaces.InterfacesKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.AdjacencyKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map.router.interfaces.InterfacesBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map.router.interfaces.InterfacesKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.AdjacencyKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3Extension;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.l3.attributes.Routes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.l3.attributes.Routes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
@@
-93,6
+94,7
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
private static final Logger logger = LoggerFactory.getLogger(NeutronvpnManager.class);
private final DataBroker broker;
private LockManagerService lockManager;
private static final Logger logger = LoggerFactory.getLogger(NeutronvpnManager.class);
private final DataBroker broker;
private LockManagerService lockManager;
+ private NeutronvpnNatManager nvpnNatManager;
IMdsalApiManager mdsalUtil;
private NotificationPublishService notificationPublishService;
private NotificationService notificationService;
IMdsalApiManager mdsalUtil;
private NotificationPublishService notificationPublishService;
private NotificationService notificationService;
@@
-103,9
+105,10
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
* @param mdsalManager - MDSAL Util API access
*/
public NeutronvpnManager(final DataBroker db, IMdsalApiManager mdsalManager,NotificationPublishService notiPublishService,
* @param mdsalManager - MDSAL Util API access
*/
public NeutronvpnManager(final DataBroker db, IMdsalApiManager mdsalManager,NotificationPublishService notiPublishService,
- NotificationService notiService) {
+ NotificationService notiService
, NeutronvpnNatManager vpnNatMgr
) {
broker = db;
mdsalUtil = mdsalManager;
broker = db;
mdsalUtil = mdsalManager;
+ nvpnNatManager = vpnNatMgr;
notificationPublishService = notiPublishService;
notificationService = notiService;
}
notificationPublishService = notiPublishService;
notificationService = notiService;
}
@@
-941,7
+944,7
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
destination, infName);
Adjacency erAdj = new AdjacencyBuilder().setIpAddress(destination).setNextHopIp(nextHop).setKey
(new AdjacencyKey(destination)).build();
destination, infName);
Adjacency erAdj = new AdjacencyBuilder().setIpAddress(destination).setNextHopIp(nextHop).setKey
(new AdjacencyKey(destination)).build();
- if (
rtrUp == false
) {
+ if (
!rtrUp
) {
if (infName.equals(vpnifname)) {
adjList.add(erAdj);
}
if (infName.equals(vpnifname)) {
adjList.add(erAdj);
}
@@
-1108,7
+1111,8
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
updateVpnMaps(vpn, null, null, null, networks);
// process corresponding subnets for VPN
for (Uuid nw : networks) {
updateVpnMaps(vpn, null, null, null, networks);
// process corresponding subnets for VPN
for (Uuid nw : networks) {
- if (NeutronvpnUtils.getNeutronNetwork(broker, nw) == null) {
+ Network net = NeutronvpnUtils.getNeutronNetwork(broker, nw);
+ if (net == null) {
failed.add(nw.getValue());
} else {
List<Uuid> networkSubnets = NeutronvpnUtils.getSubnetIdsFromNetworkId(broker, nw);
failed.add(nw.getValue());
} else {
List<Uuid> networkSubnets = NeutronvpnUtils.getSubnetIdsFromNetworkId(broker, nw);
@@
-1118,6
+1122,9
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
addSubnetToVpn(vpn, subnet);
}
}
addSubnetToVpn(vpn, subnet);
}
}
+ if (net.getAugmentation(NetworkL3Extension.class).isExternal()) {
+ nvpnNatManager.addExternalNetworkToVpn(net, vpn);
+ }
}
}
}
}
}
}
@@
-1131,7
+1138,8
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
clearFromVpnMaps(vpn, null, networks);
// process corresponding subnets for VPN
for (Uuid nw : networks) {
clearFromVpnMaps(vpn, null, networks);
// process corresponding subnets for VPN
for (Uuid nw : networks) {
- if (NeutronvpnUtils.getNeutronNetwork(broker, nw) == null) {
+ Network net = NeutronvpnUtils.getNeutronNetwork(broker, nw);
+ if (net == null) {
failed.add(nw.getValue());
} else {
List<Uuid> networkSubnets = NeutronvpnUtils.getSubnetIdsFromNetworkId(broker, nw);
failed.add(nw.getValue());
} else {
List<Uuid> networkSubnets = NeutronvpnUtils.getSubnetIdsFromNetworkId(broker, nw);
@@
-1141,6
+1149,9
@@
public class NeutronvpnManager implements NeutronvpnService, AutoCloseable , Eve
removeSubnetFromVpn(vpn, subnet);
}
}
removeSubnetFromVpn(vpn, subnet);
}
}
+ if (net.getAugmentation(NetworkL3Extension.class).isExternal()) {
+ nvpnNatManager.removeExternalNetworkFromVpn(net);
+ }
}
}
}
}
}
}