2 files changed, 9 insertions, 2 deletions
diff --git a/openecomp-ui/src/sdc-app/common/reducers/JSONSchemaReducer.js b/openecomp-ui/src/sdc-app/common/reducers/JSONSchemaReducer.js
index 35b2f936ce..916f724b40 100644
--- a/openecomp-ui/src/sdc-app/common/reducers/JSONSchemaReducer.js
+++ b/openecomp-ui/src/sdc-app/common/reducers/JSONSchemaReducer.js
@@ -99,8 +99,8 @@ function updateSchemaDataAndValidateReducer (state = {}, action, questionnaireNa
 			genericFieldInfoClone = {...state.qgenericFieldInfo};
 			let formReady = true;
 			forOwn(state.qgenericFieldInfo,(value, key) => {
-				let val = state.data[key] ? state.data[key] : '';
-				let result = Validator.validate(key, val, state.qgenericFieldInfo[key].validations, state, {});
+				let val = state.dataMap[key] ? state.dataMap[key] : '';
+				let result = Validator.validate(key, val, state.qgenericFieldInfo[key].validations, state, action.customValidations);
 				genericFieldInfoClone[key] = {...genericFieldInfoClone[key], isValid: result.isValid, errorText: result.errorText};
 				if (!result.isValid) {
 					formReady = false;
diff --git a/openecomp-ui/src/sdc-app/common/reducers/PlainDataReducer.js b/openecomp-ui/src/sdc-app/common/reducers/PlainDataReducer.js
index 0bbb5e63be..2276984f7a 100644
--- a/openecomp-ui/src/sdc-app/common/reducers/PlainDataReducer.js
+++ b/openecomp-ui/src/sdc-app/common/reducers/PlainDataReducer.js
@@ -16,6 +16,7 @@
 import {actionTypes} from './PlainDataReducerConstants.js';
 import Validator from 'nfvo-utils/Validator.js';
 import forOwn from 'lodash/forOwn.js';
+import {other as optionInputOther} from 'nfvo-components/input/inputOptions/InputOptions.jsx';
 
 function updateDataAndValidateReducer(state = {}, action) {
 	let genericFieldInfoCopy;
@@ -46,6 +47,12 @@ function updateDataAndValidateReducer(state = {}, action) {
 			forOwn(state.genericFieldInfo,(value, key) => {
 				let val = state.data && state.data[key] ? state.data[key] : '';
 				let result = Validator.validate(key, val, state.genericFieldInfo[key].validations, state, {});
+				if(val.choice !== undefined) {
+					result = Validator.validate(key, val.choice, state.genericFieldInfo[key].validations, state, {});
+				}
+				if(val.choice !== undefined && val.choice === optionInputOther.OTHER) {
+					result = Validator.validate(key, val.other, state.genericFieldInfo[key].validations, state, {});
+				}
 				genericFieldInfoCopy[key] = {...genericFieldInfoCopy[key], isValid: result.isValid, errorText: result.errorText};
 				if (!result.isValid) {
 					formReady = false;