diff options
| author |   Miroslav Los <miroslav.los@pantheon.tech> | 2019-11-13 11:15:40 +0100 |
|---|---|---|
| committer |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-12-13 09:33:42 -0500 |
| commit | fc4bb348c8a8b4a5d5f77065b8ebbca16d6ce5b8 (patch) | |
| tree | c4b37c969be7a4d644cd5d30c52fa1b085eea5d6 /dgbuilder | |
| parent | 4ec03269604e3bd897207552127f94b4d1f30850 (diff) | |
Update distribution scripts to python3
Also use python3 packages in Dockerfiles.
Make python2 also available for OpenDaylight until they migrate
Signed-off-by: Miroslav Los <miroslav.los@pantheon.tech>
Issue-ID: CCSDK-1923
Change-Id: I3d4453ccbfe191c545ba574695387dd33c129e25
Diffstat (limited to 'dgbuilder')
| -rw-r--r-- | dgbuilder/tools/formatXml.py | 2 | ||||
| -rwxr-xr-x | dgbuilder/tools/format_json.sh | 3 | ||||
| -rwxr-xr-x | dgbuilder/tools/format_xml.sh | 5 | ||||
| -rwxr-xr-x | dgbuilder/tools/getRpcsClassFromYang.sh | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/dgbuilder/tools/formatXml.py b/dgbuilder/tools/formatXml.py index 913456a1..7d7d7b6c 100644 --- a/dgbuilder/tools/formatXml.py +++ b/dgbuilder/tools/formatXml.py @@ -8,4 +8,4 @@ xml_fname=sys.argv[1] #print pretty_xml_as_string x = etree.parse(xml_fname) -print etree.tostring(x, pretty_print = True) +print(etree.tostring(x, pretty_print = True)) diff --git a/dgbuilder/tools/format_json.sh b/dgbuilder/tools/format_json.sh index f86ad3cf..5432e7d3 100755 --- a/dgbuilder/tools/format_json.sh +++ b/dgbuilder/tools/format_json.sh @@ -1,6 +1,7 @@ +#!/bin/bash if [ "$#" != "1" ] then echo "Usage: $0 jsonFileFullPath" exit fi -cat $1|python -m json.tool +python3 -m json.tool "$1" diff --git a/dgbuilder/tools/format_xml.sh b/dgbuilder/tools/format_xml.sh index c66153ed..fbe368e1 100755 --- a/dgbuilder/tools/format_xml.sh +++ b/dgbuilder/tools/format_xml.sh @@ -1,3 +1,4 @@ +#!/bin/bash if [ "$#" != "1" ] then echo "Usage: $0 xmlFileFullPath" @@ -10,7 +11,7 @@ then fi if [ -e "$1" ] then - python $PROJECT_HOME/tools/formatXml.py $1 + python3 $PROJECT_HOME/tools/formatXml.py "$1" else - echo "File $1 does not exist" + echo "File $1 does not exist" fi diff --git a/dgbuilder/tools/getRpcsClassFromYang.sh b/dgbuilder/tools/getRpcsClassFromYang.sh index 3944ed25..d32456b0 100755 --- a/dgbuilder/tools/getRpcsClassFromYang.sh +++ b/dgbuilder/tools/getRpcsClassFromYang.sh @@ -59,7 +59,7 @@ done echo "module.exports = {" echo "\"moduleName\" : \"${module}\"," echo "'${module}_VALUES' : " -echo "[ $allProps ]"|python -m json.tool +echo "[ $allProps ]"|python3 -m json.tool echo "," echo "'${module}_RPCS' : [" |