debug

Author: bradh352

src/sonic-yang-mgmt/sonic_yang_ext.py

@@ -127,10 +127,10 @@ def _preProcessYangGrouping(self, moduleName, module):
                 groupings = [groupings]
 
             for grouping in groupings:
-                print("**_preProcessYangGrouping({}): {}".format(moduleName, dumps(grouping, indent=4)))
                 gName = grouping["@name"]
-                gLeaf = grouping["leaf"]
-                self.preProcessedYang['grouping'][moduleName][gName] = gLeaf
+                self.preProcessedYang['grouping'][moduleName][gName] = dict()
+                self.preProcessedYang['grouping'][moduleName][gName]["leaf"] = grouping.get('leaf')
+                self.preProcessedYang['grouping'][moduleName][gName]["leaf-list"] = grouping.get('leaf-list')
 
         except Exception as e:
             self.sysLog(msg="_preProcessYangGrouping failed:{}".format(str(e)), \
@@ -336,7 +336,6 @@ def _fillLeafDictUses(self, uses_s, table, leafDict):
                  (void)
         '''
         try:
-            print("**_fillLeafDictUses(): {}".format(dumps(uses_s, indent=4)))
             # make a list
             if isinstance(uses_s, dict):
                 uses_s = [uses_s]
@@ -351,9 +350,12 @@ def _fillLeafDictUses(self, uses_s, table, leafDict):
                 else:
                     uses_module_name = table_module['@name']
                 grouping = uses['@name'].split(':')[-1].strip()
-                leafs = self.preProcessedYang['grouping'][uses_module_name][grouping]
-                print("**_fillLeafDictUses() leafs: {}".format(dumps(leafs, indent=4)))
-                self._fillLeafDict(leafs, leafDict)
+                groupdata = self.preProcessedYang['grouping'][uses_module_name][grouping]
+                print("**_preProcessYangGrouping({}): {}".format(moduleName, dumps(groupdata, indent=4)))
+
+                self._fillLeafDict(groupdata.get('leaf'), leafDict)
+                # leaf-lists
+                self._fillLeafDict(groupdata.get('leaf-list'), leafDict, True)
         except Exception as e:
             self.sysLog(msg="_fillLeafDictUses failed:{}".format(str(e)), \
                 debug=syslog.LOG_ERR, doPrint=True)