From 5759b8376c039694e28d91be12e874c2ab5dfdfb Mon Sep 17 00:00:00 2001 From: Julia Aranovich Date: Fri, 16 Dec 2016 10:36:08 +0300 Subject: [PATCH] Pass interface model to validation Related-Bug: #1643599 Change-Id: Iafda0ed9a00054e14072876b407f2ad80847ecb6 --- .../edit_node_interfaces_screen.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js b/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js index b097500e9..cd62c8aca 100644 --- a/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js +++ b/static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js @@ -602,10 +602,14 @@ var EditNodeInterfacesScreen = React.createClass({ var errors = {}; interfaces.each((ifc) => { if (!_.includes(slaveInterfaceNames, ifc.get('name'))) { - var interfaceErrors = ifc.validate( - {networkingParameters, networks}, - {cluster, configModels, meta: ifc.get('meta') || {}} - ); + var interfaceErrors = ifc.validate({networkingParameters, networks}, { + cluster, + configModels: _.extend({}, configModels, { + [ifc.isBond() ? 'bond_attributes' : 'nic_attributes']: ifc.get('attributes'), + default: ifc.get('attributes') + }), + meta: ifc.get('meta') || {} + }); if (!_.isEmpty(interfaceErrors)) errors[ifc.get('name')] = interfaceErrors; } }); @@ -830,7 +834,7 @@ var EditNodeInterfacesScreen = React.createClass({ return !_.includes(slaveInterfaceNames, ifcName) && (