Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fixing a bug to show node name if present instead of node id while adding...
[controller.git]
/
opendaylight
/
web
/
devices
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
devices
/
web
/
Devices.java
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 f92e92ec17ea6a2a9ffc515f495855aaa2aac36e..781242a969b0a0f5964a7223672e1b08a74f60fb 100644
(file)
--- 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
@@
-256,6
+256,7
@@
public class Devices implements IDaylightWeb {
} else {
resultBean.setStatus(true);
resultBean.setMessage("Updated node information successfully");
} else {
resultBean.setStatus(true);
resultBean.setMessage("Updated node information successfully");
+ DaylightWebUtil.auditlog("Node", userName, "updated", nodeId + " to "+ nodeName, containerName);
}
} catch (Exception e) {
resultBean.setStatus(false);
}
} catch (Exception e) {
resultBean.setStatus(false);
@@
-338,6
+339,7
@@
public class Devices implements IDaylightWeb {
if (addStaticRouteResult.isSuccess()) {
result.setStatus(true);
result.setMessage("Static Route saved successfully");
if (addStaticRouteResult.isSuccess()) {
result.setStatus(true);
result.setMessage("Static Route saved successfully");
+ DaylightWebUtil.auditlog("Static Route", userName, "added", routeName, containerName);
} else {
result.setStatus(false);
result.setMessage(addStaticRouteResult.getDescription());
} else {
result.setStatus(false);
result.setMessage(addStaticRouteResult.getDescription());
@@
-381,6
+383,7
@@
public class Devices implements IDaylightWeb {
resultBean.setMessage(result.getDescription());
break;
}
resultBean.setMessage(result.getDescription());
break;
}
+ DaylightWebUtil.auditlog("Static Route", userName, "removed", route, containerName);
}
} catch (Exception e) {
resultBean.setStatus(false);
}
} catch (Exception e) {
resultBean.setStatus(false);
@@
-451,6
+454,7
@@
public class Devices implements IDaylightWeb {
if (result.isSuccess()) {
resultBean.setStatus(true);
resultBean.setMessage("Added gateway address successfully");
if (result.isSuccess()) {
resultBean.setStatus(true);
resultBean.setMessage("Added gateway address successfully");
+ DaylightWebUtil.auditlog("Subnet Gateway", userName, "added", gatewayName, containerName);
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
@@
-491,6
+495,7
@@
public class Devices implements IDaylightWeb {
resultBean.setMessage(result.getDescription());
break;
}
resultBean.setMessage(result.getDescription());
break;
}
+ DaylightWebUtil.auditlog("Subnet Gateway", userName, "removed", subnet, containerName);
}
} catch (Exception e) {
resultBean.setStatus(false);
}
} catch (Exception e) {
resultBean.setStatus(false);
@@
-526,6
+531,7
@@
public class Devices implements IDaylightWeb {
resultBean.setStatus(true);
resultBean
.setMessage("Added ports to subnet gateway address successfully");
resultBean.setStatus(true);
resultBean
.setMessage("Added ports to subnet gateway address successfully");
+ DaylightWebUtil.auditlog("Ports to Subnet Gateway", userName, "added",nodeId+"/"+ ports, containerName);
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
@@
-564,6
+570,7
@@
public class Devices implements IDaylightWeb {
resultBean.setStatus(true);
resultBean
.setMessage("Deleted port from subnet gateway address successfully");
resultBean.setStatus(true);
resultBean
.setMessage("Deleted port from subnet gateway address successfully");
+ DaylightWebUtil.auditlog("Ports from Subnet Gateway", userName, "removed", nodePort, containerName);
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
@@
-629,7
+636,7
@@
public class Devices implements IDaylightWeb {
@RequestMapping(value = "/nodeports")
@ResponseBody
@RequestMapping(value = "/nodeports")
@ResponseBody
- public
Map<String, Object
> getNodePorts(HttpServletRequest request,
+ public
List<NodeJsonBean
> getNodePorts(HttpServletRequest request,
@RequestParam(required = false) String container) {
String containerName = (container == null) ? GlobalConstants.DEFAULT
.toString() : container;
@RequestParam(required = false) String container) {
String containerName = (container == null) ? GlobalConstants.DEFAULT
.toString() : container;
@@
-640,18
+647,16
@@
public class Devices implements IDaylightWeb {
return null;
}
return null;
}
-
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
.getInstance(ISwitchManager.class, containerName, this);
if (switchManager == null) {
return null;
}
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
.getInstance(ISwitchManager.class, containerName, this);
if (switchManager == null) {
return null;
}
-
- Map<String, Object> nodes = new HashMap<String, Object>();
- Map<Short, String> port;
+ List<NodeJsonBean> nodeJsonBeans = new ArrayList<NodeJsonBean>();
for (Switch node : switchManager.getNetworkDevices()) {
for (Switch node : switchManager.getNetworkDevices()) {
- port = new HashMap<Short, String>(); // new port
+ NodeJsonBean nodeJsonBean = new NodeJsonBean();
+ List<String> port = new ArrayList<String>();
Set<NodeConnector> nodeConnectorSet = node.getNodeConnectors();
if (nodeConnectorSet != null) {
Set<NodeConnector> nodeConnectorSet = node.getNodeConnectors();
if (nodeConnectorSet != null) {
@@
-659,15
+664,17
@@
public class Devices implements IDaylightWeb {
String nodeConnectorName = ((Name) switchManager
.getNodeConnectorProp(nodeConnector,
Name.NamePropName)).getValue();
String nodeConnectorName = ((Name) switchManager
.getNodeConnectorProp(nodeConnector,
Name.NamePropName)).getValue();
- port.
put((Short) nodeConnector.getID(),
nodeConnectorName
+ port.
add(
nodeConnectorName
+ "(" + nodeConnector.getID() + ")");
}
}
+ "(" + nodeConnector.getID() + ")");
}
}
-
- nodes.put(node.getNode().toString(), port);
+ nodeJsonBean.setNodeId(node.getNode().toString());
+ nodeJsonBean.setNodeName(getNodeDesc(node.getNode().toString(), containerName));
+ nodeJsonBean.setNodePorts(port);
+ nodeJsonBeans.add(nodeJsonBean);
}
}
- return nodes;
+ return node
JsonBean
s;
}
@RequestMapping(value = "/spanPorts/add", method = RequestMethod.GET)
}
@RequestMapping(value = "/spanPorts/add", method = RequestMethod.GET)
@@
-695,6
+702,7
@@
public class Devices implements IDaylightWeb {
if (result.isSuccess()) {
resultBean.setStatus(true);
resultBean.setMessage("SPAN Port added successfully");
if (result.isSuccess()) {
resultBean.setStatus(true);
resultBean.setMessage("SPAN Port added successfully");
+ DaylightWebUtil.auditlog("SPAN Port", userName, "added", cfgObject.getNodeId(), containerName);
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
} else {
resultBean.setStatus(false);
resultBean.setMessage(result.getDescription());
@@
-740,6
+748,7
@@
public class Devices implements IDaylightWeb {
resultBean.setMessage(result.getDescription());
break;
}
resultBean.setMessage(result.getDescription());
break;
}
+ DaylightWebUtil.auditlog("SPAN Port", userName, "removed", cfgObject.getNodeId(), containerName);
}
}
} catch (Exception e) {
}
}
} catch (Exception e) {