import org.opendaylight.controller.sal.core.Name;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
+import org.opendaylight.controller.sal.utils.GlobalConstants;
import org.opendaylight.controller.sal.utils.ServiceHelper;
import org.opendaylight.controller.sal.utils.Status;
import org.opendaylight.controller.sal.utils.StatusCode;
private static final String WEB_NAME = "Flows";
private static final String WEB_ID = "flows";
private static final short WEB_ORDER = 2;
+ private final String containerName = GlobalConstants.DEFAULT.toString();
public Flows() {
ServiceHelper.registerGlobalService(IOneWeb.class, this, null);
public Set<Map<String, Object>> getFlows() {
// fetch frm
IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper
- .getInstance(IForwardingRulesManager.class, "default", this);
+ .getInstance(IForwardingRulesManager.class, containerName, this);
if (frm == null) { return null; }
// fetch sm
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
- .getInstance(ISwitchManager.class, "default", this);
+ .getInstance(ISwitchManager.class, containerName, this);
if (switchManager == null) { return null; }
// get static flow list
Map<String, Object> entry = new HashMap<String, Object>();
entry.put("flow", flowConfig);
entry.put("name", flowConfig.getName());
-
- Node node = flowConfig.getNode();
- SwitchConfig switchConfig = switchManager.getSwitchConfig(node.getNodeIDString());
- String nodeName = node.toString();
- if (switchConfig != null) { nodeName = switchConfig.getNodeName(); }
- entry.put("node", nodeName);
+ Node node = flowConfig.getNode();
+ String description = switchManager.getNodeDescription(node);
+ entry.put("node",
+ (description.isEmpty() ||
+ description.equalsIgnoreCase("none"))?
+ node.toString() : description);
entry.put("nodeId", node.toString());
output.add(entry);
}
@ResponseBody
public Map<String, Object> getNodePorts() {
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
- .getInstance(ISwitchManager.class, "default", this);
+ .getInstance(ISwitchManager.class, containerName, this);
if (switchManager == null) { return null; }
Map<String, Object> nodes = new HashMap<String, Object>();
entry.put("ports", port);
// add name
- String nodeName = node.getNode().toString();
- SwitchConfig config = switchManager.getSwitchConfig(node.getNode().getNodeIDString());
- if (config != null) {
- nodeName = config.getNodeName();
- }
- entry.put("name", nodeName);
+ String description = switchManager
+ .getNodeDescription(node.getNode());
+ entry.put("name", (description.isEmpty() ||
+ description.equalsIgnoreCase("none"))?
+ node.getNode().toString() : description);
// add to the node
nodes.put(node.getNode().toString(), entry);
@ResponseBody
public Map<String, Object> getNodeFlows() {
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
- .getInstance(ISwitchManager.class, "default", this);
+ .getInstance(ISwitchManager.class, containerName, this);
if (switchManager == null) { return null; }
IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper
.getInstance(IForwardingRulesManager.class, "default", this);
List<FlowConfig> flows = frm.getStaticFlows(node);
- String nodeName = node.toString();
+ String nodeDesc = node.toString();
SwitchConfig config = switchManager.getSwitchConfig(node.getNodeIDString());
if (config != null) {
- nodeName = config.getNodeName();
+ nodeDesc = config.getNodeDescription();
}
- nodes.put(nodeName, flows.size());
+ nodes.put(nodeDesc, flows.size());
}
return nodes;
}
IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper
- .getInstance(IForwardingRulesManager.class, "default", this);
+ .getInstance(IForwardingRulesManager.class, containerName, this);
if (frm == null) { return null; }
Gson gson = new Gson();
if (!isUserAuthorized(UserLevel.NETWORKADMIN)) { return "Operation not authorized"; }
IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper
- .getInstance(IForwardingRulesManager.class, "default", this);
+ .getInstance(IForwardingRulesManager.class, containerName, this);
if (frm == null) { return null; }
Status result = null;