Merge "Description: - Made changes in devices.web bundle and sal.core.Config - files...

[controller.git] / opendaylight / web / devices / src / main / resources / js / page.js

diff --git a/opendaylight/web/devices/src/main/resources/js/page.js b/opendaylight/web/devices/src/main/resources/js/page.js
index d21f8d83a79d2d9ec52ca365289dc8d442b5bc6d..29f03d514b0d58c6e16e78f286e95750f68b5641 100644 (file)
--- a/opendaylight/web/devices/src/main/resources/js/page.js
+++ b/opendaylight/web/devices/src/main/resources/js/page.js
@@ -62,7 +62,7 @@ one.f.switchmanager = {
                return $table;
        },
        validateName: function(name) {
-               return name.match(/^[a-zA-Z0-9][a-zA-Z0-9_\-\.]{1,31}$/g) == null ? false : true;
+        return (name.length < 256);
        }
 };
 
@@ -77,6 +77,7 @@ one.f.switchmanager.nodesLearnt = {
                        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"
                        }
@@ -89,7 +90,7 @@ one.f.switchmanager.nodesLearnt = {
 
                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);
                });
        },
@@ -129,7 +130,7 @@ one.f.switchmanager.nodesLearnt = {
                        }
                },
                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.
@@ -147,6 +148,13 @@ one.f.switchmanager.nodesLearnt = {
                                        $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);
@@ -177,7 +185,7 @@ one.f.switchmanager.nodesLearnt = {
                        var result = {};
             result['nodeName'] = $('#' + one.f.switchmanager.nodesLearnt.id.modal.form.nodeName, $modal).val();
             if(!one.f.switchmanager.validateName(result['nodeName'])) {
-               alert("Node name can contain alphabets numbers and characters _ - . upto 32 characters in length");
+               alert("Node name can contain upto 255 characters");
                return;
             }
             result['nodeId'] = $('#' + one.f.switchmanager.nodesLearnt.id.modal.form.nodeId, $modal).val();
@@ -238,6 +246,7 @@ one.f.switchmanager.nodesLearnt = {
                                entry.push(aTag);
                                entry.push(value["nodeId"]);
                                entry.push(value["ports"]);
+                               entry.push(value["portStatus"]);
                                tr.entry = entry;
                                result.push(tr);
                        });
@@ -255,6 +264,7 @@ one.f.switchmanager.nodesLearnt = {
                                entry.push(value["tierName"]);
                                entry.push(value["mac"]);
                                entry.push(value["ports"]);
+                               entry.push(value["portStatus"]);
                                tr.entry = entry;
                                result.push(tr);
                        });
@@ -386,7 +396,7 @@ one.f.switchmanager.subnetGatewayConfig = {
                                var result = {};
                    result['gatewayName'] = $('#' + one.f.switchmanager.subnetGatewayConfig.id.modal.form.name, $modal).val();
                    if(!one.f.switchmanager.validateName(result['gatewayName'])) {
-                       alert("Gateway name can contain alphabets numbers and characters _ - . upto 32 characters in length");
+                       alert("Gateway name can contain upto 255 characters");
                        return;
                    }
                    result['gatewayIPAddress'] = $('#' + one.f.switchmanager.subnetGatewayConfig.id.modal.form.gatewayIPAddress, $modal).val();