X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fweb%2Fflows%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fflows%2Fweb%2FFlows.java;h=9c3c895916b03f88c579996d91d27c15b842776c;hp=be7560985a56fdeb3df3ae1d28020f8f87cd56a7;hb=2a4c88aa665a45c5394642cb3604603bebf8c0da;hpb=8b876deb6f9ea34a364f6dfde07761c6e386cded diff --git a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java b/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java index be7560985a..9c3c895916 100644 --- a/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java +++ b/opendaylight/web/flows/src/main/java/org/opendaylight/controller/flows/web/Flows.java @@ -8,18 +8,24 @@ package org.opendaylight.controller.flows.web; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import javax.servlet.http.HttpServletRequest; import org.opendaylight.controller.forwardingrulesmanager.FlowConfig; import org.opendaylight.controller.forwardingrulesmanager.IForwardingRulesManager; +import org.opendaylight.controller.sal.action.Action; +import org.opendaylight.controller.sal.action.ActionType; +import org.opendaylight.controller.sal.action.SupportedFlowActions; import org.opendaylight.controller.sal.authorization.Privilege; import org.opendaylight.controller.sal.authorization.UserLevel; +import org.opendaylight.controller.sal.core.Description; import org.opendaylight.controller.sal.core.Name; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; @@ -46,11 +52,15 @@ import com.google.gson.Gson; public class Flows implements IDaylightWeb { private static final UserLevel AUTH_LEVEL = UserLevel.CONTAINERUSER; private static final String WEB_NAME = "Flows"; + private static final String WEB_ID = "flows"; private static final short WEB_ORDER = 2; + private final Gson gson; + public Flows() { ServiceHelper.registerGlobalService(IDaylightWeb.class, this, null); + gson = new Gson(); } @Override @@ -81,20 +91,20 @@ public class Flows implements IDaylightWeb { // Derive the privilege this user has on the current container String userName = request.getUserPrincipal().getName(); Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); - if (privilege == Privilege.NONE) { + if (privilege == Privilege.NONE) { return null; } // fetch frm - IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper - .getInstance(IForwardingRulesManager.class, containerName, this); + IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper.getInstance( + IForwardingRulesManager.class, containerName, this); if (frm == null) { return null; } // fetch sm - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, containerName, + this); if (switchManager == null) { return null; } @@ -107,14 +117,12 @@ public class Flows implements IDaylightWeb { entry.put("flow", flowConfig); entry.put("name", flowConfig.getName()); Node node = flowConfig.getNode(); - String description = switchManager.getNodeDescription(node); - entry.put("node", (description.isEmpty() || description - .equalsIgnoreCase("none")) ? node.toString() : description); + entry.put("node", getNodeDesc(node, switchManager)); entry.put("nodeId", node.toString()); flowSet.add(entry); } - Map output = new HashMap(2); + Map output = new HashMap(2); output.put("flows", flowSet); output.put("privilege", privilege); return output; @@ -131,27 +139,25 @@ public class Flows implements IDaylightWeb { return null; } - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, containerName, + this); if (switchManager == null) { return null; } Map nodes = new HashMap(); - Map port; + Map port; for (Switch node : switchManager.getNetworkDevices()) { - port = new HashMap(); // new port + port = new HashMap(); // new port Set nodeConnectorSet = node.getNodeConnectors(); if (nodeConnectorSet != null) { for (NodeConnector nodeConnector : nodeConnectorSet) { - String nodeConnectorName = ((Name) switchManager - .getNodeConnectorProp(nodeConnector, - Name.NamePropName)).getValue(); - port.put((Short) nodeConnector.getID(), nodeConnectorName - + "(" + nodeConnector.getNodeConnectorIDString() - + ")"); + String nodeConnectorName = ((Name) switchManager.getNodeConnectorProp(nodeConnector, + Name.NamePropName)).getValue(); + port.put( nodeConnector.getID().toString(), + nodeConnectorName + "(" + nodeConnector.getNodeConnectorIDString() + ")"); } } @@ -160,11 +166,7 @@ public class Flows implements IDaylightWeb { entry.put("ports", port); // add name - String description = switchManager.getNodeDescription(node - .getNode()); - entry.put("name", (description.isEmpty() || description - .equalsIgnoreCase("none")) ? node.getNode().toString() - : description); + entry.put("name", getNodeDesc(node.getNode(), switchManager)); // add to the node nodes.put(node.getNode().toString(), entry); @@ -184,13 +186,13 @@ public class Flows implements IDaylightWeb { return null; } - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, containerName, + this); if (switchManager == null) { return null; } - IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper - .getInstance(IForwardingRulesManager.class, containerName, this); + IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper.getInstance( + IForwardingRulesManager.class, containerName, this); if (frm == null) { return null; } @@ -203,10 +205,9 @@ public class Flows implements IDaylightWeb { List flows = frm.getStaticFlows(node); String nodeDesc = node.toString(); - SwitchConfig config = switchManager.getSwitchConfig(node - .toString()); - if (config != null) { - nodeDesc = config.getNodeDescription(); + SwitchConfig config = switchManager.getSwitchConfig(node.toString()); + if ((config != null) && (config.getProperty(Description.propertyName) != null)) { + nodeDesc = ((Description) config.getProperty(Description.propertyName)).getValue(); } nodes.put(nodeDesc, flows.size()); @@ -217,10 +218,9 @@ public class Flows implements IDaylightWeb { @RequestMapping(value = "/flow", method = RequestMethod.POST) @ResponseBody - public String actionFlow(@RequestParam(required = true) String action, - @RequestParam(required = false) String body, - @RequestParam(required = true) String nodeId, - HttpServletRequest request, @RequestParam(required = false) String container) { + public String actionFlow(@RequestParam(required = true) String action, @RequestParam(required = false) String body, + @RequestParam(required = true) String nodeId, HttpServletRequest request, + @RequestParam(required = false) String container) { String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check @@ -229,31 +229,40 @@ public class Flows implements IDaylightWeb { return "Operation not authorized"; } - IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper - .getInstance(IForwardingRulesManager.class, containerName, this); + IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper.getInstance( + IForwardingRulesManager.class, containerName, this); if (frm == null) { return null; } - Gson gson = new Gson(); FlowConfig flow = gson.fromJson(body, FlowConfig.class); + Node node = Node.fromString(nodeId); flow.setNode(node); + Status result = new Status(StatusCode.BADREQUEST, "Invalid request"); if (action.equals("add")) { - result = frm.addStaticFlow(flow, false); + result = frm.addStaticFlow(flow); + if (result.isSuccess()) { + DaylightWebUtil.auditlog("Flow Entry", userName, "added", flow.getName() + " on Node " + + DaylightWebUtil.getNodeDesc(node, containerName, this), containerName); + } + } else if (action.equals("edit")){ + result = frm.modifyStaticFlow(flow); + if (result.isSuccess()) { + DaylightWebUtil.auditlog("Flow Entry", userName, "updated", flow.getName() + " on Node " + + DaylightWebUtil.getNodeDesc(node, containerName, this), containerName); + } } - return (result.isSuccess()) ? StatusCode.SUCCESS.toString() : result - .getDescription(); + return (result.isSuccess()) ? StatusCode.SUCCESS.toString() : result.getDescription(); } @RequestMapping(value = "/flow/{nodeId}/{name:.*}", method = RequestMethod.POST) @ResponseBody - public String removeFlow(@PathVariable("nodeId") String nodeId, - @PathVariable("name") String name, - @RequestParam(required = true) String action, - HttpServletRequest request, @RequestParam(required = false) String container) { + public String removeFlow(@PathVariable("nodeId") String nodeId, @PathVariable("name") String name, + @RequestParam(required = true) String action, HttpServletRequest request, + @RequestParam(required = false) String container) { String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check @@ -262,8 +271,8 @@ public class Flows implements IDaylightWeb { return "Operation not authorized"; } - IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper - .getInstance(IForwardingRulesManager.class, containerName, this); + IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper.getInstance( + IForwardingRulesManager.class, containerName, this); if (frm == null) { return null; } @@ -275,13 +284,143 @@ public class Flows implements IDaylightWeb { } if (action.equals("remove")) { result = frm.removeStaticFlow(name, node); + if (result.isSuccess()) { + DaylightWebUtil.auditlog("Flow Entry", userName, "removed", + name + " on Node " + DaylightWebUtil.getNodeDesc(node, containerName, this), containerName); + } } else if (action.equals("toggle")) { result = frm.toggleStaticFlowStatus(name, node); + if (result.isSuccess()) { + DaylightWebUtil.auditlog("Flow Entry", userName, "toggled", + name + " on Node " + DaylightWebUtil.getNodeDesc(node, containerName, this), containerName); + } } else { result = new Status(StatusCode.BADREQUEST, "Unknown action"); } - return (result.isSuccess()) ? StatusCode.SUCCESS.toString() : result - .getDescription(); + return (result.isSuccess()) ? StatusCode.SUCCESS.toString() : result.getDescription(); + } + + @SuppressWarnings("unchecked") + @RequestMapping(value = "/flow/deleteFlows", method = RequestMethod.POST) + @ResponseBody + public String removeSelectedFlows(@RequestParam(required = false) String body, HttpServletRequest request, + @RequestParam(required = false) String container) { + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; + + // Authorization check + String userName = request.getUserPrincipal().getName(); + if (DaylightWebUtil.getContainerPrivilege(userName, containerName, this) != Privilege.WRITE) { + return "Operation not authorized"; + } + IForwardingRulesManager frm = (IForwardingRulesManager) ServiceHelper.getInstance( + IForwardingRulesManager.class, containerName, this); + if (frm == null) { + return "Forwarding Rules Manager is not available"; + } + + List> flowList = new ArrayList>(); + flowList = gson.fromJson(body, flowList.getClass()); + Status result = new Status(StatusCode.BADREQUEST, "Invalid request"); + String status = ""; + for (Map flowEntry : flowList) { + Node node = Node.fromString(flowEntry.get("node")); + result = frm.removeStaticFlow(flowEntry.get("name"), node); + if (result.isSuccess()) { + DaylightWebUtil.auditlog("Flow Entry", userName, "removed", flowEntry.get("name") + " on Node " + + DaylightWebUtil.getNodeDesc(node, containerName, this), containerName); + } else { + status = flowEntry.get("name") + ", " + status; + } + } + if (!status.equals("")) { + return "Could not remove " + status.substring(0, status.length() - 2) + " Flow(s)"; + } else { + return "Success"; + } } + + @RequestMapping(value = "/valid-flows/{nodeId}") + @ResponseBody + public Object getValidActions(HttpServletRequest request, @RequestParam(required = false) String container, + @PathVariable("nodeId") String nodeId) { + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; + + // Authorization check + String userName = request.getUserPrincipal().getName(); + if (DaylightWebUtil.getContainerPrivilege(userName, containerName, this) != Privilege.WRITE) { + return "Operation not authorized"; + } + + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, containerName, this); + if (switchManager == null) { + return null; + } + + Map result = new TreeMap(); + + Node node = Node.fromString(nodeId); + SupportedFlowActions supportedFlows = (SupportedFlowActions) switchManager.getNodeProp(node, "supportedFlowActions"); + List> actions = supportedFlows.getActions(); + for (Class action : actions) { + if (action.isAssignableFrom(org.opendaylight.controller.sal.action.Drop.class)) { + result.put(ActionType.DROP.toString(), "Drop"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.Loopback.class)) { + result.put(ActionType.LOOPBACK.toString(), "Loopback"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.Flood.class)) { + result.put(ActionType.FLOOD.toString(), "Flood"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.FloodAll.class)) { + result.put(ActionType.FLOOD_ALL.toString(), "Flood All"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.Controller.class)) { + result.put(ActionType.CONTROLLER.toString(), "Controller"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SwPath.class)) { + result.put(ActionType.SW_PATH.toString(), "Software Path"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.HwPath.class)) { + result.put(ActionType.HW_PATH.toString(), "Hardware Path"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.Output.class)) { + result.put(ActionType.OUTPUT.toString(), "Output"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.Enqueue.class)) { + result.put(ActionType.ENQUEUE.toString(), "Enqueue"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetDlSrc.class)) { + result.put(ActionType.SET_DL_SRC.toString(), "Set Datalayer Source Address"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetDlDst.class)) { + result.put(ActionType.SET_DL_DST.toString(), "Set Datalayer Destination Address"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetVlanId.class)) { + result.put(ActionType.SET_VLAN_ID.toString(), "Set VLAN ID"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetVlanPcp.class)) { + result.put(ActionType.SET_VLAN_PCP.toString(), "Set VLAN Priority"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetVlanCfi.class)) { + result.put(ActionType.SET_VLAN_CFI.toString(), "Set VLAN CFI"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.PopVlan.class)) { + result.put(ActionType.POP_VLAN.toString(), "Pop VLAN"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.PushVlan.class)) { + result.put(ActionType.PUSH_VLAN.toString(), "Push VLAN"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetDlType.class)) { + result.put(ActionType.SET_DL_TYPE.toString(), "Set EtherType"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetNwSrc.class)) { + result.put(ActionType.SET_NW_SRC.toString(), "Set Network Source Address"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetNwDst.class)) { + result.put(ActionType.SET_NW_DST.toString(), "Set Network Destination Address"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetNwTos.class)) { + result.put(ActionType.SET_NW_TOS.toString(), "Modify ToS Bits"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetTpSrc.class)) { + result.put(ActionType.SET_TP_SRC.toString(), "Modify Transport Source Port"); + } else if (action.isAssignableFrom(org.opendaylight.controller.sal.action.SetTpDst.class)) { + result.put(ActionType.SET_TP_DST.toString(), "Modify Transport Destination Port"); + } + } + + return result; + } + + private boolean actionCompare(String name, ActionType type) { + return name.equals(type.getId().toLowerCase()); + } + + private String getNodeDesc(Node node, ISwitchManager switchManager) { + Description desc = (Description) switchManager.getNodeProp(node, Description.propertyName); + String description = (desc == null) ? "" : desc.getValue(); + return (description.isEmpty() || description.equalsIgnoreCase("none")) ? node.toString() : description; + } + }