From b96311a375b16d1c237f8e99b8eca6024638262b Mon Sep 17 00:00:00 2001 From: Ryan Young Date: Fri, 6 Apr 2018 17:32:41 -0400 Subject: Enhance DMaaP Adapter Configuration Change-Id: I5385cf2710fc33a85da9a67d5f4d31dce1e460aa Signed-off-by: Ryan Young Issue-ID: APPC-658 --- .../model/scripts/python/yang2props.py | 29 +++++++++----------- .../model/scripts/python/yang2props.py | 31 ++++++++++------------ .../model/scripts/python/yang2props.py | 31 ++++++++++------------ 3 files changed, 41 insertions(+), 50 deletions(-) (limited to 'appc-inbound') diff --git a/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py b/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py index e1ce2e093..dd948c99f 100755 --- a/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py +++ b/appc-inbound/appc-artifact-handler/model/scripts/python/yang2props.py @@ -36,39 +36,37 @@ def to_enum(s): s = s[0].upper() + s[1:] return re.sub(r'(?!^)-([a-zA-Z])', lambda m: m.group(1).upper(), s) + leaf = "" val = "" li = [] if len(sys.argv) < 3: - print 'yang2props.py ' + print('yang2props.py ') 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: - property = "yang."+leaf+"."+enum+"="+val - if property not in li: - li.append( property) - - + if val != enum: + property = "yang." + leaf + "." + enum + "=" + val + 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)) @@ -76,5 +74,4 @@ fo.write("\n") # Close opend file fo.close() - diff --git a/appc-inbound/appc-design-services/model/scripts/python/yang2props.py b/appc-inbound/appc-design-services/model/scripts/python/yang2props.py index 1cba3ff6d..dd948c99f 100755 --- a/appc-inbound/appc-design-services/model/scripts/python/yang2props.py +++ b/appc-inbound/appc-design-services/model/scripts/python/yang2props.py @@ -36,39 +36,37 @@ def to_enum(s): s = s[0].upper() + s[1:] return re.sub(r'(?!^)-([a-zA-Z])', lambda m: m.group(1).upper(), s) + leaf = "" val = "" li = [] if len(sys.argv) < 3: - print 'yang2props.py ' + print('yang2props.py ') 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: - property = "yang."+leaf+"."+enum+"="+val - if property not in li: - li.append( property) - - + if val != enum: + property = "yang." + leaf + "." + enum + "=" + val + 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)) @@ -76,5 +74,4 @@ fo.write("\n") # Close opend file fo.close() - diff --git a/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py b/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py index 8962c5f5e..dd948c99f 100644 --- a/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py +++ b/appc-inbound/appc-interfaces-service/model/scripts/python/yang2props.py @@ -36,39 +36,37 @@ def to_enum(s): s = s[0].upper() + s[1:] return re.sub(r'(?!^)-([a-zA-Z])', lambda m: m.group(1).upper(), s) + leaf = "" val = "" li = [] if len(sys.argv) < 3: - print 'yang2props.py ' + print('yang2props.py ') 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: - property = "yang."+leaf+"."+enum+"="+val - if property not in li: - li.append( property) - - + if val != enum: + property = "yang." + leaf + "." + enum + "=" + val + 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)) @@ -76,5 +74,4 @@ fo.write("\n") # Close opend file fo.close() - - + -- cgit 1.2.3-korg