From 70877dab1b5ac44e93322dd28aa4c7b1dcf4f922 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 14 Nov 2017 09:31:23 +0100 Subject: [PATCH] Fix odlparent 3 Checkstyle issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This doesn’t upgrade to odlparent 3, but fixes all the issues that the new Checkstyle settings in odlparent 3 pick up; in particular, utility classes need private constructors and need to be final, and parameters and local variables mustn’t shadow fields. Change-Id: Ifb43f4177cd12766538b572299cb8f858b420476 Signed-off-by: Stephen Kitt --- .../aclservice/api/utils/AclInterface.java | 4 +- .../rev160608/IpPrefixOrAddressBuilder.java | 12 +- .../netvirt/aclservice/tests/IdHelper.java | 4 +- .../aclservice/utils/AclServiceTestUtils.java | 4 +- .../shell/DisplayAclDataCaches.java | 77 ++----- .../netvirt/bgpmanager/VtyshCli.java | 4 +- .../bgpmanager/commands/ClearBgpCli.java | 6 +- .../netvirt/bgpmanager/commands/Misc.java | 4 +- .../bgpmanager/thrift/client/BgpRouter.java | 2 +- .../thrift/client/BgpSyncHandle.java | 4 +- .../utils/ElanServiceChainUtils.java | 3 +- .../utils/VpnPseudoPortCache.java | 4 +- .../utils/VpnServiceChainUtils.java | 3 +- .../netvirt/coe/utils/CoeUtils.java | 4 +- .../netvirt/dhcpservice/api/DHCP.java | 2 + .../dhcpservice/api/DHCPConstants.java | 216 +++++++++--------- .../netvirt/dhcpservice/api/DHCPOptions.java | 22 +- .../dhcpservice/api/DhcpMConstants.java | 42 ++-- .../netvirt/dhcpservice/DhcpInfo.java | 4 +- .../netvirt/dhcpservice/DhcpServiceUtils.java | 4 +- .../elan/arp/responder/ArpResponderUtil.java | 25 +- .../cli/l2gw/NetworkL2gwDeviceInfoCli.java | 14 +- .../elan/internal/ElanBridgeManager.java | 2 + .../ElanLearntVpnVipToPortListener.java | 4 +- .../ElanTunnelInterfaceStateListener.java | 2 +- .../netvirt/elan/l2gw/ha/HwvtepHAUtil.java | 4 +- .../l2gw/ha/listeners/HAJobScheduler.java | 2 +- .../ha/merge/GlobalAugmentationMerger.java | 2 +- .../l2gw/jobs/AssociateHwvtepToElanJob.java | 6 +- .../l2gw/utils/L2GatewayConnectionUtils.java | 1 + .../elan/l2gw/utils/L2GatewayUtils.java | 4 +- .../statusanddiag/ElanStatusMonitorJMX.java | 4 +- .../netvirt/elan/utils/ElanCLIUtils.java | 14 +- .../netvirt/elan/utils/ElanConstants.java | 64 +++--- .../netvirt/elan/utils/ElanUtils.java | 10 +- .../GlobalAugmentationHelper.java | 4 +- .../nodehandlertest/PhysicalSwitchHelper.java | 4 +- .../l2gw/nodehandlertest/TestBuilders.java | 4 +- .../l2gw/nodehandlertest/TestComparators.java | 4 +- .../elan/l2gw/nodehandlertest/TestUtil.java | 4 +- .../netvirt/fibmanager/api/FibHelper.java | 4 +- .../netvirt/ipv6service/IfMgr.java | 4 +- .../netvirt/ipv6service/VirtualPort.java | 2 + .../netvirt/ipv6service/VirtualRouter.java | 2 +- .../netvirt/ipv6service/VirtualSubnet.java | 2 +- .../ipv6service/utils/Ipv6Constants.java | 2 +- .../ipv6service/utils/Ipv6ServiceUtils.java | 2 +- .../natservice/internal/NaptEventHandler.java | 4 +- .../natservice/internal/NatEvpnUtil.java | 4 +- .../natservice/internal/NatOverVxlanUtil.java | 4 +- .../netvirt/natservice/internal/NatUtil.java | 4 +- .../ExternalNetworksChangeListenerTest.java | 2 - .../api/l2gw/utils/L2GatewayCacheUtils.java | 4 +- .../neutronvpn/api/utils/ChangeUtils.java | 2 +- .../neutronvpn/api/utils/NeutronUtils.java | 4 +- .../netvirt/neutronvpn/NeutronvpnUtils.java | 6 +- .../neutronvpn/l2gw/L2GatewayUtils.java | 4 +- .../shell/ConfigureL3VpnCommand.java | 2 +- .../netvirt/neutronvpn/shell/ShowSubnet.java | 16 +- .../netvirt/qosservice/QosAlertManager.java | 14 +- .../sfc/translator/SfcMdsalHelper.java | 56 ++--- .../FlowClassifierTranslator.java | 4 +- .../portchain/PortChainTranslator.java | 4 +- .../portchain/PortPairGroupTranslator.java | 4 +- .../portchain/PortPairTranslator.java | 4 +- .../statistics/CountersServiceUtils.java | 4 +- .../netvirt/statistics/CountersUtils.java | 4 +- .../statistics/ElementCountersRequest.java | 4 +- .../vpnmanager/api/InterfaceUtils.java | 4 +- .../vpnmanager/api/VpnExtraRouteHelper.java | 4 +- .../netvirt/vpnmanager/api/VpnHelper.java | 4 +- .../vpnmanager/AlivenessMonitorUtils.java | 4 +- .../netvirt/vpnmanager/ArpUtils.java | 4 +- .../vpnmanager/DpnInVpnChangeListener.java | 2 +- .../netvirt/vpnmanager/TransactionUtil.java | 4 +- .../vpnmanager/VpnFootprintService.java | 8 +- .../vpnmanager/VpnInstanceListener.java | 4 +- .../vpnmanager/VpnInterfaceManager.java | 3 +- .../netvirt/vpnmanager/VpnOperDsUtils.java | 4 +- .../netvirt/vpnmanager/VpnUtil.java | 8 +- .../intervpnlink/InterVpnLinkUtil.java | 4 +- .../intervpnlink/InterVpnLinkTestCatalog.java | 4 +- .../intervpnlink/L3VpnTestCatalog.java | 4 +- 83 files changed, 449 insertions(+), 391 deletions(-) diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java b/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java index 43e831834b..57f093bd6b 100644 --- a/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java +++ b/vpnservice/aclservice/api/src/main/java/org/opendaylight/netvirt/aclservice/api/utils/AclInterface.java @@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.aclservice.rev16060 /** * The Class AclInterface. */ -public class AclInterface { +public final class AclInterface { /** The port security enabled. */ private final boolean portSecurityEnabled; @@ -252,7 +252,7 @@ public class AclInterface { return new Builder(from); } - public static class Builder { + public static final class Builder { private boolean portSecurityEnabled; private String interfaceId; private Integer lportTag; diff --git a/vpnservice/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java b/vpnservice/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java index 6df10a0381..a228a3df09 100644 --- a/vpnservice/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java +++ b/vpnservice/aclservice/api/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/netvirt/aclservice/rev160608/IpPrefixOrAddressBuilder.java @@ -8,12 +8,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation. - * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32). + * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string + * representation. + * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string + * - uint32). * - * The reason behind putting it under src/main/java is: - * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent - * loss of user code. + *

The reason behind putting it under src/main/java is: + * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once + * to prevent loss of user code. * */ public final class IpPrefixOrAddressBuilder { diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java index 6c4ceef44e..b5b07b2e40 100644 --- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java +++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdHelper.java @@ -16,9 +16,11 @@ import java.util.Map; */ // Disabling checkstyle:linelength for readability purpose. @SuppressWarnings("checkstyle:linelength") -public class IdHelper { +public final class IdHelper { private static Map idCacheMap = new HashMap<>(); + private IdHelper() { } + static { idCacheMap.put("UDP_DESTINATION_1_0Ingress98785cc3048-abc3-43cc-89b3-377341426ac7", 1001); idCacheMap.put("TCP_DESTINATION_1_0Egress98785cc3048-abc3-43cc-89b3-377341426ac6", 1002); diff --git a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java index febcfc312d..2c6024fd23 100644 --- a/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java +++ b/vpnservice/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/utils/AclServiceTestUtils.java @@ -24,7 +24,9 @@ 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.packet.fields.rev160218.acl.transport.header.fields.DestinationPortRangeBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.packet.fields.rev160218.acl.transport.header.fields.SourcePortRangeBuilder; -public class AclServiceTestUtils { +public final class AclServiceTestUtils { + + private AclServiceTestUtils() { } public static void verifyGeneralFlows(List srcFlowMatches, String protocol, String srcIpv4Net, String dstIpv4Net, String mask) { diff --git a/vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java b/vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java index 67d8ca6442..2901937435 100644 --- a/vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java +++ b/vpnservice/aclservice/shell/src/main/java/org/opendaylight/netvirt/aclservice/shell/DisplayAclDataCaches.java @@ -135,19 +135,14 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { exeCmdStr + "aclInterfaceCache --all show | --key "); } - private boolean validateAll(String all) { - if (all.equalsIgnoreCase("show")) { - return true; - } - return false; + private boolean validateAll() { + return "show".equalsIgnoreCase(all); } protected void getAclInterfaceMap() throws Exception { if (all == null && uuidStr == null) { printAclInterfaceMapHelp(); - return; - } - if (all == null && uuidStr != null) { + } else if (all == null) { Uuid uuid; try { uuid = Uuid.getDefaultInstance(uuidStr); @@ -159,9 +154,8 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { Collection aclInterfaceList = aclDataCache.getInterfaceList(uuid); if (aclInterfaceList == null || aclInterfaceList.isEmpty()) { session.getConsole().println("UUID not matched"); - return; } else { - session.getConsole().println(String.format(ACL_INT_HEAD)); + session.getConsole().println(ACL_INT_HEAD); session.getConsole().print(String.format(KEY_TAB, uuid.toString())); for (AclInterface aclInterface : aclInterfaceList) { session.getConsole().println(String.format(ACL_INT_TAB, @@ -171,11 +165,9 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { aclInterface.getAllowedAddressPairs(), aclInterface.getSubnetIpPrefixes(), aclInterface.isMarkedForDelete())); } - return; } - } - if (all != null && uuidStr == null) { - if (!validateAll(all)) { + } else if (uuidStr == null) { + if (!validateAll()) { printAclInterfaceMapHelp(); return; } @@ -183,12 +175,10 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { if (map.isEmpty()) { session.getConsole().println("No data found"); - return; } else { - session.getConsole().println(String.format(ACL_INT_HEAD)); + session.getConsole().println(ACL_INT_HEAD); for (Entry> entry: map.entrySet()) { - Uuid key = entry.getKey(); - session.getConsole().print(String.format(KEY_TAB, key.toString())); + session.getConsole().print(String.format(KEY_TAB, entry.getKey().toString())); for (AclInterface aclInterface: entry.getValue()) { session.getConsole().println(String.format(ACL_INT_TAB, aclInterface.isPortSecurityEnabled(), aclInterface.getInterfaceId(), @@ -198,7 +188,6 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { aclInterface.isMarkedForDelete())); } } - return; } } } @@ -206,9 +195,7 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { protected void getRemoteAclIdMap() throws Exception { if (all == null && uuidStr == null) { printRemoteAclIdMapHelp(); - return; - } - if (all == null && uuidStr != null) { + } else if (all == null) { Uuid uuidRef; try { uuidRef = Uuid.getDefaultInstance(uuidStr); @@ -220,18 +207,15 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { Collection remoteUuidLst = aclDataCache.getRemoteAcl(uuidRef); if (remoteUuidLst == null || remoteUuidLst.isEmpty()) { session.getConsole().println("UUID not matched"); - return; } else { - session.getConsole().println(String.format(REM_ID_HEAD)); + session.getConsole().println(REM_ID_HEAD); session.getConsole().print(String.format(KEY_TAB, uuidRef.toString())); for (Uuid uuid : remoteUuidLst) { session.getConsole().println(String.format(REM_ID_TAB, uuid.getValue())); } - return; } - } - if (all != null && uuidStr == null) { - if (!validateAll(all)) { + } else if (uuidStr == null) { + if (!validateAll()) { printRemoteAclIdMapHelp(); return; } @@ -239,17 +223,14 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { Map> map = aclDataCache.getRemoteAclIdMap(); if (map.isEmpty()) { session.getConsole().println("No data found"); - return; } else { - session.getConsole().println(String.format(REM_ID_HEAD)); + session.getConsole().println(REM_ID_HEAD); for (Entry> entry: map.entrySet()) { - Uuid key = entry .getKey(); - session.getConsole().print(String.format(KEY_TAB, key.toString())); + session.getConsole().print(String.format(KEY_TAB, entry.getKey().toString())); for (Uuid uuid: entry.getValue()) { session.getConsole().println(String.format(REM_ID_TAB, uuid.getValue())); } } - return; } } } @@ -257,31 +238,24 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { protected void getAclFlowPriorityMap() throws Exception { if (all == null && key == null) { printAclFlowPriorityMapHelp(); - return; - } - if (all == null && key != null) { + } else if (all == null) { Integer val = aclDataCache.getAclFlowPriority(key); - session.getConsole().println(String.format(ACL_DATA_HEAD)); + session.getConsole().println(ACL_DATA_HEAD); session.getConsole().println(String.format(ACL_DATA_TAB_FOR, key, val)); - return; - } - - if (all != null && key == null) { - if (!validateAll(all)) { + } else if (key == null) { + if (!validateAll()) { printAclFlowPriorityMapHelp(); return; } Map map = aclDataCache.getAclFlowPriorityMap(); if (map.isEmpty()) { session.getConsole().println("No data found"); - return; } else { - session.getConsole().println(String.format(ACL_DATA_HEAD)); + session.getConsole().println(ACL_DATA_HEAD); for (Map.Entry entry : map.entrySet()) { session.getConsole().println(String.format(ACL_DATA_TAB_FOR, entry.getKey(), entry.getValue())); } - return; } } } @@ -297,7 +271,7 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { session.getConsole().println("No data found"); return; } - session.getConsole().println(String.format(ACL_INT_HEAD)); + session.getConsole().println(ACL_INT_HEAD); session.getConsole().println(String.format(ACL_INT_TAB_FOR, key, aclInterface.isPortSecurityEnabled(), aclInterface.getInterfaceId(), aclInterface.getLPortTag(), aclInterface.getDpId(), aclInterface.getElanId(), @@ -305,20 +279,16 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { aclInterface.getAllowedAddressPairs(), aclInterface.getSubnetIpPrefixes(), aclInterface.isMarkedForDelete())); - return; - } - - if (all != null && key == null) { - if (!validateAll(all)) { + } else if (key == null) { + if (!validateAll()) { printAclInterfaceCacheHelp(); return; } Collection> entries = aclInterfaceCache.entries(); if (entries.isEmpty()) { session.getConsole().println("No data found"); - return; } else { - session.getConsole().println(String.format(ACL_INT_HEAD)); + session.getConsole().println(ACL_INT_HEAD); for (Map.Entry entry : entries) { AclInterface aclInterface = entry.getValue(); session.getConsole().println(String.format(ACL_INT_TAB_FOR, entry.getKey(), @@ -329,7 +299,6 @@ public class DisplayAclDataCaches extends OsgiCommandSupport { aclInterface.isMarkedForDelete())); } } - return; } } } diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java index e01eb94645..e9fd00706c 100644 --- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java +++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/VtyshCli.java @@ -115,7 +115,7 @@ public class VtyshCli extends OsgiCommandSupport { return serverName; } - public void handleCommand(String arg, String cmd) throws IOException { + public void handleCommand(String arg, String command) throws IOException { char[] cbuf = new char[10]; Socket socket; PrintWriter outToSocket; @@ -228,7 +228,7 @@ public class VtyshCli extends OsgiCommandSupport { } sb.setLength(0); - String inputCmd = "show " + cmd; + String inputCmd = "show " + command; outToSocket.println(inputCmd); StringBuffer output = new StringBuffer(); String errorMsg = ""; diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java index b910eb0e9a..d1d33f96e2 100644 --- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java +++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/ClearBgpCli.java @@ -119,7 +119,7 @@ public class ClearBgpCli extends OsgiCommandSupport { return readUntilPrompt(in, promptChar, null); } - private static boolean readUntilPrompt(BufferedReader in, char promptChar, String passwordCheckStr) + private static boolean readUntilPrompt(BufferedReader in, char promptChar, String checkString) throws IOException { StringBuilder sb = new StringBuilder(); int ret = 0; @@ -132,8 +132,8 @@ public class ClearBgpCli extends OsgiCommandSupport { } sb.append((char) ret); - if (passwordCheckStr != null) { - if (sb.toString().contains(passwordCheckStr)) { + if (checkString != null) { + if (sb.toString().contains(checkString)) { break; } } diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java index e6c57b6f3c..e2a7fd1f6e 100644 --- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java +++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/commands/Misc.java @@ -53,7 +53,7 @@ public class Misc extends OsgiCommandSupport { return null; } - private boolean isValidLevel(String level) { + private boolean isValidLevel() { switch (level) { case "emergencies": case "alerts": @@ -78,7 +78,7 @@ public class Misc extends OsgiCommandSupport { if (file != null ^ level != null) { return usage(); } - if (level != null && !isValidLevel(level)) { + if (level != null && !isValidLevel()) { session.getConsole().println("error: invalid value for " + LL); return null; } diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java index 4ae5d9c1a3..0cda7c400b 100644 --- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java +++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpRouter.java @@ -33,7 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.ebgp.rev1509 import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BgpRouter { +public final class BgpRouter { private static final Logger LOG = LoggerFactory.getLogger(BgpRouter.class); private static final int THRIFT_TIMEOUT_MILLI = 10000; diff --git a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java index 080480738e..705bbf036c 100644 --- a/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java +++ b/vpnservice/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/netvirt/bgpmanager/thrift/client/BgpSyncHandle.java @@ -59,7 +59,7 @@ public class BgpSyncHandle { return 96; } - public int setState(int state) { - return this.state.getAndSet(state); + public int setState(int newState) { + return this.state.getAndSet(newState); } } diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java index ed6946ed92..80c491ad89 100755 --- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java +++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java @@ -48,10 +48,11 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ElanServiceChainUtils { +public final class ElanServiceChainUtils { private static final Logger LOG = LoggerFactory.getLogger(ElanServiceChainUtils.class); + private ElanServiceChainUtils() { } public static InstanceIdentifier getElanInstanceConfigDataPath(String elanInstanceName) { return InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class, diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java index 996f52cee3..b877157d38 100755 --- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java +++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnPseudoPortCache.java @@ -22,11 +22,13 @@ import org.slf4j.LoggerFactory; * listener. * */ -public class VpnPseudoPortCache { +public final class VpnPseudoPortCache { public static final Logger LOG = LoggerFactory.getLogger(VpnPseudoPortCache.class); public static final String VPNPSEUDOPORT_CACHE_NAME = "VrfToVpnPseudoPortCache"; + private VpnPseudoPortCache() { } + public static void createVpnPseudoPortCache(DataBroker broker) { if (CacheUtil.getCache(VPNPSEUDOPORT_CACHE_NAME) == null) { CacheUtil.createCache(VPNPSEUDOPORT_CACHE_NAME); diff --git a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java index 10cb0a23a8..e5b08a0250 100755 --- a/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java +++ b/vpnservice/cloud-servicechain/cloud-servicechain-impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/VpnServiceChainUtils.java @@ -67,10 +67,11 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VpnServiceChainUtils { +public final class VpnServiceChainUtils { private static final Logger LOG = LoggerFactory.getLogger(VpnServiceChainUtils.class); + private VpnServiceChainUtils() { } public static BigInteger getMetadataSCF(long scfTag) { // TODO: Move to a common place return new BigInteger("FF", 16).and(BigInteger.valueOf(scfTag)).shiftLeft(32); diff --git a/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java b/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java index 3f30d3dfe5..8c6bcf33c4 100644 --- a/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java +++ b/vpnservice/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java @@ -39,7 +39,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CoeUtils { +public final class CoeUtils { private static final Logger LOG = LoggerFactory.getLogger(CoeUtils.class); public static final ImmutableBiMap> NETWORK_MAP = @@ -50,6 +50,8 @@ public class CoeUtils { .put(NetworkAttributes.NetworkType.VXLAN, SegmentTypeVxlan.class) .build(); + private CoeUtils() { } + public static InstanceIdentifier buildVlanInterfaceIdentifier(String interfaceName) { InstanceIdentifier id = InstanceIdentifier.builder(Interfaces.class).child( diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java index b03b878130..3a4a017de9 100644 --- a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java +++ b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCP.java @@ -375,6 +375,8 @@ public class DHCP extends Packet { *

Note: Copied from org.opendaylight.controller.sal.packet.Packet

*/ @Override + // We can’t do much about PacketException (yet; see https://git.opendaylight.org/gerrit/65837) + @SuppressWarnings("checkstyle:AvoidHidingCauseException") public Packet deserialize(byte[] data, int bitOffset, int size) throws PacketException { diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java index 44664cd33b..1effcb3755 100644 --- a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java +++ b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPConstants.java @@ -8,123 +8,123 @@ package org.opendaylight.netvirt.dhcpservice.api; -public final class DHCPConstants { +public interface DHCPConstants { // DHCP BOOTP CODES - public static final byte BOOTREQUEST = 1; - public static final byte BOOTREPLY = 2; + byte BOOTREQUEST = 1; + byte BOOTREPLY = 2; // DHCP HTYPE CODES - public static final byte HTYPE_ETHER = 1; + byte HTYPE_ETHER = 1; // DHCP MESSAGE CODES - public static final byte MSG_DISCOVER = 1; - public static final byte MSG_OFFER = 2; - public static final byte MSG_REQUEST = 3; - public static final byte MSG_DECLINE = 4; - public static final byte MSG_ACK = 5; - public static final byte MSG_NAK = 6; - public static final byte MSG_RELEASE = 7; - public static final byte MSG_INFORM = 8; - public static final byte MSG_FORCERENEW = 9; + byte MSG_DISCOVER = 1; + byte MSG_OFFER = 2; + byte MSG_REQUEST = 3; + byte MSG_DECLINE = 4; + byte MSG_ACK = 5; + byte MSG_NAK = 6; + byte MSG_RELEASE = 7; + byte MSG_INFORM = 8; + byte MSG_FORCERENEW = 9; // DHCP OPTIONS CODE - public static final byte OPT_PAD = 0; - public static final byte OPT_SUBNET_MASK = 1; - public static final byte OPT_TIME_OFFSET = 2; - public static final byte OPT_ROUTERS = 3; - public static final byte OPT_TIME_SERVERS = 4; - public static final byte OPT_NAME_SERVERS = 5; - public static final byte OPT_DOMAIN_NAME_SERVERS = 6; - public static final byte OPT_LOG_SERVERS = 7; - public static final byte OPT_COOKIE_SERVERS = 8; - public static final byte OPT_LPR_SERVERS = 9; - public static final byte OPT_IMPRESS_SERVERS = 10; - public static final byte OPT_RESOURCE_LOCATION_SERVERS = 11; - public static final byte OPT_HOST_NAME = 12; - public static final byte OPT_BOOT_SIZE = 13; - public static final byte OPT_MERIT_DUMP = 14; - public static final byte OPT_DOMAIN_NAME = 15; - public static final byte OPT_SWAP_SERVER = 16; - public static final byte OPT_ROOT_PATH = 17; - public static final byte OPT_EXTENSIONS_PATH = 18; - public static final byte OPT_IP_FORWARDING = 19; - public static final byte OPT_NON_LOCAL_SOURCE_ROUTING = 20; - public static final byte OPT_POLICY_FILTER = 21; - public static final byte OPT_MAX_DGRAM_REASSEMBLY = 22; - public static final byte OPT_DEFAULT_IP_TTL = 23; - public static final byte OPT_PATH_MTU_AGING_TIMEOUT = 24; - public static final byte OPT_PATH_MTU_PLATEAU_TABLE = 25; - public static final byte OPT_INTERFACE_MTU = 26; - public static final byte OPT_ALL_SUBNETS_LOCAL = 27; - public static final byte OPT_BROADCAST_ADDRESS = 28; - public static final byte OPT_PERFORM_MASK_DISCOVERY = 29; - public static final byte OPT_MASK_SUPPLIER = 30; - public static final byte OPT_ROUTER_DISCOVERY = 31; - public static final byte OPT_ROUTER_SOLICITATION_ADDRESS = 32; - public static final byte OPT_STATIC_ROUTES = 33; - public static final byte OPT_TRAILER_ENCAPSULATION = 34; - public static final byte OPT_ARP_CACHE_TIMEOUT = 35; - public static final byte OPT_IEEE802_3_ENCAPSULATION = 36; - public static final byte OPT_DEFAULT_TCP_TTL = 37; - public static final byte OPT_TCP_KEEPALIVE_INTERVAL = 38; - public static final byte OPT_TCP_KEEPALIVE_GARBAGE = 39; - public static final byte OPT_NIS_SERVERS = 41; - public static final byte OPT_NTP_SERVERS = 42; - public static final byte OPT_VENDOR_ENCAPSULATED_OPTIONS = 43; - public static final byte OPT_NETBIOS_NAME_SERVERS = 44; - public static final byte OPT_NETBIOS_DD_SERVER = 45; - public static final byte OPT_NETBIOS_NODE_TYPE = 46; - public static final byte OPT_NETBIOS_SCOPE = 47; - public static final byte OPT_FONT_SERVERS = 48; - public static final byte OPT_X_DISPLAY_MANAGER = 49; - public static final byte OPT_REQUESTED_ADDRESS = 50; - public static final byte OPT_LEASE_TIME = 51; - public static final byte OPT_OPTION_OVERLOAD = 52; - public static final byte OPT_MESSAGE_TYPE = 53; - public static final byte OPT_SERVER_IDENTIFIER = 54; - public static final byte OPT_PARAMETER_REQUEST_LIST = 55; - public static final byte OPT_MESSAGE = 56; - public static final byte OPT_MAX_MESSAGE_SIZE = 57; - public static final byte OPT_RENEWAL_TIME = 58; - public static final byte OPT_REBINDING_TIME = 59; - public static final byte OPT_VENDOR_CLASS_IDENTIFIER = 60; - public static final byte OPT_CLIENT_IDENTIFIER = 61; - public static final byte OPT_NWIP_DOMAIN_NAME = 62; - public static final byte OPT_NWIP_SUBOPTIONS = 63; - public static final byte OPT_NISPLUS_DOMAIN = 64; - public static final byte OPT_NISPLUS_SERVER = 65; - public static final byte OPT_TFTP_SERVER = 66; - public static final byte OPT_BOOTFILE = 67; - public static final byte OPT_MOBILE_IP_HOME_AGENT = 68; - public static final byte OPT_SMTP_SERVER = 69; - public static final byte OPT_POP3_SERVER = 70; - public static final byte OPT_NNTP_SERVER = 71; - public static final byte OPT_WWW_SERVER = 72; - public static final byte OPT_FINGER_SERVER = 73; - public static final byte OPT_IRC_SERVER = 74; - public static final byte OPT_STREETTALK_SERVER = 75; - public static final byte OPT_STDA_SERVER = 76; - public static final byte OPT_USER_CLASS = 77; - public static final byte OPT_FQDN = 81; - public static final byte OPT_AGENT_OPTIONS = 82; - public static final byte OPT_NDS_SERVERS = 85; - public static final byte OPT_NDS_TREE_NAME = 86; - public static final byte OPT_NDS_CONTEXT = 87; - public static final byte OPT_CLIENT_LAST_TRANSACTION_TIME = 91; - public static final byte OPT_ASSOCIATED_IP = 92; - public static final byte OPT_USER_AUTHENTICATION_PROTOCOL = 98; - public static final byte OPT_AUTO_CONFIGURE = 116; - public static final byte OPT_NAME_SERVICE_SEARCH = 117; - public static final byte OPT_SUBNET_SELECTION = 118; - public static final byte OPT_DOMAIN_SEARCH = 119; - public static final byte OPT_CLASSLESS_ROUTE = 121; - public static final byte OPT_END = -1; + byte OPT_PAD = 0; + byte OPT_SUBNET_MASK = 1; + byte OPT_TIME_OFFSET = 2; + byte OPT_ROUTERS = 3; + byte OPT_TIME_SERVERS = 4; + byte OPT_NAME_SERVERS = 5; + byte OPT_DOMAIN_NAME_SERVERS = 6; + byte OPT_LOG_SERVERS = 7; + byte OPT_COOKIE_SERVERS = 8; + byte OPT_LPR_SERVERS = 9; + byte OPT_IMPRESS_SERVERS = 10; + byte OPT_RESOURCE_LOCATION_SERVERS = 11; + byte OPT_HOST_NAME = 12; + byte OPT_BOOT_SIZE = 13; + byte OPT_MERIT_DUMP = 14; + byte OPT_DOMAIN_NAME = 15; + byte OPT_SWAP_SERVER = 16; + byte OPT_ROOT_PATH = 17; + byte OPT_EXTENSIONS_PATH = 18; + byte OPT_IP_FORWARDING = 19; + byte OPT_NON_LOCAL_SOURCE_ROUTING = 20; + byte OPT_POLICY_FILTER = 21; + byte OPT_MAX_DGRAM_REASSEMBLY = 22; + byte OPT_DEFAULT_IP_TTL = 23; + byte OPT_PATH_MTU_AGING_TIMEOUT = 24; + byte OPT_PATH_MTU_PLATEAU_TABLE = 25; + byte OPT_INTERFACE_MTU = 26; + byte OPT_ALL_SUBNETS_LOCAL = 27; + byte OPT_BROADCAST_ADDRESS = 28; + byte OPT_PERFORM_MASK_DISCOVERY = 29; + byte OPT_MASK_SUPPLIER = 30; + byte OPT_ROUTER_DISCOVERY = 31; + byte OPT_ROUTER_SOLICITATION_ADDRESS = 32; + byte OPT_STATIC_ROUTES = 33; + byte OPT_TRAILER_ENCAPSULATION = 34; + byte OPT_ARP_CACHE_TIMEOUT = 35; + byte OPT_IEEE802_3_ENCAPSULATION = 36; + byte OPT_DEFAULT_TCP_TTL = 37; + byte OPT_TCP_KEEPALIVE_INTERVAL = 38; + byte OPT_TCP_KEEPALIVE_GARBAGE = 39; + byte OPT_NIS_SERVERS = 41; + byte OPT_NTP_SERVERS = 42; + byte OPT_VENDOR_ENCAPSULATED_OPTIONS = 43; + byte OPT_NETBIOS_NAME_SERVERS = 44; + byte OPT_NETBIOS_DD_SERVER = 45; + byte OPT_NETBIOS_NODE_TYPE = 46; + byte OPT_NETBIOS_SCOPE = 47; + byte OPT_FONT_SERVERS = 48; + byte OPT_X_DISPLAY_MANAGER = 49; + byte OPT_REQUESTED_ADDRESS = 50; + byte OPT_LEASE_TIME = 51; + byte OPT_OPTION_OVERLOAD = 52; + byte OPT_MESSAGE_TYPE = 53; + byte OPT_SERVER_IDENTIFIER = 54; + byte OPT_PARAMETER_REQUEST_LIST = 55; + byte OPT_MESSAGE = 56; + byte OPT_MAX_MESSAGE_SIZE = 57; + byte OPT_RENEWAL_TIME = 58; + byte OPT_REBINDING_TIME = 59; + byte OPT_VENDOR_CLASS_IDENTIFIER = 60; + byte OPT_CLIENT_IDENTIFIER = 61; + byte OPT_NWIP_DOMAIN_NAME = 62; + byte OPT_NWIP_SUBOPTIONS = 63; + byte OPT_NISPLUS_DOMAIN = 64; + byte OPT_NISPLUS_SERVER = 65; + byte OPT_TFTP_SERVER = 66; + byte OPT_BOOTFILE = 67; + byte OPT_MOBILE_IP_HOME_AGENT = 68; + byte OPT_SMTP_SERVER = 69; + byte OPT_POP3_SERVER = 70; + byte OPT_NNTP_SERVER = 71; + byte OPT_WWW_SERVER = 72; + byte OPT_FINGER_SERVER = 73; + byte OPT_IRC_SERVER = 74; + byte OPT_STREETTALK_SERVER = 75; + byte OPT_STDA_SERVER = 76; + byte OPT_USER_CLASS = 77; + byte OPT_FQDN = 81; + byte OPT_AGENT_OPTIONS = 82; + byte OPT_NDS_SERVERS = 85; + byte OPT_NDS_TREE_NAME = 86; + byte OPT_NDS_CONTEXT = 87; + byte OPT_CLIENT_LAST_TRANSACTION_TIME = 91; + byte OPT_ASSOCIATED_IP = 92; + byte OPT_USER_AUTHENTICATION_PROTOCOL = 98; + byte OPT_AUTO_CONFIGURE = 116; + byte OPT_NAME_SERVICE_SEARCH = 117; + byte OPT_SUBNET_SELECTION = 118; + byte OPT_DOMAIN_SEARCH = 119; + byte OPT_CLASSLESS_ROUTE = 121; + byte OPT_END = -1; - public static final int MAGIC_COOKIE = 0x63825363; + int MAGIC_COOKIE = 0x63825363; - public static final int DHCP_MIN_SIZE = 300; - public static final int DHCP_MAX_SIZE = 576; + int DHCP_MIN_SIZE = 300; + int DHCP_MAX_SIZE = 576; - public static final int DHCP_NOOPT_HDR_SIZE = 240; + int DHCP_NOOPT_HDR_SIZE = 240; } diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java index b687884eac..01a40253ba 100644 --- a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java +++ b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DHCPOptions.java @@ -151,13 +151,13 @@ public class DHCPOptions { } public byte[] serialize() { - byte[] options = new byte[0]; + byte[] serializedOptions = new byte[0]; for (DhcpOption dhcpOption: this.options.values()) { - options = ArrayUtils.addAll(options, dhcpOption.serialize()); + serializedOptions = ArrayUtils.addAll(serializedOptions, dhcpOption.serialize()); } byte[] end = new byte[] {(byte)255}; - options = ArrayUtils.addAll(options, end); - return options; + serializedOptions = ArrayUtils.addAll(serializedOptions, end); + return serializedOptions; } private byte[] getOptionValArray(byte[] opt, int pos, int len) { @@ -168,23 +168,23 @@ public class DHCPOptions { return val; } - public void deserialize(byte[] options) { + public void deserialize(byte[] serializedOptions) { int pos = 0; byte code; byte len; byte[] value; - if (options != null) { - while (pos < options.length) { - code = options[pos++]; + if (serializedOptions != null) { + while (pos < serializedOptions.length) { + code = serializedOptions[pos++]; if (code == OPT_END) { break; } - len = options[pos++]; - if (len + pos > options.length) { + len = serializedOptions[pos++]; + if (len + pos > serializedOptions.length) { // Throw exception??? break; } - value = getOptionValArray(options, pos, len); + value = getOptionValArray(serializedOptions, pos, len); setOption(code, value); pos += len; } diff --git a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java index cc5305b711..52300ea568 100644 --- a/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java +++ b/vpnservice/dhcpservice/dhcpservice-api/src/main/java/org/opendaylight/netvirt/dhcpservice/api/DhcpMConstants.java @@ -10,32 +10,32 @@ package org.opendaylight.netvirt.dhcpservice.api; import java.math.BigInteger; -public final class DhcpMConstants { +public interface DhcpMConstants { - public static final long DHCP_TABLE_MAX_ENTRY = 10000; + long DHCP_TABLE_MAX_ENTRY = 10000; - public static final int DEFAULT_DHCP_FLOW_PRIORITY = 50; - public static final int DEFAULT_DHCP_ALLOCATION_POOL_FLOW_PRIORITY = DEFAULT_DHCP_FLOW_PRIORITY - 1; - public static final int ARP_FLOW_PRIORITY = 50; - public static final short DEFAULT_FLOW_PRIORITY = 100; + int DEFAULT_DHCP_FLOW_PRIORITY = 50; + int DEFAULT_DHCP_ALLOCATION_POOL_FLOW_PRIORITY = DEFAULT_DHCP_FLOW_PRIORITY - 1; + int ARP_FLOW_PRIORITY = 50; + short DEFAULT_FLOW_PRIORITY = 100; - public static final BigInteger COOKIE_DHCP_BASE = new BigInteger("6800000", 16); - public static final BigInteger METADATA_ALL_CLEAR_MASK = new BigInteger("0000000000000000", 16); - public static final BigInteger METADATA_ALL_SET_MASK = new BigInteger("FFFFFFFFFFFFFFFF", 16); + BigInteger COOKIE_DHCP_BASE = new BigInteger("6800000", 16); + BigInteger METADATA_ALL_CLEAR_MASK = new BigInteger("0000000000000000", 16); + BigInteger METADATA_ALL_SET_MASK = new BigInteger("FFFFFFFFFFFFFFFF", 16); - public static final String FLOWID_PREFIX = "DHCP."; - public static final String VMFLOWID_PREFIX = "DHCP.INTERFACE."; - public static final String BCAST_DEST_IP = "255.255.255.255"; - public static final int BCAST_IP = 0xffffffff; + String FLOWID_PREFIX = "DHCP."; + String VMFLOWID_PREFIX = "DHCP.INTERFACE."; + String BCAST_DEST_IP = "255.255.255.255"; + int BCAST_IP = 0xffffffff; - public static final short DHCP_CLIENT_PORT = 68; - public static final short DHCP_SERVER_PORT = 67; + short DHCP_CLIENT_PORT = 68; + short DHCP_SERVER_PORT = 67; - public static final int DEFAULT_LEASE_TIME = 86400; - public static final String DEFAULT_DOMAIN_NAME = "openstacklocal"; + int DEFAULT_LEASE_TIME = 86400; + String DEFAULT_DOMAIN_NAME = "openstacklocal"; - public static final BigInteger COOKIE_VM_INGRESS_TABLE = new BigInteger("6800001", 16); - public static final BigInteger INVALID_DPID = new BigInteger("-1"); - public static final String DHCP_JOB_KEY_PREFIX = "DHCP_"; - public static final int RETRY_COUNT = 6; + BigInteger COOKIE_VM_INGRESS_TABLE = new BigInteger("6800001", 16); + BigInteger INVALID_DPID = new BigInteger("-1"); + String DHCP_JOB_KEY_PREFIX = "DHCP_"; + int RETRY_COUNT = 6; } diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java b/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java index 5e08a869e4..f4d741fda7 100644 --- a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java +++ b/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInfo.java @@ -55,8 +55,8 @@ public class DhcpInfo { return this; } - protected DhcpInfo setDnsServersIpAddrs(List dnsServers) { - for (IpAddress ipAddr: dnsServers) { + protected DhcpInfo setDnsServersIpAddrs(List dnsServersIpAddrs) { + for (IpAddress ipAddr: dnsServersIpAddrs) { addDnsServer(ipAddr.getIpv4Address().getValue()); } return this; diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java index 864d8199d2..55a2bdeeab 100644 --- a/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java +++ b/vpnservice/dhcpservice/dhcpservice-impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java @@ -90,7 +90,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class DhcpServiceUtils { +public final class DhcpServiceUtils { private static final Logger LOG = LoggerFactory.getLogger(DhcpServiceUtils.class); private static final FutureCallback DEFAULT_CALLBACK = new FutureCallback() { @@ -105,6 +105,8 @@ public class DhcpServiceUtils { } }; + private DhcpServiceUtils() { } + public static void setupDhcpFlowEntry(BigInteger dpId, short tableId, String vmMacAddress, int addOrRemove, IMdsalApiManager mdsalUtil, WriteTransaction tx) { if (dpId == null || dpId.equals(DhcpMConstants.INVALID_DPID) || vmMacAddress == null) { diff --git a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java b/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java index 27be002a30..7434eb219a 100644 --- a/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java +++ b/vpnservice/elanmanager/elanmanager-api/src/main/java/org/opendaylight/netvirt/elan/arp/responder/ArpResponderUtil.java @@ -16,7 +16,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.BiFunction; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -383,23 +382,25 @@ public final class ArpResponderUtil { return cookie.add(BigInteger.valueOf(lportTag)); } - private static BiFunction cookie = (tableId, - arpOpType) -> NwConstants.COOKIE_ARP_RESPONDER.add(BigInteger.ONE).add(BigInteger.valueOf(tableId)) - .add(BigInteger.valueOf(arpOpType)); + private static BigInteger buildCookie(short tableId, int arpOpType) { + return NwConstants.COOKIE_ARP_RESPONDER.add(BigInteger.ONE).add( + BigInteger.valueOf(tableId).add(BigInteger.valueOf(arpOpType))); + } - private static BiFunction flowRef = (tableId, - arpOpType) -> (tableId == NwConstants.ARP_CHECK_TABLE - ? ArpResponderConstant.FLOWID_PREFIX_FOR_ARP_CHECK.value() - : ArpResponderConstant.FLOWID_PREFIX_FOR_MY_GW_MAC.value()) + tableId + NwConstants.FLOWID_SEPARATOR - + (arpOpType == NwConstants.ARP_REQUEST ? "arp.request" : "arp.replay"); + private static String buildFlowRef(short tableId, int arpOpType) { + return (tableId == NwConstants.ARP_CHECK_TABLE + ? ArpResponderConstant.FLOWID_PREFIX_FOR_ARP_CHECK.value() + : ArpResponderConstant.FLOWID_PREFIX_FOR_MY_GW_MAC.value()) + tableId + NwConstants.FLOWID_SEPARATOR + + (arpOpType == NwConstants.ARP_REQUEST ? "arp.request" : "arp.replay"); + } public static FlowEntity createArpDefaultFlow(BigInteger dpId, short tableId, int arpOpType, Supplier> matches, Supplier> actions) { List instructions = Collections.singletonList(new InstructionApplyActions(actions.get())); - return MDSALUtil.buildFlowEntity(dpId, tableId, flowRef.apply(tableId, arpOpType), - NwConstants.DEFAULT_ARP_FLOW_PRIORITY, flowRef.apply(tableId, arpOpType), 0, 0, - cookie.apply(tableId, arpOpType), matches.get(), instructions); + return MDSALUtil.buildFlowEntity(dpId, tableId, buildFlowRef(tableId, arpOpType), + NwConstants.DEFAULT_ARP_FLOW_PRIORITY, buildFlowRef(tableId, arpOpType), 0, 0, + buildCookie(tableId, arpOpType), matches.get(), instructions); } /** diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java index 05447f1004..4f83281f24 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java @@ -68,12 +68,12 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { required = false, multiValued = false) String nodeId; - InstanceIdentifier createHwvtepTopologyInstanceIdentifier() { + private static InstanceIdentifier createHwvtepTopologyInstanceIdentifier() { return InstanceIdentifier.create(NetworkTopology.class).child(Topology.class, new TopologyKey(HwvtepSouthboundConstants.HWVTEP_TOPOLOGY_ID)); } - InstanceIdentifier createInstanceIdentifier(NodeId nodeId) { + private static InstanceIdentifier createInstanceIdentifier(NodeId nodeId) { return InstanceIdentifier.create(NetworkTopology.class).child(Topology.class, new TopologyKey(HwvtepSouthboundConstants.HWVTEP_TOPOLOGY_ID)).child(Node.class, new NodeKey(nodeId)); } @@ -131,7 +131,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } Node hwvtepConfigNode = HwvtepUtils.getHwVtepNode(dataBroker, LogicalDatastoreType.CONFIGURATION, node.getNodeId()); - Node hwvtepOpPsNode = getPSnode(dataBroker, node, LogicalDatastoreType.OPERATIONAL); + Node hwvtepOpPsNode = getPSnode(node, LogicalDatastoreType.OPERATIONAL); Node hwvtepConfigPsNode = null; if (hwvtepOpPsNode != null) { hwvtepConfigPsNode = HwvtepUtils.getHwVtepNode(dataBroker, LogicalDatastoreType.CONFIGURATION, @@ -158,6 +158,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { return null; } + @SuppressWarnings("checkstyle:HiddenField") void process(NodeId hwvtepNodeId, String elanName) { Node hwvtepConfigNode = configNodes.get(hwvtepNodeId); session.getConsole().println("Config Data >>"); @@ -185,6 +186,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { printVlanBindings(hwvtepOpPsNode, elanName); } + @SuppressWarnings("checkstyle:HiddenField") void printRemoteUcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("RemoteUCast macs :"); session.getConsole().println(HEADINGUCAST); @@ -208,6 +210,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } + @SuppressWarnings("checkstyle:HiddenField") void printLocalUcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("LocalUCast macs :"); session.getConsole().println(HEADINGUCAST); @@ -231,6 +234,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } + @SuppressWarnings("checkstyle:HiddenField") void printLocalMcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("LocalMcast macs :"); session.getConsole().println(HEADINGMCAST); @@ -257,6 +261,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } + @SuppressWarnings("checkstyle:HiddenField") void printRemoteMcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("RemoteMCast macs :"); session.getConsole().println(HEADINGMCAST); @@ -283,6 +288,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } + @SuppressWarnings("checkstyle:HiddenField") void printVlanBindings(Node psNode, String elanName) { session.getConsole().println("Vlan Bindings :"); session.getConsole().println(HEADINGVLAN); @@ -327,7 +333,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { .firstKeyOf(LogicalSwitches.class).getHwvtepNodeName().getValue(); } - Node getPSnode(DataBroker dataBroker, Node hwvtepNode, LogicalDatastoreType datastoreType) { + Node getPSnode(Node hwvtepNode, LogicalDatastoreType datastoreType) { if (hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) != null && hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches() != null) { for (Switches switches : hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches()) { diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java index de38abede5..a2f591247f 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java @@ -56,6 +56,8 @@ import org.slf4j.LoggerFactory; * This class provides functions for creating bridges via OVSDB, specifically the br-int bridge. */ @Singleton +// Checkstyle expects the first sentence to end with a period, question marks don’t count +@SuppressWarnings("checkstyle:SummaryJavadoc") public class ElanBridgeManager implements IElanBridgeManager { private static final Logger LOG = LoggerFactory.getLogger(ElanBridgeManager.class); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java index 2b269c442f..9c934510c9 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanLearntVpnVipToPortListener.java @@ -106,7 +106,7 @@ public class ElanLearntVpnVipToPortListener extends } WriteTransaction interfaceTx = broker.newWriteOnlyTransaction(); WriteTransaction flowTx = broker.newWriteOnlyTransaction(); - elanUtils.addMacEntryToDsAndSetupFlows(interfaceManager, interfaceName, macAddress, + elanUtils.addMacEntryToDsAndSetupFlows(interfaceName, macAddress, elanInterface.getElanInstanceName(), interfaceTx, flowTx, ElanConstants.STATIC_MAC_TIMEOUT); List> futures = new ArrayList<>(); futures.add(interfaceTx.submit()); @@ -133,7 +133,7 @@ public class ElanLearntVpnVipToPortListener extends } WriteTransaction interfaceTx = broker.newWriteOnlyTransaction(); WriteTransaction flowTx = broker.newWriteOnlyTransaction(); - elanUtils.deleteMacEntryFromDsAndRemoveFlows(interfaceManager, interfaceName, macAddress, + elanUtils.deleteMacEntryFromDsAndRemoveFlows(interfaceName, macAddress, elanInterface.getElanInstanceName(), interfaceTx, flowTx); List> futures = new ArrayList<>(); futures.add(interfaceTx.submit()); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java index 94319ac4c3..9261251425 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanTunnelInterfaceStateListener.java @@ -74,7 +74,7 @@ public class ElanTunnelInterfaceStateListener extends AsyncDataTreeChangeListene LOG.trace("tunnel {} is not a internal vxlan tunnel", add); return; } - if (elanUtils.isTunnelInLogicalGroup(add.getTunnelInterfaceName(), dataBroker)) { + if (elanUtils.isTunnelInLogicalGroup(add.getTunnelInterfaceName())) { LOG.trace("MULTIPLE_VxLAN_TUNNELS: ignoring the tunnel event for {}", add.getTunnelInterfaceName()); return; } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java index 252f08ea67..aaec3a598c 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java @@ -64,7 +64,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class HwvtepHAUtil { +public final class HwvtepHAUtil { static Logger LOG = LoggerFactory.getLogger(HwvtepHAUtil.class); @@ -83,6 +83,8 @@ public class HwvtepHAUtil { static HwvtepHACache hwvtepHACache = HwvtepHACache.getInstance(); + private HwvtepHAUtil() { } + public static HwvtepPhysicalLocatorRef buildLocatorRef(InstanceIdentifier nodeIid, String tepIp) { InstanceIdentifier tepId = buildTpId(nodeIid, tepIp); return new HwvtepPhysicalLocatorRef(tepId); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java index 0d816a4265..f543f684b2 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAJobScheduler.java @@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class HAJobScheduler implements Thread.UncaughtExceptionHandler { +public final class HAJobScheduler implements Thread.UncaughtExceptionHandler { private static final Logger LOG = LoggerFactory.getLogger(HAOpClusteredListener.class); ExecutorService executorService; diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java index c1c055f790..ed4fb13f44 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/merge/GlobalAugmentationMerger.java @@ -14,7 +14,7 @@ import org.opendaylight.netvirt.elan.l2gw.ha.commands.RemoteMcastCmd; import org.opendaylight.netvirt.elan.l2gw.ha.commands.RemoteUcastCmd; import org.opendaylight.netvirt.elan.l2gw.ha.commands.SwitchesCmd; -public class GlobalAugmentationMerger +public final class GlobalAugmentationMerger extends MergeCommandsAggregator { private GlobalAugmentationMerger() { diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java index f939e9762e..6a0d7652cd 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/jobs/AssociateHwvtepToElanJob.java @@ -81,9 +81,9 @@ public class AssociateHwvtepToElanJob implements Callable createLogicalSwitch(L2GatewayDevice l2GatewayDevice, ElanInstance elanInstance) { + private ListenableFuture createLogicalSwitch() { final String logicalSwitchName = ElanL2GatewayUtils.getLogicalSwitchFromElan( elanInstance.getElanInstanceName()); String segmentationId = ElanUtils.getVxlanSegmentationId(elanInstance).toString(); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java index 3802f40067..e3785d0f91 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java @@ -392,6 +392,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable { /** * Gets the associated l2 gw connections. + * * @param l2GatewayId the l2 gateway id * * @return the associated l2 gw connections diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java index be993af6da..34a1cc5050 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayUtils.java @@ -19,9 +19,11 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class L2GatewayUtils { +public final class L2GatewayUtils { private static final Logger LOG = LoggerFactory.getLogger(L2GatewayUtils.class); + private L2GatewayUtils() { } + public static void deleteItmTunnels(ItmRpcService itmRpcService, String hwvtepId, String psName, IpAddress tunnelIp) { DeleteL2GwDeviceInputBuilder builder = new DeleteL2GwDeviceInputBuilder(); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java index f1383e07e8..06adb1f9c2 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/statusanddiag/ElanStatusMonitorJMX.java @@ -56,7 +56,7 @@ public class ElanStatusMonitorJMX implements ElanStatusMonitor, ElanStatusMonito @Override @SuppressWarnings("hiding") - public void reportStatus(String serviceStatus) { - this.serviceStatus = serviceStatus; + public void reportStatus(String reportStatus) { + this.serviceStatus = reportStatus; } } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java index 074b8a3b12..932acfdf2b 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanCLIUtils.java @@ -7,12 +7,12 @@ */ package org.opendaylight.netvirt.elan.utils; -public class ElanCLIUtils { - public static final String HEADER_UNDERLINE = "----------------------------------------------------------" +public interface ElanCLIUtils { + String HEADER_UNDERLINE = "----------------------------------------------------------" + "------------------------------------"; - public static final String MAC_TABLE_CLI_FORMAT = "%-35s %-20s %-20s %-20s"; - public static final String ELAN_CLI_FORMAT = "%-35s %-20s %-20s "; - public static final String ETREE_CLI_FORMAT = "%-35s %-20s %-20s %-20s"; - public static final String ELAN_INTERFACE_CLI_FORMAT = "%-35s %-25s %-15s %-15s "; - public static final String ETREE_INTERFACE_CLI_FORMAT = "%-35s %-25s %-15s %-15s %-15s"; + String MAC_TABLE_CLI_FORMAT = "%-35s %-20s %-20s %-20s"; + String ELAN_CLI_FORMAT = "%-35s %-20s %-20s "; + String ETREE_CLI_FORMAT = "%-35s %-20s %-20s %-20s"; + String ELAN_INTERFACE_CLI_FORMAT = "%-35s %-25s %-15s %-15s "; + String ETREE_INTERFACE_CLI_FORMAT = "%-35s %-25s %-15s %-15s %-15s"; } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java index 029e68cd4e..f933e62aa8 100755 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanConstants.java @@ -13,37 +13,37 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev14 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg7; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId; -public class ElanConstants { +public interface ElanConstants { - public static final String ELAN_SERVICE_NAME = "ELAN"; - public static final String LEAVES_POSTFIX = "_leaves"; - public static final String ELAN_ID_POOL_NAME = "elan.ids.pool"; - public static final long ELAN_ID_LOW_VALUE = 5000L; - public static final long ELAN_ID_HIGH_VALUE = 10000L; - public static final int ELAN_GID_MIN = 200000; - public static final int ELAN_SERVICE_PRIORITY = 5; - public static final int STATIC_MAC_TIMEOUT = 0; - public static final int ELAN_TAG_LENGTH = 16; - public static final int INTERFACE_TAG_LENGTH = 20; - public static final BigInteger INVALID_DPN = BigInteger.valueOf(-1); - public static final BigInteger COOKIE_ELAN_BASE_SMAC = new BigInteger("8500000", 16); - public static final BigInteger COOKIE_ELAN_LEARNED_SMAC = new BigInteger("8600000", 16); - public static final BigInteger COOKIE_ELAN_UNKNOWN_DMAC = new BigInteger("8700000", 16); - public static final BigInteger COOKIE_ELAN_KNOWN_SMAC = new BigInteger("8050000", 16); - public static final BigInteger COOKIE_ELAN_KNOWN_DMAC = new BigInteger("8030000", 16); - public static final long DEFAULT_MAC_TIME_OUT = 300; - public static final BigInteger COOKIE_ELAN_FILTER_EQUALS = new BigInteger("8800000", 16); - public static final BigInteger COOKIE_L2VNI_DEMUX = new BigInteger("1080000", 16); - public static final String L2_CONTROL_PACKETS_DMAC = "01:80:C2:00:00:00"; - public static final String L2_CONTROL_PACKETS_DMAC_MASK = "FF:FF:FF:FF:FF:F0"; - public static final int LLDP_ETH_TYPE = 0x88CC; - public static final String LLDP_DST_1 = "01:80:C2:00:00:00"; - public static final String LLDP_DST_2 = "01:80:C2:00:00:03"; - public static final String LLDP_DST_3 = "01:80:C2:00:00:0E"; - public static final String L2GATEWAY_DS_JOB_NAME = "L2GW"; - public static final String UNKNOWN_DMAC = "00:00:00:00:00:00"; - public static final int JOB_MAX_RETRIES = 6; - public static final TopologyId OVSDB_TOPOLOGY_ID = new TopologyId(new Uri("ovsdb:1")); - public static final String OVSDB_BRIDGE_URI_PREFIX = "bridge"; - public static final Class ELAN_REG_ID = NxmNxReg7.class; + String ELAN_SERVICE_NAME = "ELAN"; + String LEAVES_POSTFIX = "_leaves"; + String ELAN_ID_POOL_NAME = "elan.ids.pool"; + long ELAN_ID_LOW_VALUE = 5000L; + long ELAN_ID_HIGH_VALUE = 10000L; + int ELAN_GID_MIN = 200000; + int ELAN_SERVICE_PRIORITY = 5; + int STATIC_MAC_TIMEOUT = 0; + int ELAN_TAG_LENGTH = 16; + int INTERFACE_TAG_LENGTH = 20; + BigInteger INVALID_DPN = BigInteger.valueOf(-1); + BigInteger COOKIE_ELAN_BASE_SMAC = new BigInteger("8500000", 16); + BigInteger COOKIE_ELAN_LEARNED_SMAC = new BigInteger("8600000", 16); + BigInteger COOKIE_ELAN_UNKNOWN_DMAC = new BigInteger("8700000", 16); + BigInteger COOKIE_ELAN_KNOWN_SMAC = new BigInteger("8050000", 16); + BigInteger COOKIE_ELAN_KNOWN_DMAC = new BigInteger("8030000", 16); + long DEFAULT_MAC_TIME_OUT = 300; + BigInteger COOKIE_ELAN_FILTER_EQUALS = new BigInteger("8800000", 16); + BigInteger COOKIE_L2VNI_DEMUX = new BigInteger("1080000", 16); + String L2_CONTROL_PACKETS_DMAC = "01:80:C2:00:00:00"; + String L2_CONTROL_PACKETS_DMAC_MASK = "FF:FF:FF:FF:FF:F0"; + int LLDP_ETH_TYPE = 0x88CC; + String LLDP_DST_1 = "01:80:C2:00:00:00"; + String LLDP_DST_2 = "01:80:C2:00:00:03"; + String LLDP_DST_3 = "01:80:C2:00:00:0E"; + String L2GATEWAY_DS_JOB_NAME = "L2GW"; + String UNKNOWN_DMAC = "00:00:00:00:00:00"; + int JOB_MAX_RETRIES = 6; + TopologyId OVSDB_TOPOLOGY_ID = new TopologyId(new Uri("ovsdb:1")); + String OVSDB_BRIDGE_URI_PREFIX = "bridge"; + Class ELAN_REG_ID = NxmNxReg7.class; } diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java index 40e107ce69..030d08d0a0 100755 --- a/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java @@ -651,7 +651,7 @@ public class ElanUtils { setupKnownSmacFlow(elanInfo, interfaceInfo, macTimeout, macAddress, mdsalManager, writeFlowGroupTx); setupOrigDmacFlows(elanInfo, interfaceInfo, macAddress, configureRemoteFlows, mdsalManager, - broker, writeFlowGroupTx); + writeFlowGroupTx); } } @@ -833,7 +833,7 @@ public class ElanUtils { private void setupOrigDmacFlows(ElanInstance elanInfo, InterfaceInfo interfaceInfo, String macAddress, boolean configureRemoteFlows, IMdsalApiManager mdsalApiManager, - DataBroker broker, WriteTransaction writeFlowGroupTx) + WriteTransaction writeFlowGroupTx) throws ElanException { BigInteger dpId = interfaceInfo.getDpId(); String ifName = interfaceInfo.getInterfaceName(); @@ -1536,7 +1536,7 @@ public class ElanUtils { * Add Mac Address to ElanInterfaceForwardingEntries and ElanForwardingTables * Install SMAC and DMAC flows. */ - public void addMacEntryToDsAndSetupFlows(IInterfaceManager interfaceManager, String interfaceName, + public void addMacEntryToDsAndSetupFlows(String interfaceName, String macAddress, String elanName, WriteTransaction interfaceTx, WriteTransaction flowTx, int macTimeOut) throws ElanException { LOG.trace("Adding mac address {} and interface name {} to ElanInterfaceForwardingEntries and " @@ -1560,7 +1560,7 @@ public class ElanUtils { * Remove Mac Address from ElanInterfaceForwardingEntries and ElanForwardingTables * Remove SMAC and DMAC flows. */ - public void deleteMacEntryFromDsAndRemoveFlows(IInterfaceManager interfaceManager, String interfaceName, + public void deleteMacEntryFromDsAndRemoveFlows(String interfaceName, String macAddress, String elanName, WriteTransaction interfaceTx, WriteTransaction flowTx) { LOG.trace("Deleting mac address {} and interface name {} from ElanInterfaceForwardingEntries " + "and ElanForwardingTables DS", macAddress, interfaceName); @@ -1727,7 +1727,7 @@ public class ElanUtils { return macTable.getMacEntry(); } - public boolean isTunnelInLogicalGroup(String interfaceName, DataBroker broker) { + public boolean isTunnelInLogicalGroup(String interfaceName) { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.interfaces.rev140508.interfaces.Interface configIface = interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java index 9786da41aa..c1e5b73f6d 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java @@ -28,7 +28,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Created by eaksahu on 8/9/2016. */ -public class GlobalAugmentationHelper { +public final class GlobalAugmentationHelper { + private GlobalAugmentationHelper() { } + public static void addLogicalSwitches(HwvtepGlobalAugmentationBuilder augmentationBuilder, List logicalSwitchData) { List logicalSwitches = new ArrayList<>(); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java index c88a710e60..1e9f0f98a6 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java @@ -44,11 +44,13 @@ import org.slf4j.LoggerFactory; /** * Created by eaksahu on 8/8/2016. */ -public class PhysicalSwitchHelper { +public final class PhysicalSwitchHelper { static Logger LOG = LoggerFactory.getLogger(PhysicalSwitchHelper.class); static InstanceIdentifier dId; + private PhysicalSwitchHelper() { } + public static InstanceIdentifier getPhysicalSwitchInstanceIdentifier(InstanceIdentifier iid, String switchName) { NodeId id = iid.firstKeyOf(Node.class).getNodeId(); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java index 7ce0432b7f..0c0a29c953 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java @@ -53,7 +53,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Created by ekvsver on 8/6/2016. */ -public class TestBuilders { +public final class TestBuilders { + private TestBuilders() { } + public static HwvtepLogicalSwitchRef buildLogicalSwitchesRef(InstanceIdentifier nodeIid, String logicalSwitchName) { InstanceIdentifier logicalSwitchInstanceIid = diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java index 892482d702..ec0f0444a0 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java @@ -45,9 +45,11 @@ import org.slf4j.LoggerFactory; /** * Created by ekvsver on 8/6/2016. */ -public class TestComparators { +public final class TestComparators { static Logger LOG = LoggerFactory.getLogger(TestComparators.class); + private TestComparators() { } + public static void verifySwitches(Node globalOpNode, Node psOpNode) { for (Switches switches : globalOpNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches()) { String switchValue = switches.getSwitchRef().getValue().firstKeyOf(Node.class).getNodeId().getValue(); diff --git a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java index 70c1f293e8..2bac67803d 100644 --- a/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java +++ b/vpnservice/elanmanager/elanmanager-impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java @@ -33,9 +33,11 @@ import org.slf4j.LoggerFactory; /** * Created by eaksahu on 8/12/2016. */ -public class TestUtil { +public final class TestUtil { static Logger LOG = LoggerFactory.getLogger(TestUtil.class); + private TestUtil() { } + public static void deleteNode(ReadWriteTransaction tx, InstanceIdentifier id) throws Exception { tx.delete(OPERATIONAL, id); tx.submit().checkedGet(); diff --git a/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java b/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java index dd1a18d091..1f87f9a280 100644 --- a/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java +++ b/vpnservice/fibmanager/fibmanager-api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java @@ -35,7 +35,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder; -public class FibHelper { +public final class FibHelper { + + private FibHelper() { } public static RoutePaths buildRoutePath(String nextHop, Long label) { RoutePathsBuilder builder = new RoutePathsBuilder() diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java index 3f618db8bd..77e1128c94 100644 --- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java +++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/IfMgr.java @@ -418,7 +418,7 @@ public class IfMgr implements ElementCache, AutoCloseable { } } else { LOG.info("In updateHostIntf, removing service binding for portId {}", portId); - ipv6ServiceUtils.unbindIpv6Service(dataBroker, portId.getValue()); + ipv6ServiceUtils.unbindIpv6Service(portId.getValue()); intf.setServiceBindingStatus(true); } } @@ -483,7 +483,7 @@ public class IfMgr implements ElementCache, AutoCloseable { } else { LOG.info("In removePort for host interface, portId {}", portId); // Remove the serviceBinding entry for the port. - ipv6ServiceUtils.unbindIpv6Service(dataBroker, portId.getValue()); + ipv6ServiceUtils.unbindIpv6Service(portId.getValue()); // Remove the portId from the (network <--> List[dpnIds, List ]) cache. VirtualNetwork vnet = getNetwork(networkID); if (null != vnet) { diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java index 659c3c2cb0..8bd93fd93f 100644 --- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java +++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualPort.java @@ -28,6 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// This class needs to be overridden by Mockito +@SuppressWarnings("checkstyle:FinalClass") public class VirtualPort implements IVirtualPort { static final Logger LOG = LoggerFactory.getLogger(VirtualPort.class); diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java index 7131298538..0c2b323146 100644 --- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java +++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualRouter.java @@ -15,7 +15,7 @@ import org.opendaylight.netvirt.ipv6service.api.IVirtualRouter; import org.opendaylight.netvirt.ipv6service.api.IVirtualSubnet; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; -public class VirtualRouter implements IVirtualRouter { +public final class VirtualRouter implements IVirtualRouter { private final Uuid routerUUID; private final Uuid tenantID; private final String name; diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java index e6cea4a1ce..3ad1efb3d8 100644 --- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java +++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/VirtualSubnet.java @@ -15,7 +15,7 @@ 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.inet.types.rev130715.IpPrefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; -public class VirtualSubnet implements IVirtualSubnet { +public final class VirtualSubnet implements IVirtualSubnet { private final Uuid subnetUUID; private final Uuid tenantID; diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java index 4b83966471..15c299c226 100644 --- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java +++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6Constants.java @@ -77,6 +77,6 @@ public interface Ipv6Constants { enum Ipv6RtrAdvertType { UNSOLICITED_ADVERTISEMENT, SOLICITED_ADVERTISEMENT, - CEASE_ADVERTISEMENT; + CEASE_ADVERTISEMENT } } diff --git a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java index 60d62850f0..e099bd1520 100644 --- a/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java +++ b/vpnservice/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java @@ -471,7 +471,7 @@ public class Ipv6ServiceUtils { buildServiceId(interfaceName, serviceIndex), serviceInfo); } - public void unbindIpv6Service(DataBroker broker, String interfaceName) { + public void unbindIpv6Service(String interfaceName) { MDSALUtil.syncDelete(broker, LogicalDatastoreType.CONFIGURATION, buildServiceId(interfaceName, ServiceIndex.getIndex(NwConstants.IPV6_SERVICE_NAME, NwConstants.IPV6_SERVICE_INDEX))); diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java index 991ec79a98..61eede67ed 100644 --- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java +++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java @@ -232,7 +232,7 @@ public class NaptEventHandler { return; } - Long vpnIdFromExternalSubnet = getVpnIdFromExternalSubnet(dataBroker, routerId, + Long vpnIdFromExternalSubnet = getVpnIdFromExternalSubnet(routerId, externalAddress.getIpAddress()); if (vpnIdFromExternalSubnet != NatConstants.INVALID_ID) { vpnId = vpnIdFromExternalSubnet; @@ -652,7 +652,7 @@ public class NaptEventHandler { return interfaceName; } - private long getVpnIdFromExternalSubnet(DataBroker dataBroker, Long routerId, String externalIpAddress) { + private long getVpnIdFromExternalSubnet(Long routerId, String externalIpAddress) { String routerName = NatUtil.getRouterName(dataBroker, routerId); if (routerName != null) { Routers extRouter = NatUtil.getRoutersFromConfigDS(dataBroker, routerName); diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java index c3b7b514f5..dc03f339ac 100644 --- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java +++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatEvpnUtil.java @@ -51,10 +51,12 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NatEvpnUtil { +public final class NatEvpnUtil { private static final Logger LOG = LoggerFactory.getLogger(NatEvpnUtil.class); + private NatEvpnUtil() { } + static long getLPortTagForRouter(String routerIdKey, IdManagerService idManager) { AllocateIdInput getIdInput = new AllocateIdInputBuilder() .setPoolName(IfmConstants.IFM_IDPOOL_NAME).setIdKey(routerIdKey) diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java index 9f20fb7eff..c824d2d62a 100644 --- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java +++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatOverVxlanUtil.java @@ -35,10 +35,12 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NatOverVxlanUtil { +public final class NatOverVxlanUtil { private static final Logger LOG = LoggerFactory.getLogger(NatOverVxlanUtil.class); + private NatOverVxlanUtil() { } + public static BigInteger getInternetVpnVni(IdManagerService idManager, String vpnUuid, long vpnid) { BigInteger internetVpnVni = getVNI(vpnUuid, idManager); if (internetVpnVni.longValue() == -1) { diff --git a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java index edcb43b1d2..eb76cc4b39 100644 --- a/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java +++ b/vpnservice/natservice/natservice-impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java @@ -210,11 +210,13 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NatUtil { +public final class NatUtil { private static String OF_URI_SEPARATOR = ":"; private static final Logger LOG = LoggerFactory.getLogger(NatUtil.class); + private NatUtil() { } + /* getCookieSnatFlow() computes and returns a unique cookie value for the NAT flows using the router ID as the reference value. diff --git a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java b/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java index e26aa37a60..489e20bf44 100644 --- a/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java +++ b/vpnservice/natservice/natservice-impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/ExternalNetworksChangeListenerTest.java @@ -54,8 +54,6 @@ public class ExternalNetworksChangeListenerTest { @Mock IMdsalApiManager mdsalManager; @Mock - FlowEntity flowMock; - @Mock GroupEntity groupMock; InstanceIdentifier id = null; diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/utils/L2GatewayCacheUtils.java b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/utils/L2GatewayCacheUtils.java index cf29168776..8e8fd20845 100644 --- a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/utils/L2GatewayCacheUtils.java +++ b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/l2gw/utils/L2GatewayCacheUtils.java @@ -15,11 +15,13 @@ 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.hwvtep.physical._switch.attributes.TunnelIps; -public class L2GatewayCacheUtils { +public final class L2GatewayCacheUtils { public static final String L2GATEWAY_CACHE_NAME = "L2GW"; private static final ConcurrentMap CACHE = new ConcurrentHashMap<>(); + private L2GatewayCacheUtils() { } + public static void addL2DeviceToCache(String devicename, L2GatewayDevice l2GwDevice) { CACHE.put(devicename, l2GwDevice); } diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java index 3757c62a53..3690d793dd 100644 --- a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java +++ b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/ChangeUtils.java @@ -26,7 +26,7 @@ import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; -public class ChangeUtils { +public final class ChangeUtils { private ChangeUtils() { } private static Predicate> hasDataBefore() { diff --git a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java index 91e5f39705..3f772eff08 100644 --- a/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java +++ b/vpnservice/neutronvpn/neutronvpn-api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java @@ -32,7 +32,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NeutronUtils { +public final class NeutronUtils { private static final Logger LOG = LoggerFactory.getLogger(NeutronUtils.class); public static final String VNIC_TYPE_NORMAL = "normal"; @@ -43,6 +43,8 @@ public class NeutronUtils { public static final String PORT_STATUS_NOTAPPLICABLE = "N/A"; private static volatile Pattern uuidPattern; + private NeutronUtils() { } + /** * Create a Neutron Port status entry in the operational data store. * @param uuid The uuid of the Neutron port diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java index fc3242ea16..91657b9763 100644 --- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java +++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java @@ -305,9 +305,9 @@ public class NeutronvpnUtils { Optional subnetmaps = read(LogicalDatastoreType.CONFIGURATION, subnetmapsid); if (subnetmaps.isPresent() && subnetmaps.get().getSubnetmap() != null) { List subnetMapList = subnetmaps.get().getSubnetmap(); - for (Subnetmap subnetMap : subnetMapList) { - if (subnetMap.getVpnId() != null && subnetMap.getVpnId().equals(vpnid)) { - subnets.add(subnetMap.getId()); + for (Subnetmap candidateSubnetMap : subnetMapList) { + if (candidateSubnetMap.getVpnId() != null && candidateSubnetMap.getVpnId().equals(vpnid)) { + subnets.add(candidateSubnetMap.getId()); } } } diff --git a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java index b4774ff2c1..35f36f12f2 100644 --- a/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java +++ b/vpnservice/neutronvpn/neutronvpn-impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayUtils.java @@ -22,9 +22,11 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class L2GatewayUtils { +public final class L2GatewayUtils { private static final Logger LOG = LoggerFactory.getLogger(L2GatewayUtils.class); + private L2GatewayUtils() { } + protected static boolean isGatewayAssociatedToL2Device(L2GatewayDevice l2GwDevice) { return (l2GwDevice.getL2GatewayIds().size() > 0); } diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java b/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java index e02c86f30a..07c21647f6 100644 --- a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java +++ b/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ConfigureL3VpnCommand.java @@ -46,7 +46,7 @@ public class ConfigureL3VpnCommand extends OsgiCommandSupport { this.neutronVpnManager = neutronVpnManager; } - public void setRpcRegistry(RpcProviderRegistry rpcProviderRegistry) { + public void setRpcProviderRegistry(RpcProviderRegistry rpcProviderRegistry) { this.rpcProviderRegistry = rpcProviderRegistry; } diff --git a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java b/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java index 33eeb7c960..9c97549f60 100644 --- a/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java +++ b/vpnservice/neutronvpn/neutronvpn-shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java @@ -60,21 +60,21 @@ public class ShowSubnet extends OsgiCommandSupport { if (subnetmap == null && subnetopdata == null) { getSubnet(); System.out.println("Following subnetId is present in both subnetMap and subnetOpDataEntry\n"); - for (Subnetmap subnetmap : subnetmapList) { - SubnetOpDataEntry data = subnetOpDataEntryMap.get(subnetmap.getId()); + for (Subnetmap candidateSubnetmap : subnetmapList) { + SubnetOpDataEntry data = subnetOpDataEntryMap.get(candidateSubnetmap.getId()); if (data != null) { - System.out.println(subnetmap.getId().toString() + "\n"); + System.out.println(candidateSubnetmap.getId().toString() + "\n"); } } System.out.println("\n\nFollowing subnetId is present in subnetMap but not in subnetOpDataEntry\n"); - for (Subnetmap subnetmap : subnetmapList) { - SubnetOpDataEntry data = subnetOpDataEntryMap.get(subnetmap.getId()); + for (Subnetmap candidateSubnetmap : subnetmapList) { + SubnetOpDataEntry data = subnetOpDataEntryMap.get(candidateSubnetmap.getId()); if (data == null) { - System.out.println(subnetmap.getId().toString() + "\n"); + System.out.println(candidateSubnetmap.getId().toString() + "\n"); } } getshowVpnCLIHelp(); - } else if (subnetmap == null && subnetopdata != null) { + } else if (subnetmap == null) { InstanceIdentifier subOpIdentifier = InstanceIdentifier.builder(SubnetOpData.class) .child(SubnetOpDataEntry.class, new SubnetOpDataEntryKey(new Uuid(subnetopdata))).build(); Optional optionalSubs = syncReadOptional(dataBroker, OPERATIONAL, subOpIdentifier); @@ -86,7 +86,7 @@ public class ShowSubnet extends OsgiCommandSupport { + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " + data.getVpnName() + "\n"); System.out.println("------------------------------------------------------------------------------"); - } else if (subnetmap != null && subnetopdata == null) { + } else if (subnetopdata == null) { InstanceIdentifier id = InstanceIdentifier.builder(Subnetmaps.class) .child(Subnetmap.class, new SubnetmapKey(new Uuid(subnetmap))).build(); Optional sn = syncReadOptional(dataBroker, CONFIGURATION, id); diff --git a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java b/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java index 4f1a387759..b92c955e0c 100644 --- a/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java +++ b/vpnservice/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosAlertManager.java @@ -203,9 +203,9 @@ public final class QosAlertManager implements Runnable { writeConfigDataStore(alertEnabled, alertThresholdSupplier.get().shortValue(), pollInterval); } - public void setEnable(boolean alertEnabled) { - LOG.debug("setting QoS poll to {} in config data store", alertEnabled); - writeConfigDataStore(alertEnabled, alertThresholdSupplier.get().shortValue(), pollInterval); + public void setEnable(boolean enable) { + LOG.debug("setting QoS poll to {} in config data store", enable); + writeConfigDataStore(enable, alertThresholdSupplier.get().shortValue(), pollInterval); } public void addToQosAlertCache(Port port) { @@ -320,14 +320,14 @@ public final class QosAlertManager implements Runnable { Futures.addCallback(tx.submit(), callback, MoreExecutors.directExecutor()); } - private void writeConfigDataStore(boolean alertEnabled, short threshold, int pollInterval) { + private void writeConfigDataStore(boolean qosAlertEnabled, short dropPacketThreshold, int alertPollInterval) { InstanceIdentifier path = InstanceIdentifier.builder(QosalertConfig.class).build(); QosalertConfig qosAlertConfig = new QosalertConfigBuilder() - .setQosDropPacketThreshold(threshold) - .setQosAlertEnabled(alertEnabled) - .setQosAlertPollInterval(pollInterval) + .setQosDropPacketThreshold(dropPacketThreshold) + .setQosAlertEnabled(qosAlertEnabled) + .setQosAlertPollInterval(alertPollInterval) .build(); asyncWrite(LogicalDatastoreType.CONFIGURATION, path, qosAlertConfig, dataBroker, diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java index dad3d90083..b58dcfc1de 100644 --- a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java +++ b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java @@ -8,7 +8,7 @@ package org.opendaylight.netvirt.sfc.translator; -import java.util.Objects; +import javax.annotation.Nullable; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; @@ -30,7 +30,6 @@ import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sfp.rev1407 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.AccessLists; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.Acl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.access.control.list.rev160218.access.lists.AclKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,13 +39,14 @@ import org.slf4j.LoggerFactory; */ public class SfcMdsalHelper { private static final Logger LOG = LoggerFactory.getLogger(SfcMdsalHelper.class); - private static InstanceIdentifier accessListIid = InstanceIdentifier.create(AccessLists.class); - private static InstanceIdentifier sfIid = InstanceIdentifier.create(ServiceFunctions.class); - private static InstanceIdentifier sffIid = + private static final InstanceIdentifier ACCESS_LIST_IID = InstanceIdentifier.create(AccessLists.class); + private static final InstanceIdentifier SF_IID = + InstanceIdentifier.create(ServiceFunctions.class); + private static final InstanceIdentifier SFF_IID = InstanceIdentifier.create(ServiceFunctionForwarders.class); - private static InstanceIdentifier sfcIid = + private static final InstanceIdentifier SFC_IID = InstanceIdentifier.create(ServiceFunctionChains.class); - private static InstanceIdentifier sfpIid + private static final InstanceIdentifier SFP_IID = InstanceIdentifier.create(ServiceFunctionPaths.class); public static final String NETVIRT_LOGICAL_SFF_NAME = "Netvirt-Logical-SFF"; @@ -195,38 +195,42 @@ public class SfcMdsalHelper { } } - private InstanceIdentifier getAclPath(AclKey aclKey) { - return accessListIid.builder().child(Acl.class, aclKey).build(); + private static InstanceIdentifier getAclPath(AclKey aclKey) { + return ACCESS_LIST_IID.builder().child(Acl.class, aclKey).build(); } - private InstanceIdentifier getSFPath(ServiceFunctionKey key) { - return sfIid.builder().child(ServiceFunction.class, key).build(); + private static InstanceIdentifier getSFPath(ServiceFunctionKey key) { + return SF_IID.builder().child(ServiceFunction.class, key).build(); } - private InstanceIdentifier getSFFPath(ServiceFunctionForwarderKey key) { - return sffIid.builder().child(ServiceFunctionForwarder.class, key).build(); + private static InstanceIdentifier getSFFPath(ServiceFunctionForwarderKey key) { + return SFF_IID.builder().child(ServiceFunctionForwarder.class, key).build(); } - private InstanceIdentifier getSFCPath(ServiceFunctionChainKey key) { - return sfcIid.builder().child(ServiceFunctionChain.class, key).build(); + private static InstanceIdentifier getSFCPath(ServiceFunctionChainKey key) { + return SFC_IID.builder().child(ServiceFunctionChain.class, key).build(); } - private InstanceIdentifier getSFPPath(ServiceFunctionPathKey key) { - return sfpIid.builder().child(ServiceFunctionPath.class, key).build(); + private static InstanceIdentifier getSFPPath(ServiceFunctionPathKey key) { + return SFP_IID.builder().child(ServiceFunctionPath.class, key).build(); } + @Nullable public ServiceFunctionForwarder getExistingSFF(String ipAddress) { ServiceFunctionForwarders existingSffs = SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker, - LogicalDatastoreType.CONFIGURATION, sffIid).orNull(); - - return existingSffs == null || existingSffs.getServiceFunctionForwarder() == null - ? null - : existingSffs.getServiceFunctionForwarder().stream() - .filter(sff -> Objects.nonNull(sff.getIpMgmtAddress())) - .filter(sff -> new Ipv4Address(ipAddress).equals(sff.getIpMgmtAddress().getIpv4Address())) - .findFirst() - .orElse(null); + LogicalDatastoreType.CONFIGURATION, SFF_IID).orNull(); + + if (existingSffs != null && existingSffs.getServiceFunctionForwarder() != null) { + for (ServiceFunctionForwarder forwarder : existingSffs.getServiceFunctionForwarder()) { + if (forwarder.getIpMgmtAddress() != null && ipAddress.equals( + forwarder.getIpMgmtAddress().getIpv4Address().getValue())) { + return forwarder; + } + } + } + + return null; } public void addNetvirLogicalSff() { diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java index 1b2b226587..f0733ad35e 100644 --- a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java +++ b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java @@ -43,12 +43,14 @@ import org.slf4j.LoggerFactory; * Class will convert OpenStack Flow Classifier API yang models to * OpenDaylight ACL yang models. */ -public class FlowClassifierTranslator { +public final class FlowClassifierTranslator { private static final Logger LOG = LoggerFactory.getLogger(FlowClassifierTranslator.class); private static final Short PROTO_TCP = 6; private static final Short PROTO_UDP = 17; private static final String RULE = "_rule"; + private FlowClassifierTranslator() { } + public static Acl buildAcl(SfcFlowClassifier flowClassifier) { return buildAcl(flowClassifier, null); } diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java index b9d250baff..fcc30cee80 100644 --- a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java +++ b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java @@ -34,10 +34,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.a * Class will convert OpenStack Port Chain API yang models present in * neutron northbound project to OpenDaylight SFC yang models. */ -public class PortChainTranslator { +public final class PortChainTranslator { private static final String SYMMETRIC_PARAM = "symmetric"; private static final String SFP_NAME_PREFIX = "Path-"; + private PortChainTranslator() { } + public static ServiceFunctionChain buildServiceFunctionChain( PortChain portChain, List sfList) { ServiceFunctionChainBuilder sfcBuilder = new ServiceFunctionChainBuilder(); diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java index 4451dcde89..ce8a99305d 100644 --- a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java +++ b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairGroupTranslator.java @@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory; * Class will convert OpenStack Port Pair API yang models present in * neutron northbound project to OpenDaylight SFC yang models. */ -public class PortPairGroupTranslator { +public final class PortPairGroupTranslator { private static final Logger LOG = LoggerFactory.getLogger(PortPairGroupTranslator.class); private static final String OPT_FLOW_STR = "flow"; private static final String OPT_GPE_STR = "gpe"; @@ -64,6 +64,8 @@ public class PortPairGroupTranslator { private static final String SFF_DEFAULT_NAME = "sff"; private static final String SFF_DPL_FIX_NAME = "vxgpe"; + private PortPairGroupTranslator() { } + public static ServiceFunctionForwarderBuilder buildServiceFunctionForwarder( PortPairGroup portPairGroup, List portPairs, diff --git a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java index 2cd1ff7794..6d52bf3d2a 100644 --- a/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java +++ b/vpnservice/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortPairTranslator.java @@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory; * Class will convert OpenStack Port Pair API yang models present in * neutron northbound project to OpenDaylight SFC Service Function yang models. */ -public class PortPairTranslator { +public final class PortPairTranslator { private static final Logger LOG = LoggerFactory.getLogger(PortPairTranslator.class); private static final String SF_TYPE_PARAM = "type"; private static final String DPL_SUFFIX_PARAM = "-dpl"; @@ -70,6 +70,8 @@ public class PortPairTranslator { private static final AtomicInteger COUNTER = new AtomicInteger(0); private static final String SFF_NAME_PARAM = "sff-name"; + private PortPairTranslator() { } + @Nonnull public static ServiceFunctionBuilder buildServiceFunction( PortPair portPair, diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java b/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java index 8917415187..385add4a42 100644 --- a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java +++ b/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java @@ -58,7 +58,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.statistics.rev17012 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxReg6; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class CountersServiceUtils { +public final class CountersServiceUtils { public static final Long COUNTERS_PULL_END = Long.valueOf(100000); public static final Long COUNTERS_PULL_START = Long.valueOf(1); @@ -86,6 +86,8 @@ public class CountersServiceUtils { private static AtomicLong flowIdInc = new AtomicLong(2); + private CountersServiceUtils() { } + public static BoundServices getBoundServices(String serviceName, short servicePriority, int flowPriority, BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority) diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java b/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java index e075ca19db..acc7801fe0 100644 --- a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java +++ b/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersUtils.java @@ -18,7 +18,7 @@ import org.opendaylight.genius.interfacemanager.globals.IfmConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class CountersUtils { +public final class CountersUtils { public static final String BYTE_COUNTER_NAME = "byteCount"; public static final String BYTES_GROUP_NAME = "Bytes"; @@ -49,6 +49,8 @@ public class CountersUtils { private static final Collection UNACCUMULATED_COUNTER_GROUPS = ImmutableSet.of("Duration"); + private CountersUtils() { } + public static String getNodeId(BigInteger dpId) { return IfmConstants.OF_URI_PREFIX + dpId; } diff --git a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java b/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java index 8257c36eab..d0f6a4644f 100644 --- a/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java +++ b/vpnservice/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/ElementCountersRequest.java @@ -24,8 +24,8 @@ public class ElementCountersRequest { filters = new HashMap<>(); } - public void setElementCountersDirection(ElementCountersDirection direction) { - this.direction = direction; + public void setElementCountersDirection(ElementCountersDirection elementCountersDirection) { + this.direction = elementCountersDirection; } public String getPortId() { diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java b/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java index 442b387bb0..9a553caf4f 100644 --- a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java +++ b/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java @@ -47,10 +47,12 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class InterfaceUtils { +public final class InterfaceUtils { private static final Logger LOG = LoggerFactory.getLogger(InterfaceUtils.class); private static String OF_URI_SEPARATOR = ":"; + private InterfaceUtils() { } + public static BigInteger getDpnForInterface(OdlInterfaceRpcService interfaceManagerRpcService, String ifName) { BigInteger nodeId = BigInteger.ZERO; try { diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java b/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java index 01f8154c9a..439bcac3e8 100644 --- a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java +++ b/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnExtraRouteHelper.java @@ -43,9 +43,11 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VpnExtraRouteHelper { +public final class VpnExtraRouteHelper { private static final Logger LOG = LoggerFactory.getLogger(VpnExtraRouteHelper.class); + private VpnExtraRouteHelper() { } + public static List getVpnExtraroutes(DataBroker broker, String vpnName, String vpnRd) { InstanceIdentifier vpnExtraRoutesId = getVpnToExtrarouteIdentifier(vpnName, vpnRd); Optional vpnOpc = MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL, vpnExtraRoutesId); diff --git a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java b/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java index 97a40162c4..da97ef3b0a 100644 --- a/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java +++ b/vpnservice/vpnmanager/vpnmanager-api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/VpnHelper.java @@ -36,7 +36,9 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public class VpnHelper { +public final class VpnHelper { + private VpnHelper() { } + //FIXME: Implement caches for DS reads public static VpnInstance getVpnInstance(DataBroker broker, String vpnInstanceName) { InstanceIdentifier id = InstanceIdentifier.builder(VpnInstances.class).child(VpnInstance.class, diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java index f01ca82943..a401fcb36b 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/AlivenessMonitorUtils.java @@ -46,11 +46,13 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AlivenessMonitorUtils { +public final class AlivenessMonitorUtils { private static final Logger LOG = LoggerFactory.getLogger(AlivenessMonitorUtils.class); private static Map alivenessCache = new ConcurrentHashMap<>(); + private AlivenessMonitorUtils() { } + public static void startArpMonitoring(MacEntry macEntry, Long arpMonitorProfileId, AlivenessMonitorService alivenessMonitorService, DataBroker dataBroker, OdlInterfaceRpcService interfaceRpc, INeutronVpnManager neutronVpnService, diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java index 62b8c33f80..ae139c979b 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/ArpUtils.java @@ -23,13 +23,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Tr import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class ArpUtils { +public final class ArpUtils { private static final Logger LOG = LoggerFactory.getLogger(ArpUtils.class); private static final byte[] ETHERNETDESTINATION_BROADCAST = new byte[] {(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF}; private static final byte[] MAC_BROADCAST = new byte[] {(byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0}; + private ArpUtils() { } + public static TransmitPacketInput createArpRequestInput(BigInteger dpnId, long groupId, byte[] abySenderMAC, byte[] abySenderIpAddress, byte[] abyTargetIpAddress) { return createArpRequestInput(dpnId, groupId, abySenderMAC, abySenderIpAddress, abyTargetIpAddress, null); diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java index 019a716a53..78eda053a8 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/DpnInVpnChangeListener.java @@ -76,7 +76,7 @@ public class DpnInVpnChangeListener implements OdlL3vpnListener { writeTxn.submit().get(); } catch (InterruptedException | ExecutionException e) { LOG.error("Error removing dpnToVpnList for vpn {} ", vpnName); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } } diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java index f08452b02b..80c87a33b6 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TransactionUtil.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TransactionUtil { +public final class TransactionUtil { private static final Logger LOG = LoggerFactory.getLogger(TransactionUtil.class); private TransactionUtil() { @@ -70,7 +70,7 @@ public class TransactionUtil { } catch (InterruptedException | ExecutionException e) { LOG.error("syncWrite: Error writing VPN instance to ID info to datastore (path, data) : ({}, {})", path, data); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } } diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java index 0689809b2e..49685bc72b 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java @@ -155,7 +155,7 @@ public class VpnFootprintService implements IVpnFootprintService { } catch (InterruptedException | ExecutionException e) { LOG.error("createOrUpdateVpnToDpnList: Error adding to dpnToVpnList for vpn {} vpnId {} interface {}" + " dpn {}", vpnName, vpnId, intfName, dpnId, e); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } LOG.info("createOrUpdateVpnToDpnList: Created/Updated vpn footprint for vpn {} vpnId {} interfacName{}" @@ -216,7 +216,7 @@ public class VpnFootprintService implements IVpnFootprintService { } catch (InterruptedException | ExecutionException e) { LOG.error("Error adding to dpnToVpnList for vpn {} ipAddresses {} dpn {}", vpnName, ipAddressSourceValuePair.getValue(), dpnId, e); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } /* @@ -276,7 +276,7 @@ public class VpnFootprintService implements IVpnFootprintService { } catch (InterruptedException | ExecutionException e) { LOG.error("removeOrUpdateVpnToDpnList: Error removing from dpnToVpnList for vpn {} vpnId {}" + " interface {} dpn {}", vpnName, vpnId, intfName, dpnId, e); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } } // Ends synchronized block @@ -335,7 +335,7 @@ public class VpnFootprintService implements IVpnFootprintService { } catch (InterruptedException | ExecutionException e) { LOG.error("Error removing from dpnToVpnList for vpn {} Ipaddress {} dpn {}", vpnName, ipAddressSourceValuePair.getValue(), dpnId, e); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } } // Ends synchronized block diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java index 37a82ec503..06e552caa1 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java @@ -147,7 +147,7 @@ public class VpnInstanceListener extends AsyncDataTreeChangeListenerBase> futures = new ArrayList<>(); futures.add(writeConfigTxn.submit()); diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java index 3aa34fd35f..7d9dd19886 100755 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceManager.java @@ -2117,8 +2117,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBaseThese class deals with those classes usually considered for the Operational DS.

*/ -public class VpnOperDsUtils { +public final class VpnOperDsUtils { + + private VpnOperDsUtils() { } public static InstanceIdentifier getVpnInstanceToVpnIdIdentifier(String vpnName) { diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java index af508242c4..32c571d2bb 100755 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java @@ -871,7 +871,7 @@ public final class VpnUtil { tx.submit().get(); } catch (InterruptedException | ExecutionException e) { LOG.error("syncWrite: Error writing to datastore (path, data) : ({}, {})", path, data); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } @@ -884,7 +884,7 @@ public final class VpnUtil { tx.submit().get(); } catch (InterruptedException | ExecutionException e) { LOG.error("syncUpdate: Error writing to datastore (path, data) : ({}, {})", path, data); - throw new RuntimeException(e.getMessage()); + throw new RuntimeException(e.getMessage(), e); } } @@ -1304,10 +1304,12 @@ public final class VpnUtil { } } catch (InterruptedException | ExecutionException e) { LOG.error(errMsg); - throw new RuntimeException(errMsg, e.getCause()); + throw new RuntimeException(e.getMessage(), e); } } + // We store the cause, which is what we really care about + @SuppressWarnings("checkstyle:AvoidHidingCauseException") public static void unlockSubnet(LockManagerService lockManager, String subnetId) { UnlockInput input = new UnlockInputBuilder().setLockName(subnetId).build(); Future> result = lockManager.unlock(input); diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java index 65ca05ac31..39fc0ed3a9 100755 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java @@ -60,10 +60,12 @@ import org.slf4j.LoggerFactory; /** * This class contains methods to be used as utilities related with inter-vpn-link. */ -public class InterVpnLinkUtil { +public final class InterVpnLinkUtil { private static final Logger LOG = LoggerFactory.getLogger(InterVpnLinkUtil.class); + private InterVpnLinkUtil() { } + /** * Retrieves the Instance Identifier that points to an InterVpnLink object * in MD-SAL. diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java index bbdb79617a..01ac809969 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkTestCatalog.java @@ -34,7 +34,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netvirt. /** * Gathers several InterVpnLinks that can be used for testing. */ -public class InterVpnLinkTestCatalog { +public final class InterVpnLinkTestCatalog { + + private InterVpnLinkTestCatalog() { } static InterVpnLinkDataComposite build(String ivpnLinkName, String vpn1Name, String vpn1IpAddr, String vpn2Name, String vpn2IpAddr, boolean bgpFlag, boolean staticFlag, diff --git a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java index e91192d244..e13ce2e847 100644 --- a/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java +++ b/vpnservice/vpnmanager/vpnmanager-impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java @@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.vpn /** * Gathers a collections of 'fake' L3VPN objects that can be used in JUnits. */ -public class L3VpnTestCatalog { +public final class L3VpnTestCatalog { static class L3VpnComposite { VpnInstance vpnCfgData; @@ -40,6 +40,8 @@ public class L3VpnTestCatalog { } } + private L3VpnTestCatalog() { } + static VpnTargets makeVpnTargets(List irts, List erts) { List commonRT = new ArrayList<>(irts); commonRT.retainAll(erts); -- 2.36.6