SONiC QoS MAPs and PORT_QOS_MAP Yang #7375
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,11 +4,17 @@ | |
| from __future__ import print_function | ||
| import yang as ly | ||
| import syslog | ||
| from json import dump, dumps, loads | ||
| from xmltodict import parse | ||
| from glob import glob | ||
|
|
||
| qos_maps_model = ['DSCP_TO_TC_MAP_LIST', | ||
| 'DOT1P_TO_TC_MAP_LIST', | ||
| 'TC_TO_PRIORITY_GROUP_MAP_LIST', | ||
| 'TC_TO_QUEUE_MAP_LIST', | ||
| 'MAP_PFC_PRIORITY_TO_QUEUE_LIST', | ||
| 'PFC_PRIORITY_TO_PRIORITY_GROUP_MAP_LIST'] | ||
|
|
||
| """ | ||
| This is the Exception thrown out of all public function of this class. | ||
| """ | ||
|
|
@@ -406,6 +412,108 @@ def _yangConvert(val): | |
|
|
||
| return vValue | ||
|
|
||
| """ | ||
| Xlate a Qos Maps list | ||
| This function will xlate from a dict in config DB to a Yang JSON list | ||
| using yang model. Output will be go in self.xlateJson | ||
|
|
||
| Note: Exceptions from this function are collected in exceptionList and | ||
| are displayed only when an entry is not xlated properly from ConfigDB | ||
| to sonic_yang.json. | ||
|
|
||
| QOS MAPS Yang has inner list, which is diffrent from config DB. | ||
| Each field value in config db should be converted to inner list with | ||
| key and value. | ||
| Example: | ||
|
|
||
| Config DB: | ||
| "DSCP_TO_TC_MAP": { | ||
| "Dscp_to_tc_map1": { | ||
| "1": "1", | ||
| "2": "2" | ||
| } | ||
| } | ||
|
|
||
| YANG Model: | ||
| module: sonic-dscp-tc-map | ||
| +--rw sonic-dscp-tc-map | ||
| +--rw DSCP_TO_TC_MAP | ||
| +--rw DSCP_TO_TC_MAP_LIST* [name] | ||
| +--rw name string | ||
| +--rw DSCP_TO_TC_MAP* [dscp] | ||
| +--rw dscp string | ||
| +--rw tc? string | ||
|
|
||
| YANG JSON: | ||
| "sonic-dscp-tc-map:sonic-dscp-tc-map": { | ||
| "sonic-dscp-tc-map:DSCP_TO_TC_MAP": { | ||
| "DSCP_TO_TC_MAP_LIST": [ | ||
| { | ||
| "name": "map3", | ||
| "DSCP_TO_TC_MAP": [ | ||
| { | ||
| "dscp": "64", | ||
| "tc": "1" | ||
| }, | ||
| { | ||
| "dscp":"2", | ||
| "tc":"2" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| """ | ||
| def _xlateQosMapList(self, model, yang, config, table, exceptionList): | ||
|
|
||
| #create a dict to map each key under primary key with a dict yang model. | ||
| #This is done to improve performance of mapping from values of TABLEs in | ||
| #config DB to leaf in YANG LIST. | ||
| inner_clist = model.get('list') | ||
| if inner_clist: | ||
| inner_listKey = inner_clist['key']['@value'] | ||
| inner_leafDict = self._createLeafDict(inner_clist, table) | ||
| for lkey in inner_leafDict: | ||
| if inner_listKey != lkey: | ||
| inner_listVal = lkey | ||
|
|
||
| # get keys from YANG model list itself | ||
| listKeys = model['key']['@value'] | ||
| self.sysLog(msg="xlateList keyList:{}".format(listKeys)) | ||
| primaryKeys = list(config.keys()) | ||
| for pkey in primaryKeys: | ||
| try: | ||
| vKey = None | ||
| self.sysLog(syslog.LOG_DEBUG, "xlateList Extract pkey:{}".\ | ||
| format(pkey)) | ||
| # Find and extracts key from each dict in config | ||
| keyDict = self._extractKey(pkey, listKeys) | ||
|
|
||
| if inner_clist: | ||
| inner_yang_list = list() | ||
| for vKey in config[pkey]: | ||
| inner_keyDict = dict() | ||
| self.sysLog(syslog.LOG_DEBUG, "xlateList Key {} vkey {} Val {} vval {}".\ | ||
| format(inner_listKey, str(vKey), inner_listVal, str(config[pkey][vKey]))) | ||
| inner_keyDict[inner_listKey] = str(vKey) | ||
| inner_keyDict[inner_listVal] = str(config[pkey][vKey]) | ||
| inner_yang_list.append(inner_keyDict) | ||
|
|
||
| keyDict[inner_clist['@name']] = inner_yang_list | ||
| yang.append(keyDict) | ||
| # delete pkey from config, done to match one key with one list | ||
| del config[pkey] | ||
|
|
||
| except Exception as e: | ||
| # log debug, because this exception may occur with multilists | ||
| self.sysLog(msg="xlateList Exception:{}".format(str(e)), \ | ||
| debug=syslog.LOG_DEBUG, doPrint=True) | ||
| exceptionList.append(str(e)) | ||
| # with multilist, we continue matching other keys. | ||
| continue | ||
| return | ||
|
|
||
| """ | ||
| Xlate a list | ||
| This function will xlate from a dict in config DB to a Yang JSON list | ||
|
|
@@ -416,16 +524,22 @@ def _yangConvert(val): | |
| to sonic_yang.json. | ||
| """ | ||
| def _xlateList(self, model, yang, config, table, exceptionList): | ||
|
|
||
| #Qos Map lists needs special handling because of inner yang list and | ||
| #config db format. | ||
| if model['@name'] in qos_maps_model: | ||
| self.sysLog(msg="_xlateQosMapList: {}".format(model['@name'])) | ||
| self._xlateQosMapList(model, yang,config, table, exceptionList) | ||
| return | ||
|
|
||
| #create a dict to map each key under primary key with a dict yang model. | ||
| #This is done to improve performance of mapping from values of TABLEs in | ||
| #config DB to leaf in YANG LIST. | ||
|
|
||
| leafDict = self._createLeafDict(model, table) | ||
| # get keys from YANG model list itself | ||
| listKeys = model['key']['@value'] | ||
| self.sysLog(msg="xlateList keyList:{}".format(listKeys)) | ||
| primaryKeys = list(config.keys()) | ||
| for pkey in primaryKeys: | ||
| try: | ||
|
|
@@ -459,7 +573,6 @@ def _xlateList(self, model, yang, config, table, exceptionList): | |
| """ | ||
| def _xlateListInContainer(self, model, yang, configC, table, exceptionList): | ||
| clist = model | ||
| yang[clist['@name']] = list() | ||
| self.sysLog(msg="xlateProcessListOfContainer: {}".format(clist['@name'])) | ||
| self._xlateList(clist, yang[clist['@name']], configC, table, exceptionList) | ||
|
|
@@ -629,10 +742,93 @@ def _revYangConvert(val): | |
|
|
||
| return vValue | ||
|
|
||
| """ | ||
| Rev xlate from <TABLE>_LIST to table in config DB | ||
|
There was a problem hiding this comment. Plz put some comment with example of actual config....both yang and configDB There was a problem hiding this comment. Same here...Example of yang.json will be more helpful. There was a problem hiding this comment. @praveen-li where will be auto generated yang.json file you are showing last time in meeting. There was a problem hiding this comment. @AshokDaparthi : I meant yang.json config .... similar to config stored at https://github.com/Azure/sonic-buildimage/tree/master/src/sonic-yang-models/tests/yang_model_tests/tests_config |
||
| QOS MAP Yang has inner list, each inner list key:val should | ||
| be mapped to field:value in Config DB. | ||
| Example: | ||
|
|
||
| YANG: | ||
| module: sonic-dscp-tc-map | ||
| +--rw sonic-dscp-tc-map | ||
| +--rw DSCP_TO_TC_MAP | ||
| +--rw DSCP_TO_TC_MAP_LIST* [name] | ||
| +--rw name string | ||
| +--rw DSCP_TO_TC_MAP* [dscp] | ||
| +--rw dscp string | ||
| +--rw tc? string | ||
|
|
||
| YANG JSON: | ||
| "sonic-dscp-tc-map:sonic-dscp-tc-map": { | ||
| "sonic-dscp-tc-map:DSCP_TO_TC_MAP": { | ||
| "DSCP_TO_TC_MAP_LIST": [ | ||
| { | ||
| "name": "map3", | ||
| "DSCP_TO_TC_MAP": [ | ||
| { | ||
| "dscp": "64", | ||
| "tc": "1" | ||
| }, | ||
| { | ||
| "dscp":"2", | ||
| "tc":"2" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| Config DB: | ||
| "DSCP_TO_TC_MAP": { | ||
| "Dscp_to_tc_map1": { | ||
| "1": "1", | ||
| "2": "2" | ||
| } | ||
| } | ||
| """ | ||
|
|
||
| def _revQosMapXlateList(self, model, yang, config, table): | ||
| # get keys from YANG model list itself | ||
| listKeys = model['key']['@value'] | ||
| # create a dict to map each key under primary key with a dict yang model. | ||
| # This is done to improve performance of mapping from values of TABLEs in | ||
| # config DB to leaf in YANG LIST. | ||
|
|
||
| # Gather inner list key and value from model | ||
| inner_clist = model.get('list') | ||
| if inner_clist: | ||
| inner_listKey = inner_clist['key']['@value'] | ||
| inner_leafDict = self._createLeafDict(inner_clist, table) | ||
| for lkey in inner_leafDict: | ||
| if inner_listKey != lkey: | ||
| inner_listVal = lkey | ||
|
|
||
| # list with name <NAME>_LIST should be removed, | ||
| if "_LIST" in model['@name']: | ||
| for entry in yang: | ||
| # create key of config DB table | ||
| pkey, pkeydict = self._createKey(entry, listKeys) | ||
| self.sysLog(syslog.LOG_DEBUG, "revXlateList pkey:{}".format(pkey)) | ||
| config[pkey]= dict() | ||
| # fill rest of the entries | ||
| inner_list = entry[inner_clist['@name']] | ||
| for index in range(len(inner_list)): | ||
| self.sysLog(syslog.LOG_DEBUG, "revXlateList fkey:{} fval {}".\ | ||
| format(str(inner_list[index][inner_listKey]),\ | ||
| str(inner_list[index][inner_listVal]))) | ||
| config[pkey][str(inner_list[index][inner_listKey])] = str(inner_list[index][inner_listVal]) | ||
| return | ||
|
|
||
| """ | ||
| Rev xlate from <TABLE>_LIST to table in config DB | ||
| """ | ||
| def _revXlateList(self, model, yang, config, table): | ||
|
|
||
| # special processing for QOS Map table. | ||
| if model['@name'] in qos_maps_model: | ||
|
There was a problem hiding this comment. Comment: "# special processing for QOS table" or anything better. |
||
| self._revQosMapXlateList(model, yang, config, table) | ||
| return | ||
|
|
||
| # get keys from YANG model list itself | ||
| listKeys = model['key']['@value'] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Plz put example of actual config....both configDB and yang. Better while referring code later by any Dev. Again thx for addressing it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I meant yang.json example. Thx
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done