openstack
/
fuel-ui
Code Issues Proposed changes

Merge "Pass interface model to validation"

This commit is contained in:
Jenkins 2016-12-19 08:29:30 +00:00 committed by Gerrit Code Review
parent a5aa45659e 5759b8376c
commit 1bc84c472e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
static/views/cluster_page_tabs/nodes_tab_screens/edit_node_interfaces_screen.js
View File

@ -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) && (
<NodeInterfaceDropTarget
{... _.pick(this.props,
'cluster', 'nodes', 'interfaces', 'configModels', 'bondAttributeNames'
'cluster', 'nodes', 'interfaces', 'bondAttributeNames'
)}
{... _.pick(this,
'validate', 'removeInterfaceFromBond', 'getAvailableBondingTypes'