X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fweb%2Fdevices%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fdevices%2Fweb%2FDevices.java;h=91261f6499fe6092595117d9f90e1eb967f4003a;hp=6ca60e857d8a86963be038ca1c4714050d7bff39;hb=6668a20ff21282576d2d408d9b1ce4cf9ba0c9ac;hpb=bd396fa9b759466b8e9cd9b0ac64ee99406f72e7 diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java index 6ca60e857d..91261f6499 100644 --- a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java +++ b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java @@ -12,6 +12,7 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -23,10 +24,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.codehaus.jackson.map.ObjectMapper; +import org.opendaylight.controller.connectionmanager.IConnectionManager; import org.opendaylight.controller.forwarding.staticrouting.IForwardingStaticRouting; import org.opendaylight.controller.forwarding.staticrouting.StaticRouteConfig; import org.opendaylight.controller.sal.authorization.Privilege; import org.opendaylight.controller.sal.authorization.UserLevel; +import org.opendaylight.controller.sal.connection.ConnectionConstants; import org.opendaylight.controller.sal.core.Config; import org.opendaylight.controller.sal.core.Description; import org.opendaylight.controller.sal.core.ForwardingMode; @@ -38,8 +41,10 @@ import org.opendaylight.controller.sal.core.State; import org.opendaylight.controller.sal.core.Tier; import org.opendaylight.controller.sal.utils.GlobalConstants; import org.opendaylight.controller.sal.utils.HexEncode; +import org.opendaylight.controller.sal.utils.NetUtils; import org.opendaylight.controller.sal.utils.ServiceHelper; import org.opendaylight.controller.sal.utils.Status; +import org.opendaylight.controller.sal.utils.StatusCode; import org.opendaylight.controller.sal.utils.TierHelper; import org.opendaylight.controller.switchmanager.ISwitchManager; import org.opendaylight.controller.switchmanager.SpanConfig; @@ -49,6 +54,7 @@ import org.opendaylight.controller.switchmanager.SwitchConfig; import org.opendaylight.controller.web.DaylightWebUtil; import org.opendaylight.controller.web.IDaylightWeb; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -91,11 +97,9 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/nodesLearnt", method = RequestMethod.GET) @ResponseBody - public DevicesJsonBean getNodesLearnt(HttpServletRequest request, - @RequestParam(required = false) String container) { + public DevicesJsonBean getNodesLearnt(HttpServletRequest request, @RequestParam(required = false) String container) { Gson gson = new Gson(); - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Derive the privilege this user has on the current container String userName = request.getUserPrincipal().getName(); @@ -132,7 +136,7 @@ public class Devices implements IDaylightWeb { nodeDatum.put("mode", modeStr); nodeDatum.put("json", gson.toJson(nodeDatum)); - nodeDatum.put("mac", HexEncode.bytesToHexString(device.getDataLayerAddress())); + nodeDatum.put("mac", HexEncode.bytesToHexStringFormat(device.getDataLayerAddress())); StringBuffer sb1 = new StringBuffer(); Set nodeConnectorSet = device.getNodeConnectors(); if (nodeConnectorSet != null && nodeConnectorSet.size() > 0) { @@ -141,44 +145,35 @@ public class Devices implements IDaylightWeb { for (NodeConnector nodeConnector : nodeConnectorSet) { String nodeConnectorNumberToStr = nodeConnector.getID().toString(); Name ncName = ((Name) switchManager.getNodeConnectorProp(nodeConnector, Name.NamePropName)); - Config portStatus = ((Config) switchManager - .getNodeConnectorProp(nodeConnector, - Config.ConfigPropName)); - State portState = ((State) switchManager - .getNodeConnectorProp(nodeConnector, - State.StatePropName)); - String nodeConnectorName = (ncName != null) ? ncName - .getValue() : ""; + Config portStatus = ((Config) switchManager.getNodeConnectorProp(nodeConnector, + Config.ConfigPropName)); + State portState = ((State) switchManager.getNodeConnectorProp(nodeConnector, + State.StatePropName)); + String nodeConnectorName = (ncName != null) ? ncName.getValue() : ""; nodeConnectorName += " (" + nodeConnector.getID() + ")"; if (portStatus != null) { if (portStatus.getValue() == Config.ADMIN_UP) { if (portState.getValue() == State.EDGE_UP) { - nodeConnectorName = "" - + nodeConnectorName + ""; + nodeConnectorName = "" + nodeConnectorName + ""; } else if (portState.getValue() == State.EDGE_DOWN) { - nodeConnectorName = "" - + nodeConnectorName + ""; + nodeConnectorName = "" + nodeConnectorName + ""; } } else if (portStatus.getValue() == Config.ADMIN_DOWN) { - nodeConnectorName = "" - + nodeConnectorName + ""; + nodeConnectorName = "" + nodeConnectorName + ""; } } Class idClass = nodeConnector.getID().getClass(); if (idClass.equals(Short.class)) { - portList.put( - Short.parseShort(nodeConnectorNumberToStr), - nodeConnectorName); + portList.put(Short.parseShort(nodeConnectorNumberToStr), nodeConnectorName); } else { intfList.add(nodeConnectorName); } } if (portList.size() > 0) { - Map sortedPortList = new TreeMap( - portList); + Map sortedPortList = new TreeMap(portList); for (Entry e : sortedPortList.entrySet()) { sb1.append(e.getValue()); @@ -219,27 +214,22 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/nodesLearnt/update", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean updateLearntNode( - @RequestParam("nodeName") String nodeName, - @RequestParam("nodeId") String nodeId, - @RequestParam("tier") String tier, - @RequestParam("operationMode") String operationMode, - HttpServletRequest request, + public StatusJsonBean updateLearntNode(@RequestParam("nodeName") String nodeName, + @RequestParam("nodeId") String nodeId, @RequestParam("tier") String tier, + @RequestParam("operationMode") String operationMode, HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); - if (DaylightWebUtil - .getContainerPrivilege(userName, containerName, this) != Privilege.WRITE) { + if (DaylightWebUtil.getContainerPrivilege(userName, containerName, this) != Privilege.WRITE) { return unauthorizedMessage(); } StatusJsonBean resultBean = new StatusJsonBean(); try { - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); Map nodeProperties = new HashMap(); Property desc = new Description(nodeName); nodeProperties.put(desc.getName(), desc); @@ -257,37 +247,33 @@ public class Devices implements IDaylightWeb { } else { resultBean.setStatus(true); resultBean.setMessage("Updated node information successfully"); - DaylightWebUtil.auditlog("Node", userName, "updated", nodeId + " to "+ nodeName, containerName); + DaylightWebUtil.auditlog("Property", userName, "updated", + "of Node " + DaylightWebUtil.getNodeDesc(Node.fromString(nodeId), switchManager)); } } catch (Exception e) { resultBean.setStatus(false); - resultBean.setMessage("Error updating node information. " - + e.getMessage()); + resultBean.setMessage("Error updating node information. " + e.getMessage()); } return resultBean; } @RequestMapping(value = "/staticRoutes", method = RequestMethod.GET) @ResponseBody - public DevicesJsonBean getStaticRoutes(HttpServletRequest request, - @RequestParam(required = false) String container) { + public DevicesJsonBean getStaticRoutes(HttpServletRequest request, @RequestParam(required = false) String container) { Gson gson = new Gson(); - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Derive the privilege this user has on the current container String userName = request.getUserPrincipal().getName(); Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); - IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper - .getInstance(IForwardingStaticRouting.class, containerName, - this); + IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper.getInstance( + IForwardingStaticRouting.class, containerName, this); if (staticRouting == null) { return null; } List> staticRoutes = new ArrayList>(); - ConcurrentMap routeConfigs = staticRouting - .getStaticRouteConfigs(); + ConcurrentMap routeConfigs = staticRouting.getStaticRouteConfigs(); if (routeConfigs == null) { return null; } @@ -311,27 +297,21 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/staticRoute/add", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean addStaticRoute( - @RequestParam("routeName") String routeName, - @RequestParam("staticRoute") String staticRoute, - @RequestParam("nextHop") String nextHop, - HttpServletRequest request, - @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + public StatusJsonBean addStaticRoute(@RequestParam("routeName") String routeName, + @RequestParam("staticRoute") String staticRoute, @RequestParam("nextHop") String nextHop, + 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) { + if (DaylightWebUtil.getContainerPrivilege(userName, containerName, this) != Privilege.WRITE) { return unauthorizedMessage(); } StatusJsonBean result = new StatusJsonBean(); try { - IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper - .getInstance(IForwardingStaticRouting.class, containerName, - this); + IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper.getInstance( + IForwardingStaticRouting.class, containerName, this); StaticRouteConfig config = new StaticRouteConfig(); config.setName(routeName); config.setStaticRoute(staticRoute); @@ -354,12 +334,9 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/staticRoute/delete", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean deleteStaticRoute( - @RequestParam("routesToDelete") String routesToDelete, - HttpServletRequest request, - @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + public StatusJsonBean deleteStaticRoute(@RequestParam("routesToDelete") String routesToDelete, + HttpServletRequest request, @RequestParam(required = false) String container) { + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -369,14 +346,12 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { - IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper - .getInstance(IForwardingStaticRouting.class, containerName, - this); + IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper.getInstance( + IForwardingStaticRouting.class, containerName, this); String[] routes = routesToDelete.split(","); Status result; resultBean.setStatus(true); - resultBean - .setMessage("Successfully deleted selected static routes"); + resultBean.setMessage("Successfully deleted selected static routes"); for (String route : routes) { result = staticRouting.removeStaticRoute(route); if (!result.isSuccess()) { @@ -388,9 +363,7 @@ public class Devices implements IDaylightWeb { } } catch (Exception e) { resultBean.setStatus(false); - resultBean - .setMessage("Error occurred while deleting static routes. " - + e.getMessage()); + resultBean.setMessage("Error occurred while deleting static routes. " + e.getMessage()); } return resultBean; } @@ -417,7 +390,7 @@ public class Devices implements IDaylightWeb { subnet.put("subnet", conf.getSubnet()); List portsList = new ArrayList(); Iterator itor = conf.getNodeConnectors().iterator(); - while(itor.hasNext()) { + while (itor.hasNext()) { SubnetGatewayPortBean bean = new SubnetGatewayPortBean(); NodeConnector nodeConnector = itor.next(); String nodeName = getNodeDesc(nodeConnector.getNode().toString(), containerName); @@ -443,13 +416,10 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/subnetGateway/add", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean addSubnetGateways( - @RequestParam("gatewayName") String gatewayName, - @RequestParam("gatewayIPAddress") String gatewayIPAddress, - HttpServletRequest request, + public StatusJsonBean addSubnetGateways(@RequestParam("gatewayName") String gatewayName, + @RequestParam("gatewayIPAddress") String gatewayIPAddress, HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -459,10 +429,9 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); - SubnetConfig cfgObject = new SubnetConfig(gatewayName, - gatewayIPAddress, new ArrayList()); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); + SubnetConfig cfgObject = new SubnetConfig(gatewayName, gatewayIPAddress, new ArrayList()); Status result = switchManager.addSubnet(cfgObject); if (result.isSuccess()) { resultBean.setStatus(true); @@ -481,12 +450,9 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/subnetGateway/delete", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean deleteSubnetGateways( - @RequestParam("gatewaysToDelete") String gatewaysToDelete, - HttpServletRequest request, - @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + public StatusJsonBean deleteSubnetGateways(@RequestParam("gatewaysToDelete") String gatewaysToDelete, + HttpServletRequest request, @RequestParam(required = false) String container) { + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -496,8 +462,8 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); String[] subnets = gatewaysToDelete.split(","); resultBean.setStatus(true); resultBean.setMessage("Added gateway address successfully"); @@ -519,13 +485,10 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/subnetGateway/ports/add", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean addSubnetGatewayPort( - @RequestParam("portsName") String portsName, - @RequestParam("ports") String ports, - @RequestParam("nodeId") String nodeId, HttpServletRequest request, + public StatusJsonBean addSubnetGatewayPort(@RequestParam("portsName") String portsName, + @RequestParam("ports") String ports, @RequestParam("nodeId") String nodeId, HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -535,8 +498,8 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); List toAdd = new ArrayList(); for (String port : ports.split(",")) { toAdd.add(port); @@ -545,9 +508,12 @@ public class Devices implements IDaylightWeb { if (result.isSuccess()) { resultBean.setStatus(true); - resultBean - .setMessage("Added ports to subnet gateway address successfully"); - DaylightWebUtil.auditlog("Ports to Subnet Gateway", userName, "added", ports, containerName); + resultBean.setMessage("Added ports to subnet gateway address successfully"); + for (String port : toAdd) { + DaylightWebUtil.auditlog("Port", userName, "added", + DaylightWebUtil.getPortName(NodeConnector.fromString(port), switchManager) + + " to Subnet Gateway " + portsName, containerName); + } } else { resultBean.setStatus(false); resultBean.setMessage(result.getDescription()); @@ -561,13 +527,10 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/subnetGateway/ports/delete", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean deleteSubnetGatewayPort( - @RequestParam("gatewayName") String gatewayName, - @RequestParam("nodePort") String nodePort, - HttpServletRequest request, + public StatusJsonBean deleteSubnetGatewayPort(@RequestParam("gatewayName") String gatewayName, + @RequestParam("nodePort") String nodePort, HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -577,8 +540,8 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); List toRemove = new ArrayList(); for (String port : nodePort.split(",")) { toRemove.add(port); @@ -588,7 +551,11 @@ public class Devices implements IDaylightWeb { if (result.isSuccess()) { resultBean.setStatus(true); resultBean.setMessage("Deleted port from subnet gateway address successfully"); - DaylightWebUtil.auditlog("Ports from Subnet Gateway", userName, "removed", nodePort, containerName); + for (String port : toRemove) { + DaylightWebUtil.auditlog("Port", userName, "removed", + DaylightWebUtil.getPortName(NodeConnector.fromString(port), switchManager) + + " from Subnet Gateway " + gatewayName, containerName); + } } else { resultBean.setStatus(false); resultBean.setMessage(result.getDescription()); @@ -602,22 +569,19 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/spanPorts", method = RequestMethod.GET) @ResponseBody - public DevicesJsonBean getSpanPorts(HttpServletRequest request, - @RequestParam(required = false) String container) { + public DevicesJsonBean getSpanPorts(HttpServletRequest request, @RequestParam(required = false) String container) { Gson gson = new Gson(); List> spanConfigs = new ArrayList>(); - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Derive the privilege this user has on the current container String userName = request.getUserPrincipal().getName(); - Privilege privilege = DaylightWebUtil.getContainerPrivilege( - userName, containerName, this); + Privilege privilege = DaylightWebUtil.getContainerPrivilege(userName, containerName, this); if (privilege != Privilege.NONE) { List spanConfigs_json = new ArrayList(); - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); if (switchManager != null) { for (SpanConfig conf : switchManager.getSpanConfigList()) { spanConfigs_json.add(gson.toJson(conf)); @@ -628,14 +592,12 @@ public class Devices implements IDaylightWeb { for (String config_json : spanConfigs_json) { try { @SuppressWarnings("unchecked") - Map config_data = mapper.readValue(config_json, - HashMap.class); + Map config_data = mapper.readValue(config_json, HashMap.class); Map config = new HashMap(); for (String name : config_data.keySet()) { config.put(name, config_data.get(name)); // Add switch portName value (non-configuration field) - config.put("nodeName", - getNodeDesc(config_data.get("nodeId"), containerName)); + config.put("nodeName", getNodeDesc(config_data.get("nodeId"), containerName)); NodeConnector spanPortNodeConnector = NodeConnector.fromString(config_data.get("spanPort")); Name ncName = ((Name) switchManager.getNodeConnectorProp(spanPortNodeConnector, Name.NamePropName)); @@ -668,8 +630,8 @@ public class Devices 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; } @@ -681,9 +643,10 @@ public class Devices implements IDaylightWeb { Set nodeConnectorSet = node.getNodeConnectors(); if (nodeConnectorSet != null) { for (NodeConnector nodeConnector : nodeConnectorSet) { - String nodeConnectorName = ((Name) switchManager - .getNodeConnectorProp(nodeConnector, Name.NamePropName)).getValue(); - port.add(new PortJsonBean(nodeConnector.getID().toString(), nodeConnectorName, nodeConnector.toString())); + String nodeConnectorName = ((Name) switchManager.getNodeConnectorProp(nodeConnector, + Name.NamePropName)).getValue(); + port.add(new PortJsonBean(nodeConnector.getID().toString(), nodeConnectorName, nodeConnector + .toString())); } } nodeJsonBean.setNodeId(node.getNode().toString()); @@ -697,12 +660,9 @@ public class Devices implements IDaylightWeb { @RequestMapping(value = "/spanPorts/add", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean addSpanPort( - @RequestParam("jsonData") String jsonData, - HttpServletRequest request, + public StatusJsonBean addSpanPort(@RequestParam("jsonData") String jsonData, HttpServletRequest request, @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -713,34 +673,32 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { Gson gson = new Gson(); - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); SpanConfig cfgObject = gson.fromJson(jsonData, SpanConfig.class); Status result = switchManager.addSpanConfig(cfgObject); if (result.isSuccess()) { resultBean.setStatus(true); resultBean.setMessage("SPAN Port added successfully"); - DaylightWebUtil.auditlog("SPAN Port", userName, "added", cfgObject.getNodeId(), containerName); + DaylightWebUtil.auditlog("SPAN Port", userName, "added", + DaylightWebUtil.getPortName(NodeConnector.fromString(cfgObject.getSpanPort()), switchManager), + containerName); } else { resultBean.setStatus(false); resultBean.setMessage(result.getDescription()); } } catch (Exception e) { resultBean.setStatus(false); - resultBean.setMessage("Error occurred while adding span port. " - + e.getMessage()); + resultBean.setMessage("Error occurred while adding span port. " + e.getMessage()); } return resultBean; } @RequestMapping(value = "/spanPorts/delete", method = RequestMethod.GET) @ResponseBody - public StatusJsonBean deleteSpanPorts( - @RequestParam("spanPortsToDelete") String spanPortsToDelete, - HttpServletRequest request, - @RequestParam(required = false) String container) { - String containerName = (container == null) ? GlobalConstants.DEFAULT - .toString() : container; + public StatusJsonBean deleteSpanPorts(@RequestParam("spanPortsToDelete") String spanPortsToDelete, + HttpServletRequest request, @RequestParam(required = false) String container) { + String containerName = (container == null) ? GlobalConstants.DEFAULT.toString() : container; // Authorization check String userName = request.getUserPrincipal().getName(); @@ -751,43 +709,132 @@ public class Devices implements IDaylightWeb { StatusJsonBean resultBean = new StatusJsonBean(); try { Gson gson = new Gson(); - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); - Type collectionType = new TypeToken>() {}.getType(); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + containerName, this); + Type collectionType = new TypeToken>() { + }.getType(); List jsonBeanList = gson.fromJson(spanPortsToDelete, collectionType); for (SpanPortJsonBean jsonBean : jsonBeanList) { - SpanConfig cfgObject = gson - .fromJson(gson.toJson(jsonBean), SpanConfig.class); + SpanConfig cfgObject = gson.fromJson(gson.toJson(jsonBean), SpanConfig.class); Status result = switchManager.removeSpanConfig(cfgObject); if (!result.isSuccess()) { resultBean.setStatus(false); resultBean.setMessage(result.getDescription()); break; } - DaylightWebUtil.auditlog("SPAN Port", userName, "removed", cfgObject.getNodeId(), containerName); + DaylightWebUtil.auditlog("SPAN Port", userName, "removed", + DaylightWebUtil.getPortName(NodeConnector.fromString(cfgObject.getSpanPort()), switchManager), + containerName); } resultBean.setStatus(true); resultBean.setMessage("SPAN Port(s) deleted successfully"); } catch (Exception e) { resultBean.setStatus(false); - resultBean.setMessage("Error occurred while deleting span port. " - + e.getMessage()); + resultBean.setMessage("Error occurred while deleting span port. " + e.getMessage()); } return resultBean; } + @RequestMapping(value = "/connect/nodes", method = RequestMethod.GET) + @ResponseBody + public List getNodes(HttpServletRequest request) { + IConnectionManager connectionManager = (IConnectionManager) ServiceHelper.getGlobalInstance( + IConnectionManager.class, this); + if (connectionManager == null) { + return null; + } + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, + GlobalConstants.DEFAULT.toString(), this); + if (switchManager == null) { + return null; + } + + Set nodes = connectionManager.getLocalNodes(); + List result = new LinkedList(); + for (Node node : nodes) { + Description descriptionProperty = (Description) switchManager.getNodeProp(node, "description"); + String description = descriptionProperty.getValue(); + NodeJsonBean nodeBean = new NodeJsonBean(); + nodeBean.setNodeId(node.getNodeIDString()); + nodeBean.setNodeType(node.getType()); + if (description.equals("None")) { + nodeBean.setNodeName(node.toString()); + } else { + nodeBean.setNodeName(description); + } + result.add(nodeBean); + } + + return result; + } + + @RequestMapping(value = "/connect/{nodeId}", method = RequestMethod.POST) + @ResponseBody + public Status addNode(HttpServletRequest request, @PathVariable("nodeId") String nodeId, + @RequestParam(required = true) String ipAddress, @RequestParam(required = true) String port, + @RequestParam(required = false) String nodeType) { + IConnectionManager connectionManager = (IConnectionManager) ServiceHelper.getGlobalInstance( + IConnectionManager.class, this); + if (connectionManager == null) { + return new Status(StatusCode.NOTFOUND, "Service not found"); + } + + if (!NetUtils.isIPv4AddressValid(ipAddress)) { + return new Status(StatusCode.NOTACCEPTABLE, "Invalid IP Address: " + ipAddress); + } + + try { + Integer.parseInt(port); + } catch (Exception e) { + return new Status(StatusCode.NOTACCEPTABLE, "Invalid Layer 4 Port: " + port); + } + + Map params = new HashMap(); + params.put(ConnectionConstants.ADDRESS, ipAddress); + params.put(ConnectionConstants.PORT, port); + + Node node = null; + if (nodeType != null) { + node = connectionManager.connect(nodeType, nodeId, params); + } else { + node = connectionManager.connect(nodeId, params); + } + if (node == null) { + return new Status(StatusCode.NOTFOUND, "Failed to connect to Node at " + ipAddress + ":" + port); + } + return new Status(StatusCode.SUCCESS); + } + + @RequestMapping(value = "/disconnect/{nodeId}", method = RequestMethod.POST) + @ResponseBody + public Status removeNode(HttpServletRequest request, @PathVariable("nodeId") String nodeId, + @RequestParam(required = true) String nodeType) { + IConnectionManager connectionManager = (IConnectionManager) ServiceHelper.getGlobalInstance( + IConnectionManager.class, this); + if (connectionManager == null) { + return new Status(StatusCode.NOTFOUND, "Service not found"); + } + + try { + Node node = new Node(nodeType, nodeId); + return connectionManager.disconnect(node); + } catch (Exception e) { + return new Status(StatusCode.NOTFOUND, "Resource not found"); + } + } + private String getNodeDesc(String nodeId, String containerName) { - ISwitchManager switchManager = (ISwitchManager) ServiceHelper - .getInstance(ISwitchManager.class, containerName, this); + ISwitchManager switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, containerName, + this); String description = ""; if (switchManager != null) { - Description desc = (Description) switchManager.getNodeProp(Node.fromString(nodeId), Description.propertyName); - if(desc != null) { + Description desc = (Description) switchManager.getNodeProp(Node.fromString(nodeId), + Description.propertyName); + if (desc != null) { description = desc.getValue(); } } - return (description.isEmpty() || description.equalsIgnoreCase("none")) ? nodeId - : description; + return (description.isEmpty() || description.equalsIgnoreCase("none")) ? nodeId : description; } private StatusJsonBean unauthorizedMessage() { @@ -798,9 +845,7 @@ public class Devices implements IDaylightWeb { } @RequestMapping(value = "login") - public String login(final HttpServletRequest request, - final HttpServletResponse response) { - // response.setHeader("X-Page-Location", "/login"); + public String login(final HttpServletRequest request, final HttpServletResponse response) { /* * IUserManager userManager = (IUserManager) ServiceHelper * .getGlobalInstance(IUserManager.class, this); if (userManager == @@ -815,4 +860,4 @@ public class Devices implements IDaylightWeb { return "forward:" + "/"; } -} +} \ No newline at end of file