package org.opendaylight.controller.sal.implementation.internal;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
import org.opendaylight.controller.sal.action.PopVlan;
import org.opendaylight.controller.sal.core.ConstructionException;
import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.controller.sal.core.NodeConnector;
import org.opendaylight.controller.sal.core.Node.NodeIDType;
+import org.opendaylight.controller.sal.core.NodeConnector;
+import org.opendaylight.controller.sal.core.NodeTable;
import org.opendaylight.controller.sal.flowprogrammer.Flow;
import org.opendaylight.controller.sal.match.Match;
import org.opendaylight.controller.sal.match.MatchType;
import org.opendaylight.controller.sal.reader.FlowOnNode;
import org.opendaylight.controller.sal.reader.IPluginInReadService;
+import org.opendaylight.controller.sal.reader.IPluginOutReadService;
import org.opendaylight.controller.sal.reader.IReadService;
+import org.opendaylight.controller.sal.reader.IReadServiceListener;
import org.opendaylight.controller.sal.reader.NodeConnectorStatistics;
import org.opendaylight.controller.sal.reader.NodeDescription;
+import org.opendaylight.controller.sal.reader.NodeTableStatistics;
import org.opendaylight.controller.sal.utils.EtherTypes;
+import org.opendaylight.controller.sal.utils.GlobalConstants;
import org.opendaylight.controller.sal.utils.IPProtocols;
import org.opendaylight.controller.sal.utils.NodeConnectorCreator;
import org.opendaylight.controller.sal.utils.NodeCreator;
+import org.opendaylight.controller.sal.utils.NodeTableCreator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The SAL Read Service. It dispatches the read request to
- * the proper SDN protocol plugin
- *
- *
- *
+ * The SAL Read Service. Dispatches read requests to the proper SDN protocol
+ * plugin, and notifies any listeners on updates from any plugin readers
*/
-public class ReadService implements IReadService, CommandProvider {
+public class ReadService implements IReadService, CommandProvider, IPluginOutReadService {
- protected static final Logger logger = LoggerFactory
- .getLogger(ReadService.class);
- private ConcurrentHashMap<String, IPluginInReadService>
- pluginReader =
+ protected static final Logger logger = LoggerFactory.getLogger(ReadService.class);
+ private ConcurrentHashMap<String, IPluginInReadService> pluginReader =
new ConcurrentHashMap<String, IPluginInReadService>();
+ private Set<IReadServiceListener> readerListeners =
+ new CopyOnWriteArraySet<IReadServiceListener>();
/**
* Function called by the dependency manager when all the required
// In case of plugin disactivating make sure we clear the
// dependencies
this.pluginReader.clear();
+ this.readerListeners.clear();
}
/**
}
// Set the reference to the plugin flow Reader service
- public void setService(Map props, IPluginInReadService s) {
+ public void setService(Map<?, ?> props, IPluginInReadService s) {
if (this.pluginReader == null) {
logger.error("pluginReader store null");
return;
logger.trace("Got a service set request {}", s);
String type = null;
for (Object e : props.entrySet()) {
- Map.Entry entry = (Map.Entry) e;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) e;
logger.trace("Prop key:({}) value:({})", entry.getKey(),
- entry.getValue());
+ entry.getValue());
}
- Object value = props.get("protocolPluginType");
+ Object value = props.get(GlobalConstants.PROTOCOLPLUGINTYPE.toString());
if (value instanceof String) {
type = (String) value;
}
}
}
- public void unsetService(Map props, IPluginInReadService s) {
+ public void unsetService(Map<?, ?> props, IPluginInReadService s) {
if (this.pluginReader == null) {
logger.error("pluginReader store null");
return;
String type = null;
logger.debug("Received unsetpluginReader request");
for (Object e : props.entrySet()) {
- Map.Entry entry = (Map.Entry) e;
+ Map.Entry<?, ?> entry = (Map.Entry<?, ?>) e;
logger.trace("Prop key:({}) value:({})", entry.getKey(),
- entry.getValue());
+ entry.getValue());
}
- Object value = props.get("protocoloPluginType");
+ Object value = props.get(GlobalConstants.PROTOCOLPLUGINTYPE.toString());
if (value instanceof String) {
type = (String) value;
}
logger.debug("Removed the pluginReader for type: {}", type);
}
}
+ public void setReaderListener(IReadServiceListener service) {
+ logger.trace("Got a listener set request {}", service);
+ this.readerListeners.add(service);
+ }
+
+ public void unsetReaderListener(IReadServiceListener service) {
+ logger.trace("Got a listener Unset request");
+ this.readerListeners.remove(service);
+ }
@Override
public FlowOnNode readFlow(Node node, Flow flow) {
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readFlow(node, flow, true);
+ .readFlow(node, flow, true);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readFlow(node, flow, false);
+ .readFlow(node, flow, false);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readAllFlow(node, true);
+ .readAllFlow(node, true);
}
}
- logger.warn("Plugin unavailable");
- return null;
+ logger.warn("Plugin {} unavailable", node.getType());
+ return Collections.emptyList();
}
@Override
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readAllFlow(node, false);
+ .readAllFlow(node, false);
}
}
- logger.warn("Plugin unavailable");
- return null;
+ logger.warn("Plugin {} unavailable", node.getType());
+ return Collections.emptyList();
}
@Override
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readDescription(node, true);
+ .readDescription(node, true);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readDescription(node, false);
+ .readDescription(node, false);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null && node != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readNodeConnector(connector, true);
+ .readNodeConnector(connector, true);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null && node != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readNodeConnector(connector, false);
+ .readNodeConnector(connector, false);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readAllNodeConnector(node, true);
+ .readAllNodeConnector(node, true);
+ }
+ }
+ logger.warn("Plugin {} unavailable", node.getType());
+ return Collections.emptyList();
+ }
+
+ @Override
+ public List<NodeTableStatistics> readNodeTable(Node node) {
+ if (pluginReader != null) {
+ if (this.pluginReader.get(node.getType()) != null) {
+ return this.pluginReader.get(node.getType())
+ .readAllNodeTable(node, true);
+ }
+ }
+ logger.warn("Plugin {} unavailable", node.getType());
+ return Collections.emptyList();
+ }
+
+
+ @Override
+ public NodeTableStatistics nonCachedReadNodeTable(NodeTable table) {
+ Node node = table.getNode();
+ if (pluginReader != null && node != null) {
+ if (this.pluginReader.get(node.getType()) != null) {
+ return this.pluginReader.get(node.getType())
+ .readNodeTable(table, false);
+ }
+ }
+ logger.warn("Plugin {} unavailable", node.getType());
+ return null;
+ }
+
+ @Override
+ public NodeTableStatistics readNodeTable(NodeTable table) {
+ Node node = table.getNode();
+ if (pluginReader != null && node != null) {
+ if (this.pluginReader.get(node.getType()) != null) {
+ return this.pluginReader.get(node.getType())
+ .readNodeTable(table, true);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return null;
}
if (pluginReader != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .readAllNodeConnector(node, false);
+ .readAllNodeConnector(node, false);
}
}
- logger.warn("Plugin unavailable");
- return null;
+ logger.warn("Plugin {} unavailable", node.getType());
+ return Collections.emptyList();
}
@Override
if (pluginReader != null && node != null) {
if (this.pluginReader.get(node.getType()) != null) {
return this.pluginReader.get(node.getType())
- .getTransmitRate(connector);
+ .getTransmitRate(connector);
}
}
- logger.warn("Plugin unavailable");
+ logger.warn("Plugin {} unavailable", node.getType());
return 0;
}
+ @Override
+ public void nodeFlowStatisticsUpdated(Node node, List<FlowOnNode> flowStatsList) {
+ for (IReadServiceListener l : readerListeners){
+ l.nodeFlowStatisticsUpdated(node, flowStatsList);
+ }
+ }
+
+ @Override
+ public void nodeConnectorStatisticsUpdated(Node node, List<NodeConnectorStatistics> ncStatsList) {
+ for (IReadServiceListener l : readerListeners){
+ l.nodeConnectorStatisticsUpdated(node, ncStatsList);
+ }
+ }
+
+ @Override
+ public void nodeTableStatisticsUpdated(Node node, List<NodeTableStatistics> tableStatsList) {
+ for (IReadServiceListener l : readerListeners){
+ l.nodeTableStatisticsUpdated(node, tableStatsList);
+ }
+ }
+
+ @Override
+ public void descriptionStatisticsUpdated(Node node, NodeDescription nodeDescription) {
+ for (IReadServiceListener l : readerListeners){
+ l.descriptionStatisticsUpdated(node, nodeDescription);
+ }
+ }
+
// ---------------- OSGI TEST CODE ------------------------------//
private void registerWithOSGIConsole() {
public String getHelp() {
StringBuffer help = new StringBuffer();
help.append("---SAL Reader testing commands---\n");
- help
- .append("\t readflows <sid> <cached> - Read all the (cached) flows from the openflow switch <sid>\n");
- help
- .append("\t readflow <sid> <cached> - Read the (cached) sample flow from the openflow switch <sid>\n");
- help
- .append("\t readdesc <sid> <cached> - Read the (cached) description from openflow switch <sid>\n");
- help
- .append("\t cached=true/false. If false or not specified, the protocol plugin cached info\n");
- help
- .append("\t is returned. If true, the info is directly retrieved from the switch\n");
+ help.append("\t readflows <sid> <cached> - Read all the (cached) flows from the openflow switch <sid>\n");
+ help.append("\t readflow <sid> <cached> - Read the (cached) sample flow from the openflow switch <sid>\n");
+ help.append("\t readdescr <sid> <cached> - Read the (cached) description from openflow switch <sid>\n");
+ help.append("\t\t cached = (true|false). If false or not specified, the plugin cached info\n");
+ help.append("\t\t is returned. If true, the info is directly retrieved from the switch\n");
+ help.append("\t readport <sid> <port> - Read port statistics for the specified port\n");
+ help.append("\t readports <sid> - Read port statistics for all ports of specified switch\n");
+ help.append("\t readtable <sid> <tableid>- Read specified table statistics\n");
+
return help.toString();
}
List<NodeConnectorStatistics> list = (cached) ? this
.readNodeConnectors(node) : this
.nonCachedReadNodeConnectors(node);
- if (list != null) {
- ci.println(list.toString());
- } else {
- ci.println("null");
- }
+ if (list != null) {
+ ci.println(list.toString());
+ } else {
+ ci.println("null");
+ }
}
public void _readport(CommandInterpreter ci) {
NodeConnectorStatistics stats = (cached) ? this
.readNodeConnector(nodeConnector) : this
.nonCachedReadNodeConnector(nodeConnector);
- if (stats != null) {
- ci.println(stats.toString());
- } else {
- ci.println("null");
+ if (stats != null) {
+ ci.println(stats.toString());
+ } else {
+ ci.println("null");
+ }
+ }
+
+ public void _readtable(CommandInterpreter ci) {
+ String nodeId = ci.nextArgument();
+ String tableId = ci.nextArgument();
+ String cacheReq = ci.nextArgument();
+ boolean cached;
+ if (nodeId == null) {
+ ci.print("Node id not specified");
+ return;
}
+ if (tableId == null) {
+ ci.print("Table id not specified");
+ return;
+ }
+ cached = (cacheReq == null) ? true : cacheReq.equals("true");
+ NodeTable nodeTable = null;
+ Node node = NodeCreator.createOFNode(Long.parseLong(nodeId));
+ nodeTable = NodeTableCreator.createNodeTable(Byte
+ .valueOf(tableId), node);
+ NodeTableStatistics stats = (cached) ? this
+ .readNodeTable(nodeTable) : this
+ .nonCachedReadNodeTable(nodeTable);
+ if (stats != null) {
+ ci.println(stats.toString());
+ } else {
+ ci.println("null");
+ }
}
public void _readdescr(CommandInterpreter ci) {
actions.add(new Controller());
return new Flow(match, actions);
}
-
}
Code Review / controller.git / blobdiff