From 9b150c8f13240f61c410a95c27e10e6b2fa2ce44 Mon Sep 17 00:00:00 2001 From: Siva Kumar Bavanasi Date: Fri, 6 Jan 2017 11:07:24 +0530 Subject: [PATCH] Corrected vlan validation in vn page and udp port validation in port page Change-Id: Ia7e490677ca6f09cb39fed27a3eb4f7e826346b7 Closes-bug: #1551765 Closes-bug: #1611748 --- .../config/networking/networks/ui/js/models/vnCfgModel.js | 7 ++++--- webroot/config/networking/port/ui/js/models/portModel.js | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/webroot/config/networking/networks/ui/js/models/vnCfgModel.js b/webroot/config/networking/networks/ui/js/models/vnCfgModel.js index 629ba9fdb..ccd60fb93 100644 --- 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 index c6c413790..09a2cb9fc 100644 --- a/webroot/config/networking/port/ui/js/models/portModel.js +++ b/webroot/config/networking/port/ui/js/models/portModel.js @@ -625,8 +625,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"; } } }