From 5b014030ed2acd8fb76792fc08169357cc160495 Mon Sep 17 00:00:00 2001
From: Rahul Sharma <rahuls@juniper.net>
Date: Fri, 26 Feb 2016 17:36:16 +0530
Subject: [PATCH] Add prefix check for DNS servers.

Change-Id: Iee192d26bb02939f1a264d4731d6d2a04e9b951a
Related-Bug: #1535531
(cherry picked from commit 77f6851fddda6691d6666f2122a339dea64eabee)
---
 .../config/networking/networks/ui/js/models/hostRouteModel.js | 4 ++--
 .../config/networking/networks/ui/js/models/subnetDNSModel.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webroot/config/networking/networks/ui/js/models/hostRouteModel.js b/webroot/config/networking/networks/ui/js/models/hostRouteModel.js
index c70da3af9..f60efcae6 100644
--- a/webroot/config/networking/networks/ui/js/models/hostRouteModel.js
+++ b/webroot/config/networking/networks/ui/js/models/hostRouteModel.js
@@ -32,13 +32,13 @@ define([
             hostRouteModelConfigValidations: {
                 'prefix':
                     function (value, attr, finalObj) {
-                    if (!((value && value.indexOf('/') != -1) || isValidIP(value))) {
+                    if (!((value && value.indexOf('/') != -1) && isValidIP(value))) {
                         return 'Enter Prefix in form xxx.xxx.xxx.xxx/xx';
                     }
                 },
                 'next_hop':
                     function (value, attr, finalObj) {
-                    if (!(isValidIP(value))) {
+                    if ((value && value.indexOf('/') != -1) || !isValidIP(value)) {
                         return 'Enter Next Hop in form xxx.xxx.xxx.xxx';
                     }
                 },
diff --git a/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js b/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js
index cd8b5d424..a61ae9863 100644
--- a/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js
+++ b/webroot/config/networking/networks/ui/js/models/subnetDNSModel.js
@@ -34,7 +34,7 @@ define([
                     if (value && value.length) {
                         var dnsServers = value.split(' ');
                         $.each(dnsServers, function (idx, dnsServer) {
-                            if (!isValidIP(dnsServer)) {
+                            if (dnsServer.indexOf('/') != -1 || !isValidIP(dnsServer)) {
                                 err.push(dnsServer);
                             }
                         });