diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2018-07-19 18:25:12 +0300 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2018-07-25 15:03:36 +0000 |
commit | 924b33856a717a70570e9108596716a781e39ec0 (patch) | |
tree | 27951fd24b1d5e6217580254c49d6f02efc3185a /catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py | |
parent | 6c3541e2f1a64a7140b7bb54ff5aa546facbb14f (diff) |
Align normatives and scripts
Change-Id: I5e15e3c5adaf13a5b785613d20411f5d0e42e264
Issue-ID: SDC-1544
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py')
-rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py index 805d012298..32045513b8 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py @@ -13,10 +13,10 @@ def usage(): print sys.argv[0], '[optional -s <scheme> | --scheme=<scheme>, default http] [-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() + print_frame_line() for result in results: - printNameAndReturnCode(result[0], result[1]) - printFrameLine() + print_name_and_return_code(result[0], result[1]) + print_frame_line() responseCodes = [200, 201] @@ -25,7 +25,7 @@ def handleResults(results, updateversion): failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) if (len(failedResults) > 0): - errorAndExit(1, None) + error_and_exit(1, None) def main(argv): print 'Number of arguments:', len(sys.argv), 'arguments.' @@ -42,7 +42,7 @@ def main(argv): opts, args = getopt.getopt(argv,"i:p:u:d:v:h:s:",["ip=","port=","user=","debug=","updateversion=","scheme="]) except getopt.GetoptError: usage() - errorAndExit(2, 'Invalid input') + error_and_exit(2, 'Invalid input') for opt, arg in opts: #print opt, arg @@ -93,7 +93,7 @@ def main(argv): resultsOnap = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion) handleResults(resultsOnap, updateversion) - errorAndExit(0, None) + error_and_exit(0, None) if __name__ == "__main__": main(sys.argv[1:]) |