-
/*
* Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved.
*
/**
* The class represents Admin Config status
- *
- *
+ *
+ *
*/
@XmlRootElement
@SuppressWarnings("serial")
@Override
public String toString() {
- return "Config[" + ReflectionToStringBuilder.toString(this) + "]";
+ StringBuffer ret = new StringBuffer();
+ if (this.configValue == 0) {
+ ret.append("Down");
+ } else if (this.configValue == 1) {
+ ret.append("Up");
+ } else {
+ ret.append("Undefined");
+ }
+ return ret.toString();
}
}
import org.opendaylight.controller.forwarding.staticrouting.IForwardingStaticRouting;
import org.opendaylight.controller.forwarding.staticrouting.StaticRouteConfig;
import org.opendaylight.controller.sal.authorization.UserLevel;
+import org.opendaylight.controller.sal.core.Config;
import org.opendaylight.controller.sal.core.Name;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
ISwitchManager switchManager = (ISwitchManager) ServiceHelper
.getInstance(ISwitchManager.class, containerName, this);
List<Map<String, String>> nodeData = new ArrayList<Map<String, String>>();
+ Map<String, String> portListStatus = new HashMap<String, String>();
for (Switch device : switchManager.getNetworkDevices()) {
HashMap<String, String> nodeDatum = new HashMap<String, String>();
Node node = device.getNode();
nodeDatum.put("mac",
HexEncode.bytesToHexString(device.getDataLayerAddress()));
StringBuffer sb1 = new StringBuffer();
+ StringBuffer sb2 = new StringBuffer();
Set<NodeConnector> nodeConnectorSet = device.getNodeConnectors();
String nodeConnectorName;
String nodeConnectorNumberToStr;
nodeConnectorNumberToStr = nodeConnector.getID().toString();
Name ncName = ((Name) switchManager.getNodeConnectorProp(
nodeConnector, Name.NamePropName));
+ Config portStatus = ((Config) switchManager
+ .getNodeConnectorProp(nodeConnector,
+ Config.ConfigPropName));
nodeConnectorName = (ncName != null) ? ncName.getValue()
: "";
portList.put(Short.parseShort(nodeConnectorNumberToStr),
nodeConnectorName);
+ portListStatus
+ .put(nodeConnectorName, portStatus.toString());
}
+
Map<Short, String> sortedPortList = new TreeMap<Short, String>(
portList);
+
for (Entry<Short, String> e : sortedPortList.entrySet()) {
sb1.append(e.getValue() + "(" + e.getKey() + ")");
sb1.append("<br>");
+ sb2.append(portListStatus.get(e.getValue()) + "<br>");
}
}
nodeDatum.put("ports", sb1.toString());
+ nodeDatum.put("portStatus", sb2.toString());
nodeData.add(nodeDatum);
}
DevicesJsonBean result = new DevicesJsonBean();
columnNames.add("Tier");
columnNames.add("Mac Address");
columnNames.add("Ports");
+ columnNames.add("Port Status");
result.setColumnNames(columnNames);
return result;
package org.opendaylight.controller.devices.web;
public class StatusJsonBean {
- private boolean status;
- private String message;
- public boolean isStatus() {
- return status;
- }
- public void setStatus(boolean status) {
- this.status = status;
- }
- public String getMessage() {
- return message;
- }
- public void setMessage(String message) {
- this.message = message;
- }
+ private boolean status;
+ private String message;
+
+ public boolean isStatus() {
+ return status;
+ }
+
+ public void setStatus(boolean status) {
+ this.status = status;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
}
form: {
nodeId: "one_f_switchmanager_nodesLearnt_id_modal_form_nodeid",
nodeName : "one_f_switchmanager_nodesLearnt_id_modal_form_nodename",
+ portStatus : "one_f_switchmanager_nodesLearnt_id_modal_form_portstatus",
tier: "one_f_switchmanager_nodesLearnt_id_modal_form_tier",
operationMode: "one_f_switchmanager_nodesLearnt_id_modal_form_opmode"
}
one.f.switchmanager.nodesLearnt.ajax.main(url, function(content) {
var body = one.f.switchmanager.nodesLearnt.data.abridged(content);
- var $table = one.f.switchmanager.createTable(["Node Name", "Node ID", "Ports"], body);
+ var $table = one.f.switchmanager.createTable(["Node Name", "Node ID", "Ports", "Port Status"], body);
$dashlet.append($table);
});
},
}
},
body: {
- updateNode: function(nodeId, switchDetails, tiers) {
+ updateNode: function(nodeId, portStatus, switchDetails, tiers) {
var $form = $(document.createElement('form'));
var $fieldset = $(document.createElement('fieldset'));
// node ID. not editable.
$input.attr('value', switchDetails["nodeName"]);
}
$fieldset.append($label).append($input);
+ // Port Status. not editable.
+ var $label = one.lib.form.label("Port Status");
+ var $input = one.lib.form.input("Port Status");
+ $input.attr('id', one.f.switchmanager.nodesLearnt.id.modal.form.portStatus);
+ $input.attr("disabled", true);
+ $input.attr("value", portStatus);
+ $fieldset.append($label).append($input);
// node tier
var $label = one.lib.form.label("Tier");
var $select = one.lib.form.select.create(tiers);
entry.push(aTag);
entry.push(value["nodeId"]);
entry.push(value["ports"]);
+ entry.push(value["portStatus"]);
tr.entry = entry;
result.push(tr);
});
entry.push(value["tierName"]);
entry.push(value["mac"]);
entry.push(value["ports"]);
+ entry.push(value["portStatus"]);
tr.entry = entry;
result.push(tr);
});