Align normatives and scripts

Change-Id: I5e15e3c5adaf13a5b785613d20411f5d0e42e264
Issue-ID: SDC-1544
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

1 files changed, 16 insertions, 15 deletions

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
index 6144d69104..ef1fe4d3b9 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
@@ -37,19 +37,20 @@ def usage():
 	print sys.argv[0], '[-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] [-v <true|false> | --updateversion=<true|false>]'
 
 def handleResults(results, updateversion):
-	printFrameLine()
-	for result in results:
-		printNameAndReturnCode(result[0], result[1])
-	printFrameLine()
-	
-	responseCodes = [200, 201]
-	
-	if(updateversion == 'false'):
-		responseCodes = [200, 201, 409]
-	
-	failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
-	if (len(failedResults) > 0):
-		errorAndExit(1, None)
+    if results is not None:
+	    print_frame_line()
+	    for result in results:
+	    	print_name_and_return_code(result[0], result[1])
+	    print_frame_line()
+
+	    responseCodes = [200, 201]
+
+	    if(updateversion == 'false'):
+	    	responseCodes = [200, 201, 409]
+
+	    failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results)
+	    if (len(failedResults) > 0):
+	    	error_and_exit(1, None)
 
 def main(argv):
 	print 'Number of arguments:', len(sys.argv), 'arguments.'
@@ -66,7 +67,7 @@ def main(argv):
 		opts, args = getopt.getopt(argv,"i:p:u:d:v:h",["ip=","port=","user=","debug=","updateversion="])
 	except getopt.GetoptError:
 		usage()
-		errorAndExit(2, 'Invalid input')
+		error_and_exit(2, 'Invalid input')
 	
 	for opt, arg in opts:
 	#print opt, arg
@@ -146,7 +147,7 @@ def main(argv):
 	fileLocation = baseFileLocation + "policy-types/"
 	importPolicyTypes(scheme, beHost, bePort, adminUser, False, fileLocation)
 
-	errorAndExit(0, None)	
+	error_and_exit(0, None)	
 
 if __name__ == "__main__":
 		main(sys.argv[1:])