Convert yang2props.py to python 3

Convert yang2props.py scripts to python 3 format.

Change-Id: I5a89525f4a3cafea4c159b0cd0acb017521458bf
Issue-ID: SDNC-967
Signed-off-by: Dan Timoney <dtimoney@att.com>

diff --git a/generic-resource-api/model/scripts/python/yang2props.py b/generic-resource-api/model/scripts/python/yang2props.py
index 559d31b..3cd56e4 100755 (executable)
--- a/generic-resource-api/model/scripts/python/yang2props.py
+++ b/generic-resource-api/model/scripts/python/yang2props.py
@@ -18,34 +18,34 @@ val = ""
 li = []
 
 if len(sys.argv) < 3:
-     print 'yang2props.py <input yang> <output properties>'
+     print('yang2props.py <input yang> <output properties>')
      sys.exit(2)
 
 with open(sys.argv[1], "r") as ins:
     for line in ins:
         # if we see a leaf save the name for later
         if "leaf " in line:
-           match = re.search(r'leaf (\S+)', line)
-           if match:
-                 leaf = match.group(1)
+            match = re.search(r'leaf (\S+)', line)
+            if match:
+                leaf = match.group(1)
       
         # if we see enum convert the value to enum format and see if it changed
         # if the value is different write a property entry
         if "enum " in line:
-           match = re.search(r'enum "(\S+)";', line)
-           if match:
+            match = re.search(r'enum "(\S+)";', line)
+            if match:
                 val = match.group(1)
-               enum = to_enum(val)
+                enum = to_enum(val)
 
                 # see if converting to enum changed the string
-               if val != enum:
+                if val != enum:
                     property = "yang."+leaf+"."+enum+"="+val
-                   if property not in li:
-                       li.append( property)
+                    if property not in li:
+                        li.append( property)
 
 
 # Open output file
-fo = open(sys.argv[2], "wb")
+fo = open(sys.argv[2], "w")
 fo.write("# yang conversion properties \n")
 fo.write("# used to convert Enum back to the original yang value \n")
 fo.write("\n".join(li))

diff --git a/vnfapi/model/scripts/python/yang2props.py b/vnfapi/model/scripts/python/yang2props.py
index 559d31b..3cd56e4 100755 (executable)
--- a/vnfapi/model/scripts/python/yang2props.py
+++ b/vnfapi/model/scripts/python/yang2props.py
@@ -18,34 +18,34 @@ val = ""
 li = []
 
 if len(sys.argv) < 3:
-     print 'yang2props.py <input yang> <output properties>'
+     print('yang2props.py <input yang> <output properties>')
      sys.exit(2)
 
 with open(sys.argv[1], "r") as ins:
     for line in ins:
         # if we see a leaf save the name for later
         if "leaf " in line:
-           match = re.search(r'leaf (\S+)', line)
-           if match:
-                 leaf = match.group(1)
+            match = re.search(r'leaf (\S+)', line)
+            if match:
+                leaf = match.group(1)
       
         # if we see enum convert the value to enum format and see if it changed
         # if the value is different write a property entry
         if "enum " in line:
-           match = re.search(r'enum "(\S+)";', line)
-           if match:
+            match = re.search(r'enum "(\S+)";', line)
+            if match:
                 val = match.group(1)
-               enum = to_enum(val)
+                enum = to_enum(val)
 
                 # see if converting to enum changed the string
-               if val != enum:
+                if val != enum:
                     property = "yang."+leaf+"."+enum+"="+val
-                   if property not in li:
-                       li.append( property)
+                    if property not in li:
+                        li.append( property)
 
 
 # Open output file
-fo = open(sys.argv[2], "wb")
+fo = open(sys.argv[2], "w")
 fo.write("# yang conversion properties \n")
 fo.write("# used to convert Enum back to the original yang value \n")
 fo.write("\n".join(li))