From 924b33856a717a70570e9108596716a781e39ec0 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 19 Jul 2018 18:25:12 +0300 Subject: Align normatives and scripts Change-Id: I5e15e3c5adaf13a5b785613d20411f5d0e42e264 Issue-ID: SDC-1544 Signed-off-by: Tal Gitelman --- .../resources/scripts/import/tosca/upgradeONAPNormative.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py') diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py index 289678b369..bebba6c2cb 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py @@ -37,15 +37,15 @@ def usage(): def handleResults(results): if results is not None: - printFrameLine() + print_frame_line() for result in results: - printNameAndReturnCode(result[0], result[1]) + print_name_and_return_code(result[0], result[1]) - printFrameLine() + print_frame_line() failedResults = filter(lambda x: x[1] == None or x[1] not in [200, 201, 409], results) if (len(failedResults) > 0): - errorAndExit(1, None) + error_and_exit(1, None) def main(argv): print 'Number of arguments:', len(sys.argv), 'arguments.' @@ -63,7 +63,7 @@ def main(argv): opts, args = getopt.getopt(argv,"i:p:u:d:h",["ip=","port=","user=","debug="]) except getopt.GetoptError: usage() - errorAndExit(2, 'Invalid input') + error_and_exit(2, 'Invalid input') for opt, arg in opts: #print opt, arg @@ -131,7 +131,7 @@ def main(argv): resultsHeat = upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion) handleResults(resultsHeat) - errorAndExit(0, None) + error_and_exit(0, None) if __name__ == "__main__": main(sys.argv[1:]) -- cgit 1.2.3-korg