* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netvirt.elanmanager.utils;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.genius.utils.cache.CacheUtil;
import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
public final class ElanL2GwCacheUtils {
private static final ConcurrentHashMap<String, L2GatewayDevice> EMPTY_MAP = new ConcurrentHashMap<>();
- public static final String L2GATEWAY_CONN_CACHE_NAME = "L2GWCONN";
+ private static final LoadingCache<String, ConcurrentMap<String, L2GatewayDevice>> CACHES = CacheBuilder.newBuilder()
+ .build(new CacheLoader<String, ConcurrentMap<String, L2GatewayDevice>>() {
+ @Override
+ public ConcurrentMap<String, L2GatewayDevice> load(String key) {
+ return new ConcurrentHashMap<>();
+ }
+ });
private ElanL2GwCacheUtils() {
}
- static {
- CacheUtil.createCache(ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- }
-
public static void addL2GatewayDeviceToCache(String elanName, L2GatewayDevice l2GwDevice) {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
- ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- ConcurrentMap<String, L2GatewayDevice> deviceMap = cachedMap.get(elanName);
- if (deviceMap == null) {
- synchronized (ElanL2GwCacheUtils.class) {
- deviceMap = cachedMap.computeIfAbsent(elanName, k -> new ConcurrentHashMap<>());
- }
- }
- deviceMap.put(l2GwDevice.getHwvtepNodeId(), l2GwDevice);
+ CACHES.getUnchecked(elanName).put(l2GwDevice.getHwvtepNodeId(), l2GwDevice);
}
public static void removeL2GatewayDeviceFromAllElanCache(String deviceName) {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
- ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- cachedMap.values().forEach(deviceMap -> deviceMap.remove(deviceName));
+ CACHES.asMap().values().forEach(deviceMap -> deviceMap.remove(deviceName));
}
@Nullable
public static L2GatewayDevice removeL2GatewayDeviceFromCache(String elanName, String l2gwDeviceNodeId) {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
- ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- ConcurrentMap<String, L2GatewayDevice> deviceMap = cachedMap.get(elanName);
- if (deviceMap != null) {
- return deviceMap.remove(l2gwDeviceNodeId);
- } else {
- return null;
- }
+ ConcurrentMap<String, L2GatewayDevice> deviceMap = CACHES.getIfPresent(elanName);
+ return deviceMap == null ? null : deviceMap.remove(l2gwDeviceNodeId);
}
@Nullable
public static L2GatewayDevice getL2GatewayDeviceFromCache(String elanName, String l2gwDeviceNodeId) {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
- ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- ConcurrentMap<String, L2GatewayDevice> deviceMap = cachedMap.get(elanName);
- if (deviceMap != null) {
- return deviceMap.get(l2gwDeviceNodeId);
- } else {
- return null;
- }
+ ConcurrentMap<String, L2GatewayDevice> deviceMap = CACHES.getIfPresent(elanName);
+ return deviceMap == null ? null : deviceMap.get(l2gwDeviceNodeId);
}
public static ConcurrentMap<String, L2GatewayDevice> getInvolvedL2GwDevices(String elanName) {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil
- .getCache(ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- ConcurrentMap<String, L2GatewayDevice> result = cachedMap.get(elanName);
- if (result == null) {
- result = EMPTY_MAP;
- }
- return result;
+ ConcurrentMap<String, L2GatewayDevice> result = CACHES.getIfPresent(elanName);
+ return result == null ? EMPTY_MAP : result;
+ }
+
+ public static Set<Entry<String, ConcurrentMap<String, L2GatewayDevice>>> getCaches() {
+ return CACHES.asMap().entrySet();
}
@NonNull
public static List<L2GatewayDevice> getAllElanDevicesFromCache() {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cachedMap =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
- ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
- if (cachedMap == null || cachedMap.isEmpty()) {
- return Collections.emptyList();
- }
-
List<L2GatewayDevice> l2GwDevices = new ArrayList<>();
- for (ConcurrentMap<String, L2GatewayDevice> l2gwDevices : cachedMap.values()) {
- for (L2GatewayDevice l2gwDevice : l2gwDevices.values()) {
- l2GwDevices.add(l2gwDevice);
- }
+ for (ConcurrentMap<String, L2GatewayDevice> cache : CACHES.asMap().values()) {
+ l2GwDevices.addAll(cache.values());
}
return l2GwDevices;
}
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netvirt.elan.cli.l2gw;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.karaf.shell.commands.Option;
import org.apache.karaf.shell.console.OsgiCommandSupport;
import org.eclipse.jdt.annotation.Nullable;
-import org.opendaylight.genius.utils.cache.CacheUtil;
import org.opendaylight.genius.utils.hwvtep.HwvtepNodeHACache;
import org.opendaylight.netvirt.elanmanager.utils.ElanL2GwCacheUtils;
import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayCache;
@Command(scope = "l2gw", name = "show-cache", description = "display l2gateways cache")
public class L2GwUtilsCacheCli extends OsgiCommandSupport {
private static final String L2GATEWAY_CACHE_NAME = "L2GW";
+ private static final String L2GATEWAY_CONN_CACHE_NAME = "L2GWCONN";
+
private static final String DEMARCATION = "=================================";
@Option(name = "-cache", aliases = {"--cache"}, description = "cache name",
protected Object doExecute() throws IOException {
if (cacheName == null) {
session.getConsole().println("Available caches");
- session.getConsole().println(ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME);
+ session.getConsole().println(L2GATEWAY_CONN_CACHE_NAME);
session.getConsole().println(L2GATEWAY_CACHE_NAME);
session.getConsole().println("HA");
session.getConsole().println("HA_EVENTS");
return null;
}
switch (cacheName) {
- case ElanL2GwCacheUtils.L2GATEWAY_CONN_CACHE_NAME:
- dumpElanL2GwCache();
+ case L2GATEWAY_CONN_CACHE_NAME:
+ if (elanName == null) {
+ for (Entry<String, ConcurrentMap<String, L2GatewayDevice>> entry : ElanL2GwCacheUtils.getCaches()) {
+ print(entry.getKey(), entry.getValue().values());
+ session.getConsole().println(DEMARCATION);
+ session.getConsole().println(DEMARCATION);
+ }
+ } else {
+ print(elanName, ElanL2GwCacheUtils.getInvolvedL2GwDevices(elanName).values());
+ }
break;
case L2GATEWAY_CACHE_NAME:
dumpL2GwCache();
}
}
- private void dumpElanL2GwCache() {
- if (elanName == null) {
- ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>> cache =
- (ConcurrentMap<String, ConcurrentMap<String, L2GatewayDevice>>) CacheUtil.getCache(
- cacheName);
- if (cache == null) {
- session.getConsole().println("no devices are present in elan cache");
- } else {
- for (Entry<String, ConcurrentMap<String, L2GatewayDevice>> entry : cache.entrySet()) {
- print(entry.getKey(), entry.getValue());
- session.getConsole().println(DEMARCATION);
- session.getConsole().println(DEMARCATION);
- }
- }
- return;
- }
- ConcurrentMap<String, L2GatewayDevice> elanDevices = ElanL2GwCacheUtils
- .getInvolvedL2GwDevices(elanName);
- print(elanName, elanDevices);
- }
-
- private void print(String elan, ConcurrentMap<String, L2GatewayDevice> devices) {
+ private void print(String elan, Collection<L2GatewayDevice> devices) {
session.getConsole().println("Elan name : " + elan);
- session.getConsole().println("No of devices in elan " + devices.keySet().size());
- for (L2GatewayDevice device : devices.values()) {
+ session.getConsole().println("No of devices in elan " + devices.size());
+ for (L2GatewayDevice device : devices) {
session.getConsole().println("device " + device);
}
}