X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnservice%2Fvpnmanager%2Fvpnmanager-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetvirt%2Fvpnmanager%2FVpnUtil.java;h=205608587065640c58557f52dd99a1411134bd3e;hb=c878eb781079a5135ae661e0f4de9ba573d59e5d;hp=83c0f8d7dd6f136fcac7c53067458d730886e1b6;hpb=6021420e09fcdd32586b974c4d17811e72504576;p=netvirt.git diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java index 83c0f8d7dd..2056085870 100755 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java @@ -36,9 +36,9 @@ import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchEthernetDestination; import org.opendaylight.genius.mdsalutil.matches.MatchMetadata; import org.opendaylight.genius.utils.cache.DataStoreCache; +import org.opendaylight.genius.utils.clustering.ClusteringUtils; import org.opendaylight.netvirt.bgpmanager.api.IBgpManager; import org.opendaylight.netvirt.fibmanager.api.RouteOrigin; -import org.opendaylight.genius.utils.clustering.ClusteringUtils; import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager; import org.opendaylight.netvirt.vpnmanager.utilities.InterfaceUtils; import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.VpnAfConfig; @@ -87,14 +87,17 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3nexthop.rev150409 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3nexthop.rev150409.l3nexthop.VpnNexthopsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.Adjacencies; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.AdjacenciesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.LearntVpnVipToPortData; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.PrefixToInterface; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.RouterInterfaces; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.LearntVpnVipToPortData; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnIdToVpnInstance; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnInstanceOpData; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnInstanceToVpnId; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnToExtraroute; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.Adjacency; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPort; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPortBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPortKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.prefix.to._interface.VpnIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.prefix.to._interface.VpnIdsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.prefix.to._interface.VpnIdsKey; @@ -115,9 +118,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroute.vpn.Extraroute; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroute.vpn.ExtrarouteBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.to.extraroute.vpn.ExtrarouteKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPort; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPortBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.learnt.vpn.vip.to.port.data.LearntVpnVipToPortKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ExtRouters; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.ExternalNetworks; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.NaptSwitches; @@ -154,29 +154,31 @@ public class VpnUtil { static InstanceIdentifier getVpnInterfaceIdentifier(String vpnInterfaceName) { return InstanceIdentifier.builder(VpnInterfaces.class) - .child(VpnInterface.class, new VpnInterfaceKey(vpnInterfaceName)).build(); + .child(VpnInterface.class, new VpnInterfaceKey(vpnInterfaceName)).build(); } static InstanceIdentifier getVpnInstanceIdentifier(String vpnName) { return InstanceIdentifier.builder(VpnInstances.class) - .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build(); + .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build(); } - static VpnInterface getVpnInterface(String intfName, String vpnName, Adjacencies aug, BigInteger dpnId, Boolean isSheduledForRemove) { - return new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(intfName)).setVpnInstanceName(vpnName).setDpnId(dpnId) - .setScheduledForRemove(isSheduledForRemove).addAugmentation(Adjacencies.class, aug) - .build(); + static VpnInterface getVpnInterface(String intfName, String vpnName, Adjacencies aug, BigInteger dpnId, + Boolean isSheduledForRemove) { + return new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(intfName)).setVpnInstanceName(vpnName).setDpnId( + dpnId) + .setScheduledForRemove(isSheduledForRemove).addAugmentation(Adjacencies.class, aug) + .build(); } static InstanceIdentifier getPrefixToInterfaceIdentifier(long vpnId, String ipPrefix) { return InstanceIdentifier.builder(PrefixToInterface.class) - .child(VpnIds.class, new VpnIdsKey(vpnId)).child(Prefixes.class, - new PrefixesKey(ipPrefix)).build(); + .child(VpnIds.class, new VpnIdsKey(vpnId)).child(Prefixes.class, + new PrefixesKey(ipPrefix)).build(); } static InstanceIdentifier getPrefixToInterfaceIdentifier(long vpnId) { return InstanceIdentifier.builder(PrefixToInterface.class) - .child(VpnIds.class, new VpnIdsKey(vpnId)).build(); + .child(VpnIds.class, new VpnIdsKey(vpnId)).build(); } static VpnIds getPrefixToInterface(long vpnId) { @@ -185,18 +187,18 @@ public class VpnUtil { static Prefixes getPrefixToInterface(BigInteger dpId, String vpnInterfaceName, String ipPrefix) { return new PrefixesBuilder().setDpnId(dpId).setVpnInterfaceName( - vpnInterfaceName).setIpAddress(ipPrefix).build(); + vpnInterfaceName).setIpAddress(ipPrefix).build(); } static InstanceIdentifier getVpnToExtrarouteIdentifier(String vrfId, String ipPrefix) { return InstanceIdentifier.builder(VpnToExtraroute.class) - .child(Vpn.class, new VpnKey(vrfId)).child(Extraroute.class, - new ExtrarouteKey(ipPrefix)).build(); + .child(Vpn.class, new VpnKey(vrfId)).child(Extraroute.class, + new ExtrarouteKey(ipPrefix)).build(); } static InstanceIdentifier getVpnToExtrarouteIdentifier(String vrfId) { return InstanceIdentifier.builder(VpnToExtraroute.class) - .child(Vpn.class, new VpnKey(vrfId)).build(); + .child(Vpn.class, new VpnKey(vrfId)).build(); } static Vpn getVpnToExtraRoute(String vrfId) { @@ -204,7 +206,7 @@ public class VpnUtil { } /** - * Get VRF table given a Route Distinguisher + * Get VRF table given a Route Distinguisher. * * @param broker dataBroker service reference * @param rd Route-Distinguisher @@ -212,24 +214,23 @@ public class VpnUtil { */ public static VrfTables getVrfTable(DataBroker broker, String rd) { InstanceIdentifier id = - InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); Optional vrfTable = read(broker, LogicalDatastoreType.CONFIGURATION, id); return vrfTable.isPresent() ? vrfTable.get() : null; } /** * Retrieves the VrfEntries that belong to a given VPN filtered out by - * Origin, searching by its Route-Distinguisher + * Origin, searching by its Route-Distinguisher. * * @param broker dataBroker service reference - * @param rd Route-distinguisher of the VPN - * @param originsToConsider Only entries whose origin is included in this - * list will be considered + * @param rd Route-distinguisher of the VPN + * @param originsToConsider Only entries whose origin is included in this list will be considered * @return the list of VrfEntries */ public static List getVrfEntriesByOrigin(DataBroker broker, String rd, - List originsToConsider) { - List result = new ArrayList(); + List originsToConsider) { + List result = new ArrayList<>(); List allVpnVrfEntries = getAllVrfEntries(broker, rd); for (VrfEntry vrfEntry : allVpnVrfEntries) { if (originsToConsider.contains(RouteOrigin.value(vrfEntry.getOrigin()))) { @@ -244,7 +245,7 @@ public class VpnUtil { if (vpnIds.isPresent()) { return vpnIds.get().getPrefixes(); } - return new ArrayList(); + return new ArrayList<>(); } static List getAllExtraRoutes(DataBroker broker, String vrfId) { @@ -252,26 +253,26 @@ public class VpnUtil { if (extraRoutes.isPresent()) { return extraRoutes.get().getExtraroute(); } - return new ArrayList(); + return new ArrayList<>(); } /** * Retrieves all the VrfEntries that belong to a given VPN searching by its - * Route-Distinguisher + * Route-Distinguisher. * * @param broker dataBroker service reference - * @param rd Route-distinguisher of the VPN + * @param rd Route-distinguisher of the VPN * @return the list of VrfEntries */ public static List getAllVrfEntries(DataBroker broker, String rd) { VrfTables vrfTables = VpnUtil.getVrfTable(broker, rd); - return (vrfTables != null) ? vrfTables.getVrfEntry() : new ArrayList(); + return (vrfTables != null) ? vrfTables.getVrfEntry() : new ArrayList<>(); } //FIXME: Implement caches for DS reads public static VpnInstance getVpnInstance(DataBroker broker, String vpnInstanceName) { InstanceIdentifier id = InstanceIdentifier.builder(VpnInstances.class).child(VpnInstance.class, - new VpnInstanceKey(vpnInstanceName)).build(); + new VpnInstanceKey(vpnInstanceName)).build(); Optional vpnInstance = read(broker, LogicalDatastoreType.CONFIGURATION, id); return (vpnInstance.isPresent()) ? vpnInstance.get() : null; } @@ -288,17 +289,18 @@ public class VpnUtil { static List getAllVpnInstanceOpData(DataBroker broker) { InstanceIdentifier id = InstanceIdentifier.builder(VpnInstanceOpData.class).build(); - Optional vpnInstanceOpDataOptional = VpnUtil.read(broker, LogicalDatastoreType.OPERATIONAL, id); + Optional vpnInstanceOpDataOptional = + VpnUtil.read(broker, LogicalDatastoreType.OPERATIONAL, id); if (vpnInstanceOpDataOptional.isPresent()) { return vpnInstanceOpDataOptional.get().getVpnInstanceOpDataEntry(); } else { - return new ArrayList(); + return new ArrayList<>(); } } public static List getDpnVpnInterfaces(DataBroker broker, - VpnInstance vpnInstance, BigInteger dpnId) { + .instance.op.data.entry.vpn.to.dpn.list.VpnInterfaces> getDpnVpnInterfaces(DataBroker broker, + VpnInstance vpnInstance, BigInteger dpnId) { String rd = getRdFromVpnInstance(vpnInstance); InstanceIdentifier dpnToVpnId = getVpnToDpnListIdentifier(rd, dpnId); Optional dpnInVpn = VpnUtil.read(broker, LogicalDatastoreType.OPERATIONAL, dpnToVpnId); @@ -323,8 +325,8 @@ public class VpnUtil { // TODO: why check VrfTables if we later go for the specific VrfEntry? if (vrfTable != null) { InstanceIdentifier vrfEntryId = - InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)). - child(VrfEntry.class, new VrfEntryKey(ipPrefix)).build(); + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).child( + VrfEntry.class, new VrfEntryKey(ipPrefix)).build(); Optional vrfEntry = read(broker, LogicalDatastoreType.CONFIGURATION, vrfEntryId); if (vrfEntry.isPresent()) { return vrfEntry.get(); @@ -351,9 +353,9 @@ public class VpnUtil { public static List getVpnExtraroutes(DataBroker broker, String vpnRd) { InstanceIdentifier vpnExtraRoutesId = - InstanceIdentifier.builder(VpnToExtraroute.class).child(Vpn.class, new VpnKey(vpnRd)).build(); + InstanceIdentifier.builder(VpnToExtraroute.class).child(Vpn.class, new VpnKey(vpnRd)).build(); Optional vpnOpc = read(broker, LogicalDatastoreType.OPERATIONAL, vpnExtraRoutesId); - return vpnOpc.isPresent() ? vpnOpc.get().getExtraroute() : new ArrayList(); + return vpnOpc.isPresent() ? vpnOpc.get().getExtraroute() : new ArrayList<>(); } static Adjacencies getVpnInterfaceAugmentation(List nextHopList) { @@ -362,7 +364,7 @@ public class VpnUtil { public static InstanceIdentifier getPoolId(String poolName) { InstanceIdentifier.InstanceIdentifierBuilder idBuilder = - InstanceIdentifier.builder(IdPools.class).child(IdPool.class, new IdPoolKey(poolName)); + InstanceIdentifier.builder(IdPools.class).child(IdPool.class, new IdPoolKey(poolName)); InstanceIdentifier id = idBuilder.build(); return id; } @@ -373,28 +375,28 @@ public class VpnUtil { static InstanceIdentifier getInterfaceIdentifier(String interfaceName) { return InstanceIdentifier.builder(Interfaces.class) - .child(Interface.class, new InterfaceKey(interfaceName)).build(); + .child(Interface.class, new InterfaceKey(interfaceName)).build(); } static InstanceIdentifier getVpnToDpnListIdentifier(String rd, BigInteger dpnId) { return InstanceIdentifier.builder(VpnInstanceOpData.class) - .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(rd)) - .child(VpnToDpnList.class, new VpnToDpnListKey(dpnId)).build(); + .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(rd)) + .child(VpnToDpnList.class, new VpnToDpnListKey(dpnId)).build(); } public static BigInteger getCookieArpFlow(int interfaceTag) { return VpnConstants.COOKIE_L3_BASE.add(new BigInteger("0110000", 16)).add( - BigInteger.valueOf(interfaceTag)); + BigInteger.valueOf(interfaceTag)); } public static BigInteger getCookieL3(int vpnId) { return VpnConstants.COOKIE_L3_BASE.add(new BigInteger("0610000", 16)).add(BigInteger.valueOf(vpnId)); } - public static String getFlowRef(BigInteger dpnId, short tableId, int ethType, int lPortTag, int arpType) { + public static String getFlowRef(BigInteger dpnId, short tableId, int ethType, int lportTag, int arpType) { return new StringBuffer().append(VpnConstants.FLOWID_PREFIX).append(dpnId).append(NwConstants.FLOWID_SEPARATOR) - .append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(ethType).append(lPortTag) - .append(NwConstants.FLOWID_SEPARATOR).append(arpType).toString(); + .append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(ethType).append(lportTag) + .append(NwConstants.FLOWID_SEPARATOR).append(arpType).toString(); } public static int getUniqueId(IdManagerService idManager, String poolName, String idKey) { @@ -433,7 +435,7 @@ public class VpnUtil { /** * Retrieves the VpnInstance name (typically the VPN Uuid) out from the - * route-distinguisher + * route-distinguisher. * * @param broker dataBroker service reference * @param rd Route-Distinguisher @@ -454,10 +456,14 @@ public class VpnUtil { */ public static long getVpnId(DataBroker broker, String vpnName) { - InstanceIdentifier id - = getVpnInstanceToVpnIdIdentifier(vpnName); - Optional vpnInstance - = read(broker, LogicalDatastoreType.CONFIGURATION, id); + InstanceIdentifier + id + = getVpnInstanceToVpnIdIdentifier(vpnName); + Optional + vpnInstance + = read(broker, LogicalDatastoreType.CONFIGURATION, id); long vpnId = VpnConstants.INVALID_ID; if (vpnInstance.isPresent()) { @@ -467,17 +473,21 @@ public class VpnUtil { } /** - * Retrieves the VPN Route Distinguisher searching by its Vpn instance name + * Retrieves the VPN Route Distinguisher searching by its Vpn instance name. * * @param broker dataBroker service reference * @param vpnName Name of the VPN * @return the route-distinguisher of the VPN */ public static String getVpnRd(DataBroker broker, String vpnName) { - InstanceIdentifier id - = getVpnInstanceToVpnIdIdentifier(vpnName); - Optional vpnInstance - = read(broker, LogicalDatastoreType.CONFIGURATION, id); + InstanceIdentifier + id + = getVpnInstanceToVpnIdIdentifier(vpnName); + Optional + vpnInstance + = read(broker, LogicalDatastoreType.CONFIGURATION, id); String rd = null; if (vpnInstance.isPresent()) { @@ -487,7 +497,7 @@ public class VpnUtil { } /** - * Get VPN Route Distinguisher from VPN Instance Configuration + * Get VPN Route Distinguisher from VPN Instance Configuration. * * @param broker dataBroker service reference * @param vpnName Name of the VPN @@ -495,7 +505,7 @@ public class VpnUtil { */ public static String getVpnRdFromVpnInstanceConfig(DataBroker broker, String vpnName) { InstanceIdentifier id = InstanceIdentifier.builder(VpnInstances.class) - .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build(); + .child(VpnInstance.class, new VpnInstanceKey(vpnName)).build(); Optional vpnInstance = VpnUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id); String rd = null; if (vpnInstance.isPresent()) { @@ -507,22 +517,23 @@ public class VpnUtil { } /** - * Remove from MDSAL all those VrfEntries in a VPN that have an specific RouteOrigin + * Remove from MDSAL all those VrfEntries in a VPN that have an specific RouteOrigin. * * @param broker dataBroker service reference - * @param rd Route Distinguisher + * @param rd Route Distinguisher * @param origin Origin of the Routes to be removed (see {@link RouteOrigin}) */ public static void removeVrfEntriesByOrigin(DataBroker broker, String rd, RouteOrigin origin) { InstanceIdentifier vpnVrfTableIid = - InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); Optional vrfTablesOpc = read(broker, LogicalDatastoreType.CONFIGURATION, vpnVrfTableIid); if (vrfTablesOpc.isPresent()) { VrfTables vrfTables = vrfTablesOpc.get(); WriteTransaction tx = broker.newWriteOnlyTransaction(); for (VrfEntry vrfEntry : vrfTables.getVrfEntry()) { if (origin == RouteOrigin.value(vrfEntry.getOrigin())) { - tx.delete(LogicalDatastoreType.CONFIGURATION, vpnVrfTableIid.child(VrfEntry.class, vrfEntry.getKey())); + tx.delete(LogicalDatastoreType.CONFIGURATION, + vpnVrfTableIid.child(VrfEntry.class, vrfEntry.getKey())); } } tx.submit(); @@ -531,9 +542,9 @@ public class VpnUtil { public static List findVrfEntriesByNexthop(DataBroker broker, String rd, String nexthop) { InstanceIdentifier vpnVrfTableIid = - InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).build(); Optional vrfTablesOpc = read(broker, LogicalDatastoreType.CONFIGURATION, vpnVrfTableIid); - List matches = new ArrayList(); + List matches = new ArrayList<>(); if (vrfTablesOpc.isPresent()) { VrfTables vrfTables = vrfTablesOpc.get(); @@ -556,6 +567,8 @@ public class VpnUtil { tx.submit(); } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void withdrawRoutes(IBgpManager bgpManager, String rd, List vrfEntries) { vrfEntries.forEach(vrfEntry -> { try { @@ -568,39 +581,50 @@ public class VpnUtil { } static org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id.VpnInstance - getVpnInstanceToVpnId(String vpnName, long vpnId, String rd) { - + getVpnInstanceToVpnId(String vpnName, long vpnId, String rd) { return new VpnInstanceBuilder().setVpnId(vpnId).setVpnInstanceName(vpnName).setVrfId(rd).build(); } - static InstanceIdentifier - getVpnInstanceToVpnIdIdentifier(String vpnName) { + static InstanceIdentifier + getVpnInstanceToVpnIdIdentifier(String vpnName) { return InstanceIdentifier.builder(VpnInstanceToVpnId.class) - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id.VpnInstance.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id.VpnInstanceKey(vpnName)).build(); + .child( + org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id + .VpnInstance.class, + new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.instance.to.vpn.id + .VpnInstanceKey( + vpnName)).build(); } static RouterInterface getConfiguredRouterInterface(DataBroker broker, String interfaceName) { - Optional optRouterInterface = read(broker, LogicalDatastoreType.CONFIGURATION, VpnUtil.getRouterInterfaceId(interfaceName)); - if(optRouterInterface.isPresent()) { + Optional optRouterInterface = + read(broker, LogicalDatastoreType.CONFIGURATION, VpnUtil.getRouterInterfaceId(interfaceName)); + if (optRouterInterface.isPresent()) { return optRouterInterface.get(); } return null; } static org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIds - getVpnIdToVpnInstance(long vpnId, String vpnName, String rd, boolean isExternalVpn) { - return new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIdsBuilder() - .setVpnId(vpnId).setVpnInstanceName(vpnName).setVrfId(rd).setExternalVpn(isExternalVpn).build(); + getVpnIdToVpnInstance(long vpnId, String vpnName, String rd, boolean isExternalVpn) { + return new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance + .VpnIdsBuilder() + .setVpnId(vpnId).setVpnInstanceName(vpnName).setVrfId(rd).setExternalVpn(isExternalVpn).build(); } - public static InstanceIdentifier + public static InstanceIdentifier getVpnIdToVpnInstanceIdentifier(long vpnId) { return InstanceIdentifier.builder(VpnIdToVpnInstance.class) - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIds.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIdsKey(Long.valueOf(vpnId))).build(); + .child( + org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIds + .class, + new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance + .VpnIdsKey( + Long.valueOf(vpnId))).build(); } /** @@ -612,10 +636,13 @@ public class VpnUtil { */ public static String getVpnName(DataBroker broker, long vpnId) { - InstanceIdentifier id - = getVpnIdToVpnInstanceIdentifier(vpnId); - Optional vpnInstance - = read(broker, LogicalDatastoreType.CONFIGURATION, id); + InstanceIdentifier + id + = getVpnIdToVpnInstanceIdentifier(vpnId); + Optional + vpnInstance + = read(broker, LogicalDatastoreType.CONFIGURATION, id); String vpnName = null; if (vpnInstance.isPresent()) { @@ -626,17 +653,17 @@ public class VpnUtil { public static InstanceIdentifier getVpnInstanceOpDataIdentifier(String rd) { return InstanceIdentifier.builder(VpnInstanceOpData.class) - .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(rd)).build(); + .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(rd)).build(); } static InstanceIdentifier getRouterInterfaceId(String interfaceName) { return InstanceIdentifier.builder(RouterInterfaces.class) - .child(RouterInterface.class, new RouterInterfaceKey(interfaceName)).build(); + .child(RouterInterface.class, new RouterInterfaceKey(interfaceName)).build(); } static RouterInterface getRouterInterface(String interfaceName, String routerName) { return new RouterInterfaceBuilder().setKey(new RouterInterfaceKey(interfaceName)) - .setInterfaceName(interfaceName).setRouterName(routerName).build(); + .setInterfaceName(interfaceName).setRouterName(routerName).build(); } public static VpnInstanceOpDataEntry getVpnInstanceOpData(DataBroker broker, String rd) { @@ -646,7 +673,8 @@ public class VpnUtil { static VpnInstanceOpDataEntry getVpnInstanceOpDataFromCache(DataBroker broker, String rd) { InstanceIdentifier id = VpnUtil.getVpnInstanceOpDataIdentifier(rd); - return (VpnInstanceOpDataEntry) DataStoreCache.get(VpnConstants.VPN_OP_INSTANCE_CACHE_NAME, id, rd, broker, false); + return (VpnInstanceOpDataEntry) DataStoreCache.get(VpnConstants.VPN_OP_INSTANCE_CACHE_NAME, id, rd, broker, + false); } static VpnInterface getConfiguredVpnInterface(DataBroker broker, String interfaceName) { @@ -661,19 +689,26 @@ public class VpnUtil { static String getNeutronRouterFromInterface(DataBroker broker, String interfaceName) { InstanceIdentifier.InstanceIdentifierBuilder idBuilder = - InstanceIdentifier.builder(RouterInterfacesMap.class); + InstanceIdentifier.builder(RouterInterfacesMap.class); InstanceIdentifier id = idBuilder.build(); - Optional RouterInterfacesMap = MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id); - if (RouterInterfacesMap.isPresent()) { - List rtrInterfaces = RouterInterfacesMap.get().getRouterInterfaces(); - for (org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map.RouterInterfaces rtrInterface : rtrInterfaces) { - List rtrIfc = rtrInterface.getInterfaces(); - for(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map.router.interfaces.Interfaces ifc : rtrIfc) { - if (ifc.getInterfaceId().equals(interfaceName)) { - return rtrInterface.getRouterId().getValue(); - } - } - } + Optional routerInterfacesMap = + MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, id); + if (routerInterfacesMap.isPresent()) { + List + rtrInterfaces = routerInterfacesMap.get().getRouterInterfaces(); + for (org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map + .RouterInterfaces rtrInterface : rtrInterfaces) { + List + rtrIfc = rtrInterface.getInterfaces(); + for (org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.router.interfaces.map + .router.interfaces.Interfaces ifc : rtrIfc) { + if (ifc.getInterfaceId().equals(interfaceName)) { + return rtrInterface.getRouterId().getValue(); + } + } + } } return null; } @@ -700,7 +735,8 @@ public class VpnUtil { static boolean isInterfaceAssociatedWithVpn(DataBroker broker, String vpnName, String interfaceName) { InstanceIdentifier interfaceId = getVpnInterfaceIdentifier(interfaceName); - Optional optConfiguredVpnInterface = read(broker, LogicalDatastoreType.CONFIGURATION, interfaceId); + Optional optConfiguredVpnInterface = + read(broker, LogicalDatastoreType.CONFIGURATION, interfaceId); if (optConfiguredVpnInterface.isPresent()) { String configuredVpnName = optConfiguredVpnInterface.get().getVpnInstanceName(); @@ -712,7 +748,7 @@ public class VpnUtil { } static String getIpPrefix(String prefix) { - String prefixValues[] = prefix.split("/"); + String[] prefixValues = prefix.split("/"); if (prefixValues.length == 1) { prefix = prefix + PREFIX_SEPARATOR + DEFAULT_PREFIX_LENGTH; } @@ -720,29 +756,29 @@ public class VpnUtil { } static final FutureCallback DEFAULT_CALLBACK = - new FutureCallback() { - @Override - public void onSuccess(Void result) { - LOG.debug("Success in Datastore operation"); - } + new FutureCallback() { + @Override + public void onSuccess(Void result) { + LOG.debug("Success in Datastore operation"); + } - @Override - public void onFailure(Throwable error) { - LOG.error("Error in Datastore operation", error); - } + @Override + public void onFailure(Throwable error) { + LOG.error("Error in Datastore operation", error); + } - ; - }; + ; + }; public static Optional read(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path) { + InstanceIdentifier path) { ReadOnlyTransaction tx = broker.newReadOnlyTransaction(); Optional result = Optional.absent(); try { result = tx.read(datastoreType, path).get(); - } catch (Exception e) { + } catch (InterruptedException | ExecutionException e) { throw new RuntimeException(e); } finally { tx.close(); @@ -752,55 +788,57 @@ public class VpnUtil { } public static void asyncUpdate(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data) { + InstanceIdentifier path, T data) { asyncUpdate(broker, datastoreType, path, data, DEFAULT_CALLBACK); } public static void asyncUpdate(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data, FutureCallback callback) { + InstanceIdentifier path, T data, FutureCallback callback) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.merge(datastoreType, path, data, true); Futures.addCallback(tx.submit(), callback); } public static void asyncWrite(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data) { + InstanceIdentifier path, T data) { asyncWrite(broker, datastoreType, path, data, DEFAULT_CALLBACK); } public static void asyncWrite(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data, FutureCallback callback) { + InstanceIdentifier path, T data, FutureCallback callback) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.put(datastoreType, path, data, true); Futures.addCallback(tx.submit(), callback); } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void tryDelete(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path) { + InstanceIdentifier path) { try { delete(broker, datastoreType, path, DEFAULT_CALLBACK); - } catch ( SchemaValidationFailedException sve ) { + } catch (SchemaValidationFailedException sve) { LOG.info("Could not delete {}. SchemaValidationFailedException: {}", path, sve.getMessage()); - } catch ( Exception e) { + } catch (Exception e) { LOG.info("Could not delete {}. Unhandled error: {}", path, e.getMessage()); } } public static void delete(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path) { + InstanceIdentifier path) { delete(broker, datastoreType, path, DEFAULT_CALLBACK); } public static void delete(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, FutureCallback callback) { + InstanceIdentifier path, FutureCallback callback) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.delete(datastoreType, path); Futures.addCallback(tx.submit(), callback); } public static void syncWrite(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data) { + InstanceIdentifier path, T data) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.put(datastoreType, path, data, true); CheckedFuture futures = tx.submit(); @@ -813,7 +851,7 @@ public class VpnUtil { } public static void syncUpdate(DataBroker broker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data) { + InstanceIdentifier path, T data) { WriteTransaction tx = broker.newWriteOnlyTransaction(); tx.merge(datastoreType, path, data, true); CheckedFuture futures = tx.submit(); @@ -832,7 +870,8 @@ public class VpnUtil { // interface-index-tag operational container public static IfIndexInterface getInterfaceInfoByInterfaceTag(DataBroker broker, long interfaceTag) { InstanceIdentifier interfaceId = getInterfaceInfoEntriesOperationalDataPath(interfaceTag); - Optional existingInterfaceInfo = VpnUtil.read(broker, LogicalDatastoreType.OPERATIONAL, interfaceId); + Optional existingInterfaceInfo = + VpnUtil.read(broker, LogicalDatastoreType.OPERATIONAL, interfaceId); if (existingInterfaceInfo.isPresent()) { return existingInterfaceInfo.get(); } @@ -841,7 +880,7 @@ public class VpnUtil { private static InstanceIdentifier getInterfaceInfoEntriesOperationalDataPath(long interfaceTag) { return InstanceIdentifier.builder(IfIndexesInterfaceMap.class).child(IfIndexInterface.class, - new IfIndexInterfaceKey((int) interfaceTag)).build(); + new IfIndexInterfaceKey((int) interfaceTag)).build(); } public static ElanTagName getElanInfoByElanTag(DataBroker broker, long elanTag) { @@ -855,65 +894,72 @@ public class VpnUtil { private static InstanceIdentifier getElanInfoEntriesOperationalDataPath(long elanTag) { return InstanceIdentifier.builder(ElanTagNameMap.class).child(ElanTagName.class, - new ElanTagNameKey(elanTag)).build(); + new ElanTagNameKey(elanTag)).build(); } /** - * Returns the Path identifier to reach a specific interface in a specific DPN in a given VpnInstance + * Returns the Path identifier to reach a specific interface in a specific DPN in a given VpnInstance. * - * @param vpnRd Route-Distinguisher of the VpnInstance - * @param dpnId Id of the DPN where the interface is + * @param vpnRd Route-Distinguisher of the VpnInstance + * @param dpnId Id of the DPN where the interface is * @param ifaceName Interface name * @return the Instance Identifier */ public static InstanceIdentifier - getVpnToDpnInterfacePath(String vpnRd, BigInteger dpnId, String ifaceName) { + .instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfaces> + getVpnToDpnInterfacePath(String vpnRd, BigInteger dpnId, String ifaceName) { return - InstanceIdentifier.builder(VpnInstanceOpData.class) - .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(vpnRd)) - .child(VpnToDpnList.class, new VpnToDpnListKey(dpnId)) - .child(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn - .instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfaces.class, - new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn - .instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfacesKey(ifaceName)) - .build(); + InstanceIdentifier.builder(VpnInstanceOpData.class) + .child(VpnInstanceOpDataEntry.class, new VpnInstanceOpDataEntryKey(vpnRd)) + .child(VpnToDpnList.class, new VpnToDpnListKey(dpnId)) + .child(org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn + .instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfaces.class, + new org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn + .instance.op.data.vpn.instance.op.data.entry.vpn.to.dpn.list.VpnInterfacesKey(ifaceName)) + .build(); } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removePrefixToInterfaceForVpnId(DataBroker broker, long vpnId, WriteTransaction writeTxn) { try { // Clean up PrefixToInterface Operational DS if (writeTxn != null) { writeTxn.delete(LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(PrefixToInterface.class).child( - VpnIds.class, new VpnIdsKey(vpnId)).build()); + InstanceIdentifier.builder(PrefixToInterface.class).child( + VpnIds.class, new VpnIdsKey(vpnId)).build()); } else { delete(broker, LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(PrefixToInterface.class).child(VpnIds.class, new VpnIdsKey(vpnId)).build(), - DEFAULT_CALLBACK); + InstanceIdentifier.builder(PrefixToInterface.class).child(VpnIds.class, + new VpnIdsKey(vpnId)).build(), + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during cleanup of PrefixToInterface for VPN ID {}", vpnId, e); } } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removeVpnExtraRouteForVpn(DataBroker broker, String vpnName, WriteTransaction writeTxn) { try { // Clean up VPNExtraRoutes Operational DS if (writeTxn != null) { writeTxn.delete(LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(VpnToExtraroute.class).child(Vpn.class, new VpnKey(vpnName)).build()); + InstanceIdentifier.builder(VpnToExtraroute.class).child(Vpn.class, new VpnKey(vpnName)).build()); } else { delete(broker, LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(VpnToExtraroute.class).child(Vpn.class, new VpnKey(vpnName)).build(), - DEFAULT_CALLBACK); + InstanceIdentifier.builder(VpnToExtraroute.class).child(Vpn.class, new VpnKey(vpnName)).build(), + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during cleanup of VPNToExtraRoute for VPN {}", vpnName, e); } } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removeVpnOpInstance(DataBroker broker, String vpnName, WriteTransaction writeTxn) { try { // Clean up VPNInstanceOpDataEntry @@ -921,65 +967,77 @@ public class VpnUtil { writeTxn.delete(LogicalDatastoreType.OPERATIONAL, getVpnInstanceOpDataIdentifier(vpnName)); } else { delete(broker, LogicalDatastoreType.OPERATIONAL, getVpnInstanceOpDataIdentifier(vpnName), - DEFAULT_CALLBACK); + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during cleanup of VPNInstanceOpDataEntry for VPN {}", vpnName, e); } } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removeVpnInstanceToVpnId(DataBroker broker, String vpnName, WriteTransaction writeTxn) { try { if (writeTxn != null) { writeTxn.delete(LogicalDatastoreType.CONFIGURATION, getVpnInstanceToVpnIdIdentifier(vpnName)); } else { delete(broker, LogicalDatastoreType.CONFIGURATION, getVpnInstanceToVpnIdIdentifier(vpnName), - DEFAULT_CALLBACK); + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during clean up of VpnInstanceToVpnId for VPN {}", vpnName, e); } } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removeVpnIdToVpnInstance(DataBroker broker, long vpnId, WriteTransaction writeTxn) { try { if (writeTxn != null) { writeTxn.delete(LogicalDatastoreType.CONFIGURATION, getVpnIdToVpnInstanceIdentifier(vpnId)); } else { delete(broker, LogicalDatastoreType.CONFIGURATION, getVpnIdToVpnInstanceIdentifier(vpnId), - DEFAULT_CALLBACK); + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during clean up of VpnIdToVpnInstance for VPNID {}", vpnId, e); } } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removeVrfTableForVpn(DataBroker broker, String vpnName, WriteTransaction writeTxn) { // Clean up FIB Entries Config DS try { if (writeTxn != null) { writeTxn.delete(LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(vpnName)).build()); + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, + new VrfTablesKey(vpnName)).build()); } else { delete(broker, LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(vpnName)).build(), - DEFAULT_CALLBACK); + InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, + new VrfTablesKey(vpnName)).build(), + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during clean up of VrfTable from FIB for VPN {}", vpnName, e); } } + // TODO Clean up the exception handling + @SuppressWarnings("checkstyle:IllegalCatch") public static void removeL3nexthopForVpnId(DataBroker broker, long vpnId, WriteTransaction writeTxn) { try { // Clean up L3NextHop Operational DS if (writeTxn != null) { writeTxn.delete(LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(L3nexthop.class).child(VpnNexthops.class, new VpnNexthopsKey(vpnId)).build()); + InstanceIdentifier.builder(L3nexthop.class).child(VpnNexthops.class, + new VpnNexthopsKey(vpnId)).build()); } else { delete(broker, LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(L3nexthop.class).child(VpnNexthops.class, new VpnNexthopsKey(vpnId)).build(), - DEFAULT_CALLBACK); + InstanceIdentifier.builder(L3nexthop.class).child(VpnNexthops.class, + new VpnNexthopsKey(vpnId)).build(), + DEFAULT_CALLBACK); } } catch (Exception e) { LOG.error("Exception during cleanup of L3NextHop for VPN ID {}", vpnId, e); @@ -988,9 +1046,10 @@ public class VpnUtil { public static void scheduleVpnInterfaceForRemoval(DataBroker broker,String interfaceName, BigInteger dpnId, String vpnInstanceName, Boolean isScheduledToRemove, - WriteTransaction writeOperTxn){ + WriteTransaction writeOperTxn) { InstanceIdentifier interfaceId = VpnUtil.getVpnInterfaceIdentifier(interfaceName); - VpnInterface interfaceToUpdate = new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(interfaceName)).setName(interfaceName) + VpnInterface interfaceToUpdate = + new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(interfaceName)).setName(interfaceName) .setDpnId(dpnId).setVpnInstanceName(vpnInstanceName).setScheduledForRemove(isScheduledToRemove).build(); if (writeOperTxn != null) { writeOperTxn.merge(LogicalDatastoreType.OPERATIONAL, interfaceId, interfaceToUpdate, true); @@ -1003,18 +1062,21 @@ public class VpnUtil { portName, String macAddress) { synchronized ((vpnName + fixedIp).intern()) { InstanceIdentifier id = buildLearntVpnVipToPortIdentifier(vpnName, fixedIp); - LearntVpnVipToPortBuilder builder = new LearntVpnVipToPortBuilder().setKey( - new LearntVpnVipToPortKey(fixedIp, vpnName)).setVpnName(vpnName).setPortFixedip(fixedIp).setPortName - (portName).setMacAddress(macAddress.toLowerCase()); + LearntVpnVipToPortBuilder builder = + new LearntVpnVipToPortBuilder().setKey(new LearntVpnVipToPortKey(fixedIp, vpnName)).setVpnName( + vpnName).setPortFixedip(fixedIp).setPortName(portName).setMacAddress( + macAddress.toLowerCase()); MDSALUtil.syncWrite(broker, LogicalDatastoreType.OPERATIONAL, id, builder.build()); - LOG.debug("ARP learned for fixedIp: {}, vpn {}, interface {}, mac {}, isSubnetIp {} added to " + - "VpnPortipToPort DS", fixedIp, vpnName, portName, macAddress); + LOG.debug("ARP learned for fixedIp: {}, vpn {}, interface {}, mac {}, isSubnetIp {} added to " + + "VpnPortipToPort DS", fixedIp, vpnName, portName, macAddress); } } - private static InstanceIdentifier buildLearntVpnVipToPortIdentifier(String vpnName, String fixedIp) { - InstanceIdentifier id = InstanceIdentifier.builder(LearntVpnVipToPortData.class).child - (LearntVpnVipToPort.class, new LearntVpnVipToPortKey(fixedIp, vpnName)).build(); + private static InstanceIdentifier buildLearntVpnVipToPortIdentifier(String vpnName, + String fixedIp) { + InstanceIdentifier id = + InstanceIdentifier.builder(LearntVpnVipToPortData.class).child(LearntVpnVipToPort.class, + new LearntVpnVipToPortKey(fixedIp, vpnName)).build(); return id; } @@ -1027,8 +1089,9 @@ public class VpnUtil { } static InstanceIdentifier buildVpnPortipToPortIdentifier(String vpnName, String fixedIp) { - InstanceIdentifier id = InstanceIdentifier.builder(NeutronVpnPortipPortData.class).child - (VpnPortipToPort.class, new VpnPortipToPortKey(fixedIp, vpnName)).build(); + InstanceIdentifier id = + InstanceIdentifier.builder(NeutronVpnPortipPortData.class).child(VpnPortipToPort.class, + new VpnPortipToPortKey(fixedIp, vpnName)).build(); return id; } @@ -1051,25 +1114,25 @@ public class VpnUtil { } public static List getDpnsOnVpn(DataBroker dataBroker, String vpnInstanceName) { - List result = new ArrayList(); + List result = new ArrayList<>(); String rd = getVpnRd(dataBroker, vpnInstanceName); - if ( rd == null ) { + if (rd == null) { LOG.debug("Could not find Route-Distinguisher for VpnName={}", vpnInstanceName); return result; } VpnInstanceOpDataEntry vpnInstanceOpData = getVpnInstanceOpData(dataBroker, rd); - if ( vpnInstanceOpData == null ) { + if (vpnInstanceOpData == null) { LOG.debug("Could not find OpState for VpnName={}", vpnInstanceName); return result; } List vpnToDpnList = vpnInstanceOpData.getVpnToDpnList(); - if ( vpnToDpnList == null ) { + if (vpnToDpnList == null) { LOG.debug("Could not find DPN footprint for VpnName={}", vpnInstanceName); return result; } - for ( VpnToDpnList vpnToDpn : vpnToDpnList) { + for (VpnToDpnList vpnToDpn : vpnToDpnList) { result.add(vpnToDpn.getDpnId()); } return result; @@ -1080,7 +1143,7 @@ public class VpnUtil { Optional routerData = read(dataBroker, LogicalDatastoreType.CONFIGURATION, id); if (routerData.isPresent()) { Uuid networkId = routerData.get().getNetworkId(); - if(networkId != null) { + if (networkId != null) { return networkId.getValue(); } } @@ -1088,14 +1151,14 @@ public class VpnUtil { } static InstanceIdentifier buildRouterIdentifier(String routerId) { - InstanceIdentifier routerInstanceIndentifier = InstanceIdentifier.builder(ExtRouters.class).child - (Routers.class, new RoutersKey(routerId)).build(); + InstanceIdentifier routerInstanceIndentifier = + InstanceIdentifier.builder(ExtRouters.class).child(Routers.class, new RoutersKey(routerId)).build(); return routerInstanceIndentifier; } static Networks getExternalNetwork(DataBroker dataBroker, Uuid networkId) { InstanceIdentifier netsIdentifier = InstanceIdentifier.builder(ExternalNetworks.class) - .child(Networks.class, new NetworksKey(networkId)).build(); + .child(Networks.class, new NetworksKey(networkId)).build(); Optional optionalNets = VpnUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, netsIdentifier); return optionalNets.isPresent() ? optionalNets.get() : null; } @@ -1119,12 +1182,13 @@ public class VpnUtil { static List getAllSubnetGatewayMacAddressesforVpn(DataBroker broker, String vpnName) { List macAddresses = new ArrayList<>(); - Optional subnetMapsData = read(broker, LogicalDatastoreType.CONFIGURATION, buildSubnetMapsWildCardPath()); + Optional subnetMapsData = + read(broker, LogicalDatastoreType.CONFIGURATION, buildSubnetMapsWildCardPath()); if (subnetMapsData.isPresent()) { List subnetMapList = subnetMapsData.get().getSubnetmap(); if (subnetMapList != null && !subnetMapList.isEmpty()) { - for (Subnetmap subnet: subnetMapList) { - if (subnet.getVpnId() !=null && subnet.getVpnId().equals(Uuid.getDefaultInstance(vpnName))) { + for (Subnetmap subnet : subnetMapList) { + if (subnet.getVpnId() != null && subnet.getVpnId().equals(Uuid.getDefaultInstance(vpnName))) { String routerIntfMacAddress = subnet.getRouterIntfMacAddress(); if (routerIntfMacAddress != null && !routerIntfMacAddress.isEmpty()) { macAddresses.add(subnet.getRouterIntfMacAddress()); @@ -1141,7 +1205,7 @@ public class VpnUtil { } static void setupSubnetMacIntoVpnInstance(DataBroker dataBroker, IMdsalApiManager mdsalManager, - String vpnName, String srcMacAddress, BigInteger dpnId, WriteTransaction writeTx, int addOrRemove) { + String vpnName, String srcMacAddress, BigInteger dpnId, WriteTransaction writeTx, int addOrRemove) { long vpnId = getVpnId(dataBroker, vpnName); if (dpnId.equals(BigInteger.ZERO)) { /* Apply the MAC on all DPNs in a VPN */ @@ -1158,7 +1222,7 @@ public class VpnUtil { } static void addGwMacIntoTx(IMdsalApiManager mdsalManager, String srcMacAddress, WriteTransaction writeTx, - int addOrRemove, long vpnId, BigInteger dpId) { + int addOrRemove, long vpnId, BigInteger dpId) { FlowEntity flowEntity = buildL3vpnGatewayFlow(dpId, srcMacAddress, vpnId); if (addOrRemove == NwConstants.ADD_FLOW) { mdsalManager.addFlowToTx(flowEntity, writeTx); @@ -1168,28 +1232,30 @@ public class VpnUtil { } public static FlowEntity buildL3vpnGatewayFlow(BigInteger dpId, String gwMacAddress, long vpnId) { - List mkMatches = new ArrayList(); + List mkMatches = new ArrayList<>(); mkMatches.add(new MatchMetadata(MetaDataUtil.getVpnIdMetadata(vpnId), MetaDataUtil.METADATA_MASK_VRFID)); mkMatches.add(new MatchEthernetDestination(new MacAddress(gwMacAddress))); - List mkInstructions = new ArrayList(); + List mkInstructions = new ArrayList<>(); mkInstructions.add(new InstructionGotoTable(NwConstants.L3_FIB_TABLE)); String flowId = getL3VpnGatewayFlowRef(NwConstants.L3_GW_MAC_TABLE, dpId, vpnId, gwMacAddress); FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpId, NwConstants.L3_GW_MAC_TABLE, - flowId, 20, flowId, 0, 0, NwConstants.COOKIE_L3_GW_MAC_TABLE, mkMatches, mkInstructions); + flowId, 20, flowId, 0, 0, NwConstants.COOKIE_L3_GW_MAC_TABLE, mkMatches, mkInstructions); return flowEntity; } private static String getL3VpnGatewayFlowRef(short l3GwMacTable, BigInteger dpId, long vpnId, String gwMacAddress) { - return gwMacAddress+NwConstants.FLOWID_SEPARATOR+vpnId+NwConstants.FLOWID_SEPARATOR+dpId+NwConstants.FLOWID_SEPARATOR+l3GwMacTable; + return gwMacAddress + NwConstants.FLOWID_SEPARATOR + vpnId + NwConstants.FLOWID_SEPARATOR + dpId + + NwConstants.FLOWID_SEPARATOR + l3GwMacTable; } public static void lockSubnet(LockManagerService lockManager, String subnetId) { - TryLockInput input = new TryLockInputBuilder().setLockName(subnetId).setTime(3000L).setTimeUnit(TimeUnits.Milliseconds).build(); + TryLockInput input = + new TryLockInputBuilder().setLockName(subnetId).setTime(3000L).setTimeUnit(TimeUnits.Milliseconds).build(); Future> result = lockManager.tryLock(input); String errMsg = "Unable to getLock for subnet " + subnetId; try { if ((result != null) && (result.get().isSuccessful())) { - LOG.debug("Acquired lock for {}", subnetId); + LOG.debug("Acquired lock for {}", subnetId); } else { throw new RuntimeException(errMsg); } @@ -1216,12 +1282,14 @@ public class VpnUtil { static Optional getGatewayIpAddressFromInterface(String srcInterface, INeutronVpnManager neutronVpnService, DataBroker dataBroker) { - Optional gatewayIp = Optional.absent(); + Optional gatewayIp = Optional.absent(); if (neutronVpnService != null) { //TODO(Gobinath): Need to fix this as assuming port will belong to only one Subnet would be incorrect" Port port = neutronVpnService.getNeutronPort(srcInterface); - if (port != null && port.getFixedIps() != null && port.getFixedIps().get(0) != null && port.getFixedIps().get(0).getSubnetId() != null) { - gatewayIp = Optional.of(neutronVpnService.getNeutronSubnet(port.getFixedIps().get(0).getSubnetId()).getGatewayIp()); + if (port != null && port.getFixedIps() != null && port.getFixedIps().get(0) != null + && port.getFixedIps().get(0).getSubnetId() != null) { + gatewayIp = Optional.of( + neutronVpnService.getNeutronSubnet(port.getFixedIps().get(0).getSubnetId()).getGatewayIp()); } } else { LOG.debug("neutron vpn service is not configured"); @@ -1230,24 +1298,27 @@ public class VpnUtil { } static Optional getGWMacAddressFromInterface(MacEntry macEntry, IpAddress gatewayIp, - DataBroker dataBroker, OdlInterfaceRpcService interfaceRpc) { - Optional gatewayMac = Optional.absent(); + DataBroker dataBroker, OdlInterfaceRpcService interfaceRpc) { + Optional gatewayMac = Optional.absent(); long vpnId = getVpnId(dataBroker, macEntry.getVpnName()); - InstanceIdentifier - vpnIdsInstanceIdentifier = VpnUtil.getVpnIdToVpnInstanceIdentifier(vpnId); - Optional vpnIdsOptional - = VpnUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIdsInstanceIdentifier); + InstanceIdentifier + vpnIdsInstanceIdentifier = VpnUtil.getVpnIdToVpnInstanceIdentifier(vpnId); + Optional + vpnIdsOptional + = VpnUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIdsInstanceIdentifier); if (!vpnIdsOptional.isPresent()) { LOG.trace("VPN {} not configured", vpnId); return gatewayMac; } VpnPortipToPort vpnTargetIpToPort = VpnUtil.getNeutronPortFromVpnPortFixedIp(dataBroker, - macEntry.getVpnName(), gatewayIp.getIpv4Address().getValue()); + macEntry.getVpnName(), gatewayIp.getIpv4Address().getValue()); if (vpnTargetIpToPort != null && vpnTargetIpToPort.isSubnetIp()) { gatewayMac = Optional.of(vpnTargetIpToPort.getMacAddress()); } else { - org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIds vpnIds = vpnIdsOptional.get(); - if(vpnIds.isExternalVpn()) { + org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn.id.to.vpn.instance.VpnIds vpnIds = + vpnIdsOptional.get(); + if (vpnIds.isExternalVpn()) { gatewayMac = InterfaceUtils.getMacAddressForInterface(dataBroker, macEntry.getInterfaceName()); } } @@ -1286,8 +1357,8 @@ public class VpnUtil { VpnInstanceOpDataEntry vpnInstanceOpData = VpnUtil.getVpnInstanceOpDataFromCache(broker, rd); if (vpnInstanceOpData != null) { List dpnToVpns = vpnInstanceOpData.getVpnToDpnList(); - if (dpnToVpns!= null) { - for (VpnToDpnList dpn :dpnToVpns) { + if (dpnToVpns != null) { + for (VpnToDpnList dpn : dpnToVpns) { if (dpn.getDpnId().equals(dpnId)) { if (dpn.getVpnInterfaces().contains(vpnInterface.getName())) { return true; @@ -1301,12 +1372,13 @@ public class VpnUtil { return false; } - public static void setupGwMacIfExternalVpn(DataBroker dataBroker, IMdsalApiManager mdsalManager, BigInteger dpnId, String interfaceName, long vpnId, - WriteTransaction writeInvTxn, int addOrRemove) { - InstanceIdentifier vpnIdsInstanceIdentifier = - getVpnIdToVpnInstanceIdentifier(vpnId); - Optional vpnIdsOptional = read(dataBroker, - LogicalDatastoreType.CONFIGURATION, vpnIdsInstanceIdentifier); + public static void setupGwMacIfExternalVpn(DataBroker dataBroker, IMdsalApiManager mdsalManager, BigInteger dpnId, + String interfaceName, long vpnId, WriteTransaction writeInvTxn, int addOrRemove) { + InstanceIdentifier + vpnIdsInstanceIdentifier = getVpnIdToVpnInstanceIdentifier(vpnId); + Optional + vpnIdsOptional = read(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIdsInstanceIdentifier); if (vpnIdsOptional.isPresent() && vpnIdsOptional.get().isExternalVpn()) { Optional gwMacAddressOptional = InterfaceUtils.getMacAddressForInterface(dataBroker, interfaceName); if (!gwMacAddressOptional.isPresent()) {