X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fweb%2Fdevices%2Fsrc%2Fmain%2Fresources%2Fjs%2Fpage.js;h=2488d06d0cae7745a4efc58c8d8a42ff1f565271;hp=3fd292bdf263c9954e8e5076466666eb25e9e3a7;hb=766dd3752bb4115655373db59422d31b04a15562;hpb=d07c39a5f9e77c8e6f4293ee23eae53b7d6b525c
diff --git a/opendaylight/web/devices/src/main/resources/js/page.js b/opendaylight/web/devices/src/main/resources/js/page.js
index 3fd292bdf2..2488d06d0c 100644
--- a/opendaylight/web/devices/src/main/resources/js/page.js
+++ b/opendaylight/web/devices/src/main/resources/js/page.js
@@ -680,7 +680,11 @@ one.f.switchmanager.subnetGatewayConfig = {
one.f.switchmanager.subnetGatewayConfig.registry['currentNode'] = node;
var $ports = $('#' + one.f.switchmanager.subnetGatewayConfig.id.modal.form.ports);
var ports = nodeports[node];
- one.lib.form.select.inject($ports, ports);
+ var options = {};
+ $(ports).each(function(idx, val) {
+ options[val.internalPortName] = val.portName+' ('+val.portId+')';
+ });
+ one.lib.form.select.inject($ports, options);
one.lib.form.select.prepend($ports, { '' : 'Please Select a Port' });
$ports.val($ports.find("option:first").val());
});
@@ -797,7 +801,7 @@ one.f.switchmanager.subnetGatewayConfig = {
},
{
property: 'nodePorts',
- label: 'Node/Ports',
+ label: 'Ports',
sortable: false
}
],
@@ -810,10 +814,9 @@ one.f.switchmanager.subnetGatewayConfig = {
var nodePorts = JSON.parse(json);
var nodePortHtml = "
";
$.each(nodePorts, function(index, nodePort) {
- var nodePortID = nodePort["nodeId"] + "/" + nodePort["nodePortId"];
- nodePortHtml += nodePort["nodeName"] + " / " + nodePort["nodePortName"];
+ nodePortHtml += nodePort["nodePortName"] + " @ " + nodePort["nodeName"];
nodePortHtml += " ";
- nodePortHtml += '
Remove';
nodePortHtml += "
";
@@ -1236,7 +1239,12 @@ one.f.switchmanager.spanPortConfig = {
return false;
}
checkedCheckBoxes.each(function(index, value) {
- spanPortsToDelete.push(decodeURIComponent(checkedCheckBoxes[index].getAttribute("spanPort")));
+ var spanPortObj = {};
+ spanPortObj['spanPortJson'] = decodeURIComponent(checkedCheckBoxes[index].getAttribute("spanPort"));
+ spanPortObj['spanPortNodeName'] = checkedCheckBoxes[index].getAttribute("spanPortNode");
+ spanPortObj['spanPortPortName'] = checkedCheckBoxes[index].getAttribute("spanPortPort");
+
+ spanPortsToDelete.push(spanPortObj);
});
one.f.switchmanager.spanPortConfig.modal.removeMultiple.dialog(spanPortsToDelete);
});
@@ -1327,7 +1335,11 @@ one.f.switchmanager.spanPortConfig = {
one.f.switchmanager.spanPortConfig.registry['currentNode'] = nodeId;
var $ports = $('#' + one.f.switchmanager.spanPortConfig.id.modal.form.port);
var ports = one.f.switchmanager.spanPortConfig.registry['nodePorts'][nodeId]
- one.lib.form.select.inject($ports, ports);
+ var options = {};
+ $(ports).each(function(idx, val) {
+ options[val.internalPortName] = val.portName+' ('+val.portId+')';
+ });
+ one.lib.form.select.inject($ports, options);
});
$fieldset.append($label).append($select);
@@ -1385,12 +1397,12 @@ one.f.switchmanager.spanPortConfig = {
// bind remove rule button
$('#'+one.f.switchmanager.spanPortConfig.id.modal.remove, $modal).click(this, function(e) {
var requestData = {};
- var spanPorts="";
- $(spanPortsToDelete).each(function(){
- spanPorts = spanPorts + "###" + this.toString();
+ var spanPorts = [];
+ $(spanPortsToDelete).each(function(index, spanPort) {
+ spanPorts.push(JSON.parse(spanPort.spanPortJson));
});
- requestData["spanPortsToDelete"] = spanPorts.slice(3,spanPorts.length);
-
+ requestData["spanPortsToDelete"] = JSON.stringify(spanPorts);
+
var url = one.f.switchmanager.rootUrl + "/spanPorts/delete";
one.f.switchmanager.spanPortConfig.ajax.main(url, requestData, function(response) {
$modal.modal('hide');
@@ -1422,10 +1434,9 @@ one.f.switchmanager.spanPortConfig = {
var p = 'Remove the following Span Port(s)?';
//creata a BS label for each rule and append to list
- var spanPortList = JSON.parse("["+spanPortToDelete.toString()+"]");
- $(spanPortList).each(function(){
+ $(spanPortToDelete).each(function(index, spanPortItem) {
var $span = $(document.createElement('span'));
- $span.append(this.nodeId+"-"+this.spanPort);
+ $span.append(this.spanPortNodeName+"-"+this.spanPortPortName);
p += '
' + $span[0].outerHTML;
});
$p.append(p);
@@ -1450,7 +1461,7 @@ one.f.switchmanager.spanPortConfig = {
sortable: true
},
{
- property: 'spanPort',
+ property: 'spanPortName',
label: 'SPAN Port',
sortable: true
},
@@ -1458,7 +1469,7 @@ one.f.switchmanager.spanPortConfig = {
data: data.nodeData,
formatter: function(items) {
$.each(items, function(index, item) {
- item["selector"] = '
';
+ item["selector"] = '
';
});
},
delay: 0