From 993aa2a49eb88f074aee0958f3740860e3d6d675 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Mon, 18 Sep 2017 11:43:35 +0200 Subject: [PATCH] Remove unused parameters MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch removes unused parameters (except where they’re obviously WIP). Change-Id: I9e9e741c4c10df347ccb95099d7554ad53dd241f Signed-off-by: Stephen Kitt Signed-off-by: Sam Hague --- .../aclservice/EgressAclServiceImpl.java | 2 +- .../aclservice/IngressAclServiceImpl.java | 14 ++-- .../aclservice/utils/AclServiceUtils.java | 6 +- .../netvirt/bgpmanager/api/IBgpManager.java | 2 +- .../bgpmanager/BgpConfigurationManager.java | 22 +++---- .../netvirt/bgpmanager/BgpManager.java | 4 +- .../netvirt/bgpmanager/BgpUtil.java | 15 ++--- .../netvirt/bgpmanager/ConfigureBgpCli.java | 2 +- .../netvirt/bgpmanager/FibDSWriter.java | 30 ++++----- .../netvirt/bgpmanager/VtyshCli.java | 4 +- .../bgpmanager/oam/BgpAlarmBroadcaster.java | 2 +- .../oam/BgpAlarmBroadcasterMBean.java | 2 +- .../bgpmanager/thrift/client/BgpRouter.java | 4 +- .../thrift/server/BgpThriftService.java | 4 +- .../bgpmanager/test/BgpManagerTest.java | 4 +- .../api/ICloudServiceChain.java | 5 +- .../CloudServiceChainProvider.java | 2 +- .../netvirt/coe/listeners/PodListener.java | 10 +-- .../netvirt/coe/utils/CoeUtils.java | 6 +- .../DhcpExternalTunnelManager.java | 16 ++--- .../netvirt/dhcpservice/DhcpPktHandler.java | 5 +- .../netvirt/elanmanager/api/IElanService.java | 7 +- .../elanmanager/api/IEtreeService.java | 2 +- .../netvirt/elanmanager/api/IL2gwService.java | 3 +- .../netvirt/elan/cli/ElanInterfaceDelete.java | 2 +- .../netvirt/elan/cli/StaticMacAdd.java | 2 +- .../netvirt/elan/cli/StaticMacDelete.java | 2 +- .../elan/cli/etree/EtreeInterfaceDelete.java | 2 +- .../elan/cli/l2gw/L2GwValidateCli.java | 3 +- .../diagstatus/ElanDiagStatusProvider.java | 4 +- .../elan/internal/ElanBridgeManager.java | 4 +- .../ElanDpnToTransportZoneListener.java | 3 +- .../elan/internal/ElanServiceProvider.java | 17 +++-- .../VpnDpnToTransportZoneListener.java | 3 +- .../netvirt/elan/l2gw/ha/HwvtepHAUtil.java | 13 ---- .../ha/handlers/ConfigNodeUpdatedHandler.java | 12 +--- .../elan/l2gw/ha/handlers/HAEventHandler.java | 21 ++---- .../l2gw/ha/handlers/IHAEventHandler.java | 13 +--- .../ha/handlers/OpNodeUpdatedHandler.java | 8 +-- .../ha/listeners/HAConfigNodeListener.java | 13 ++-- .../ha/listeners/HAOpClusteredListener.java | 6 +- .../l2gw/ha/listeners/HAOpNodeListener.java | 22 +++---- .../ha/listeners/HwvtepNodeBaseListener.java | 4 +- .../jobs/DisAssociateHwvtepFromElanJob.java | 2 +- .../elan/l2gw/jobs/LogicalSwitchAddedJob.java | 2 +- .../elan/l2gw/listeners/ChildListener.java | 7 +- .../HwvtepRemoteMcastMacListener.java | 2 +- .../HwvtepTerminationPointListener.java | 5 +- .../l2gw/listeners/LocalUcastMacListener.java | 3 +- .../utils/ElanL2GatewayMulticastUtils.java | 47 ++++++-------- .../elan/l2gw/utils/ElanL2GatewayUtils.java | 10 +-- .../l2gw/utils/L2GatewayConnectionUtils.java | 5 +- .../elan/l2gw/utils/L2gwServiceProvider.java | 2 +- .../netvirt/elan/utils/ElanDmacUtils.java | 4 +- .../netvirt/fibmanager/api/IFibManager.java | 15 ++--- .../fibmanager/BgpRouteVrfEntryHandler.java | 2 +- .../netvirt/fibmanager/FibManagerImpl.java | 27 ++++---- .../netvirt/fibmanager/VrfEntryListener.java | 2 +- .../internal/AbstractSnatService.java | 10 +-- .../internal/ConntrackBasedSnatService.java | 11 ++-- .../internal/EvpnDnatFlowProgrammer.java | 4 +- .../ExternalNetworksChangeListener.java | 2 +- .../internal/ExternalRoutersListener.java | 30 ++++----- .../internal/FloatingIPListener.java | 16 ++--- .../natservice/internal/NaptSwitchHA.java | 10 +-- .../natservice/internal/NatEvpnUtil.java | 2 +- .../NatTunnelInterfaceStateListener.java | 13 ++-- .../netvirt/natservice/internal/NatUtil.java | 16 ++--- .../internal/VpnFloatingIpHandler.java | 6 +- .../neutronvpn/NeutronPortChangeListener.java | 4 +- .../neutronvpn/NeutronvpnNatManager.java | 4 +- .../neutronvpn/l2gw/L2GatewayListener.java | 2 +- .../listeners/UnderlayNetworkDpnListener.java | 10 +-- .../DelegatingDataTreeListener.java | 8 +-- .../translator/INeutronSfcDataProcessor.java | 14 ++-- .../NeutronFlowClassifierListener.java | 12 +--- .../portchain/NeutronPortChainListener.java | 10 +-- .../NeutronPortPairGroupListener.java | 12 +--- .../portchain/NeutronPortPairListener.java | 10 +-- .../netvirt/statistics/CounterRetriever.java | 9 ++- .../statistics/CountersServiceUtils.java | 4 +- .../netvirt/statistics/StatisticsImpl.java | 4 +- .../netvirt/vpnmanager/api/IVpnManager.java | 8 +-- .../api/intervpnlink/IVpnLinkService.java | 3 +- .../vpnmanager/AlivenessMonitorUtils.java | 12 ++-- .../vpnmanager/ArpMonitorStartTask.java | 9 +-- .../vpnmanager/ArpMonitoringHandler.java | 2 +- .../CentralizedSwitchChangeListener.java | 2 +- .../SubnetRoutePacketInHandler.java | 4 +- .../netvirt/vpnmanager/TransactionUtil.java | 2 +- .../TunnelInterfaceStateListener.java | 18 +++--- .../vpnmanager/VpnInstanceListener.java | 19 +++--- .../vpnmanager/VpnInterfaceManager.java | 64 +++++++++---------- .../netvirt/vpnmanager/VpnManagerImpl.java | 44 +++++-------- .../vpnmanager/VpnOpStatusListener.java | 2 +- .../netvirt/vpnmanager/VpnRpcServiceImpl.java | 4 +- .../vpnmanager/VpnSubnetRouteHandler.java | 8 +-- .../netvirt/vpnmanager/VpnUtil.java | 9 ++- .../arp/responder/ArpResponderHandler.java | 17 +---- .../intervpnlink/IVpnLinkServiceImpl.java | 17 +++-- .../intervpnlink/InterVpnLinkNodeAddTask.java | 5 +- .../intervpnlink/InterVpnLinkUtil.java | 23 +------ .../impl/L3vpnOverMplsGrePopulator.java | 6 +- .../impl/L3vpnOverVxlanPopulator.java | 3 +- .../populator/impl/L3vpnPopulator.java | 5 +- .../populator/intfc/VpnPopulator.java | 2 +- 106 files changed, 382 insertions(+), 591 deletions(-) diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java index 4aa4881d2f..5444fead7b 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/EgressAclServiceImpl.java @@ -137,7 +137,7 @@ public class EgressAclServiceImpl extends AbstractAclServiceImpl { protected void programRemoteAclTableFlow(BigInteger dpId, Integer aclTag, AllowedAddressPairs aap, int addOrRemove) { List flowMatches = new ArrayList<>(); - flowMatches.addAll(AclServiceUtils.buildIpAndDstServiceMatch(aclTag, aap, dataBroker)); + flowMatches.addAll(AclServiceUtils.buildIpAndDstServiceMatch(aclTag, aap)); List instructions = AclServiceOFFlowBuilder.getGotoInstructionInfo(getAclCommitterTable()); String flowNameAdded = "Acl_Filter_Egress_" + String.valueOf(aap.getIpAddress().getValue()) + "_" + aclTag; diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java index c73eeb1e0e..6bacbc81d9 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/IngressAclServiceImpl.java @@ -127,8 +127,8 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl { BigInteger dpid = port.getDpId(); int lportTag = port.getLPortTag(); if (action == Action.ADD || action == Action.REMOVE) { - ingressAclDhcpAllowServerTraffic(dpid, lportTag, addOrRemove, AclConstants.PROTO_PREFIX_MATCH_PRIORITY); - ingressAclDhcpv6AllowServerTraffic(dpid, lportTag, addOrRemove, AclConstants.PROTO_PREFIX_MATCH_PRIORITY); + ingressAclDhcpAllowServerTraffic(dpid, lportTag, addOrRemove); + ingressAclDhcpv6AllowServerTraffic(dpid, lportTag, addOrRemove); ingressAclIcmpv6AllowedTraffic(dpid, lportTag, addOrRemove); programArpRule(dpid, lportTag, addOrRemove); @@ -162,7 +162,7 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl { protected void programRemoteAclTableFlow(BigInteger dpId, Integer aclTag, AllowedAddressPairs aap, int addOrRemove) { List flowMatches = new ArrayList<>(); - flowMatches.addAll(AclServiceUtils.buildIpAndSrcServiceMatch(aclTag, aap, dataBroker)); + flowMatches.addAll(AclServiceUtils.buildIpAndSrcServiceMatch(aclTag, aap)); List instructions = AclServiceOFFlowBuilder.getGotoInstructionInfo(getAclCommitterTable()); String flowNameAdded = "Acl_Filter_Ingress_" + String.valueOf(aap.getIpAddress().getValue()) + "_" + aclTag; @@ -178,10 +178,8 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl { * @param dpId the dpid * @param lportTag the lport tag * @param addOrRemove is write or delete - * @param protoPortMatchPriority the priority */ - protected void ingressAclDhcpAllowServerTraffic(BigInteger dpId, int lportTag, int addOrRemove, - int protoPortMatchPriority) { + protected void ingressAclDhcpAllowServerTraffic(BigInteger dpId, int lportTag, int addOrRemove) { final List matches = AclServiceUtils.buildDhcpMatches(AclConstants.DHCP_SERVER_PORT_IPV4, AclConstants.DHCP_CLIENT_PORT_IPV4, lportTag, serviceMode); List instructions = getDispatcherTableResubmitInstructions(); @@ -198,10 +196,8 @@ public class IngressAclServiceImpl extends AbstractAclServiceImpl { * @param dpId the dpid * @param lportTag the lport tag * @param addOrRemove is write or delete - * @param protoPortMatchPriority the priority */ - protected void ingressAclDhcpv6AllowServerTraffic(BigInteger dpId, int lportTag, int addOrRemove, - Integer protoPortMatchPriority) { + protected void ingressAclDhcpv6AllowServerTraffic(BigInteger dpId, int lportTag, int addOrRemove) { final List matches = AclServiceUtils.buildDhcpV6Matches(AclConstants.DHCP_SERVER_PORT_IPV6, AclConstants.DHCP_CLIENT_PORT_IPV6, lportTag, serviceMode); List instructions = getDispatcherTableResubmitInstructions(); diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java index 4f8b7c5a68..00fe3e6354 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java @@ -1027,8 +1027,7 @@ public final class AclServiceUtils { deleteIdPool(AclConstants.ACL_TAG_POOL_NAME); } - public static List buildIpAndSrcServiceMatch(Integer aclTag, AllowedAddressPairs aap, - DataBroker dataBroker) { + public static List buildIpAndSrcServiceMatch(Integer aclTag, AllowedAddressPairs aap) { List flowMatches = new ArrayList<>(); flowMatches.add(buildRemoteAclTagMetadataMatch(aclTag)); if (aap.getIpAddress().getIpAddress() != null) { @@ -1061,8 +1060,7 @@ public final class AclServiceUtils { return flowMatches; } - public static List buildIpAndDstServiceMatch(Integer aclTag, AllowedAddressPairs aap, - DataBroker dataBroker) { + public static List buildIpAndDstServiceMatch(Integer aclTag, AllowedAddressPairs aap) { List flowMatches = new ArrayList<>(); flowMatches.add(buildRemoteAclTagMetadataMatch(aclTag)); diff --git a/bgpmanager/api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java b/bgpmanager/api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java index 41b3374309..5c00826267 100644 --- a/bgpmanager/api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java +++ b/bgpmanager/api/src/main/java/org/opendaylight/netvirt/bgpmanager/api/IBgpManager.java @@ -76,7 +76,7 @@ public interface IBgpManager { String getDCGwIP(); - void sendNotificationEvent(String pfx, int code, int subcode); + void sendNotificationEvent(int code, int subcode); void setQbgprestartTS(long qbgprestartTS); diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java index b03a46b4bd..92632f3525 100755 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpConfigurationManager.java @@ -1207,8 +1207,8 @@ public class BgpConfigurationManager { List vrfAddrFamilyList = vrfs.getAddressFamiliesVrf(); for (AddressFamiliesVrf vrfAddrFamily : vrfAddrFamilyList) { /*add to br the new vrfs arguments*/ - br.addVrf(BgpUtil.getLayerType(vrfAddrFamily), rd, vrfs.getImportRts(), vrfs.getExportRts(), - vrfAddrFamily.getAfi(), vrfAddrFamily.getSafi()); + br.addVrf(BgpUtil.getLayerType(vrfAddrFamily), rd, vrfs.getImportRts(), vrfs.getExportRts() + ); } /*add to br the vrfs contained in mapNewAdFamily*/ List vrfAddrFamilyListFromMap = mapNewAdFamily.get(rd); @@ -1221,8 +1221,8 @@ public class BgpConfigurationManager { mapNewAdFamily.remove(rd); } else if (adf != null) { - br.addVrf(BgpUtil.getLayerType(adf), rd, vrfs.getImportRts(), vrfs.getExportRts(), - adf.getAfi(), adf.getSafi()); + br.addVrf(BgpUtil.getLayerType(adf), rd, vrfs.getImportRts(), vrfs.getExportRts() + ); // remove AddressFamiliesVrf which was already added to BGP vrfAddrFamilyListFromMap.remove(adf); if (vrfAddrFamilyListFromMap.isEmpty()) { @@ -1329,7 +1329,7 @@ public class BgpConfigurationManager { try { LOG.debug("call addVRf rd {} afi {} safi {}", rd, adfvrf.getAfi(), adfvrf.getSafi()); br.addVrf(BgpUtil.getLayerType(adfvrf), rd, newval.getImportRts(), - newval.getExportRts(), adfvrf.getAfi(), adfvrf.getSafi()); + newval.getExportRts()); } catch (TException | BgpRouterException e) { LOG.error("{} Add received exception; {}", YANG_OBJ, ADD_WARN, e); } @@ -1731,8 +1731,6 @@ public class BgpConfigurationManager { prefix, plen, nexthop, - update.getEthtag(), - update.getEsi(), update.getMacaddress(), label, l2label, @@ -1780,7 +1778,7 @@ public class BgpConfigurationManager { */ public void onUpdatePushRoute(protocol_type protocolType, String rd, String prefix, int plen, String nextHop, - int ethtag, String esi, String macaddress, int label, int l2label, String routermac, af_afi afi) { + String macaddress, int label, int l2label, String routermac, af_afi afi) { boolean addroute = false; boolean macupdate = false; long l3vni = 0L; @@ -1838,7 +1836,7 @@ public class BgpConfigurationManager { rd, prefix, nextHop, label, afi); // TODO: modify addFibEntryToDS signature List nextHopList = Collections.singletonList(nextHop); - fibDSWriter.addFibEntryToDS(rd, macaddress, prefix + "/" + plen, nextHopList, encapType, label, l3vni, + fibDSWriter.addFibEntryToDS(rd, prefix + "/" + plen, nextHopList, encapType, label, l3vni, routermac, RouteOrigin.BGP); LOG.info("ADD: Added Fib entry rd {} prefix {} nexthop {} label {}", rd, prefix, nextHop, label); String vpnName = bgpUtil.getVpnNameFromRd(rd); @@ -2191,7 +2189,7 @@ public class BgpConfigurationManager { for (AddressFamiliesVrf adf : vrf.getAddressFamiliesVrf()) { try { br.addVrf(BgpUtil.getLayerType(adf), vrf.getRd(), vrf.getImportRts(), - vrf.getExportRts(), adf.getAfi(), adf.getSafi()); + vrf.getExportRts()); } catch (TException | BgpRouterException e) { LOG.error("Replay:addVrf() received exception", e); } @@ -2282,11 +2280,11 @@ public class BgpConfigurationManager { } private void update(InstanceIdentifier iid, T dto) { - bgpUtil.update(LogicalDatastoreType.CONFIGURATION, iid, dto); + bgpUtil.update(iid, dto); } private void delete(InstanceIdentifier iid) { - bgpUtil.delete(LogicalDatastoreType.CONFIGURATION, iid); + bgpUtil.delete(iid); } public void startConfig(String bgpHost, int thriftPort) { diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java index 36f3031f4a..929b2456ce 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpManager.java @@ -112,7 +112,7 @@ public class BgpManager implements AutoCloseable, IBgpManager { public void addPrefix(String rd, String macAddress, String prefix, List nextHopList, VrfEntry.EncapType encapType, int vpnLabel, long l3vni, String gatewayMac, RouteOrigin origin) { - fibDSWriter.addFibEntryToDS(rd, macAddress, prefix, nextHopList, + fibDSWriter.addFibEntryToDS(rd, prefix, nextHopList, encapType, vpnLabel, l3vni, gatewayMac, origin); bcm.addPrefix(rd, macAddress, prefix, nextHopList, encapType, vpnLabel, l3vni, 0 /*l2vni*/, gatewayMac); @@ -220,7 +220,7 @@ public class BgpManager implements AutoCloseable, IBgpManager { @Override // This method doesn't actually do any real work currently but may at some point so suppress FindBugs violation. @SuppressFBWarnings("UC_USELESS_VOID_METHOD") - public synchronized void sendNotificationEvent(String pfx, int code, int subcode) { + public synchronized void sendNotificationEvent(int code, int subcode) { if (code != BgpConstants.BGP_NOTIFY_CEASE_CODE) { // CEASE Notifications alone have to be reported to the CBA. // Silently return here. No need to log because tons diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java index c6cce539d1..d3c1bf583a 100755 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java @@ -121,8 +121,7 @@ public class BgpUtil implements AutoCloseable { return retValue; } - public void update(final LogicalDatastoreType datastoreType, - final InstanceIdentifier path, final T data) { + public void update(final InstanceIdentifier path, final T data) { ActionableResource actResource = new ActionableResourceImpl(path.toString()); actResource.setAction(ActionableResource.UPDATE); actResource.setInstanceIdentifier(path); @@ -130,8 +129,7 @@ public class BgpUtil implements AutoCloseable { bgpResourcesBufferQ.add(actResource); } - public void write(final LogicalDatastoreType datastoreType, final InstanceIdentifier path, - final T data) { + public void write(final InstanceIdentifier path, final T data) { ActionableResource actResource = new ActionableResourceImpl(path.toString()); actResource.setAction(ActionableResource.CREATE); actResource.setInstanceIdentifier(path); @@ -139,8 +137,7 @@ public class BgpUtil implements AutoCloseable { bgpResourcesBufferQ.add(actResource); } - public void delete(final LogicalDatastoreType datastoreType, - final InstanceIdentifier path) { + public void delete(final InstanceIdentifier path) { ActionableResource actResource = new ActionableResourceImpl(path.toString()); actResource.setAction(ActionableResource.DELETE); actResource.setInstanceIdentifier(path); @@ -225,7 +222,7 @@ public class BgpUtil implements AutoCloseable { ExternalTepsKey externalTepsKey = externalTepsId.firstKeyOf(ExternalTeps.class); externalTepsBuilder.setKey(externalTepsKey); externalTepsBuilder.setTepIp(externalTepsKey.getTepIp()); - update(LogicalDatastoreType.CONFIGURATION, externalTepsId, externalTepsBuilder.build()); + update(externalTepsId, externalTepsBuilder.build()); } public void deleteTepFromElanInstance(String rd, String tepIp) { @@ -240,7 +237,7 @@ public class BgpUtil implements AutoCloseable { } LOG.debug("Deleting tepIp {} from elan {}", tepIp, elanName); InstanceIdentifier externalTepsId = getExternalTepsIdentifier(elanName, tepIp); - delete(LogicalDatastoreType.CONFIGURATION, externalTepsId); + delete(externalTepsId); } private static InstanceIdentifier getExternalTepsIdentifier(String elanInstanceName, String tepIp) { @@ -290,6 +287,6 @@ public class BgpUtil implements AutoCloseable { InstanceIdentifier.builder(FibEntries.class) .child(VrfTables.class, new VrfTablesKey(rd)) .child(VrfEntry.class, new VrfEntryKey(vrfEntry.getDestPrefix())).build(); - delete(LogicalDatastoreType.CONFIGURATION, vrfEntryId); + delete(vrfEntryId); } } diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java index a605b3e25d..b73a6c64c5 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/ConfigureBgpCli.java @@ -367,7 +367,7 @@ public class ConfigureBgpCli extends OsgiCommandSupport { protected void addRoute() { bgpConfigurationManager.onUpdatePushRoute(protocol_type.PROTOCOL_EVPN, rd, prefix, - 0, nexthop, 0, null, mac, l3vni, l2vni, null, null); + 0, nexthop, mac, l3vni, l2vni, null, null); } protected void deleteRoute() { diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java index f102fd6c27..f2eea91ef2 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/FibDSWriter.java @@ -41,20 +41,18 @@ import org.slf4j.LoggerFactory; @Singleton public class FibDSWriter { private static final Logger LOG = LoggerFactory.getLogger(FibDSWriter.class); - private final DataBroker dataBroker; private final SingleTransactionDataBroker singleTxDB; private final BgpUtil bgpUtil; @Inject public FibDSWriter(final DataBroker dataBroker, final BgpUtil bgpUtil) { - this.dataBroker = dataBroker; this.bgpUtil = bgpUtil; this.singleTxDB = new SingleTransactionDataBroker(dataBroker); } - public synchronized void addFibEntryToDS(String rd, String macAddress, String prefix, List nextHopList, - VrfEntry.EncapType encapType, int label, long l3vni, - String gatewayMacAddress, RouteOrigin origin) { + public synchronized void addFibEntryToDS(String rd, String prefix, List nextHopList, + VrfEntry.EncapType encapType, int label, long l3vni, + String gatewayMacAddress, RouteOrigin origin) { if (rd == null || rd.isEmpty()) { LOG.error("Prefix {} not associated with vpn", prefix); return; @@ -76,9 +74,9 @@ public class FibDSWriter { .child(VrfEntry.class, new VrfEntryKey(prefix)).build(); VrfEntryBuilder vrfEntryBuilder = new VrfEntryBuilder().setDestPrefix(prefix).setOrigin(origin.getValue()); - buildVpnEncapSpecificInfo(vrfEntryBuilder, encapType, label, l3vni, macAddress, + buildVpnEncapSpecificInfo(vrfEntryBuilder, encapType, label, l3vni, gatewayMacAddress, nextHopList); - bgpUtil.update(LogicalDatastoreType.CONFIGURATION, vrfEntryId, vrfEntryBuilder.build()); + bgpUtil.update(vrfEntryId, vrfEntryBuilder.build()); } public void addMacEntryToDS(String rd, String macAddress, String prefix, @@ -98,7 +96,7 @@ public class FibDSWriter { } MacVrfEntryBuilder macEntryBuilder = new MacVrfEntryBuilder().setOrigin(origin.getValue()); - buildVpnEncapSpecificInfo(macEntryBuilder, encapType, l2vni, macAddress, + buildVpnEncapSpecificInfo(macEntryBuilder, encapType, l2vni, gatewayMacAddress, nextHopList); macEntryBuilder.setMac(macAddress); macEntryBuilder.setDestPrefix(prefix); @@ -106,11 +104,11 @@ public class FibDSWriter { InstanceIdentifier.builder(FibEntries.class) .child(VrfTables.class, new VrfTablesKey(rd)) .child(MacVrfEntry.class, new MacVrfEntryKey(macAddress)).build(); - bgpUtil.update(LogicalDatastoreType.CONFIGURATION, macEntryId, macEntryBuilder.build()); + bgpUtil.update(macEntryId, macEntryBuilder.build()); } private static void buildVpnEncapSpecificInfo(VrfEntryBuilder builder, - VrfEntry.EncapType encapType, long label, long l3vni, String macAddress, + VrfEntry.EncapType encapType, long label, long l3vni, String gatewayMac, List nextHopList) { if (!encapType.equals(VrfEntry.EncapType.Mplsgre)) { builder.setL3vni(l3vni); @@ -125,7 +123,7 @@ public class FibDSWriter { } private static void buildVpnEncapSpecificInfo(MacVrfEntryBuilder builder, - VrfEntry.EncapType encapType, long l2vni, String macAddress, + VrfEntry.EncapType encapType, long l2vni, String gatewayMac, List nextHopList) { builder.setEncapType(encapType); builder.setGatewayMacAddress(gatewayMac); @@ -148,7 +146,7 @@ public class FibDSWriter { InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).child( VrfEntry.class, new VrfEntryKey(prefix)); InstanceIdentifier vrfEntryId = idBuilder.build(); - bgpUtil.delete(LogicalDatastoreType.CONFIGURATION, vrfEntryId); + bgpUtil.delete(vrfEntryId); } @@ -164,7 +162,7 @@ public class FibDSWriter { InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).child( MacVrfEntry.class, new MacVrfEntryKey(macAddress)); InstanceIdentifier macEntryId = idBuilder.build(); - bgpUtil.delete(LogicalDatastoreType.CONFIGURATION, macEntryId); + bgpUtil.delete(macEntryId); } @@ -187,7 +185,7 @@ public class FibDSWriter { existingVrfEntry.toJavaUtil().map(VrfEntry::getRoutePaths).orElse(Collections.emptyList()); if (routePaths.size() == 1) { if (routePaths.get(0).getNexthopAddress().equals(nextHop)) { - bgpUtil.delete(LogicalDatastoreType.CONFIGURATION, vrfEntryId); + bgpUtil.delete(vrfEntryId); } } else { routePaths.stream() @@ -197,7 +195,7 @@ public class FibDSWriter { .ifPresent(nh -> { InstanceIdentifier routePathId = FibHelper.buildRoutePathId(rd, prefix, nextHop); - bgpUtil.delete(LogicalDatastoreType.CONFIGURATION, routePathId); + bgpUtil.delete(routePathId); }); } } catch (ReadFailedException e) { @@ -262,7 +260,7 @@ public class FibDSWriter { InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)); InstanceIdentifier vrfTableId = idBuilder.build(); - bgpUtil.delete(LogicalDatastoreType.CONFIGURATION, vrfTableId); + bgpUtil.delete(vrfTableId); } } diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java index ca24351cf5..27106315c7 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java @@ -96,7 +96,7 @@ public class VtyshCli extends OsgiCommandSupport { switch (handlerModule) { case BGPD: try { - handleCommand(firstArg, cmd); + handleCommand(cmd); } catch (IOException ioe) { session.getConsole().println("IOException thrown."); } @@ -115,7 +115,7 @@ public class VtyshCli extends OsgiCommandSupport { return serverName; } - public void handleCommand(String arg, String command) throws IOException { + public void handleCommand(String command) throws IOException { char[] cbuf = new char[10]; Socket socket; PrintWriter outToSocket; diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java index 7dde3eb0b7..d87632a4c8 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcaster.java @@ -59,7 +59,7 @@ public class BgpAlarmBroadcaster extends NotificationBroadcasterSupport } @Override - public void sendBgpAlarmInfo(String pfx, int code, int subcode) { + public void sendBgpAlarmInfo(String pfx, int subcode) { BgpAlarmErrorCodes userAlarm = BgpAlarmErrorCodes.checkErrorSubcode(subcode); ArrayList arrayList = new ArrayList<>(); arrayList.add(userAlarm.getAlarmType()); diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java index da98b15e67..e813f52fed 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/oam/BgpAlarmBroadcasterMBean.java @@ -14,6 +14,6 @@ package org.opendaylight.netvirt.bgpmanager.oam; */ public interface BgpAlarmBroadcasterMBean { - void sendBgpAlarmInfo(String pfx, int code , int subcode); + void sendBgpAlarmInfo(String pfx, int subcode); } diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java index 116f427aea..b0a0f8b968 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java @@ -399,8 +399,8 @@ public final class BgpRouter { dispatch(bop); } - public synchronized void addVrf(LayerType layerType, String rd, List irts, List erts, - long afi, long safi) throws TException, BgpRouterException { + public synchronized void addVrf(LayerType layerType, String rd, List irts, List erts) + throws TException, BgpRouterException { bop.thriftLayerType = layerType == LayerType.LAYER2 ? layer_type.LAYER_2 : layer_type.LAYER_3; bop.type = Optype.VRF; bop.add = true; diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java index 53139bad1d..4f31e1c73e 100644 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/server/BgpThriftService.java @@ -149,8 +149,6 @@ public class BgpThriftService { prefix, plen, nexthop, - ethtag, - esi, macaddress, l3label, l2label, @@ -190,7 +188,7 @@ public class BgpThriftService { @Override public void onNotificationSendEvent(String prefix, byte errCode, byte errSubcode) { - bgpManager.sendNotificationEvent(prefix, errCode, errSubcode); + bgpManager.sendNotificationEvent((int) errCode, (int) errSubcode); } } diff --git a/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java b/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java index b013d962f7..d9d7e691b3 100644 --- a/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java +++ b/bgpmanager/impl/src/test/java/org/opendaylight/netvirt/bgpmanager/test/BgpManagerTest.java @@ -43,7 +43,7 @@ public class BgpManagerTest extends AbstractDataBrokerTest { List nexthop = Collections.singletonList("100.100.100.100"); int label = 1234; - bgpFibWriter.addFibEntryToDS(rd, null /*macAddress*/, prefix, nexthop, + bgpFibWriter.addFibEntryToDS(rd, /*macAddress*/ prefix, nexthop, VrfEntry.EncapType.Mplsgre, label, 0 /*l3vni*/, null /*gatewayMacAddress*/, RouteOrigin.LOCAL); //assertEquals(1, fibManager.getDataChgCount()); assertEquals(1, 1); @@ -56,7 +56,7 @@ public class BgpManagerTest extends AbstractDataBrokerTest { String prefix = "10.10.10.10/32"; int label = 1234; try { - bgpFibWriter.addFibEntryToDS(rd, null /*macAddress*/, prefix, null, + bgpFibWriter.addFibEntryToDS(rd, /*macAddress*/ prefix, null, VrfEntry.EncapType.Mplsgre, label, 0 /*l3vni*/, null /*gatewayMacAddress*/, RouteOrigin.CONNECTED); assertEquals(1,0); //The code is not launching NullPointerException } catch (NullPointerException e) { diff --git a/cloud-servicechain/api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java b/cloud-servicechain/api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java index 92b88a8c40..b29fc7ac56 100755 --- a/cloud-servicechain/api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java +++ b/cloud-servicechain/api/src/main/java/org/opendaylight/netvirt/cloudservicechain/api/ICloudServiceChain.java @@ -67,13 +67,10 @@ public interface ICloudServiceChain { * retrieve the VNI and the elanTag. * @param scfTag ServiceChainForwarding Tag * @param elanLportTag LPortTag of the Elan Pseudo Port - * @param isLastServiceChain Only considered in removal operations. States - * if there are no more ServiceChains using the ElanPseudoPort as - * ingress port. * @param addOrRemove States if the flows must be added or removed */ void programElanScfPipeline(String elanName, short tableId, long scfTag, int elanLportTag, - boolean isLastServiceChain, int addOrRemove); + int addOrRemove); // TODO: To be removed when sdnc is changed so that it calls the following API instead: void programElanScfPipeline(String elanName, short tableId, int scfTag, int elanLportTag, int addOrRemove); diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java index 9037275346..3fafb5f690 100755 --- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java +++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/CloudServiceChainProvider.java @@ -54,7 +54,7 @@ public class CloudServiceChainProvider implements ICloudServiceChain { @Override public void programElanScfPipeline(String elanName, short tableId, long scfTag, int elanLportTag, - boolean isLastServiceChain, int addOrRemove) { + int addOrRemove) { LOG.info("ELAN Service chaining :programElanScfPipeline [Started] {} {} {} {} {}", elanName, tableId, scfTag, elanLportTag, addOrRemove); elanServiceChainHandler.programElanScfPipeline(elanName, tableId, scfTag, elanLportTag, addOrRemove); diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java index 04f27e9091..48f631cb47 100644 --- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java +++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/listeners/PodListener.java @@ -97,13 +97,13 @@ public class PodListener implements DataTreeChangeListener { remove(podsBefore, podInterfaceBefore); break; case SUBTREE_MODIFIED: - update(pods, podsBefore, podInterfaceBefore, podInterfaceAfter); + update(pods, podsBefore, podInterfaceAfter); break; case WRITE: if (podInterfaceBefore == null) { add(pods, podInterfaceAfter); } else { - update(pods, podsBefore, podInterfaceBefore, podInterfaceAfter); + update(pods, podsBefore, podInterfaceAfter); } break; default: @@ -123,7 +123,7 @@ public class PodListener implements DataTreeChangeListener { jobCoordinator.enqueueJob(pods.getName(), new PodConfigAddWorker(txRunner, pods, podInterface)); } - private void update(Pods podsAfter, Pods podsBefore, Interface podInterfaceBefore, Interface podInterfaceAfter) { + private void update(Pods podsAfter, Pods podsBefore, Interface podInterfaceAfter) { LOG.trace("Pod updated before :{}, after :{}",podsBefore, podsAfter); if (!Objects.equals(podsAfter.getNetworkNS(), podsBefore.getNetworkNS()) || !Objects.equals(podsAfter.getHostIpAddress(), podsBefore.getHostIpAddress())) { @@ -168,9 +168,9 @@ public class PodListener implements DataTreeChangeListener { ElanInstance elanInstance = CoeUtils.createElanInstanceForTheFirstPodInTheNetwork( pods.getNetworkNS(), nodeIp, podInterface, tx); LOG.info("interface creation for pod {}", interfaceName); - String portInterfaceName = CoeUtils.createOfPortInterface(interfaceName, podInterface, tx); + String portInterfaceName = CoeUtils.createOfPortInterface(interfaceName, tx); LOG.debug("Creating ELAN Interface for pod {}", interfaceName); - CoeUtils.createElanInterface(podInterface, portInterfaceName, + CoeUtils.createElanInterface(portInterfaceName, elanInstance.getElanInstanceName(), tx); })); } diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java index cba2b59c41..475b6d923d 100644 --- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java +++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java @@ -95,9 +95,7 @@ public final class CoeUtils { return elanInstanceBuilder.build(); } - public static void createElanInterface(org.opendaylight.yang.gen.v1.urn.opendaylight.coe - .northbound.pod.rev170611.pod_attributes.Interface podInterface, - String elanInterfaceName, String elanInstanceName, + public static void createElanInterface(String elanInterfaceName, String elanInstanceName, WriteTransaction wrtConfigTxn) { InstanceIdentifier id = InstanceIdentifier.builder(ElanInterfaces.class).child(ElanInterface .class, new ElanInterfaceKey(elanInterfaceName)).build(); @@ -116,8 +114,6 @@ public final class CoeUtils { } public static String createOfPortInterface(String interfaceName, - org.opendaylight.yang.gen.v1.urn.opendaylight.coe - .northbound.pod.rev170611.pod_attributes.Interface podInterface, WriteTransaction wrtConfigTxn) { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface inf = buildInterface(interfaceName); diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java index 134529fda1..38dbfbe95a 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java @@ -392,14 +392,14 @@ public class DhcpExternalTunnelManager { } } for (Pair pair : setOfTunnelIpElanNamePairs) { - updateCacheAndInstallNewFlows(dpnId, listOfDpns, pair, tx); + updateCacheAndInstallNewFlows(listOfDpns, pair, tx); } }), LOG, "Error writing to datastore"); } } - public void updateCacheAndInstallNewFlows(BigInteger dpnId, - List listOfDpns, Pair pair, WriteTransaction tx) { + public void updateCacheAndInstallNewFlows(List listOfDpns, Pair pair, + WriteTransaction tx) { BigInteger newDesignatedDpn = chooseDpn(pair.getLeft(), pair.getRight(), listOfDpns); if (newDesignatedDpn.equals(DhcpMConstants.INVALID_DPID)) { return; @@ -448,7 +448,7 @@ public class DhcpExternalTunnelManager { elanDpnAvailableFlag = false; } int size = 0; - L2GatewayDevice device = getDeviceFromTunnelIp(elanInstanceName, tunnelIp); + L2GatewayDevice device = getDeviceFromTunnelIp(tunnelIp); if (device == null) { LOG.trace("Could not find any device for elanInstanceName {} and tunnelIp {}", elanInstanceName, tunnelIp); @@ -519,7 +519,7 @@ public class DhcpExternalTunnelManager { public void configureDhcpArpRequestResponseFlow(BigInteger dpnId, String elanInstanceName, boolean addFlow, IpAddress tunnelIp, String dhcpIpAddress, String dhcpMacAddress) { - L2GatewayDevice device = getDeviceFromTunnelIp(elanInstanceName, tunnelIp); + L2GatewayDevice device = getDeviceFromTunnelIp(tunnelIp); if (device == null) { LOG.error("Unable to get L2Device for tunnelIp {} and elanInstanceName {}", tunnelIp, elanInstanceName); @@ -657,7 +657,7 @@ public class DhcpExternalTunnelManager { tunnelIpInDpn, subnetDhcpData.get().getPortFixedip(), subnetDhcpData.get().getPortMacaddress()); } - updateCacheAndInstallNewFlows(interfaceDpn, dpns, tunnelElanPair, tx); + updateCacheAndInstallNewFlows(dpns, tunnelElanPair, tx); } } })); @@ -832,7 +832,7 @@ public class DhcpExternalTunnelManager { } LOG.info("Installing remote McastMac"); - L2GatewayDevice device = getDeviceFromTunnelIp(elanInstanceName, tunnelIp); + L2GatewayDevice device = getDeviceFromTunnelIp(tunnelIp); if (device == null) { LOG.error("Unable to get L2Device for tunnelIp {} and elanInstanceName {}", tunnelIp, elanInstanceName); @@ -855,7 +855,7 @@ public class DhcpExternalTunnelManager { }); } - private L2GatewayDevice getDeviceFromTunnelIp(String elanInstanceName, IpAddress tunnelIp) { + private L2GatewayDevice getDeviceFromTunnelIp(IpAddress tunnelIp) { Collection devices = l2GatewayCache.getAll(); LOG.trace("In getDeviceFromTunnelIp devices {}", devices); for (L2GatewayDevice device : devices) { diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java index fa83285d13..5153984459 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpPktHandler.java @@ -189,7 +189,7 @@ public class DhcpPktHandler implements PacketProcessingListener { if (interfacePort != null) { dhcpInfo = handleDhcpNeutronPacket(msgType, interfacePort, subnet, serverIp); } else if (config.isDhcpDynamicAllocationPoolEnabled()) { - dhcpInfo = handleDhcpAllocationPoolPacket(msgType, dhcpPkt, interfaceName, macAddress); + dhcpInfo = handleDhcpAllocationPoolPacket(msgType, interfaceName, macAddress); } DHCP reply = null; if (dhcpInfo != null) { @@ -215,8 +215,7 @@ public class DhcpPktHandler implements PacketProcessingListener { } - private DhcpInfo handleDhcpAllocationPoolPacket(byte msgType, DHCP dhcpPkt, String interfaceName, - String macAddress) { + private DhcpInfo handleDhcpAllocationPoolPacket(byte msgType, String interfaceName, String macAddress) { String networkId = dhcpAllocationPoolMgr.getNetworkByPort(interfaceName); AllocationPool pool = networkId != null ? dhcpAllocationPoolMgr.getAllocationPoolByNetwork(networkId) : null; diff --git a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java index dda8164f3f..17d3c1e9ed 100644 --- a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java +++ b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IElanService.java @@ -35,12 +35,11 @@ public interface IElanService extends IEtreeService { void updateElanInterface(String elanInstanceName, String interfaceName, List updatedStaticMacAddresses, String newDescription); - void deleteElanInterface(String elanInstanceName, String interfaceName); + void deleteElanInterface(String interfaceName); - void addStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress); + void addStaticMacAddress(String interfaceName, String macAddress); - void deleteStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress) - ; + void deleteStaticMacAddress(String interfaceName, String macAddress); Collection getElanMacTable(String elanInstanceName); diff --git a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java index 9e44ffae92..5327760682 100644 --- a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java +++ b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IEtreeService.java @@ -13,7 +13,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.etree.rev16061 public interface IEtreeService { - void deleteEtreeInterface(String elanInstanceName, String interfaceName); + void deleteEtreeInterface(String interfaceName); boolean deleteEtreeInstance(String elanInstanceName); diff --git a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java index deb6c2ccf5..598b730643 100644 --- a/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java +++ b/elanmanager/api/src/main/java/org/opendaylight/netvirt/elanmanager/api/IL2gwService.java @@ -11,7 +11,6 @@ package org.opendaylight.netvirt.elanmanager.api; import java.util.List; import java.util.Set; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; @@ -30,5 +29,5 @@ public interface IL2gwService { String l2GwDeviceName, L2gateway l2Gateway); - List getAssociatedL2GwConnections(DataBroker broker, Set l2GatewayIds); + List getAssociatedL2GwConnections(Set l2GatewayIds); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java index e317f68206..7cbf0f68bb 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/ElanInterfaceDelete.java @@ -31,7 +31,7 @@ public class ElanInterfaceDelete extends OsgiCommandSupport { @Override protected Object doExecute() { LOG.debug("Deleting ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t"); - elanProvider.deleteElanInterface(elanName, interfaceName); + elanProvider.deleteElanInterface(interfaceName); return null; } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java index 8a92cd7096..f18a6a37aa 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacAdd.java @@ -35,7 +35,7 @@ public class StaticMacAdd extends OsgiCommandSupport { protected Object doExecute() { LOG.debug("Executing create ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" + staticMacAddress + "\t"); - elanProvider.addStaticMacAddress(elanName, interfaceName, staticMacAddress); + elanProvider.addStaticMacAddress(interfaceName, staticMacAddress); return null; } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java index 4236c30a06..eaa487ead0 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/StaticMacDelete.java @@ -35,7 +35,7 @@ public class StaticMacDelete extends OsgiCommandSupport { protected Object doExecute() { LOG.debug("Executing create ElanInterface command" + "\t" + elanName + "\t" + interfaceName + "\t" + staticMacAddress + "\t"); - elanProvider.deleteStaticMacAddress(elanName, interfaceName, staticMacAddress); + elanProvider.deleteStaticMacAddress(interfaceName, staticMacAddress); return null; } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java index bc2bd6dc9a..b4a7a27cbe 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java @@ -39,7 +39,7 @@ public class EtreeInterfaceDelete extends OsgiCommandSupport { session.getConsole() .println("Etree interface doesn't exist or isn't configured as etree: " + interfaceName); } - elanProvider.deleteEtreeInterface(etreeName, interfaceName); + elanProvider.deleteEtreeInterface(interfaceName); session.getConsole().println("Deleted the Etree interface succesfully"); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java index da91352340..897e1546c8 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java @@ -397,7 +397,7 @@ public class L2GwValidateCli extends OsgiCommandSupport { isValid = verfiyLogicalSwitch(logicalSwitchName, nodeIid); if (isValid) { - isValid = verifyMcastMac(logicalSwitchName, l2GatewayDevice, nodeIid); + isValid = verifyMcastMac(logicalSwitchName, nodeIid); verifyVlanBindings(nodeIid, logicalSwitchName, device, l2gatewayConnection.getSegmentId()); L2GatewayDevice elanL2gatewayDevice = ElanL2GwCacheUtils .getL2GatewayDeviceFromCache(logicalSwitchName, nodeId.getValue()); @@ -457,7 +457,6 @@ public class L2GwValidateCli extends OsgiCommandSupport { } private boolean verifyMcastMac(String logicalSwitchName, - L2GatewayDevice l2GatewayDevice, InstanceIdentifier nodeIid) { NodeId nodeId = nodeIid.firstKeyOf(Node.class).getNodeId(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java index 8aa6cc6c2f..1b76d6a694 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/diagstatus/ElanDiagStatusProvider.java @@ -14,7 +14,6 @@ import org.opendaylight.infrautils.diagstatus.DiagStatusService; import org.opendaylight.infrautils.diagstatus.ServiceDescriptor; import org.opendaylight.infrautils.diagstatus.ServiceState; import org.opendaylight.infrautils.diagstatus.ServiceStatusProvider; -import org.opendaylight.netvirt.elan.internal.ElanServiceProvider; import org.opendaylight.netvirt.elan.utils.ElanConstants; import org.ops4j.pax.cdi.api.OsgiServiceProvider; import org.slf4j.Logger; @@ -33,8 +32,7 @@ public class ElanDiagStatusProvider implements ServiceStatusProvider { private volatile ServiceDescriptor serviceDescriptor; @Inject - public ElanDiagStatusProvider(final ElanServiceProvider elanServiceProvider, - final DiagStatusService diagStatusService) { + public ElanDiagStatusProvider(final DiagStatusService diagStatusService) { this.diagStatusService = diagStatusService; diagStatusService.register(ElanConstants.ELAN_SERVICE_NAME); serviceDescriptor = new ServiceDescriptor(ElanConstants.ELAN_SERVICE_NAME, ServiceState.OPERATIONAL, diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java index 05035f4c73..ce331b1261 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java @@ -21,7 +21,6 @@ import java.util.Optional; import java.util.Random; import javax.inject.Inject; import javax.inject.Singleton; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.genius.interfacemanager.globals.IfmConstants; import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; @@ -84,14 +83,13 @@ public class ElanBridgeManager implements IElanBridgeManager { /** * Construct a new ElanBridgeManager. - * @param dataBroker DataBroker * @param elanConfig the elan configuration * @param interfaceManager InterfaceManager * @param southboundUtils southboutUtils * @param mdsalUtils mdsalUtils */ @Inject - public ElanBridgeManager(DataBroker dataBroker, ElanConfig elanConfig, IInterfaceManager interfaceManager, + public ElanBridgeManager(ElanConfig elanConfig, IInterfaceManager interfaceManager, SouthboundUtils southboundUtils, MdsalUtils mdsalUtils) { //TODO: ClusterAware!!!?? this.mdsalUtils = mdsalUtils; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java index 498acc848b..baf8711d9f 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnToTransportZoneListener.java @@ -14,7 +14,6 @@ import javax.inject.Singleton; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase; -import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; import org.opendaylight.netvirt.elan.cache.ElanInstanceCache; import org.opendaylight.netvirt.elan.utils.ElanUtils; import org.opendaylight.netvirt.elan.utils.TransportZoneNotificationUtil; @@ -37,7 +36,7 @@ public class ElanDpnToTransportZoneListener private final ElanInstanceCache elanInstanceCache; @Inject - public ElanDpnToTransportZoneListener(final DataBroker dbx, final IInterfaceManager interfaceManager, + public ElanDpnToTransportZoneListener(final DataBroker dbx, final ElanConfig elanConfig, final TransportZoneNotificationUtil tznu, final ElanInstanceCache elanInstanceCache) { useTransportZone = elanConfig.isAutoConfigTransportZones(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java index 785cb0110d..94b582d6d2 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java @@ -105,7 +105,6 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi public ElanServiceProvider(IdManagerService idManager, IInterfaceManager interfaceManager, ElanBridgeManager bridgeMgr, DataBroker dataBroker, - ElanInterfaceManager elanInterfaceManager, ElanUtils elanUtils, EntityOwnershipService entityOwnershipService, SouthboundUtils southboundUtils, ElanInstanceCache elanInstanceCache, @@ -330,13 +329,13 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi } @Override - public void deleteEtreeInterface(String elanInstanceName, String interfaceName) { - deleteElanInterface(elanInstanceName, interfaceName); + public void deleteEtreeInterface(String interfaceName) { + deleteElanInterface(interfaceName); LOG.debug("deleting the Etree Interface {}", interfaceName); } @Override - public void deleteElanInterface(String elanInstanceName, String interfaceName) { + public void deleteElanInterface(String interfaceName) { Optional existingElanInterface = elanInterfaceCache.get(interfaceName); if (existingElanInterface.isPresent()) { ElanUtils.delete(broker, LogicalDatastoreType.CONFIGURATION, @@ -346,7 +345,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi } @Override - public void addStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress) { + public void addStaticMacAddress(String interfaceName, String macAddress) { Optional existingElanInterface = elanInterfaceCache.get(interfaceName); if (existingElanInterface.isPresent()) { StaticMacEntriesBuilder staticMacEntriesBuilder = new StaticMacEntriesBuilder(); @@ -359,7 +358,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi } @Override - public void deleteStaticMacAddress(String elanInstanceName, String interfaceName, String macAddress) { + public void deleteStaticMacAddress(String interfaceName, String macAddress) { Optional existingElanInterface = elanInterfaceCache.get(interfaceName); if (existingElanInterface.isPresent()) { InstanceIdentifier staticMacEntriesIdentifier = @@ -404,7 +403,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi if (elanInterfaceMac.getMacEntry() != null && elanInterfaceMac.getMacEntry().size() > 0) { List macEntries = elanInterfaceMac.getMacEntry(); for (MacEntry macEntry : macEntries) { - deleteStaticMacAddress(elanInstanceName, elanInterface, macEntry.getMacAddress().getValue()); + deleteStaticMacAddress(elanInterface, macEntry.getMacAddress().getValue()); } } } @@ -510,7 +509,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi String intfName = providerIntfName + IfmConstants.OF_URI_SEPARATOR + elanInstance.getSegmentationId(); Interface memberIntf = interfaceManager.getInterfaceInfoFromConfigDataStore(intfName); if (memberIntf != null) { - deleteElanInterface(elanInstance.getElanInstanceName(), intfName); + deleteElanInterface(intfName); deleteIetfInterface(intfName); LOG.debug("delete vlan prv intf {} in elan {}, dpID {}", intfName, elanInstance.getElanInstanceName(), dpnId); @@ -535,7 +534,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi if (shouldDeleteTrunk(trunkInterfaceName, elanInterface)) { deleteIetfInterface(trunkInterfaceName); } - deleteElanInterface(elanInstanceName, elanInterface); + deleteElanInterface(elanInterface); } } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java index 6f3d41c6d9..e8b57ad179 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/VpnDpnToTransportZoneListener.java @@ -14,7 +14,6 @@ import javax.inject.Singleton; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase; -import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; import org.opendaylight.netvirt.elan.utils.TransportZoneNotificationUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.VpnInstanceOpData; @@ -34,7 +33,7 @@ public class VpnDpnToTransportZoneListener private final Boolean useTransportZone; @Inject - public VpnDpnToTransportZoneListener(final DataBroker dbx, final IInterfaceManager interfaceManager, + public VpnDpnToTransportZoneListener(final DataBroker dbx, final ElanConfig elanConfig, final TransportZoneNotificationUtil tznu) { useTransportZone = elanConfig.isAutoConfigTransportZones(); transportZoneNotificationUtil = tznu; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java index 88db72b857..d0fc9fa14c 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java @@ -29,7 +29,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepLogicalSwitchRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepNodeName; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef; @@ -221,18 +220,6 @@ public final class HwvtepHAUtil { return false; } - public static void mergeManagedByNode(Node psNode, - PhysicalSwitchAugmentationBuilder builder, - InstanceIdentifier haNodePath, - InstanceIdentifier haPsPath, NodeId haPSNodeId) { - PhysicalSwitchAugmentation psAugmentation = psNode.getAugmentation(PhysicalSwitchAugmentation.class); - builder.setManagedBy(new HwvtepGlobalRef(haNodePath)); - builder.setHwvtepNodeName(psAugmentation.getHwvtepNodeName()); - builder.setHwvtepNodeDescription(psAugmentation.getHwvtepNodeDescription()); - builder.setTunnelIps(psAugmentation.getTunnelIps()); - builder.setPhysicalSwitchUuid(getUUid(psAugmentation.getHwvtepNodeName().getValue())); - } - public static Node getOriginal(DataObjectModification mod) { Node node = null; switch (mod.getModificationType()) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java index 2c925321cd..b890bc1dce 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/ConfigNodeUpdatedHandler.java @@ -27,15 +27,11 @@ public class ConfigNodeUpdatedHandler { /** * Copy updated data from HA node to child node of config data tree. * - * @param haUpdated HA node updated - * @param haOriginal HA node original * @param haChildNodeId HA child node which needs to be updated * @param mod the data object modification * @param tx Transaction */ - public void copyHAGlobalUpdateToChild(Node haUpdated, - Node haOriginal, - InstanceIdentifier haChildNodeId, + public void copyHAGlobalUpdateToChild(InstanceIdentifier haChildNodeId, DataObjectModification mod, ReadWriteTransaction tx) { globalAugmentationMerger.mergeConfigUpdate(haChildNodeId, @@ -46,15 +42,11 @@ public class ConfigNodeUpdatedHandler { /** * Copy HA ps node update to HA child ps node of config data tree. * - * @param haUpdated HA node updated - * @param haOriginal HA node original * @param haChildNodeId HA child node which needs to be updated * @param mod the data object modification * @param tx Transaction */ - public void copyHAPSUpdateToChild(Node haUpdated, - Node haOriginal, - InstanceIdentifier haChildNodeId, + public void copyHAPSUpdateToChild(InstanceIdentifier haChildNodeId, DataObjectModification mod, ReadWriteTransaction tx) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java index 7ce513d704..0f9e7b59fc 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/HAEventHandler.java @@ -59,51 +59,44 @@ public class HAEventHandler implements IHAEventHandler { } @Override - public void copyChildGlobalOpUpdateToHAParent(Node updatedSrcNode, - Node origSrcNode, - InstanceIdentifier haPath, + public void copyChildGlobalOpUpdateToHAParent(InstanceIdentifier haPath, DataObjectModification mod, ReadWriteTransaction tx) { if (haPath == null) { return; } - opNodeUpdatedHandler.copyChildGlobalOpUpdateToHAParent(updatedSrcNode, origSrcNode, haPath, mod, tx); + opNodeUpdatedHandler.copyChildGlobalOpUpdateToHAParent(haPath, mod, tx); } @Override public void copyChildPsOpUpdateToHAParent(Node updatedSrcPSNode, - Node origSrcPSNode, InstanceIdentifier haPath, DataObjectModification mod, ReadWriteTransaction tx) { if (haPath == null) { return; } - opNodeUpdatedHandler.copyChildPsOpUpdateToHAParent(updatedSrcPSNode, origSrcPSNode, haPath, mod, tx); + opNodeUpdatedHandler.copyChildPsOpUpdateToHAParent(updatedSrcPSNode, haPath, mod, tx); } @Override - public void copyHAPSUpdateToChild(Node haUpdated, - Node haOriginal, - InstanceIdentifier haChildNodeId, + public void copyHAPSUpdateToChild(InstanceIdentifier haChildNodeId, DataObjectModification mod, ReadWriteTransaction tx) { if (haChildNodeId == null) { return; } - configNodeUpdatedHandler.copyHAPSUpdateToChild(haUpdated, haOriginal, haChildNodeId, mod, tx); + configNodeUpdatedHandler.copyHAPSUpdateToChild(haChildNodeId, mod, tx); } @Override - public void copyHAGlobalUpdateToChild(Node haUpdated, - Node haOriginal, - InstanceIdentifier haChildNodeId, + public void copyHAGlobalUpdateToChild(InstanceIdentifier haChildNodeId, DataObjectModification mod, ReadWriteTransaction tx) { if (haChildNodeId == null) { return; } - configNodeUpdatedHandler.copyHAGlobalUpdateToChild(haUpdated, haOriginal, haChildNodeId, mod, tx); + configNodeUpdatedHandler.copyHAGlobalUpdateToChild(haChildNodeId, mod, tx); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java index 8ac0bd5736..1a04d70f9a 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/IHAEventHandler.java @@ -34,28 +34,21 @@ public interface IHAEventHandler { throws ReadFailedException, ExecutionException, InterruptedException; - void copyChildGlobalOpUpdateToHAParent(Node updatedSrcNode, - Node origSrcNode, - InstanceIdentifier haPath, + void copyChildGlobalOpUpdateToHAParent(InstanceIdentifier haPath, DataObjectModification mod, ReadWriteTransaction tx); void copyChildPsOpUpdateToHAParent(Node updatedSrcPSNode, - Node origSrcPSNode, InstanceIdentifier haPath, DataObjectModification mod, ReadWriteTransaction tx); - void copyHAPSUpdateToChild(Node haUpdated, - Node haOriginal, - InstanceIdentifier haChildPath, + void copyHAPSUpdateToChild(InstanceIdentifier haChildPath, DataObjectModification mod, ReadWriteTransaction tx) ; - void copyHAGlobalUpdateToChild(Node haUpdated, - Node haOriginal, - InstanceIdentifier haChildPath, + void copyHAGlobalUpdateToChild(InstanceIdentifier haChildPath, DataObjectModification mod, ReadWriteTransaction tx) ; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java index 846bc3aad9..2c215f49f3 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/OpNodeUpdatedHandler.java @@ -30,13 +30,11 @@ public class OpNodeUpdatedHandler { * Copy HA ps node update to HA child ps node of operational data tree. * * @param updatedSrcPSNode Updated HA child ps node - * @param origSrcPSNode Original HA ps node * @param haPath HA node path * @param mod the data object modification * @param tx Transaction */ public void copyChildPsOpUpdateToHAParent(Node updatedSrcPSNode, - Node origSrcPSNode, InstanceIdentifier haPath, DataObjectModification mod, ReadWriteTransaction tx) { @@ -51,15 +49,11 @@ public class OpNodeUpdatedHandler { /** * Copy updated data from HA node to child node of operational data tree. * - * @param updatedSrcNode Updated HA child node - * @param origSrcNode Original HA node * @param haPath HA node path * @param mod the data object modification * @param tx Transaction */ - public void copyChildGlobalOpUpdateToHAParent(Node updatedSrcNode, - Node origSrcNode, - InstanceIdentifier haPath, + public void copyChildGlobalOpUpdateToHAParent(InstanceIdentifier haPath, DataObjectModification mod, ReadWriteTransaction tx) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java index cc8b903388..622e5e7ed6 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAConfigNodeListener.java @@ -61,16 +61,15 @@ public class HAConfigNodeListener extends HwvtepNodeBaseListener { } @Override - void onPsNodeUpdate(InstanceIdentifier key, - Node haPSUpdated, - Node haPSOriginal, - DataObjectModification mod, - ReadWriteTransaction tx) throws InterruptedException, ExecutionException, ReadFailedException { + void onPsNodeUpdate(Node haPSUpdated, + Node haPSOriginal, + DataObjectModification mod, + ReadWriteTransaction tx) throws InterruptedException, ExecutionException, ReadFailedException { //copy the ps node data to children String psId = haPSUpdated.getNodeId().getValue(); Set> childSwitchIds = HwvtepHAUtil.getPSChildrenIdsForHAPSNode(psId); for (InstanceIdentifier childSwitchId : childSwitchIds) { - haEventHandler.copyHAPSUpdateToChild(haPSUpdated, haPSOriginal, childSwitchId, mod, tx); + haEventHandler.copyHAPSUpdateToChild(childSwitchId, mod, tx); } } @@ -83,7 +82,7 @@ public class HAConfigNodeListener extends HwvtepNodeBaseListener { throws InterruptedException, ExecutionException, ReadFailedException { Set> childNodeIds = hwvtepHACache.getChildrenForHANode(key); for (InstanceIdentifier haChildNodeId : childNodeIds) { - haEventHandler.copyHAGlobalUpdateToChild(haUpdated, haOriginal, haChildNodeId, mod, tx); + haEventHandler.copyHAGlobalUpdateToChild(haChildNodeId, mod, tx); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java index 0eb9746282..33033e4500 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpClusteredListener.java @@ -107,7 +107,7 @@ public class HAOpClusteredListener extends HwvtepNodeBaseListener implements Clu DataObjectModification mod, ReadWriteTransaction tx) { boolean wasHAChild = hwvtepHACache.isHAEnabledDevice(childPath); - addToHACacheIfBecameHAChild(childPath, updatedChildNode, beforeChildNode, tx); + addToHACacheIfBecameHAChild(childPath, updatedChildNode, beforeChildNode); boolean isHAChild = hwvtepHACache.isHAEnabledDevice(childPath); @@ -133,12 +133,10 @@ public class HAOpClusteredListener extends HwvtepNodeBaseListener implements Clu * @param childPath HA child path which got converted to HA node * @param updatedChildNode updated Child node * @param beforeChildNode non-ha node before updated to HA node - * @param tx Transaction */ public static void addToHACacheIfBecameHAChild(InstanceIdentifier childPath, Node updatedChildNode, - Node beforeChildNode, - ReadWriteTransaction tx) { + Node beforeChildNode) { HwvtepGlobalAugmentation updatedAugmentaion = updatedChildNode.getAugmentation(HwvtepGlobalAugmentation.class); HwvtepGlobalAugmentation beforeAugmentaion = null; if (beforeChildNode != null) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java index 08bb93cf51..f2fcb9f549 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java @@ -84,7 +84,7 @@ public class HAOpNodeListener extends HwvtepNodeBaseListener { } catch (ReadFailedException e) { LOG.error("Failed to read nodes {} , {} ", childGlobalPath, haNodePath); } - readAndCopyChildPsOpToParent(childGlobalPath, childNode, haNodePath, tx); + readAndCopyChildPsOpToParent(childNode, tx); } //Update on global node has been taken care by HAListeners as per perf improvement @@ -99,11 +99,11 @@ public class HAOpNodeListener extends HwvtepNodeBaseListener { if (!Strings.isNullOrEmpty(oldHAId)) { //was already ha child InstanceIdentifier haPath = hwvtepHACache.getParent(childGlobalPath); LOG.debug("Copy oper update from child {} to parent {}", childGlobalPath, haPath); - haEventHandler.copyChildGlobalOpUpdateToHAParent(updatedChildNode, originalChildNode, haPath, mod, tx); + haEventHandler.copyChildGlobalOpUpdateToHAParent(haPath, mod, tx); return;//TODO handle unha case } - HAOpClusteredListener.addToHACacheIfBecameHAChild(childGlobalPath, updatedChildNode, originalChildNode, tx); + HAOpClusteredListener.addToHACacheIfBecameHAChild(childGlobalPath, updatedChildNode, originalChildNode); if (IS_NOT_HA_CHILD.test(childGlobalPath)) { return; } @@ -163,17 +163,16 @@ public class HAOpNodeListener extends HwvtepNodeBaseListener { } @Override - void onPsNodeUpdate(InstanceIdentifier childPsPath, - Node updatedChildPSNode, - Node originalChildPSNode, - DataObjectModification mod, - ReadWriteTransaction tx) throws ReadFailedException { + void onPsNodeUpdate(Node updatedChildPSNode, + Node originalChildPSNode, + DataObjectModification mod, + ReadWriteTransaction tx) throws ReadFailedException { InstanceIdentifier childGlobalPath = HwvtepHAUtil.getGlobalNodePathFromPSNode(updatedChildPSNode); if (IS_NOT_HA_CHILD.test(childGlobalPath)) { return; } InstanceIdentifier haGlobalPath = hwvtepHACache.getParent(childGlobalPath); - haEventHandler.copyChildPsOpUpdateToHAParent(updatedChildPSNode, originalChildPSNode, haGlobalPath, mod, tx); + haEventHandler.copyChildPsOpUpdateToHAParent(updatedChildPSNode, haGlobalPath, mod, tx); } @Override @@ -204,10 +203,7 @@ public class HAOpNodeListener extends HwvtepNodeBaseListener { } } - private void readAndCopyChildPsOpToParent(InstanceIdentifier childGlobalPath, - Node childNode, - InstanceIdentifier haNodePath, - ReadWriteTransaction tx) { + private void readAndCopyChildPsOpToParent(Node childNode, ReadWriteTransaction tx) { String childGlobalNodeId = childNode.getNodeId().getValue(); List childPsIids = new ArrayList<>(); HwvtepGlobalAugmentation hwvtepGlobalAugmentation = childNode.getAugmentation(HwvtepGlobalAugmentation.class); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java index 1e8ba0fcbb..ba7581a18d 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java @@ -88,7 +88,7 @@ public abstract class HwvtepNodeBaseListener implements DataTreeChangeListener key, Node updated, Node original, + void onPsNodeUpdate(Node updated, Node original, DataObjectModification mod, ReadWriteTransaction tx) throws ReadFailedException, InterruptedException, ExecutionException { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java index 85d3488260..946b350556 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/DisAssociateHwvtepFromElanJob.java @@ -85,7 +85,7 @@ public class DisAssociateHwvtepFromElanJob implements Callable childIid, C child); + protected abstract G getGroup(C child); /** * Process the added/updated/Deleted subtree data. @@ -190,12 +189,12 @@ public abstract class ChildListener

new ConcurrentHashMap<>()); updatedMacsGrouped.get(group).put(childIid, dataAfter); break; case DELETE: - group = getGroup(childIid, dataBefore); + group = getGroup(dataBefore); deletedMacsGrouped.computeIfAbsent(group, (grp) -> new ConcurrentHashMap<>()); deletedMacsGrouped.get(group).put(childIid, dataBefore); break; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java index 126004f2e0..a1dc1daf9b 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepRemoteMcastMacListener.java @@ -151,7 +151,7 @@ public class HwvtepRemoteMcastMacListener @SuppressWarnings("checkstyle:IllegalCatch") // TODO remove when using AutoCloseables void runTask() { try { - String jobKey = ElanL2GatewayUtils.getL2GatewayConnectionJobKey(nodeId.getValue(), nodeId.getValue()); + String jobKey = ElanL2GatewayUtils.getL2GatewayConnectionJobKey(nodeId.getValue()); jobCoordinator.enqueueJob(jobKey, taskToRun, SystemPropertyReader.getDataStoreJobCoordinatorMaxRetries()); } finally { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java index a62dd54def..44a56c6ad4 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java @@ -99,7 +99,7 @@ public class HwvtepTerminationPointListener if (portAugmentation != null) { final NodeId nodeId = identifier.firstIdentifierOf(Node.class).firstKeyOf(Node.class).getNodeId(); elanClusterUtils.runOnlyInOwnerNode(HwvtepSouthboundConstants.ELAN_ENTITY_NAME, - () -> handlePortAdded(portAugmentation, add, nodeId)); + () -> handlePortAdded(add, nodeId)); return; } @@ -118,8 +118,7 @@ public class HwvtepTerminationPointListener return this; } - private List> handlePortAdded(HwvtepPhysicalPortAugmentation portAugmentation, - TerminationPoint portAdded, NodeId psNodeId) { + private List> handlePortAdded(TerminationPoint portAdded, NodeId psNodeId) { Node psNode = HwvtepUtils.getHwVtepNode(broker, LogicalDatastoreType.OPERATIONAL, psNodeId); if (psNode != null) { String psName = psNode.getAugmentation(PhysicalSwitchAugmentation.class).getHwvtepNodeName().getValue(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java index 273c257e92..831d81dd0f 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java @@ -100,8 +100,7 @@ public class LocalUcastMacListener extends ChildListener childIid, - final LocalUcastMacs localUcastMacs) { + protected String getGroup(final LocalUcastMacs localUcastMacs) { return getElanName(localUcastMacs); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java index 2f0fe43fcf..5886cba7af 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java @@ -22,7 +22,6 @@ import javax.annotation.Nonnull; import javax.inject.Inject; import javax.inject.Singleton; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker; @@ -112,17 +111,15 @@ public class ElanL2GatewayMulticastUtils { /** * Handle mcast for elan l2 gw device add. * @param elanName the elan name - * @param elanInstance elanInstace * @param device the device * @return the listenable future */ - public ListenableFuture handleMcastForElanL2GwDeviceAdd(String elanName, ElanInstance elanInstance, - L2GatewayDevice device) { + public ListenableFuture handleMcastForElanL2GwDeviceAdd(String elanName, L2GatewayDevice device) { InstanceIdentifier tepPath = buildExternalTepPath(elanName, device.getTunnelIp()); JdkFutures.addErrorLogging(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { tx.put(LogicalDatastoreType.CONFIGURATION, tepPath, buildExternalTeps(device)); }), LOG, "Failed to write to config external tep {}", tepPath); - return updateMcastMacsForAllElanDevices(elanName, elanInstance, device, true/* updateThisDevice */); + return updateMcastMacsForAllElanDevices(elanName, device, true/* updateThisDevice */); } public static InstanceIdentifier buildExternalTepPath(String elan, IpAddress tepIp) { @@ -147,7 +144,7 @@ public class ElanL2GatewayMulticastUtils { public ListenableFuture updateRemoteMcastMacOnElanL2GwDevices(String elanName) { return txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { for (L2GatewayDevice device : ElanL2GwCacheUtils.getInvolvedL2GwDevices(elanName).values()) { - prepareRemoteMcastMacUpdateOnDevice(tx, elanName, device); + prepareRemoteMcastMacUpdateOnDevice(elanName, device); } }); } @@ -168,17 +165,17 @@ public class ElanL2GatewayMulticastUtils { */ public ListenableFuture updateRemoteMcastMacOnElanL2GwDevice(String elanName, L2GatewayDevice device) { return txRunner.callWithNewWriteOnlyTransactionAndSubmit( - tx -> prepareRemoteMcastMacUpdateOnDevice(tx, elanName, device)); + tx -> prepareRemoteMcastMacUpdateOnDevice(elanName, device)); } - public void prepareRemoteMcastMacUpdateOnDevice(WriteTransaction transaction,String elanName, - L2GatewayDevice device) { + public void prepareRemoteMcastMacUpdateOnDevice(String elanName, + L2GatewayDevice device) { ConcurrentMap elanL2gwDevices = ElanL2GwCacheUtils .getInvolvedL2GwDevices(elanName); List dpns = elanUtils.getElanDPNByName(elanName); List dpnsTepIps = getAllTepIpsOfDpns(device, dpns); List l2GwDevicesTepIps = getAllTepIpsOfL2GwDevices(elanL2gwDevices); - preapareRemoteMcastMacEntry(transaction, elanName, device, dpnsTepIps, l2GwDevicesTepIps); + preapareRemoteMcastMacEntry(elanName, device, dpnsTepIps, l2GwDevicesTepIps); } /** @@ -188,16 +185,14 @@ public class ElanL2GatewayMulticastUtils { * * @param elanName * the elan name - * @param elanInstance - * the ElanInstance * @param device * the device * @param updateThisDevice * the update this device * @return the listenable future */ - private ListenableFuture updateMcastMacsForAllElanDevices(String elanName, ElanInstance elanInstance, - L2GatewayDevice device, boolean updateThisDevice) { + private ListenableFuture updateMcastMacsForAllElanDevices(String elanName, L2GatewayDevice device, + boolean updateThisDevice) { SettableFuture ft = SettableFuture.create(); ft.set(null); @@ -216,14 +211,14 @@ public class ElanL2GatewayMulticastUtils { return txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { if (updateThisDevice) { - preapareRemoteMcastMacEntry(tx, elanName, device, dpnsTepIps, l2GwDevicesTepIps); + preapareRemoteMcastMacEntry(elanName, device, dpnsTepIps, l2GwDevicesTepIps); } // TODO: Need to revisit below logic as logical switches might not be // present to configure RemoteMcastMac entry for (L2GatewayDevice otherDevice : devices.values()) { if (!otherDevice.getDeviceName().equals(device.getDeviceName())) { - preapareRemoteMcastMacEntry(tx, elanName, otherDevice, dpnsTepIps, l2GwDevicesTepIps); + preapareRemoteMcastMacEntry(elanName, otherDevice, dpnsTepIps, l2GwDevicesTepIps); } } }); @@ -425,8 +420,6 @@ public class ElanL2GatewayMulticastUtils { /** * Update remote mcast mac. * - * @param transaction - * the transaction * @param elanName * the elan name * @param device @@ -437,9 +430,9 @@ public class ElanL2GatewayMulticastUtils { * the l2 gw devices tep ips * @return the write transaction */ - private void preapareRemoteMcastMacEntry(WriteTransaction transaction, String elanName, - L2GatewayDevice device, List dpnsTepIps, - List l2GwDevicesTepIps) { + private void preapareRemoteMcastMacEntry(String elanName, + L2GatewayDevice device, List dpnsTepIps, + List l2GwDevicesTepIps) { NodeId nodeId = new NodeId(device.getHwvtepNodeId()); ArrayList remoteTepIps = new ArrayList<>(l2GwDevicesTepIps); @@ -473,7 +466,7 @@ public class ElanL2GatewayMulticastUtils { remoteTepIps.add(dhcpDesignatedSwitchTepIp); } String logicalSwitchName = ElanL2GatewayUtils.getLogicalSwitchFromElan(elanName); - putRemoteMcastMac(transaction, nodeId, logicalSwitchName, remoteTepIps); + putRemoteMcastMac(nodeId, logicalSwitchName, remoteTepIps); LOG.info("Adding RemoteMcastMac for node: {} with physical locators: {}", device.getHwvtepNodeId(), remoteTepIps); } @@ -481,8 +474,6 @@ public class ElanL2GatewayMulticastUtils { /** * Put remote mcast mac in config DS. * - * @param transaction - * the transaction * @param nodeId * the node id * @param logicalSwitchName @@ -490,7 +481,7 @@ public class ElanL2GatewayMulticastUtils { * @param tepIps * the tep ips */ - private static void putRemoteMcastMac(WriteTransaction transaction, NodeId nodeId, String logicalSwitchName, + private static void putRemoteMcastMac(NodeId nodeId, String logicalSwitchName, ArrayList tepIps) { List locators = new ArrayList<>(); for (IpAddress tepIp : tepIps) { @@ -557,20 +548,18 @@ public class ElanL2GatewayMulticastUtils { * * @param elanName * the elan instance name - * @param elanInstance - * the ElanInstance * @param l2GatewayDevice * the l2 gateway device * @return the listenable future */ public List> handleMcastForElanL2GwDeviceDelete(String elanName, - ElanInstance elanInstance, L2GatewayDevice l2GatewayDevice) { + L2GatewayDevice l2GatewayDevice) { ListenableFuture deleteTepFuture = txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { tx.delete(LogicalDatastoreType.CONFIGURATION, buildExternalTepPath(elanName, l2GatewayDevice.getTunnelIp())); }); ListenableFuture updateMcastMacsFuture = updateMcastMacsForAllElanDevices( - elanName, elanInstance, l2GatewayDevice, false/* updateThisDevice */); + elanName, l2GatewayDevice, false/* updateThisDevice */); ListenableFuture deleteRemoteMcastMacFuture = deleteRemoteMcastMac( new NodeId(l2GatewayDevice.getHwvtepNodeId()), elanName); return Arrays.asList(updateMcastMacsFuture, deleteRemoteMcastMacFuture, deleteTepFuture); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java index d6a39be726..5373249cdd 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java @@ -650,7 +650,7 @@ public class ElanL2GatewayUtils { List lstL2GatewayDevicesMacs = getOtherDevicesMacs(elanName, l2GatewayDevice, hwVtepNodeId, logicalSwitchName); - List lstElanMacTableEntries = getElanMacTableEntriesMacs(elanName, l2GatewayDevice, + List lstElanMacTableEntries = getElanMacTableEntriesMacs(elanName, hwVtepNodeId, logicalSwitchName); List lstRemoteUcastMacs = new ArrayList<>(lstL2GatewayDevicesMacs); @@ -725,8 +725,6 @@ public class ElanL2GatewayUtils { * * @param elanName * the elan name - * @param l2GatewayDeviceToBeConfigured - * the l2 gateway device to be configured * @param hwVtepNodeId * the hw vtep node id * @param logicalSwitchName @@ -734,7 +732,7 @@ public class ElanL2GatewayUtils { * @return the elan mac table entries as remote ucast macs */ public List getElanMacTableEntriesMacs(String elanName, - L2GatewayDevice l2GatewayDeviceToBeConfigured, NodeId hwVtepNodeId, String logicalSwitchName) { + NodeId hwVtepNodeId, String logicalSwitchName) { List lstRemoteUcastMacs = new ArrayList<>(); MacTable macTable = ElanUtils.getElanMacTable(broker, elanName); @@ -925,13 +923,11 @@ public class ElanL2GatewayUtils { /** * Gets the l2 gateway connection job key. * - * @param nodeId - * the node id * @param logicalSwitchName * the logical switch name * @return the l2 gateway connection job key */ - public static String getL2GatewayConnectionJobKey(String nodeId, String logicalSwitchName) { + public static String getL2GatewayConnectionJobKey(String logicalSwitchName) { return logicalSwitchName; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java index 24cd393778..c21dbac829 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java @@ -31,7 +31,6 @@ import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundUtils; import org.opendaylight.genius.utils.hwvtep.HwvtepUtils; import org.opendaylight.infrautils.jobcoordinator.JobCoordinator; import org.opendaylight.netvirt.elan.cache.ElanInstanceCache; -import org.opendaylight.netvirt.elan.internal.ElanInstanceManager; import org.opendaylight.netvirt.elan.l2gw.ha.listeners.HAOpClusteredListener; import org.opendaylight.netvirt.elan.l2gw.jobs.AssociateHwvtepToElanJob; import org.opendaylight.netvirt.elan.l2gw.jobs.DisAssociateHwvtepFromElanJob; @@ -64,7 +63,6 @@ public class L2GatewayConnectionUtils implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(L2GatewayConnectionUtils.class); private final DataBroker broker; - private final ElanInstanceManager elanInstanceManager; private final ElanL2GatewayUtils elanL2GatewayUtils; private final ElanClusterUtils elanClusterUtils; private final ElanL2GatewayMulticastUtils elanL2GatewayMulticastUtils; @@ -75,13 +73,12 @@ public class L2GatewayConnectionUtils implements AutoCloseable { private final HAOpClusteredListener haOpClusteredListener; @Inject - public L2GatewayConnectionUtils(DataBroker dataBroker, ElanInstanceManager elanInstanceManager, + public L2GatewayConnectionUtils(DataBroker dataBroker, ElanClusterUtils elanClusterUtils, ElanL2GatewayUtils elanL2GatewayUtils, JobCoordinator jobCoordinator, ElanL2GatewayMulticastUtils elanL2GatewayMulticastUtils, L2GatewayCache l2GatewayCache, HAOpClusteredListener haOpClusteredListener, ElanInstanceCache elanInstanceCache) { this.broker = dataBroker; - this.elanInstanceManager = elanInstanceManager; this.elanL2GatewayUtils = elanL2GatewayUtils; this.elanClusterUtils = elanClusterUtils; this.elanL2GatewayMulticastUtils = elanL2GatewayMulticastUtils; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java index 1ae9495368..1d1c1c72a1 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2gwServiceProvider.java @@ -85,7 +85,7 @@ public class L2gwServiceProvider extends AbstractLifecycle implements IL2gwServi } @Override - public List getAssociatedL2GwConnections(DataBroker broker, Set l2GatewayIds) { + public List getAssociatedL2GwConnections(Set l2GatewayIds) { return L2GatewayConnectionUtils.getAssociatedL2GwConnections(dataBroker, l2GatewayIds); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java index 4f2a97b685..8b508be52c 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanDmacUtils.java @@ -329,7 +329,7 @@ public class ElanDmacUtils { } private ListenableFuture buildEtreeDmacFlowDropIfPacketComingFromTunnelwithBatch( - BigInteger dpnId, String extDeviceNodeId, Long elanTag, String macAddress,EtreeLeafTagName etreeLeafTag) { + BigInteger dpnId, String extDeviceNodeId, String macAddress, EtreeLeafTagName etreeLeafTag) { if (etreeLeafTag != null) { Flow dropFlow = buildDmacFlowDropIfPacketComingFromTunnel(dpnId, extDeviceNodeId, etreeLeafTag.getEtreeLeafTag().getValue(), macAddress); @@ -365,7 +365,7 @@ public class ElanDmacUtils { if (etreeLeafTag != null) { return Lists.newArrayList( buildEtreeDmacFlowDropIfPacketComingFromTunnelwithBatch( - dpnId, extDeviceNodeId, elanTag, macAddress, etreeLeafTag), + dpnId, extDeviceNodeId, macAddress, etreeLeafTag), buildEtreeDmacFlowForExternalRemoteMacWithBatch( dpnId, extDeviceNodeId, vni, macAddress, displayName, interfaceName, etreeLeafTag)); } diff --git a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java index b9566ed44d..c655877277 100644 --- a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java +++ b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/IFibManager.java @@ -13,7 +13,6 @@ import com.google.common.util.concurrent.FutureCallback; import java.math.BigInteger; import java.util.List; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.RouterInterface; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.vrfentries.VrfEntry; @@ -51,22 +50,22 @@ public interface IFibManager { String destTepIp, long label); - void addOrUpdateFibEntry(DataBroker broker, String rd, String macAddress, String prefix, List nextHopList, + void addOrUpdateFibEntry(String rd, String macAddress, String prefix, List nextHopList, VrfEntry.EncapType encapType, long label, long l3vni, String gwMacAddress, String parentVpnRd, RouteOrigin origin, WriteTransaction writeConfigTxn); - void addFibEntryForRouterInterface(DataBroker broker, String rd, String prefix, + void addFibEntryForRouterInterface(String rd, String prefix, RouterInterface routerInterface, long label, WriteTransaction writeConfigTxn); - void removeOrUpdateFibEntry(DataBroker broker, String rd, String prefix, String nextHopToRemove, + void removeOrUpdateFibEntry(String rd, String prefix, String nextHopToRemove, WriteTransaction writeConfigTxn); - void removeFibEntry(DataBroker broker, String rd, String prefix, WriteTransaction writeConfigTxn); + void removeFibEntry(String rd, String prefix, WriteTransaction writeConfigTxn); - void updateRoutePathForFibEntry(DataBroker broker, String rd, String prefix, String nextHop, - long label, boolean nextHopAdd, WriteTransaction writeConfigTxn); + void updateRoutePathForFibEntry(String rd, String prefix, String nextHop, + long label, boolean nextHopAdd, WriteTransaction writeConfigTxn); - void removeVrfTable(DataBroker broker, String rd, WriteTransaction writeConfigTxn); + void removeVrfTable(String rd, WriteTransaction writeConfigTxn); void removeInterVPNLinkRouteFlows(String interVpnLinkName, boolean isVpnFirstEndPoint, diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java index f7527a304d..4e786feaf3 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java @@ -370,7 +370,7 @@ public class BgpRouteVrfEntryHandler extends BaseVrfEntryHandler } public Consumer getConsumerForDeletingRemoteFib( - final BigInteger dpnId, final long vpnId, final String rd, + final BigInteger dpnId, final long vpnId, final String remoteNextHopIp, final Optional vrfTable, WriteTransaction writeCfgTxn, List subTxns) { return vrfEntry -> vrfEntry.getRoutePaths().stream() diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java index e87486950a..71ff1f7ef4 100755 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibManagerImpl.java @@ -15,7 +15,6 @@ import java.util.List; import javax.inject.Inject; import javax.inject.Singleton; import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.netvirt.fibmanager.api.IFibManager; import org.opendaylight.netvirt.fibmanager.api.RouteOrigin; @@ -121,40 +120,40 @@ public class FibManagerImpl implements IFibManager { } @Override - public void addOrUpdateFibEntry(DataBroker broker, String rd, String macAddress, String prefix, - List nextHopList, VrfEntry.EncapType encapType, long label, - long l3vni, String gwMacAddress, String parentVpnRd, RouteOrigin origin, - WriteTransaction writeConfigTxn) { + public void addOrUpdateFibEntry(String rd, String macAddress, String prefix, + List nextHopList, VrfEntry.EncapType encapType, long label, + long l3vni, String gwMacAddress, String parentVpnRd, RouteOrigin origin, + WriteTransaction writeConfigTxn) { fibUtil.addOrUpdateFibEntry(rd, macAddress, prefix, nextHopList , encapType, label, l3vni, gwMacAddress, parentVpnRd, origin, writeConfigTxn); } @Override - public void addFibEntryForRouterInterface(DataBroker broker, String rd, String prefix, - RouterInterface routerInterface, long label, - WriteTransaction writeConfigTxn) { + public void addFibEntryForRouterInterface(String rd, String prefix, + RouterInterface routerInterface, long label, + WriteTransaction writeConfigTxn) { fibUtil.addFibEntryForRouterInterface(rd, prefix, routerInterface, label, writeConfigTxn); } @Override - public void removeOrUpdateFibEntry(DataBroker broker, String rd, String prefix, - String nextHopToRemove, WriteTransaction writeConfigTxn) { + public void removeOrUpdateFibEntry(String rd, String prefix, + String nextHopToRemove, WriteTransaction writeConfigTxn) { fibUtil.removeOrUpdateFibEntry(rd, prefix, nextHopToRemove, writeConfigTxn); } @Override - public void removeFibEntry(DataBroker broker, String rd, String prefix, WriteTransaction writeConfigTxn) { + public void removeFibEntry(String rd, String prefix, WriteTransaction writeConfigTxn) { fibUtil.removeFibEntry(rd, prefix, writeConfigTxn); } @Override - public void updateRoutePathForFibEntry(DataBroker broker, String rd, String prefix, String nextHop, - long label, boolean nextHopAdd, WriteTransaction writeConfigTxn) { + public void updateRoutePathForFibEntry(String rd, String prefix, String nextHop, + long label, boolean nextHopAdd, WriteTransaction writeConfigTxn) { fibUtil.updateRoutePathForFibEntry(rd, prefix, nextHop, label, nextHopAdd, writeConfigTxn); } @Override - public void removeVrfTable(DataBroker broker, String rd, WriteTransaction writeConfigTxn) { + public void removeVrfTable(String rd, WriteTransaction writeConfigTxn) { fibUtil.removeVrfTable(rd, writeConfigTxn); } diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java index b2b30951b4..12848837c3 100755 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java @@ -1835,7 +1835,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase RouteOrigin.value(vrfEntry.getOrigin()) == RouteOrigin.BGP) - .forEach(bgpRouteVrfEntryHandler.getConsumerForDeletingRemoteFib(dpnId, vpnId, rd, + .forEach(bgpRouteVrfEntryHandler.getConsumerForDeletingRemoteFib(dpnId, vpnId, remoteNextHopIp, vrfTable, writeCfgTxn, txnObjects)); futures.add(writeCfgTxn.submit()); } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java index 0476f789ba..59bac165c1 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/AbstractSnatService.java @@ -147,8 +147,8 @@ public abstract class AbstractSnatService implements SnatServiceListener { if (addOrRemove == NwConstants.ADD_FLOW) { extSubnetId = NatUtil.getExternalSubnetVpnId(dataBroker,externalSubnetId); } - installInboundFibEntry(dpnId, externalIp, routerName, routerId, extSubnetId, addOrRemove); - installInboundTerminatingServiceTblEntry(dpnId, routerId, routerName, externalIp, extSubnetId, addOrRemove); + installInboundFibEntry(dpnId, externalIp, routerId, extSubnetId, addOrRemove); + installInboundTerminatingServiceTblEntry(dpnId, routerId, extSubnetId, addOrRemove); } protected void installSnatCommonEntriesForNonNaptSwitch(Routers routers, BigInteger primarySwitchId, @@ -179,7 +179,7 @@ public abstract class AbstractSnatService implements SnatServiceListener { protected abstract void installSnatSpecificEntriesForNonNaptSwitch(Routers routers, BigInteger dpnId, int addOrRemove); - protected void installInboundFibEntry(BigInteger dpnId, String externalIp, String routerName, Long routerId, + protected void installInboundFibEntry(BigInteger dpnId, String externalIp, Long routerId, long extSubnetId, int addOrRemove) { List matches = new ArrayList<>(); matches.add(MatchEthernetType.IPV4); @@ -265,8 +265,8 @@ public abstract class AbstractSnatService implements SnatServiceListener { NwConstants.COOKIE_SNAT_TABLE, matches, instructions, addOrRemove); } - protected void installInboundTerminatingServiceTblEntry(BigInteger dpnId, Long routerId, String routerName, - String externalIp, long extSubnetId, int addOrRemove) { + protected void installInboundTerminatingServiceTblEntry(BigInteger dpnId, Long routerId, + long extSubnetId, int addOrRemove) { //Install the tunnel table entry in NAPT switch for inbound traffic to SNAP IP from a non a NAPT switch. LOG.info("installInboundTerminatingServiceTblEntry : creating entry for Terminating Service Table " + "for switch {}, routerId {}", dpnId, routerId); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java index f49b810f27..84f3daea78 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ConntrackBasedSnatService.java @@ -89,11 +89,10 @@ public abstract class ConntrackBasedSnatService extends AbstractSnatService { extSubnetId = NatUtil.getExternalSubnetVpnId(getDataBroker(),externalSubnetId); } createOutboundTblEntry(dpnId, routerId, externalIp, elanId, extGwMacAddress, addOrRemove); - installNaptPfibFlow(routers, dpnId, routerId, routerName, extSubnetId, addOrRemove); + installNaptPfibFlow(routers, dpnId, routerId, extSubnetId, addOrRemove); //Install Inbound NAT entries - Long extNetId = NatUtil.getVpnId(getDataBroker(), routers.getNetworkId().getValue()); - installInboundEntry(dpnId, routerId, routerName, extNetId, externalIp, elanId, extSubnetId, addOrRemove); + installInboundEntry(dpnId, routerId, externalIp, elanId, extSubnetId, addOrRemove); installNaptPfibEntry(dpnId, routerId, addOrRemove); } @@ -203,7 +202,7 @@ public abstract class ConntrackBasedSnatService extends AbstractSnatService { } protected void installNaptPfibFlow(Routers routers, BigInteger dpnId, long routerId, - String routerName, long extSubnetId, int addOrRemove) { + long extSubnetId, int addOrRemove) { Long extNetId = NatUtil.getVpnId(getDataBroker(), routers.getNetworkId().getValue()); LOG.info("installNaptPfibFlow : dpId {}, extNetId {}", dpnId, extNetId); List matches = new ArrayList<>(); @@ -230,8 +229,8 @@ public abstract class ConntrackBasedSnatService extends AbstractSnatService { flowRef, NwConstants.COOKIE_SNAT_TABLE, matches, instructions, addOrRemove); } - protected void installInboundEntry(BigInteger dpnId, long routerId, String routerName, Long extNetId, - String externalIp, int elanId, long extSubnetId, int addOrRemove) { + protected void installInboundEntry(BigInteger dpnId, long routerId, String externalIp, int elanId, long extSubnetId, + int addOrRemove) { LOG.info("installInboundEntry : dpId {} and routerId {}", dpnId, routerId); List matches = new ArrayList<>(); matches.add(MatchEthernetType.IPV4); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java index 64a26cc65f..21d5c1f57c 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java @@ -252,7 +252,7 @@ public class EvpnDnatFlowProgrammer { public void onRemoveFloatingIp(final BigInteger dpnId, final String vpnName, final String externalIp, final String floatingIpInterface, final String floatingIpPortMacAddress, - final String routerName, final long routerId, WriteTransaction removeFlowInvTx) { + final long routerId, WriteTransaction removeFlowInvTx) { /* * 1) Remove the flow INTERNAL_TUNNEL_TABLE (table=36)-> PDNAT_TABLE (table=25) (SNAT VM on DPN1 is * responding back to FIP VM on DPN2) {SNAT to DNAT traffic on different Hypervisor} @@ -284,7 +284,7 @@ public class EvpnDnatFlowProgrammer { String fibExternalIp = NatUtil.validateAndAddNetworkMask(externalIp); //Remove Prefix from BGP - NatUtil.removePrefixFromBGP(dataBroker, bgpManager, fibManager, rd, fibExternalIp, vpnName, LOG); + NatUtil.removePrefixFromBGP(bgpManager, fibManager, rd, fibExternalIp, vpnName, LOG); //Remove custom FIB routes flow for L3_FIB_TABLE (table=21)-> PDNAT_TABLE (table=25) RemoveFibEntryInput input = new RemoveFibEntryInputBuilder().setVpnName(vpnName) diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java index e405e87bbf..1dce2ca995 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java @@ -145,7 +145,7 @@ public class ExternalNetworksChangeListener Collection externalIps = NatUtil.getExternalIpsForRouter(dataBroker,routerId); if (natMode == NatMode.Controller) { externalRouterListener.handleDisableSnatInternetVpn(routerUuid.getValue(), routerId, networkUuid, - externalIps, false, original.getVpnid().getValue(), writeFlowInvTx); + externalIps, original.getVpnid().getValue(), writeFlowInvTx); } } } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java index e12145dffd..3c23b87375 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java @@ -265,7 +265,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase> futures = new ArrayList<>(); // Allocate Primary Napt Switch for this router - BigInteger primarySwitchId = getPrimaryNaptSwitch(routerName, routerId); + BigInteger primarySwitchId = getPrimaryNaptSwitch(routerName); if (primarySwitchId != null && !primarySwitchId.equals(BigInteger.ZERO)) { if (!routers.isEnableSnat()) { LOG.info("add : SNAT is disabled for external router {} ", routerName); @@ -317,7 +317,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase listActionInfoPrimary = new ArrayList<>(); String ifNamePrimary = getTunnelInterfaceName(dpnId, primarySwitchId); @@ -1042,7 +1041,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase externalSubnetList = NatUtil.getExternalSubnetIdsFromExternalIps(router.getExternalIps()); removeNaptFlowsFromActiveSwitch(routerId, routerName, naptSwitchDpnId, networkUuid, vpnName, externalIps, externalSubnetList, removeFlowInvTx, extNwProvType); - removeFlowsFromNonActiveSwitches(routerId, routerName, naptSwitchDpnId, networkUuid, removeFlowInvTx); + removeFlowsFromNonActiveSwitches(routerId, routerName, naptSwitchDpnId, removeFlowInvTx); try { String externalSubnetVpn = null; for (Uuid externalSubnetId : externalSubnetList) { @@ -1770,7 +1769,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase externalIps, boolean routerFlag, + @Nonnull Collection externalIps, String vpnId, WriteTransaction writeFlowInvTx) { LOG.debug("handleDisableSnatInternetVpn: Started to process handle disable snat for router {} " + "with internet vpn {}", routerName, vpnId); @@ -2113,7 +2112,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase intExtPortMapId = NatUtil.getIntExtPortMapIdentifier(routerId, interfaceName, internalIp); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java index 2fea7e522b..9a72205c86 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java @@ -43,7 +43,6 @@ import org.opendaylight.genius.mdsalutil.instructions.InstructionGotoTable; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.genius.mdsalutil.matches.MatchEthernetType; import org.opendaylight.genius.mdsalutil.matches.MatchMetadata; -import org.opendaylight.netvirt.bgpmanager.api.IBgpManager; import org.opendaylight.netvirt.elanmanager.api.IElanService; import org.opendaylight.netvirt.fibmanager.api.IFibManager; import org.opendaylight.netvirt.natservice.api.SnatServiceManager; @@ -61,7 +60,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fib.rpc.rev160121.FibRpcService; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.FibEntries; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTables; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.fibmanager.rev150330.fibentries.VrfTablesKey; @@ -82,7 +80,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev16011 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitch; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitchBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.natservice.rev160111.napt.switches.RouterToNaptSwitchKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.vpn.rpc.rev160201.VpnRpcService; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; @@ -114,9 +111,6 @@ public class NaptSwitchHA { final OdlInterfaceRpcService interfaceManager, final IdManagerService idManager, final NAPTSwitchSelector naptSwitchSelector, - final IBgpManager bgpManager, - final VpnRpcService vpnService, - final FibRpcService fibService, final IFibManager fibManager, final EvpnNaptSwitchHA evpnNaptSwitchHA, final IElanService elanManager, @@ -449,7 +443,7 @@ public class NaptSwitchHA { String rd = NatUtil.getVpnRd(dataBroker, vpnName); for (String externalIp : externalIpsCache) { LOG.debug("isNaptSwitchDown : Removing Fib entry rd {} prefix {}", rd, externalIp); - fibManager.removeFibEntry(dataBroker, rd, externalIp, null); + fibManager.removeFibEntry(rd, externalIp, null); } } } else { @@ -1056,7 +1050,7 @@ public class NaptSwitchHA { Optional ent = MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION, vrfEntryId); if (ent.isPresent()) { LOG.debug("removeFibEntry : Removing Fib entry rd {} prefix {}", rd, prefix); - fibManager.removeFibEntry(dataBroker, rd, prefix, null); + fibManager.removeFibEntry(rd, prefix, null); } } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java index dc03f339ac..09f2e12d73 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java @@ -181,7 +181,7 @@ public final class NatEvpnUtil { NatUtil.addPrefixToInterface(broker, NatUtil.getVpnId(broker, vpnName), interfaceName, prefix, dpId, null /* subnet-id */, Prefixes.PrefixCue.Nat); - fibManager.addOrUpdateFibEntry(broker, rd, null /*macAddress*/, prefix, + fibManager.addOrUpdateFibEntry(rd, null /*macAddress*/, prefix, Collections.singletonList(nextHopIp), VrfEntry.EncapType.Vxlan, NatConstants.DEFAULT_LABEL_VALUE, l3Vni, gwMacAddress, null /* parent-vpn-rd */, origin, writeTx); /* Publish to Bgp only if its an INTERNET VPN */ diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java index dbe45a3ddb..a5f5b485e5 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java @@ -479,7 +479,7 @@ public class NatTunnelInterfaceStateListener if (extNwProvType == null) { return false; } - hndlTepDelForDnatInEachRtr(router, routerId, srcDpnId, extNwProvType, writeFlowInvTx); + hndlTepDelForDnatInEachRtr(router, routerId, srcDpnId, extNwProvType); LOG.debug("handleTepDelForAllRtrs : TEP DEL : SNAT -> Withdrawing and Advertising routes for router {} ", router.getRouter()); hndlTepDelForSnatInEachRtr(router, routerId, srcDpnId, tunnelType, srcTepIp, destTepIp, @@ -577,7 +577,7 @@ public class NatTunnelInterfaceStateListener LOG.debug("hndlTepAddOnNonNaptSwitch : SNAT -> Install the group which forward packet to the tunnel port " + "for the NAPT switch {} and the flow 26 which forwards to group", primaryDpnId); - externalRouterListner.handleSwitches(srcDpnId, routerName, routerId, primaryDpnId, writeFlowInvTx); + externalRouterListner.handleSwitches(srcDpnId, routerName, routerId, primaryDpnId); } else { LOG.debug("hndlTepAddOnNonNaptSwitch : SNAT -> External BGP VPN (Private BGP) associated to router {}", routerId); @@ -674,7 +674,7 @@ public class NatTunnelInterfaceStateListener for (String externalIp : externalIps) { String rd = NatUtil.getVpnRd(dataBroker, externalVpnName); LOG.debug("hndlTepAddOnNaptSwitch : Removing Fib entry rd {} prefix {}", rd, externalIp); - fibManager.removeFibEntry(dataBroker, rd, externalIp, null); + fibManager.removeFibEntry(rd, externalIp, null); } /* @@ -735,8 +735,7 @@ public class NatTunnelInterfaceStateListener if (NatUtil.isOpenStackVniSemanticsEnforcedForGreAndVxlan(elanManager, extNwProvType)) { l3vni = NatOverVxlanUtil.getInternetVpnVni(idManager, externalVpnName, l3vni).longValue(); } - Uuid externalSubnetId = NatUtil.getExternalSubnetForRouterExternalIp(dataBroker, externalIp, - router); + Uuid externalSubnetId = NatUtil.getExternalSubnetForRouterExternalIp(externalIp, router); NatUtil.addPrefixToBGP(dataBroker, bgpManager, fibManager, externalVpnName, rd, externalSubnetId, fibExternalIp, nextHopIp, networkId.getValue(), null /* mac-address */, label, l3vni, RouteOrigin.STATIC, srcDpnId); @@ -1016,7 +1015,7 @@ public class NatTunnelInterfaceStateListener } private void hndlTepDelForDnatInEachRtr(RoutersList router, long routerId, BigInteger tepDeletedDpnId, - ProviderTypes extNwProvType, WriteTransaction writeFlowInvTx) { + ProviderTypes extNwProvType) { //DNAT : Withdraw the routes from the BGP String routerName = router.getRouter(); @@ -1078,7 +1077,7 @@ public class NatTunnelInterfaceStateListener LOG.debug("hndlTepDelForDnatInEachRtr : DNAT -> Withdrawing the FIB route to the floating IP {} " + "configured for the port: {}", externalIp, interfaceName); - NatUtil.removePrefixFromBGP(dataBroker, bgpManager, fibManager, rd, externalIp, vpnName, LOG); + NatUtil.removePrefixFromBGP(bgpManager, fibManager, rd, externalIp, vpnName, LOG); long serviceId = 0; if (extNwProvType == ProviderTypes.VXLAN) { serviceId = l3Vni; diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java index eb76cc4b39..118feb0e72 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java @@ -623,7 +623,8 @@ public final class NatUtil { String macAddress, long label, long l3vni, - RouteOrigin origin, BigInteger dpId) { + RouteOrigin origin, + BigInteger dpId) { try { LOG.info("addPrefixToBGP : Adding Fib entry rd {} prefix {} nextHop {} label {}", rd, prefix, nextHopIp, label); @@ -635,7 +636,7 @@ public final class NatUtil { addPrefixToInterface(broker, getVpnId(broker, vpnName), null /*interfaceName*/,prefix, dpId, subnetId, Prefixes.PrefixCue.Nat); - fibManager.addOrUpdateFibEntry(broker, rd, macAddress, prefix, + fibManager.addOrUpdateFibEntry(rd, macAddress, prefix, Collections.singletonList(nextHopIp), VrfEntry.EncapType.Mplsgre, (int)label, l3vni /*l3vni*/, null /*gatewayMacAddress*/, parentVpnRd, origin, null /*writeTxn*/); if (rd != null && !rd.equalsIgnoreCase(vpnName)) { @@ -754,11 +755,11 @@ public final class NatUtil { // TODO Clean up the exception handling @SuppressWarnings("checkstyle:IllegalCatch") - public static void removePrefixFromBGP(DataBroker broker, IBgpManager bgpManager, IFibManager fibManager, + public static void removePrefixFromBGP(IBgpManager bgpManager, IFibManager fibManager, String rd, String prefix, String vpnName, Logger log) { try { LOG.debug("removePrefixFromBGP: Removing Fib entry rd {} prefix {}", rd, prefix); - fibManager.removeFibEntry(broker, rd, prefix, null); + fibManager.removeFibEntry(rd, prefix, null); if (rd != null && !rd.equalsIgnoreCase(vpnName)) { bgpManager.withdrawPrefix(rd, prefix); } @@ -1662,7 +1663,7 @@ public final class NatUtil { protected static long getExternalSubnetVpnIdForRouterExternalIp(DataBroker dataBroker, String externalIpAddress, Routers router) { - Uuid externalSubnetId = NatUtil.getExternalSubnetForRouterExternalIp(dataBroker, externalIpAddress, router); + Uuid externalSubnetId = NatUtil.getExternalSubnetForRouterExternalIp(externalIpAddress, router); if (externalSubnetId != null) { return NatUtil.getExternalSubnetVpnId(dataBroker,externalSubnetId); } @@ -1670,8 +1671,7 @@ public final class NatUtil { return NatConstants.INVALID_ID; } - protected static Uuid getExternalSubnetForRouterExternalIp(DataBroker dataBroker, String externalIpAddress, - Routers router) { + protected static Uuid getExternalSubnetForRouterExternalIp(String externalIpAddress, Routers router) { externalIpAddress = validateAndAddNetworkMask(externalIpAddress); List externalIps = router.getExternalIps(); for (ExternalIps extIp : externalIps) { @@ -1917,7 +1917,7 @@ public final class NatUtil { router.getNetworkId(), subnetVpnName.getValue(), writeTx); vpnManager.removeArpResponderFlowsToExternalNetworkIps(router.getRouterName(), externalIpsSting, router.getExtGwMacAddress(), primarySwitchId, - router.getNetworkId(), writeTx); + router.getNetworkId()); } writeTx.submit(); } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java index 2d75f714f1..47f2e78127 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/VpnFloatingIpHandler.java @@ -313,7 +313,7 @@ public class VpnFloatingIpHandler implements FloatingIPHandler { vpnManager.removeSubnetMacFromVpnInstance(networkVpnName, subnetId.getValue(), floatingIpPortMacAddress, dpnId, tx); vpnManager.removeArpResponderFlowsToExternalNetworkIps(routerUuid, Collections.singletonList(externalIp), - floatingIpPortMacAddress, dpnId, networkId, tx); + floatingIpPortMacAddress, dpnId, networkId); }), LOG, "onRemoveFloatingIp"); removeFromFloatingIpPortInfo(floatingIpId); @@ -324,7 +324,7 @@ public class VpnFloatingIpHandler implements FloatingIPHandler { if (provType == ProviderTypes.VXLAN) { Uuid floatingIpInterface = NatEvpnUtil.getFloatingIpInterfaceIdFromFloatingIpId(dataBroker, floatingIpId); evpnDnatFlowProgrammer.onRemoveFloatingIp(dpnId, vpnName, externalIp, floatingIpInterface.getValue(), - floatingIpPortMacAddress, routerUuid, routerId, removeFlowInvTx); + floatingIpPortMacAddress, routerId, removeFlowInvTx); return; } cleanupFibEntries(dpnId, vpnName, externalIp, label, removeFlowInvTx, provType); @@ -336,7 +336,7 @@ public class VpnFloatingIpHandler implements FloatingIPHandler { //Remove Prefix from BGP String rd = NatUtil.getVpnRd(dataBroker, vpnName); String fibExternalIp = NatUtil.validateAndAddNetworkMask(externalIp); - NatUtil.removePrefixFromBGP(dataBroker, bgpManager, fibManager, rd, fibExternalIp, vpnName, LOG); + NatUtil.removePrefixFromBGP(bgpManager, fibManager, rd, fibExternalIp, vpnName, LOG); //Remove custom FIB routes diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java index 99e709e96e..7de7a8b1be 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java @@ -243,7 +243,7 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase

routersIdentifier = NeutronvpnUtils.buildExtRoutersIdentifier(routerId); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java index dfcdbeaaa7..50e86c26f7 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java @@ -123,7 +123,7 @@ public class L2GatewayListener extends AsyncClusteredDataTreeChangeListenerBase< protected void update(InstanceIdentifier identifier, L2gateway original, L2gateway update) { LOG.trace("Updating L2gateway : key: {}, original value={}, update value={}", identifier, original, update); List connections = l2gwService.getAssociatedL2GwConnections( - dataBroker, Sets.newHashSet(update.getUuid())); + Sets.newHashSet(update.getUuid())); if (connections == null) { LOG.warn("There are no connections associated with l2 gateway uuid {} name {}", update.getUuid(), update.getName()); diff --git a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java index 6314bbeabc..c27a00f27d 100644 --- a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java +++ b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/listeners/UnderlayNetworkDpnListener.java @@ -124,7 +124,7 @@ public class UnderlayNetworkDpnListener addedTunnelInterfaces.removeAll(origTunnelInterfaces); populatePolicyGroupBucketsToDpn(underlayNetwork, profiles, removedTunnelInterfaces, dpId, NwConstants.DEL_FLOW); - populatePolicyGroupsToDpn(underlayNetwork, profiles, addedTunnelInterfaces, dpId, NwConstants.ADD_FLOW); + populatePolicyGroupsToDpn(profiles, addedTunnelInterfaces, dpId, NwConstants.ADD_FLOW); populatePolicyGroupBucketsToDpn(underlayNetwork, profiles, addedTunnelInterfaces, dpId, NwConstants.ADD_FLOW); } @@ -140,13 +140,13 @@ public class UnderlayNetworkDpnListener return; } - populatePolicyGroupsToDpn(underlayNetwork, profiles, tunnelInterfaces, dpId, NwConstants.ADD_FLOW); + populatePolicyGroupsToDpn(profiles, tunnelInterfaces, dpId, NwConstants.ADD_FLOW); populatePolicyGroupBucketsToDpn(underlayNetwork, profiles, tunnelInterfaces, dpId, NwConstants.ADD_FLOW); - populatePolicyAclRulesToDpn(underlayNetwork, dpId, profiles, NwConstants.ADD_FLOW); + populatePolicyAclRulesToDpn(dpId, profiles, NwConstants.ADD_FLOW); populatePolicyRoutesToDpn(profiles, tunnelInterfaces, dpId, NwConstants.ADD_FLOW); } - private void populatePolicyGroupsToDpn(String underlayNetwork, List profiles, + private void populatePolicyGroupsToDpn(List profiles, List tunnelInterfaces, BigInteger dpId, int addOrRemove) { profiles.forEach(profile -> { String policyClassifier = profile.getPolicyClassifier(); @@ -176,7 +176,7 @@ public class UnderlayNetworkDpnListener }); } - private void populatePolicyAclRulesToDpn(String underlayNetwork, BigInteger dpId, List profiles, + private void populatePolicyAclRulesToDpn(BigInteger dpId, List profiles, int addOrRemove) { profiles.forEach(profile -> { String policyClassifier = profile.getPolicyClassifier(); diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java index ddd69eef84..4acbe10ba4 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/DelegatingDataTreeListener.java @@ -66,16 +66,16 @@ public abstract class DelegatingDataTreeListener implement mod.getModificationType(), key); switch (mod.getModificationType()) { case DELETE: - dataProcessor.remove(key, mod.getDataBefore()); + dataProcessor.remove(mod.getDataBefore()); break; case SUBTREE_MODIFIED: - dataProcessor.update(key, mod.getDataBefore(), mod.getDataAfter()); + dataProcessor.update(mod.getDataAfter()); break; case WRITE: if (mod.getDataBefore() == null) { - dataProcessor.add(key, mod.getDataAfter()); + dataProcessor.add(mod.getDataAfter()); } else { - dataProcessor.update(key, mod.getDataBefore(), mod.getDataAfter()); + dataProcessor.update(mod.getDataAfter()); } break; default: diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java index 814d141629..2f561720f9 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/INeutronSfcDataProcessor.java @@ -9,7 +9,6 @@ package org.opendaylight.netvirt.sfc.translator; import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Neutron SFC yang model processor. @@ -19,28 +18,23 @@ public interface INeutronSfcDataProcessor { /** * Method removes DataObject which is identified by InstanceIdentifier. * - * @param identifier - the whole path to DataObject * @param del - DataObject for removing */ - void remove(InstanceIdentifier identifier, D del); + void remove(D del); /** * Method updates the original DataObject to the update DataObject. * Both are identified by same InstanceIdentifier. * - * @param identifier - the whole path to DataObject - * @param original - original DataObject (for update) - * @param update - changed DataObject (contain updates) - */ - void update(InstanceIdentifier identifier, D original, D update); + * @param update - changed DataObject (contain updates)*/ + void update(D update); /** * Method adds the DataObject which is identified by InstanceIdentifier * to device. * - * @param identifier - the whole path to new DataObject * @param add - new DataObject */ - void add(InstanceIdentifier identifier, D add); + void add(D add); } diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java index 2cdb1c634a..051e9c3607 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/NeutronFlowClassifierListener.java @@ -38,11 +38,10 @@ public class NeutronFlowClassifierListener extends DelegatingDataTreeListener path, SfcFlowClassifier deletedSfcFlowClassifier) { + public void remove(SfcFlowClassifier deletedSfcFlowClassifier) { Acl aclFlowClassifier = FlowClassifierTranslator.buildAcl(deletedSfcFlowClassifier); sfcMdsalHelper.removeAclFlowClassifier(aclFlowClassifier); } @@ -51,14 +50,10 @@ public class NeutronFlowClassifierListener extends DelegatingDataTreeListener path, - SfcFlowClassifier originalSfcFlowClassifier, - SfcFlowClassifier updatedSfcFlowClassifier) { + public void update(SfcFlowClassifier updatedSfcFlowClassifier) { Acl aclFlowClassifier = FlowClassifierTranslator.buildAcl(updatedSfcFlowClassifier); sfcMdsalHelper.updateAclFlowClassifier(aclFlowClassifier); @@ -68,11 +63,10 @@ public class NeutronFlowClassifierListener extends DelegatingDataTreeListener path, SfcFlowClassifier sfcFlowClassifier) { + public void add(SfcFlowClassifier sfcFlowClassifier) { // Respective ACL classifier will be written in data store, once the chain is created. } diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java index 5329f9ef2d..52c437fda5 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortChainListener.java @@ -65,11 +65,10 @@ public class NeutronPortChainListener extends DelegatingDataTreeListener path, PortChain deletedPortChain) { + public void remove(PortChain deletedPortChain) { if (this.rspService != null) { DeleteRenderedPathInput deleteRenderedPathInput = PortChainTranslator.buildDeleteRenderedServicePathInput(PortChainTranslator @@ -87,12 +86,10 @@ public class NeutronPortChainListener extends DelegatingDataTreeListener path, PortChain originalPortChain, PortChain updatePortChain) { + public void update(PortChain updatePortChain) { //TODO: Add support for chain update } @@ -100,11 +97,10 @@ public class NeutronPortChainListener extends DelegatingDataTreeListener path, final PortChain newPortChain) { + public void add(final PortChain newPortChain) { processPortChain(newPortChain); } diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java index af76ba5634..d967c7f7dc 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairGroupListener.java @@ -31,11 +31,10 @@ public class NeutronPortPairGroupListener extends DelegatingDataTreeListener path, PortPairGroup deletedPortPairGroup) { + public void remove(PortPairGroup deletedPortPairGroup) { //NO-OP } @@ -43,14 +42,10 @@ public class NeutronPortPairGroupListener extends DelegatingDataTreeListener path, - PortPairGroup originalPortPairGroup, - PortPairGroup updatePortPairGroup) { + public void update(PortPairGroup updatePortPairGroup) { //NO-OP } @@ -58,11 +53,10 @@ public class NeutronPortPairGroupListener extends DelegatingDataTreeListener path, PortPairGroup newPortPairGroup) { + public void add(PortPairGroup newPortPairGroup) { //NO-OP } } diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java index 2aa2b7267a..f9006be44a 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/NeutronPortPairListener.java @@ -43,11 +43,10 @@ public class NeutronPortPairListener extends DelegatingDataTreeListener path, PortPair deletedPortPair) { + public void remove(PortPair deletedPortPair) { LOG.info("Received remove port pair event {}", deletedPortPair); ServiceFunctionKey sfKey = PortPairTranslator.getSFKey(deletedPortPair); @@ -67,12 +66,10 @@ public class NeutronPortPairListener extends DelegatingDataTreeListener path, PortPair originalPortPair, PortPair updatePortPair) { + public void update(PortPair updatePortPair) { //NO-OP } @@ -80,11 +77,10 @@ public class NeutronPortPairListener extends DelegatingDataTreeListener path, PortPair newPortPair) { + public void add(PortPair newPortPair) { //NO-OP // Port Pair data written in neutron data store will be used // When user will create port chain. diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java index 9f327379aa..fd74fdc23e 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CounterRetriever.java @@ -20,7 +20,6 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; import javax.inject.Inject; import javax.inject.Singleton; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.infrautils.counters.api.OccurenceCounter; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsInputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.direct.statistics.rev160511.GetFlowStatisticsOutput; @@ -52,10 +51,10 @@ public class CounterRetriever { private final Counters counters = new Counters(); @Inject - public CounterRetriever(final RpcProviderRegistry rpcProviderRegistry, - final StatisticsConfig statisticsConfig, final OpendaylightDirectStatisticsService odlDirectStatsService) { + public CounterRetriever(final StatisticsConfig statisticsConfig, + final OpendaylightDirectStatisticsService odlDirectStatsService) { this.odlDirectStatsService = odlDirectStatsService; - this.nodeResultTimeout = statisticsConfig.getNodeCounterResultTimeout(); + nodeResultTimeout = statisticsConfig.getNodeCounterResultTimeout(); } @PreDestroy @@ -195,7 +194,7 @@ public class CounterRetriever { return crds; } - public CounterResultDataStructure getSwitchFlowCountersDirect(BigInteger dpId, Match match, short tableId) { + public CounterResultDataStructure getSwitchFlowCountersDirect(BigInteger dpId, Match match) { NodeRef nodeRef = new NodeRef(InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId(CountersUtils.getNodeId(dpId)))).toInstance()); GetFlowStatisticsInputBuilder gfsib = new GetFlowStatisticsInputBuilder(); diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java index 385add4a42..49734ebae6 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java @@ -162,11 +162,11 @@ public final class CountersServiceUtils { } public static Flow createFlowOnTable(Match match, int priority, short tableId) { - return createFlowOnTable(match, priority, tableId, null, false, null); + return createFlowOnTable(match, priority, tableId, null, null); } public static Flow createFlowOnTable(Match match, int priority, short tableId, BigInteger cookie, - boolean isCreateFlowIdFromMatch, Integer timeout) { + Integer timeout) { FlowBuilder fb = new FlowBuilder(); if (match != null) { fb.setMatch(match); diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java index d90255869e..e26c3ef428 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java @@ -559,9 +559,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan List matches = CountersServiceUtils.getCounterFlowMatch(ecr, lportTag, ElementCountersDirection.valueOf(counterRequest.getTrafficDirection())); Match match = MDSALUtil.buildMatches(matches); - CounterResultDataStructure counterResultDS = counterRetriever.getSwitchFlowCountersDirect(dpId, match, - CountersServiceUtils.getTableId(ecr.getDirection())); - return counterResultDS; + return counterRetriever.getSwitchFlowCountersDirect(dpId, match); } private void initializeCountrsConfigDataSrore() { diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java index 5c4f0102e2..1779fa49c4 100644 --- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java +++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java @@ -28,7 +28,7 @@ public interface IVpnManager { String rd, String routerID, int label, RouteOrigin origin); void addExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID, - int label, Long l3vni, RouteOrigin origin, String intfName, Adjacency operationalAdj, + Long l3vni, RouteOrigin origin, String intfName, Adjacency operationalAdj, VrfEntry.EncapType encapType, WriteTransaction writeConfigTxn); void delExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID); @@ -74,13 +74,13 @@ public interface IVpnManager { BigInteger dpnId, Uuid extNetworkId, WriteTransaction writeTx); void addArpResponderFlowsToExternalNetworkIps(String id, Collection fixedIps, String routerGwMac, - BigInteger dpnId, long vpnId, String extInterfaceName, int lportTag, WriteTransaction writeTx); + BigInteger dpnId, String extInterfaceName, int lportTag, WriteTransaction writeTx); void removeArpResponderFlowsToExternalNetworkIps(String id, Collection fixedIps, String macAddress, - BigInteger dpnId, Uuid extNetworkId, WriteTransaction writeTx); + BigInteger dpnId, Uuid extNetworkId); void removeArpResponderFlowsToExternalNetworkIps(String id, Collection fixedIps, - BigInteger dpnId, String extInterfaceName, int lportTag, WriteTransaction writeTx); + BigInteger dpnId, String extInterfaceName, int lportTag); void onSubnetAddedToVpn(Subnetmap subnetmap, boolean isBgpVpn, Long elanTag); diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java index 1f3d490ac1..8b0f372fe4 100755 --- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java +++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/intervpnlink/IVpnLinkService.java @@ -37,10 +37,9 @@ public interface IVpnLinkService { * @param label Label of the route in the original VPN * @param forcedOrigin By default, origin for leaked routes is INTERVPN, however it is possible to * provide a different origin if desired. - * @param addOrRemove states if the routes must be leaked or withdrawn */ void leakRoute(InterVpnLinkDataComposite interVpnLink, String srcVpnUuid, String dstVpnUuid, - String prefix, Long label, RouteOrigin forcedOrigin, int addOrRemove); + String prefix, Long label, RouteOrigin forcedOrigin); /** * Similar to leakRouteIfNeeded but the only requisite to be met is that diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java index a401fcb36b..ca2aae5fd8 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java @@ -41,7 +41,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor.profile.create.input.Profile; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor.profile.create.input.ProfileBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.monitor.start.input.ConfigBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService; + import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,9 +54,9 @@ public final class AlivenessMonitorUtils { private AlivenessMonitorUtils() { } public static void startArpMonitoring(MacEntry macEntry, Long arpMonitorProfileId, - AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker, - OdlInterfaceRpcService interfaceRpc, INeutronVpnManager neutronVpnService, - IInterfaceManager interfaceManager) { + AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker, + INeutronVpnManager neutronVpnService, + IInterfaceManager interfaceManager) { if (interfaceManager.isExternalInterface(macEntry.getInterfaceName())) { LOG.debug("ARP monitoring is currently not supported through external interfaces," + "skipping ARP monitoring from interface {} for IP {} (last known MAC {})", @@ -64,14 +64,14 @@ public final class AlivenessMonitorUtils { return; } Optional gatewayIpOptional = - VpnUtil.getGatewayIpAddressFromInterface(macEntry.getInterfaceName(), neutronVpnService, dataBroker); + VpnUtil.getGatewayIpAddressFromInterface(macEntry.getInterfaceName(), neutronVpnService); if (!gatewayIpOptional.isPresent()) { LOG.error("Error while retrieving GatewayIp for interface{}", macEntry.getInterfaceName()); return; } final IpAddress gatewayIp = gatewayIpOptional.get(); Optional gatewayMacOptional = VpnUtil.getGWMacAddressFromInterface(macEntry, - gatewayIp, dataBroker, interfaceRpc); + gatewayIp, dataBroker); if (!gatewayMacOptional.isPresent()) { LOG.error("Error while retrieving GatewayMac for interface{}", macEntry.getInterfaceName()); return; diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java index 9bbaace99e..fc309eecf2 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitorStartTask.java @@ -14,25 +14,22 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager; import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager; import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev160411.AlivenessMonitorService; -import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.interfacemanager.rpcs.rev160406.OdlInterfaceRpcService; public class ArpMonitorStartTask implements Callable>> { private MacEntry macEntry; private Long arpMonitorProfileId; private DataBroker databroker; private AlivenessMonitorService alivenessManager; - private OdlInterfaceRpcService interfaceRpc; private INeutronVpnManager neutronVpnService; private IInterfaceManager interfaceManager; public ArpMonitorStartTask(MacEntry macEntry, Long profileId, DataBroker databroker, - AlivenessMonitorService alivenessManager, OdlInterfaceRpcService interfaceRpc, - INeutronVpnManager neutronVpnService, IInterfaceManager interfaceManager) { + AlivenessMonitorService alivenessManager, + INeutronVpnManager neutronVpnService, IInterfaceManager interfaceManager) { this.macEntry = macEntry; this.arpMonitorProfileId = profileId; this.databroker = databroker; this.alivenessManager = alivenessManager; - this.interfaceRpc = interfaceRpc; this.neutronVpnService = neutronVpnService; this.interfaceManager = interfaceManager; } @@ -40,7 +37,7 @@ public class ArpMonitorStartTask implements Callable @Override public List> call() { AlivenessMonitorUtils.startArpMonitoring(macEntry, arpMonitorProfileId, - alivenessManager, databroker, interfaceRpc, neutronVpnService, + alivenessManager, databroker, neutronVpnService, interfaceManager); return null; } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java index da9eecb49d..5a2b3c838a 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpMonitoringHandler.java @@ -145,7 +145,7 @@ public class ArpMonitoringHandler value.getCreationTime()); jobCoordinator.enqueueJob(buildJobKey(srcInetAddr.toString(), vpnName), new ArpMonitorStartTask(macEntry, arpMonitorProfileId, dataBroker, alivenessManager, - interfaceRpc, neutronVpnService, interfaceManager)); + neutronVpnService, interfaceManager)); } catch (UnknownHostException e) { LOG.error("Error in deserializing packet {} with exception", value, e); } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java index f5e53a0d4c..2e0e413d96 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/CentralizedSwitchChangeListener.java @@ -128,7 +128,7 @@ public class CentralizedSwitchChangeListener subnetVpnName.getValue(), writeTx); vpnManager.removeArpResponderFlowsToExternalNetworkIps(routerName, VpnUtil.getIpsListFromExternalIps(router.getExternalIps()), - extGwMacAddress, primarySwitchId, extNetworkId, writeTx); + extGwMacAddress, primarySwitchId, extNetworkId); } } } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java index fa5da8580b..7eb7a20796 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java @@ -192,7 +192,7 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener { throws InterruptedException, ExecutionException, UnknownHostException { String vmVpnInterfaceName = VpnUtil.getVpnInterfaceName(odlInterfaceRpcService, metadata); if (isTunnel(vmVpnInterfaceName)) { - handlePacketFromTunnelToExternalNetwork(vpnIdVpnInstanceName, vmVpnInterfaceName, + handlePacketFromTunnelToExternalNetwork(vpnIdVpnInstanceName, srcIpStr, dstIp, elanTag); } VpnInterface vmVpnInterface = VpnUtil.getVpnInterface(dataBroker, vmVpnInterfaceName); @@ -272,7 +272,7 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener { transmitArpPacket(targetSubnetForPacketOut.getNhDpnId(), sourceIp, sourceMac, dstIp, elanTag); } - private void handlePacketFromTunnelToExternalNetwork(String vpnIdVpnInstanceName, String tunnelInterfaceName, + private void handlePacketFromTunnelToExternalNetwork(String vpnIdVpnInstanceName, String srcIpStr, byte[] dstIp, long elanTag) throws UnknownHostException { String routerId = VpnUtil.getAssociatedExternalRouter(dataBroker, srcIpStr); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java index 80c87a33b6..1fc965c6b8 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java @@ -62,7 +62,7 @@ public final class TransactionUtil { } public static void syncWrite(DataBroker dataBroker, LogicalDatastoreType datastoreType, - InstanceIdentifier path, T data, FutureCallback callback) { + InstanceIdentifier path, T data) { WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); tx.put(datastoreType, path, data, WriteTransaction.CREATE_MISSING_PARENTS); try { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java index db3d126fc6..f016512bd7 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java @@ -135,7 +135,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas if (isGreTunnel(del)) { programDcGwLoadBalancingGroup(del, NwConstants.DEL_FLOW); } - handleTunnelEventForDPN(del, UpdateRouteAction.WITHDRAW_ROUTE, TunnelAction.TUNNEL_EP_DELETE); + handleTunnelEventForDPN(del, TunnelAction.TUNNEL_EP_DELETE); } @Override @@ -166,7 +166,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas } WriteTransaction writeConfigTxn = dataBroker.newWriteOnlyTransaction(); if (tunOpStatus == TunnelOperStatus.Up) { - handleTunnelEventForDPN(update, UpdateRouteAction.ADVERTISE_ROUTE, TunnelAction.TUNNEL_EP_ADD); + handleTunnelEventForDPN(update, TunnelAction.TUNNEL_EP_ADD); } else { vpnInstanceOpData.stream().filter(opData -> { if (opData.getVpnToDpnList() == null) { @@ -185,7 +185,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas List routePaths = vrfEntry.getRoutePaths(); routePaths.forEach(routePath -> { if (routePath.getNexthopAddress().equals(srcTepIp)) { - fibManager.updateRoutePathForFibEntry(dataBroker, opData.getVrfId(), + fibManager.updateRoutePathForFibEntry(opData.getVrfId(), destPrefix.getDestPrefix(), srcTepIp, routePath.getLabel(), false, writeConfigTxn); } @@ -214,7 +214,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas LOG.info("add: ITM Tunnel ,type {} ,added between src: {} and dest: {}", fibManager.getTransportTypeStr(add.getTransportType().toString()), add.getSrcInfo().getTepDeviceId(), add.getDstInfo().getTepDeviceId()); - handleTunnelEventForDPN(add, UpdateRouteAction.ADVERTISE_ROUTE, TunnelAction.TUNNEL_EP_ADD); + handleTunnelEventForDPN(add, TunnelAction.TUNNEL_EP_ADD); } public enum TunnelEventProcessingMethod { @@ -233,8 +233,8 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas // TODO Clean up the exception handling @SuppressWarnings("checkstyle:IllegalCatch") - private void handleTunnelEventForDPN(StateTunnelList stateTunnelList, UpdateRouteAction action, - TunnelAction tunnelAction) { + private void handleTunnelEventForDPN(StateTunnelList stateTunnelList, + TunnelAction tunnelAction) { final BigInteger srcDpnId = new BigInteger(stateTunnelList.getSrcInfo().getTepDeviceId()); final String srcTepIp = String.valueOf(stateTunnelList.getSrcInfo().getTepIp().getValue()); String destTepIp = String.valueOf(stateTunnelList.getDstInfo().getTepIp().getValue()); @@ -340,7 +340,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas if (vpnInterface != null && !vpnInterface.isScheduledForRemove()) { listVpnName.addAll(VpnHelper .getVpnInterfaceVpnInstanceNamesString(vpnInterface.getVpnInstanceNames())); - handleTunnelEventForDPNVpn(stateTunnelList, action, vpnIdRdMap, + handleTunnelEventForDPNVpn(stateTunnelList, vpnIdRdMap, tunnelAction, isTepDeletedOnDpn, subnetList, TunnelEventProcessingMethod.POPULATESUBNETS, vpnInterface); @@ -361,7 +361,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas VpnInterface vpnInterface = VpnUtil.getConfiguredVpnInterface(dataBroker, intfName); if (vpnInterface != null) { - handleTunnelEventForDPNVpn(stateTunnelList, action, vpnIdRdMap, + handleTunnelEventForDPNVpn(stateTunnelList, vpnIdRdMap, tunnelAction, isTepDeletedOnDpn, subnetList, TunnelEventProcessingMethod.MANAGEREMOTEROUTES, vpnInterface); @@ -402,7 +402,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas // TODO Clean up the exception handling @SuppressWarnings("checkstyle:IllegalCatch") - private void handleTunnelEventForDPNVpn(StateTunnelList stateTunnelList, UpdateRouteAction action, + private void handleTunnelEventForDPNVpn(StateTunnelList stateTunnelList, Map vpnIdRdMap, TunnelAction tunnelAction, boolean isTepDeletedOnDpn, List subnetList, TunnelEventProcessingMethod method, diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java index 8494196faa..816a821779 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java @@ -154,20 +154,17 @@ public class VpnInstanceListener extends AsyncDataTreeChangeListenerBase identifier, final VpnInstance value) { LOG.trace("{} add: Add VPN event key: {}, value: {}", LOGGING_PREFIX_ADD, identifier, value); final String vpnName = value.getVpnInstanceName(); - jobCoordinator.enqueueJob("VPN-" + vpnName, new AddVpnInstanceWorker(idManager, dataBroker, value), + jobCoordinator.enqueueJob("VPN-" + vpnName, new AddVpnInstanceWorker(dataBroker, value), SystemPropertyReader.getDataStoreJobCoordinatorMaxRetries()); } private class AddVpnInstanceWorker implements Callable>> { private final Logger log = LoggerFactory.getLogger(AddVpnInstanceWorker.class); - IdManagerService idManager; VpnInstance vpnInstance; DataBroker broker; - AddVpnInstanceWorker(IdManagerService idManager, - DataBroker broker, - VpnInstance value) { - this.idManager = idManager; + AddVpnInstanceWorker(DataBroker broker, + VpnInstance value) { this.broker = broker; this.vpnInstance = value; } @@ -221,7 +218,7 @@ public class VpnInstanceListener extends AsyncDataTreeChangeListenerBase rd = config.getRouteDistinguisher(); - if (rd == null || addBgpVrf(voids)) { + if (rd == null || addBgpVrf()) { notifyTask(); vpnInterfaceManager.vpnInstanceIsReady(vpnName); } @@ -368,7 +365,7 @@ public class VpnInstanceListener extends AsyncDataTreeChangeListenerBase voids) { + private boolean addBgpVrf() { VpnAfConfig config = vpnInstance.getIpv4Family(); String primaryRd = VpnUtil.getPrimaryRd(dataBroker, vpnName); List vpnTargetList = config.getVpnTargets().getVpnTarget(); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java index aaa3d58728..7d7888e934 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java @@ -554,11 +554,11 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase rdToAllocate = VpnUtil .allocateRdForExtraRouteAndUpdateUsedRdsMap(dataBroker, vpnId, null, - prefix, vpnName, nextHop.getNextHopIpList().get(0), dpnId, writeOperTxn); + prefix, vpnName, nextHop.getNextHopIpList().get(0), dpnId); if (rdToAllocate.isPresent()) { rd = rdToAllocate.get(); LOG.info("processVpnInterfaceAdjacencies: The rd {} is allocated for the extraroute {}", @@ -836,7 +836,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase { - fibManager.removeOrUpdateFibEntry(dataBroker, vpnName, nextHop.getIpAddress(), nh, + fibManager.removeOrUpdateFibEntry(vpnName, nextHop.getIpAddress(), nh, writeConfigTxn); LOG.info("removeAdjacenciesFromVpn: removed/updated FIB with rd {} prefix {}" + " nexthop {} for interface {} on dpn {} for internal vpn {}", @@ -1408,7 +1408,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase getNextHopForNonPrimaryAdjacency(Adjacency nextHop, String vpnName, BigInteger dpnId, @@ -1816,13 +1815,13 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase rdToAllocate = VpnUtil.allocateRdForExtraRouteAndUpdateUsedRdsMap( - dataBroker, vpnId, null, prefix, vpnName, nh, dpnId, writeOperTxn); + dataBroker, vpnId, null, prefix, vpnName, nh, dpnId); if (rdToAllocate.isPresent()) { input.setRd(rdToAllocate.get()); operationalAdjacency = populator.createOperationalAdjacency(input); int label = operationalAdjacency.getLabel().intValue(); vpnManager.addExtraRoute(vpnName, adj.getIpAddress(), nh, rdToAllocate.get(), - currVpnIntf.getVpnInstanceName(), label, l3vni, origin, + currVpnIntf.getVpnInstanceName(), l3vni, origin, currVpnIntf.getName(), operationalAdjacency, encapType, writeConfigTxn); LOG.info("addNewAdjToVpnInterface: Added extra route ip {} nh {} rd {} vpnname {} label {}" + " Interface {} on dpn {}", adj.getIpAddress(), nh, rdToAllocate.get(), @@ -1842,14 +1841,12 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase vpnManager.addExtraRoute( VpnUtil.getVpnName(dataBroker, vpn.getVpnId()), adj.getIpAddress(), nh, rds, currVpnIntf.getVpnInstanceName(), - opAdjacency.getLabel().intValue(), l3vni, RouteOrigin.SELF_IMPORTED, currVpnIntf.getName(), opAdjacency, encapType, writeConfigTxn)); } @@ -1869,7 +1866,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase { WriteTransaction writeConfigTxn = dataBroker.newWriteOnlyTransaction(); WriteTransaction writeOperTxn = dataBroker.newWriteOnlyTransaction(); - if (VpnUtil.isAdjacencyEligibleToVpn( - dataBroker, adjacency, vpnName, vpnInterface.getInterfaceName())) { + if (VpnUtil.isAdjacencyEligibleToVpn(dataBroker, adjacency, vpnName)) { addNewAdjToVpnInterface(existingVpnInterfaceId, primaryRd, adjacency, vpnInterfaceOptional.get().getDpnId(), writeConfigTxn, writeOperTxn); ListenableFuture operFuture = writeOperTxn.submit(); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java index 53c17956da..6ddc4c5b48 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnManagerImpl.java @@ -30,7 +30,6 @@ import org.opendaylight.genius.mdsalutil.FlowEntity; import org.opendaylight.genius.mdsalutil.MDSALUtil; import org.opendaylight.genius.mdsalutil.MatchInfoBase; import org.opendaylight.genius.mdsalutil.MetaDataUtil; -import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.genius.mdsalutil.UpgradeState; import org.opendaylight.genius.mdsalutil.instructions.InstructionWriteMetadata; import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager; @@ -97,7 +96,6 @@ public class VpnManagerImpl implements IVpnManager { public VpnManagerImpl(final DataBroker dataBroker, final IdManagerService idManagerService, final IMdsalApiManager mdsalManager, - final VpnFootprintService vpnFootprintService, final IElanService elanService, final IInterfaceManager interfaceManager, final VpnSubnetRouteHandler vpnSubnetRouteHandler, @@ -176,13 +174,13 @@ public class VpnManagerImpl implements IVpnManager { VpnInstanceOpDataEntry vpnOpEntry = VpnUtil.getVpnInstanceOpData(dataBroker, rd); Boolean isVxlan = VpnUtil.isL3VpnOverVxLan(vpnOpEntry.getL3vni()); VrfEntry.EncapType encapType = VpnUtil.getEncapType(isVxlan); - addExtraRoute(vpnName, destination, nextHop, rd, routerID, label, vpnOpEntry.getL3vni(), + addExtraRoute(vpnName, destination, nextHop, rd, routerID, vpnOpEntry.getL3vni(), origin,/*intfName*/ null, null /*Adjacency*/, encapType, null); } @Override public void addExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID, - int label, Long l3vni, RouteOrigin origin, String intfName, Adjacency operationalAdj, + Long l3vni, RouteOrigin origin, String intfName, Adjacency operationalAdj, VrfEntry.EncapType encapType, WriteTransaction writeConfigTxn) { Boolean writeConfigTxnPresent = true; @@ -234,8 +232,7 @@ public class VpnManagerImpl implements IVpnManager { + " route for destination {}", destination); return; } - ivpnLinkService.leakRoute(interVpnLink, srcVpnUuid, dstVpnUuid, destination, newLabel, RouteOrigin.STATIC, - NwConstants.ADD_FLOW); + ivpnLinkService.leakRoute(interVpnLink, srcVpnUuid, dstVpnUuid, destination, newLabel, RouteOrigin.STATIC); } else { Optional optVpnExtraRoutes = VpnExtraRouteHelper .getVpnExtraroutes(dataBroker, vpnName, rd != null ? rd : routerID, destination); @@ -248,7 +245,7 @@ public class VpnManagerImpl implements IVpnManager { L3vpnInput input = new L3vpnInput().setNextHop(operationalAdj).setNextHopIp(nextHop).setL3vni(l3vni) .setPrimaryRd(primaryRd).setVpnName(vpnName).setDpnId(dpnId) .setEncapType(encapType).setRd(rd).setRouteOrigin(origin); - L3vpnRegistry.getRegisteredPopulator(encapType).populateFib(input, writeConfigTxn, null); + L3vpnRegistry.getRegisteredPopulator(encapType).populateFib(input, writeConfigTxn); } } } @@ -290,7 +287,7 @@ public class VpnManagerImpl implements IVpnManager { LOG.info("delExtraRoute: Removed extra route {} from interface {} for rd {}", destination, intfName, rd); } else { // add FIB route directly - fibManager.removeOrUpdateFibEntry(dataBroker, routerID, destination, tunnelIp, writeConfigTxn); + fibManager.removeOrUpdateFibEntry(routerID, destination, tunnelIp, writeConfigTxn); LOG.info("delExtraRoute: Removed extra route {} from interface {} for rd {}", destination, intfName, routerID); } @@ -338,7 +335,7 @@ public class VpnManagerImpl implements IVpnManager { return; } } - fibManager.removeOrUpdateFibEntry(dataBroker, primaryRd, prefix, tunnelIp, writeConfigTxn); + fibManager.removeOrUpdateFibEntry(primaryRd, prefix, tunnelIp, writeConfigTxn); if (VpnUtil.isEligibleForBgp(rd, vpnName, dpnId, null /*networkName*/)) { // TODO: Might be needed to include nextHop here bgpManager.withdrawPrefix(rd, prefix); @@ -546,7 +543,7 @@ public class VpnManagerImpl implements IVpnManager { @Override public void addArpResponderFlowsToExternalNetworkIps(String id, Collection fixedIps, String macAddress, - BigInteger dpnId, long vpnId, String extInterfaceName, int lportTag, WriteTransaction writeTx) { + BigInteger dpnId, String extInterfaceName, int lportTag, WriteTransaction writeTx) { if (fixedIps == null || fixedIps.isEmpty()) { LOG.debug("No external IPs defined for {}", id); return; @@ -559,14 +556,14 @@ public class VpnManagerImpl implements IVpnManager { tx -> { for (String fixedIp : fixedIps) { installArpResponderFlowsToExternalNetworkIp(macAddress, dpnId, extInterfaceName, lportTag, - vpnId,fixedIp, tx); + fixedIp); } }); ListenableFutures.addErrorLogging(future, LOG, "Commit transaction"); } else { for (String fixedIp : fixedIps) { - installArpResponderFlowsToExternalNetworkIp(macAddress, dpnId, extInterfaceName, lportTag, vpnId, - fixedIp, writeTx); + installArpResponderFlowsToExternalNetworkIp(macAddress, dpnId, extInterfaceName, lportTag, + fixedIp); } } } @@ -593,14 +590,13 @@ public class VpnManagerImpl implements IVpnManager { return; } - long vpnId = getVpnIdFromExtNetworkId(extNetworkId); - addArpResponderFlowsToExternalNetworkIps(id, fixedIps, macAddress, dpnId, vpnId, extInterfaceName, lportTag, + addArpResponderFlowsToExternalNetworkIps(id, fixedIps, macAddress, dpnId, extInterfaceName, lportTag, writeTx); } @Override public void removeArpResponderFlowsToExternalNetworkIps(String id, Collection fixedIps, String macAddress, - BigInteger dpnId, Uuid extNetworkId, WriteTransaction writeTx) { + BigInteger dpnId, Uuid extNetworkId) { if (dpnId == null || BigInteger.ZERO.equals(dpnId)) { LOG.warn("Failed to remove arp responder flows for router {}. DPN id is missing.", id); @@ -634,12 +630,12 @@ public class VpnManagerImpl implements IVpnManager { } removeArpResponderFlowsToExternalNetworkIps(id, fixedIps, dpnId, - extInterfaceName, lportTag, writeTx); + extInterfaceName, lportTag); } @Override public void removeArpResponderFlowsToExternalNetworkIps(String id, Collection fixedIps, - BigInteger dpnId, String extInterfaceName, int lportTag, WriteTransaction writeTx) { + BigInteger dpnId, String extInterfaceName, int lportTag) { if (fixedIps == null || fixedIps.isEmpty()) { LOG.debug("No external IPs defined for {}", id); return; @@ -670,7 +666,7 @@ public class VpnManagerImpl implements IVpnManager { } private void installArpResponderFlowsToExternalNetworkIp(String macAddress, BigInteger dpnId, - String extInterfaceName, int lportTag, long vpnId, String fixedIp, WriteTransaction writeTx) { + String extInterfaceName, int lportTag, String fixedIp) { // reset the split-horizon bit to allow traffic to be sent back to the // provider port List instructions = new ArrayList<>(); @@ -691,16 +687,6 @@ public class VpnManagerImpl implements IVpnManager { elanService.removeArpResponderFlow(arpInput); } - private long getVpnIdFromExtNetworkId(Uuid extNetworkId) { - Uuid vpnInstanceId = VpnUtil.getExternalNetworkVpnId(dataBroker, extNetworkId); - if (vpnInstanceId == null) { - LOG.debug("Network {} is not associated with VPN", extNetworkId.getValue()); - return VpnConstants.INVALID_ID; - } - - return VpnUtil.getVpnId(dataBroker, vpnInstanceId.getValue()); - } - @Override public void onSubnetAddedToVpn(Subnetmap subnetmap, boolean isBgpVpn, Long elanTag) { vpnSubnetRouteHandler.onSubnetAddedToVpn(subnetmap, isBgpVpn, elanTag); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java index 1163a54cf1..155bbf6f0c 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOpStatusListener.java @@ -101,7 +101,7 @@ public class VpnOpStatusListener extends AsyncDataTreeChangeListenerBase optVpnLink = interVpnLinkCache.getInterVpnLinkByEndpoint(nexthop); if (optVpnLink.isPresent()) { - fibManager.removeOrUpdateFibEntry(dataBroker, vpnRd, destination, nexthop, /*writeTx*/ null); + fibManager.removeOrUpdateFibEntry(vpnRd, destination, nexthop, /*writeTx*/ null); bgpManager.withdrawPrefix(vpnRd, destination); } else { vpnManager.delExtraRoute(vpnInstanceName, destination, diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java index e4c710d7b7..14c14b8a40 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java @@ -832,7 +832,7 @@ public class VpnSubnetRouteHandler { .setSubnetIp(subnetIp).setNextHopIp(nextHopIp).setL3vni(l3vni).setLabel(label).setElanTag(elanTag) .setDpnId(nhDpnId).setEncapType(encapType).setNetworkName(networkName).setPrimaryRd(rd); if (!isBgpVpn) { - vpnPopulator.populateFib(input, null /*writeCfgTxn*/, null /*writeOperTxn*/); + vpnPopulator.populateFib(input, null /*writeCfgTxn*/); return true; } Preconditions.checkNotNull(nextHopIp, LOGGING_PREFIX + "NextHopIp cannot be null or empty!"); @@ -840,7 +840,7 @@ public class VpnSubnetRouteHandler { .getPrefixToInterfaceIdentifier(VpnUtil.getVpnId(dataBroker, vpnName), subnetIp), VpnUtil .getPrefixToInterface(nhDpnId, subnetId.getValue(), subnetIp, subnetId, Prefixes.PrefixCue.SubnetRoute)); - vpnPopulator.populateFib(input, null /*writeCfgTxn*/, null /*writeOperTxn*/); + vpnPopulator.populateFib(input, null /*writeCfgTxn*/); try { // BGP manager will handle withdraw and advertise internally if prefix // already exist @@ -883,11 +883,11 @@ public class VpnSubnetRouteHandler { } public void deleteSubnetRouteFibEntryFromDS(String rd, String prefix, String vpnName) { - fibManager.removeFibEntry(dataBroker, rd, prefix, null); + fibManager.removeFibEntry(rd, prefix, null); List vpnsToImportRoute = VpnUtil.getVpnsImportingMyRoute(dataBroker, vpnName); for (VpnInstanceOpDataEntry vpnInstance : vpnsToImportRoute) { String importingRd = vpnInstance.getVrfId(); - fibManager.removeFibEntry(dataBroker, importingRd, prefix, null); + fibManager.removeFibEntry(importingRd, prefix, null); LOG.info("SUBNETROUTE: deleteSubnetRouteFibEntryFromDS: Deleted imported subnet route rd {} prefix {}" + " from vpn {} importingRd {}", rd, prefix, vpnInstance.getVpnInstanceName(), importingRd); } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java index 3795a9bc5b..e210f4a6b9 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java @@ -1328,7 +1328,7 @@ public final class VpnUtil { } static Optional getGatewayIpAddressFromInterface(String srcInterface, - INeutronVpnManager neutronVpnService, DataBroker dataBroker) { + INeutronVpnManager neutronVpnService) { 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" @@ -1346,7 +1346,7 @@ public final class VpnUtil { } static Optional getGWMacAddressFromInterface(MacEntry macEntry, IpAddress gatewayIp, - DataBroker dataBroker, OdlInterfaceRpcService interfaceRpc) { + DataBroker dataBroker) { Optional gatewayMac = Optional.absent(); long vpnId = getVpnId(dataBroker, macEntry.getVpnName()); InstanceIdentifier getRouterInterfaceForVpnInterface(DataBroker dataBroker, - String interfaceName, String vpnName, Uuid subnetUuid) { Optional gwPortOptional = Optional.absent(); @@ -1504,7 +1503,7 @@ public final class VpnUtil { static java.util.Optional allocateRdForExtraRouteAndUpdateUsedRdsMap( DataBroker dataBroker, long vpnId, @Nullable Long parentVpnId, String prefix, String vpnName, - String nextHop, BigInteger dpnId, WriteTransaction writeOperTxn) { + String nextHop, BigInteger dpnId) { //Check if rd is already allocated for this extraroute behind the same VM. If yes, reuse it. //This is particularly useful during reboot scenarios. java.util.Optional allocatedRd = VpnExtraRouteHelper @@ -1855,7 +1854,7 @@ public final class VpnUtil { } public static boolean isAdjacencyEligibleToVpn(DataBroker dataBroker, Adjacency adjacency, - String vpnName, String interfaceName) { + String vpnName) { // returns true if BGPVPN Internet and adjacency is IPv6, false otherwise boolean adjacencyEligible = true; // if BGPVPN internet, return false if subnetmap has not internetVpnId() filled in diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java index c3baa495b9..a426016d19 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/arp/responder/ArpResponderHandler.java @@ -72,22 +72,16 @@ public class ArpResponderHandler { * dpn Id on which ARP responder flow to be added * @param lportTag * lport tag of the interface - * @param vpnName - * vpnname of the interface - * @param vpnId - * vpn id that interface belongs to * @param interfaceName * interface to which ARP responder flow to be added - * @param subnetId - * subnet Id of the interface * @param gatewayIp * gateway ip of the interface * @param mac * mac address */ - public void addArpResponderFlow(BigInteger dpnId, int lportTag, String vpnName, long vpnId, String interfaceName, - Uuid subnetId, String gatewayIp, String mac) { + public void addArpResponderFlow(BigInteger dpnId, int lportTag, String interfaceName, + String gatewayIp, String mac) { LOG.trace("Creating the ARP Responder flow for VPN Interface {}", interfaceName); ArpReponderInputBuilder builder = new ArpReponderInputBuilder(); @@ -107,15 +101,10 @@ public class ArpResponderHandler { * lport tag of the interface * @param ifName * interface to which ARP responder flow to be removed - * @param vpnName - * vpnname of the interface - * @param vpnId - * vpn id that interface belongs to - * * @param subnetUuid * subnet Id of the interface */ - public void removeArpResponderFlow(BigInteger dpId, int lportTag, String ifName, String vpnName, long vpnId, + public void removeArpResponderFlow(BigInteger dpId, int lportTag, String ifName, Uuid subnetUuid) { Optional gwIp = VpnUtil.getVpnSubnetGatewayIp(dataBroker, subnetUuid); if (gwIp.isPresent()) { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java index 2bebfdcf4b..1f388bb663 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java @@ -120,7 +120,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { String key = dstVpnRd + VpnConstants.SEPARATOR + prefix; long leakedLabel = VpnUtil.getUniqueId(idManager, VpnConstants.VPN_IDPOOL_NAME, key); String leakedNexthop = interVpnLink.getEndpointIpAddr(vpnName); - fibManager.addOrUpdateFibEntry(dataBroker, dstVpnRd, null /*macAddress*/, prefix, + fibManager.addOrUpdateFibEntry(dstVpnRd, null /*macAddress*/, prefix, Collections.singletonList(leakedNexthop), VrfEntry.EncapType.Mplsgre, (int) leakedLabel, 0 /*l3vni*/, null /*gatewayMacAddress*/, null /*parentVpnRd*/, RouteOrigin.INTERVPN, null /*writeConfigTxn*/); @@ -138,7 +138,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { } } else { LOG.debug("Removing leaked route to {} from VPN {}", prefix, dstVpnName); - fibManager.removeFibEntry(dataBroker, dstVpnRd, prefix, null /*writeConfigTxn*/); + fibManager.removeFibEntry(dstVpnRd, prefix, null /*writeConfigTxn*/); bgpManager.withdrawPrefix(dstVpnRd, prefix); } } @@ -147,7 +147,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { @SuppressWarnings("checkstyle:IllegalCatch") @Override public void leakRoute(InterVpnLinkDataComposite interVpnLink, String srcVpnUuid, String dstVpnUuid, - String prefix, Long label, RouteOrigin forcedOrigin, int addOrRemove) { + String prefix, Long label, RouteOrigin forcedOrigin) { String ivpnLinkName = interVpnLink.getInterVpnLinkName(); // The source VPN must participate in the InterVpnLink Preconditions.checkArgument(interVpnLink.isVpnLinked(srcVpnUuid), @@ -265,11 +265,11 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { if (! originsToConsider.isEmpty()) { // 1st Endpoint ==> 2nd endpoint - leakRoutes(ivpnLink, vpn1Uuid, vpn2Uuid, originsToConsider, NwConstants.ADD_FLOW); + leakRoutes(ivpnLink, vpn1Uuid, vpn2Uuid, originsToConsider); // 2nd Endpoint ==> 1st endpoint - leakRoutes(ivpnLink, vpn2Uuid, vpn1Uuid, originsToConsider, NwConstants.ADD_FLOW); + leakRoutes(ivpnLink, vpn2Uuid, vpn1Uuid, originsToConsider); } // Static routes in Vpn1 pointing to Vpn2's endpoint @@ -306,7 +306,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { vpnLink.getInterVpnLinkName(), vpn1Rd, vrfEntry.getDestPrefix()); } else { leakRoute(vpnLink, vpn2Uuid, vpn1Uuid, vrfEntry.getDestPrefix(), label, - RouteOrigin.value(vrfEntry.getOrigin()), NwConstants.ADD_FLOW); + RouteOrigin.value(vrfEntry.getOrigin())); } }); @@ -314,7 +314,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { } private void leakRoutes(InterVpnLinkDataComposite vpnLink, String srcVpnUuid, String dstVpnUuid, - List originsToConsider, int addOrRemove) { + List originsToConsider) { String srcVpnRd = VpnUtil.getVpnRd(dataBroker, srcVpnUuid); String dstVpnRd = VpnUtil.getVpnRd(dataBroker, dstVpnUuid); List srcVpnRemoteVrfEntries = VpnUtil.getVrfEntriesByOrigin(dataBroker, srcVpnRd, originsToConsider); @@ -327,8 +327,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { vpnLink.getInterVpnLinkName(), dstVpnRd, vrfEntry.getDestPrefix()); continue; } - leakRoute(vpnLink, srcVpnUuid, dstVpnUuid, vrfEntry.getDestPrefix(), label, null /*NotForcedOrigin*/, - addOrRemove); + leakRoute(vpnLink, srcVpnUuid, dstVpnUuid, vrfEntry.getDestPrefix(), label, null /*NotForcedOrigin*/); } } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java index aa33a331f9..07bed23d5e 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkNodeAddTask.java @@ -70,8 +70,7 @@ public class InterVpnLinkNodeAddTask implements Callable { installLPortDispatcherTable(i.getInterVpnLinkState(), firstDpnList, secondDpnList); - result.add(updateInterVpnLinkState(i.getInterVpnLinkState(), firstDpnList, secondDpnList, - numberOfDpns)); + result.add(updateInterVpnLinkState(i.getInterVpnLinkState(), firstDpnList, secondDpnList)); }); return result; @@ -95,7 +94,7 @@ public class InterVpnLinkNodeAddTask implements Callable updateInterVpnLinkState(InterVpnLinkState interVpnLinkState, List firstDpnList, - List secondDpnList, int numberOfDpns) { + List secondDpnList) { FirstEndpointState firstEndPointState = new FirstEndpointStateBuilder(interVpnLinkState.getFirstEndpointState()).setDpId(firstDpnList).build(); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java index 39fc0ed3a9..80b11e6755 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java @@ -374,29 +374,10 @@ public final class InterVpnLinkUtil { * @param prefix Prefix of the route * @param label Label of the route in the original VPN */ - public static void leakRoute(DataBroker broker, IBgpManager bgpManager, InterVpnLink interVpnLink, - String srcVpnUuid, String dstVpnUuid, String prefix, Long label) { - leakRoute(broker, bgpManager, interVpnLink, srcVpnUuid, dstVpnUuid, prefix, label, RouteOrigin.INTERVPN); - } - - /** - * Leaks a route from one VPN to another. - * - * @param broker dataBroker service reference - * @param bgpManager Used to advertise routes to the BGP Router - * @param interVpnLink Reference to the object that holds the info about the link between the 2 VPNs - * @param srcVpnUuid UUID of the VPN that has the route that is going to be leaked to the other VPN - * @param dstVpnUuid UUID of the VPN that is going to receive the route - * @param prefix Prefix of the route - * @param label Label of the route in the original VPN - * @param forcedOrigin By default, origin for leaked routes should be INTERVPN, however it is possible to provide - * a different origin if desired. - */ // TODO Clean up the exception handling @SuppressWarnings("checkstyle:IllegalCatch") public static void leakRoute(DataBroker broker, IBgpManager bgpManager, InterVpnLink interVpnLink, - String srcVpnUuid, String dstVpnUuid, String prefix, Long label, - RouteOrigin forcedOrigin) { + String srcVpnUuid, String dstVpnUuid, String prefix, Long label) { Preconditions.checkNotNull(interVpnLink); // The source VPN must participate in the InterVpnLink @@ -468,7 +449,7 @@ public final class InterVpnLinkUtil { } LOG.debug("Writing FibEntry to DS: vpnRd={}, prefix={}, label={}, nexthop={} (interVpnLink)", vpnRd, destination, label, nexthop); - fibManager.addOrUpdateFibEntry(dataBroker, vpnRd, null /*macAddress*/, destination, + fibManager.addOrUpdateFibEntry(vpnRd, null /*macAddress*/, destination, Collections.singletonList(nexthop), VrfEntry.EncapType.Mplsgre, label, 0 /*l3vni*/, null /*gatewayMacAddress*/, null /*parentVpnRd*/, RouteOrigin.STATIC, null /*writeTxn*/); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java index fa5d24a86f..e3572d374e 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java @@ -57,7 +57,7 @@ public class L3vpnOverMplsGrePopulator extends L3vpnPopulator { } @Override - public void populateFib(L3vpnInput input, WriteTransaction writeConfigTxn, WriteTransaction writeOperTxn) { + public void populateFib(L3vpnInput input, WriteTransaction writeConfigTxn) { if (input.getRouteOrigin() == RouteOrigin.CONNECTED) { LOG.info("populateFib : Found SubnetRoute for subnet {} rd {}", input.getSubnetIp(), input.getPrimaryRd()); addSubnetRouteFibEntry(input); @@ -89,7 +89,7 @@ public class L3vpnOverMplsGrePopulator extends L3vpnPopulator { for (VpnInstanceOpDataEntry vpn : vpnsToImportRoute) { String vpnRd = vpn.getVrfId(); if (vpnRd != null) { - fibManager.addOrUpdateFibEntry(broker, vpnRd, null /*macAddress*/, + fibManager.addOrUpdateFibEntry(vpnRd, null /*macAddress*/, nextHopIpAddress, Arrays.asList(nextHopIp), encapType, (int) label, 0 /*l3vni*/, input.getGatewayMac(), null /*parentVpnRd*/, RouteOrigin.SELF_IMPORTED, writeConfigTxn); @@ -100,7 +100,7 @@ public class L3vpnOverMplsGrePopulator extends L3vpnPopulator { } } else { // ### add FIB route directly - fibManager.addOrUpdateFibEntry(broker, vpnName, null /*macAddress*/, + fibManager.addOrUpdateFibEntry(vpnName, null /*macAddress*/, nextHopIpAddress, Arrays.asList(nextHopIp), encapType, (int) label, 0 /*l3vni*/, input.getGatewayMac(), null /*parentVpnRd*/, input.getRouteOrigin(), writeConfigTxn); LOG.info("populateFib: Added internal FIB entry for prefix {} nexthop {} label {}" diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java index 490508c1ae..ea627fcb68 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java @@ -50,8 +50,7 @@ public class L3vpnOverVxlanPopulator extends L3vpnPopulator { } @Override - public void populateFib(L3vpnInput input, WriteTransaction writeConfigTxn, - WriteTransaction writeOperTxn) { + public void populateFib(L3vpnInput input, WriteTransaction writeConfigTxn) { if (input.getRouteOrigin() == RouteOrigin.CONNECTED) { LOG.info("populateFib : Found SubnetRoute for subnet {} rd {}", input.getSubnetIp(), input.getPrimaryRd()); addSubnetRouteFibEntry(input); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java index c7557275ae..88b5e613e9 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnPopulator.java @@ -63,8 +63,7 @@ public abstract class L3vpnPopulator implements VpnPopulator { } @Override - public void populateFib(L3vpnInput input, WriteTransaction writeCfgTxn, - WriteTransaction writeOperTxn) {} + public void populateFib(L3vpnInput input, WriteTransaction writeCfgTxn) {} public void addSubnetRouteFibEntry(L3vpnInput input) { String rd = input.getRd(); @@ -199,7 +198,7 @@ public abstract class L3vpnPopulator implements VpnPopulator { List nextHopList = Collections.singletonList(nextHopIp); LOG.info("ADD: addPrefixToBGP: Adding Fib entry rd {} prefix {} nextHop {} label {} gwMac {}", rd, prefix, nextHopList, label, gatewayMac); - fibManager.addOrUpdateFibEntry(broker, primaryRd, macAddress, prefix, nextHopList, + fibManager.addOrUpdateFibEntry(primaryRd, macAddress, prefix, nextHopList, encapType, (int)label, l3vni, gatewayMac, null /*parentVpnRd*/, origin, writeConfigTxn); LOG.info("ADD: addPrefixToBGP: Added Fib entry rd {} prefix {} nextHop {} label {} gwMac {}", rd, prefix, nextHopList, label, gatewayMac); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java index 5a29dbe8d1..8b0c80e0c3 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/intfc/VpnPopulator.java @@ -12,7 +12,7 @@ import org.opendaylight.netvirt.vpnmanager.populator.input.L3vpnInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.adjacency.list.Adjacency; public interface VpnPopulator { - void populateFib(L3vpnInput input, WriteTransaction writeCfgTxn, WriteTransaction writeOperTxn); + void populateFib(L3vpnInput input, WriteTransaction writeCfgTxn); Adjacency createOperationalAdjacency(L3vpnInput input); } -- 2.36.6