From a7daffea83e832f8d9cb2fd738375d4a4dbbb0cc Mon Sep 17 00:00:00 2001 From: chennab Date: Wed, 5 Apr 2017 12:27:11 +0530 Subject: [PATCH] Changes to allow VMI local preference value between 0 to 2**32 - 1 Closes-bug: #1676498 Change-Id: Ic411afecf18b60d791883dc14ff5d1263deac819 --- .../networking/port/ui/js/models/portModel.js | 12 +++++++----- .../networking/port/ui/js/portViewConfigs.js | 18 ++++-------------- .../port/ui/js/views/portFormatters.js | 2 +- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/webroot/config/networking/port/ui/js/models/portModel.js b/webroot/config/networking/port/ui/js/models/portModel.js index f30ba90f3..d650dcd1c 100644 --- a/webroot/config/networking/port/ui/js/models/portModel.js +++ b/webroot/config/networking/port/ui/js/models/portModel.js @@ -530,11 +530,13 @@ define([ }, 'virtual_machine_interface_properties.local_preference' : function(value, attr, finalObj) { - if(value != "") { - if (!isNumber(String(value).trim()) || - (value.toString() !== "100" && - value.toString() !== "200")){ - return "Local Preference has to be 100 or 200."; + if(value){ + var numVal = Number(value); + if(isNaN(numVal) || !Number.isInteger(numVal)){ + return "Local Preference has to be a integer"; + } + if(numVal < 0 || numVal > 4294967295){ + return "Local Preference has to be between 0 - 4294967295"; } } }, diff --git a/webroot/config/networking/port/ui/js/portViewConfigs.js b/webroot/config/networking/port/ui/js/portViewConfigs.js index f1be53fd0..4196434e0 100644 --- a/webroot/config/networking/port/ui/js/portViewConfigs.js +++ b/webroot/config/networking/port/ui/js/portViewConfigs.js @@ -325,25 +325,15 @@ columns: [{ elementId: 'local_preference', name: "Local Preference", - view: "FormComboboxView", + view: "FormInputView", viewConfig: { path: 'virtual_machine_interface_properties.local_preference', label: 'Local Preference', + placeholder: '0 - 4294967295', dataBindValue: 'virtual_machine_interface_properties().local_preference', - class: 'col-xs-6', - elementConfig: { - dataTextField: "text", - dataValueField: "value", - placeholder: "Select Local Preference", - dataSource:{ - type: "local", - data: [ - {text: "100", value: "100"}, - {text: "200", value: "200"}] - } - } + class: "col-xs-6" } - },{ + }, { elementId: 'bridge_domain_refs', view: "FormDropdownView", viewConfig: { diff --git a/webroot/config/networking/port/ui/js/views/portFormatters.js b/webroot/config/networking/port/ui/js/views/portFormatters.js index 6dc4eeac3..aea2035fa 100644 --- a/webroot/config/networking/port/ui/js/views/portFormatters.js +++ b/webroot/config/networking/port/ui/js/views/portFormatters.js @@ -143,7 +143,7 @@ define([ var localPrefValue = getValueByJsonPath(dc, "virtual_machine_interface_properties;local_preference", "") - if(localPrefValue != ""){ + if(localPrefValue !== ""){ localPref = localPrefValue; } return localPref;