[SDC] Full OnBoard health-check and NFoD support

Change-Id: I606f8a52c7e6d2bd5558f824957d890e552c5423
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>

2 files changed, 36 insertions, 1 deletions

diff --git a/openecomp-ui/src/nfvo-utils/Validator.js b/openecomp-ui/src/nfvo-utils/Validator.js
index 8fcf24a714..1df82a2ada 100644
--- a/openecomp-ui/src/nfvo-utils/Validator.js
+++ b/openecomp-ui/src/nfvo-utils/Validator.js
@@ -20,7 +20,9 @@ import i18n from 'nfvo-utils/i18n/i18n.js';
 class Validator {
 	static get globalValidationFunctions() {
 		return {
-			required: value => value !== '',
+			required: value => {				
+				return typeof value === 'string' ? value.replace(/\s+/g, '') !== '' : value !== '';				
+			},
 			requiredChooseOption: value => value !== '',
 			maxLength: (value, length) => ValidatorJS.isLength(value, {max: length}),
 			minLength: (value, length) => ValidatorJS.isLength(value, {min: length}),
@@ -107,6 +109,7 @@ class Validator {
 	}
 
 	static isItemNameAlreadyExistsInList({itemId, itemName, list}) {
+		itemName = itemName.toLowerCase();
 		return list[itemName] && list[itemName] !== itemId;
 	}
 }
diff --git a/openecomp-ui/src/nfvo-utils/getValue.js b/openecomp-ui/src/nfvo-utils/getValue.js
new file mode 100644
index 0000000000..e6871c094d
--- /dev/null
+++ b/openecomp-ui/src/nfvo-utils/getValue.js
@@ -0,0 +1,32 @@
+/*!
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+import {other as optionInputOther} from 'nfvo-components/input/validation/InputOptions.jsx';
+
+function getValueFromObject(element) {
+	return element.choices && element.choices.length > 0 && element.choices[0] !== '' && element.choices[0] !== optionInputOther.OTHER ||
+			element.other && element.choices[0] === optionInputOther.OTHER ?
+			element : undefined;
+} 
+
+function getValueFromVariable(variable) {
+	return variable ? variable : undefined;
+}
+
+ let getValue = element => {
+	return typeof element === 'object' ? getValueFromObject(element) : getValueFromVariable(element);	
+ };
+
+ export default getValue;
\ No newline at end of file