X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fremote%2Frpc%2Fregistry%2Fmbeans%2FRemoteRpcRegistryMXBeanImpl.java;h=58abcac0d5b87ba0995c664d33ad06b1485005d6;hp=c7d9b9955d912a14462afe4ffbd65344dc53332a;hb=81674d6fd50b419b868d0851062e23f34b34557d;hpb=2727bea09c83646b6cbd2ef9672d0b7f6cf3b22f diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java index c7d9b9955d..58abcac0d5 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImpl.java @@ -1,31 +1,37 @@ +/* + * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * 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.controller.remote.rpc.registry.mbeans; import akka.actor.Address; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; +import org.opendaylight.controller.md.sal.dom.api.DOMRpcIdentifier; import org.opendaylight.controller.remote.rpc.registry.RoutingTable; import org.opendaylight.controller.remote.rpc.registry.RpcRegistry; import org.opendaylight.controller.remote.rpc.registry.gossip.Bucket; -import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements RemoteRpcRegistryMXBean { protected final Logger log = LoggerFactory.getLogger(getClass()); - private final String NULL_CONSTANT = "null"; - - private final String LOCAL_CONSTANT = "local"; + private static final String LOCAL_CONSTANT = "local"; - private final String ROUTE_CONSTANT = "route:"; + private static final String ROUTE_CONSTANT = "route:"; - private final String NAME_CONSTANT = " | name:"; + private static final String NAME_CONSTANT = " | name:"; private final RpcRegistry rpcRegistry; @@ -37,88 +43,76 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot @Override public Set getGlobalRpc() { - RoutingTable table = rpcRegistry.getLocalBucket().getData(); + RoutingTable table = rpcRegistry.getLocalData(); Set globalRpc = new HashSet<>(table.getRoutes().size()); - for(RpcRouter.RouteIdentifier route : table.getRoutes()){ - if(route.getRoute() == null) { - globalRpc.add(route.getType() != null ? route.getType().toString() : NULL_CONSTANT); + for (DOMRpcIdentifier route : table.getRoutes()) { + if (route.getContextReference().isEmpty()) { + globalRpc.add(route.getType().toString()); } } - if(log.isDebugEnabled()) { - log.debug("Locally registered global RPCs {}", globalRpc); - } + + log.debug("Locally registered global RPCs {}", globalRpc); return globalRpc; } @Override public Set getLocalRegisteredRoutedRpc() { - RoutingTable table = rpcRegistry.getLocalBucket().getData(); + RoutingTable table = rpcRegistry.getLocalData(); Set routedRpc = new HashSet<>(table.getRoutes().size()); - for(RpcRouter.RouteIdentifier route : table.getRoutes()){ - if(route.getRoute() != null) { - StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(route.getRoute().toString()).append(NAME_CONSTANT).append(route.getType() != null ? - route.getType().toString() : NULL_CONSTANT); - routedRpc.add(builder.toString()); + for (DOMRpcIdentifier route : table.getRoutes()) { + if (!route.getContextReference().isEmpty()) { + routedRpc.add(ROUTE_CONSTANT + route.getContextReference() + NAME_CONSTANT + route.getType()); } } - if(log.isDebugEnabled()) { - log.debug("Locally registered routed RPCs {}", routedRpc); - } + + log.debug("Locally registered routed RPCs {}", routedRpc); return routedRpc; } @Override public Map findRpcByName(final String name) { - RoutingTable localTable = rpcRegistry.getLocalBucket().getData(); + RoutingTable localTable = rpcRegistry.getLocalData(); // Get all RPCs from local bucket Map rpcMap = new HashMap<>(getRpcMemberMapByName(localTable, name, LOCAL_CONSTANT)); // Get all RPCs from remote bucket Map> buckets = rpcRegistry.getRemoteBuckets(); - for(Address address : buckets.keySet()) { - RoutingTable table = buckets.get(address).getData(); - rpcMap.putAll(getRpcMemberMapByName(table, name, address.toString())); - } - if(log.isDebugEnabled()) { - log.debug("list of RPCs {} searched by name {}", rpcMap, name); + for (Entry> entry : buckets.entrySet()) { + RoutingTable table = entry.getValue().getData(); + rpcMap.putAll(getRpcMemberMapByName(table, name, entry.getKey().toString())); } + + log.debug("list of RPCs {} searched by name {}", rpcMap, name); return rpcMap; } @Override - public Map findRpcByRoute(String routeId) { - RoutingTable localTable = rpcRegistry.getLocalBucket().getData(); + public Map findRpcByRoute(final String routeId) { + RoutingTable localTable = rpcRegistry.getLocalData(); Map rpcMap = new HashMap<>(getRpcMemberMapByRoute(localTable, routeId, LOCAL_CONSTANT)); Map> buckets = rpcRegistry.getRemoteBuckets(); - for(Address address : buckets.keySet()) { - RoutingTable table = buckets.get(address).getData(); - rpcMap.putAll(getRpcMemberMapByRoute(table, routeId, address.toString())); - - } - if(log.isDebugEnabled()) { - log.debug("list of RPCs {} searched by route {}", rpcMap, routeId); + for (Entry> entry : buckets.entrySet()) { + RoutingTable table = entry.getValue().getData(); + rpcMap.putAll(getRpcMemberMapByRoute(table, routeId, entry.getKey().toString())); } + + log.debug("list of RPCs {} searched by route {}", rpcMap, routeId); return rpcMap; } /** - * Search if the routing table route String contains routeName + * Search if the routing table route String contains routeName. */ - - private Map getRpcMemberMapByRoute(final RoutingTable table, final String routeName, + private static Map getRpcMemberMapByRoute(final RoutingTable table, final String routeName, final String address) { - Set> routes = table.getRoutes(); + Set routes = table.getRoutes(); Map rpcMap = new HashMap<>(routes.size()); - for(RpcRouter.RouteIdentifier route : table.getRoutes()){ - if(route.getRoute() != null) { - String routeString = route.getRoute().toString(); - if(routeString.contains(routeName)) { - StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(routeString).append(NAME_CONSTANT).append(route.getType() != null ? - route.getType().toString() : NULL_CONSTANT); - rpcMap.put(builder.toString(), address); + for (DOMRpcIdentifier route : routes) { + if (!route.getContextReference().isEmpty()) { + String routeString = route.getContextReference().toString(); + if (routeString.contains(routeName)) { + rpcMap.put(ROUTE_CONSTANT + routeString + NAME_CONSTANT + route.getType(), address); } } } @@ -126,31 +120,25 @@ public class RemoteRpcRegistryMXBeanImpl extends AbstractMXBean implements Remot } /** - * Search if the routing table route type contains name + * Search if the routing table route type contains name. */ - private Map getRpcMemberMapByName(final RoutingTable table, final String name, + private static Map getRpcMemberMapByName(final RoutingTable table, final String name, final String address) { - Set> routes = table.getRoutes(); + Set routes = table.getRoutes(); Map rpcMap = new HashMap<>(routes.size()); - for(RpcRouter.RouteIdentifier route : routes){ - if(route.getType() != null) { + for (DOMRpcIdentifier route : routes) { + if (!route.getContextReference().isEmpty()) { String type = route.getType().toString(); - if(type.contains(name)) { - StringBuilder builder = new StringBuilder(ROUTE_CONSTANT); - builder.append(route.getRoute() != null ? route.getRoute().toString(): NULL_CONSTANT) - .append(NAME_CONSTANT).append(type); - rpcMap.put(builder.toString(), address); + if (type.contains(name)) { + rpcMap.put(ROUTE_CONSTANT + route.getContextReference() + NAME_CONSTANT + type, address); } } } return rpcMap; } - - @Override public String getBucketVersions() { return rpcRegistry.getVersions().toString(); } - -} \ No newline at end of file +}