Merge "Corrected vlan validation in vn page and udp port validation i…

…n port page"
Juniper · Jan 23, 2017 · 1712368 · 1712368
2 parents 06fb794 + 9b150c8
commit 1712368
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/webroot/config/networking/networks/ui/js/models/vnCfgModel.js b/webroot/config/networking/networks/ui/js/models/vnCfgModel.js
@@ -838,10 +838,11 @@ define([
                 function (value, attr, finalObj) {
                     var sriovEnabled =
                         getValueByJsonPath(finalObj,
-                        'user_created_sriov_enabled', false);
+                        'user_created_sriov_enabled', false),
+                        vlanId = Number(value);
                     if (sriovEnabled) {
-                        if (!value || (Number(value) < 1 || Number(value) > 4094))  {
-                            return "1 - 4094";
+                        if (isNaN(vlanId) || (vlanId < 1 || vlanId > 4094))  {
+                            return "Enter valid VLAN between 1 - 4094";
                         }
                     }
                 },

diff --git a/webroot/config/networking/port/ui/js/models/portModel.js b/webroot/config/networking/port/ui/js/models/portModel.js
@@ -622,8 +622,9 @@ define([
                     if(finalObj.is_mirror == true) {
                         if(value !== "" && value !== null) {
                             var vlanVal = Number(String(value).trim());
-                            if (vlanVal < 1 || vlanVal > 65535) {
-                                return "Enter UDP port between 1 to 65535";
+                            if (isNaN(vlanVal) ||
+                                    (vlanVal < 1 || vlanVal > 65535)) {
+                                return "Enter UDP Port between 1 to 65535";
                             }
                         }
                     }