Fix python version

Change-Id: I59686403b5c533dfa07ec4d5d71052bd1f0e22da
Issue-ID: NONRTRIC-63
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>

diff --git a/sdnc-a1-controller/.gitignore b/sdnc-a1-controller/.gitignore
index 264db96..cd1773f 100755 (executable)
--- a/sdnc-a1-controller/.gitignore
+++ b/sdnc-a1-controller/.gitignore
@@ -10,6 +10,7 @@ org.eclipse.core.resources.prefs
 .checkstyle
 maven-eclipse.xml
 workspace
+.pydevproject
 
 ## Compilation Files ##
 *.class

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
index 9dfabed..322aac5 100644 (file)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
@@ -61,7 +61,7 @@
                 <executions>
                     <execution>
                         <configuration>
-                            <executable>python</executable>
+                            <executable>python3</executable>
                             <arguments>
                                 <argument>scripts/python/yang2props.py</argument>
                                 <argument>src/main/yang/NONRT-RIC-API.yang</argument>

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/scripts/python/yang2props.py b/sdnc-a1-controller/northbound/nonrt-ric-api/model/scripts/python/yang2props.py
index 559d31b..951ddf5 100755 (executable)
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/scripts/python/yang2props.py
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/scripts/python/yang2props.py
@@ -18,34 +18,33 @@ 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))