SONIC QOS YANG - Remove qos tables field value reference format #7752
Conversation
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
2 times, most recently
from
43cda6c
to
6ba4923
Compare
|
Hi @neethajohn , @stephenxs- could you please review this PR. This is related to sonic-net/sonic-utilities#1626 and sonic-net/sonic-swss#1754, thanks. |
Sure. Will review it. |
Are you referring to the sonic-mgmt test? I don't think there is a PR yet. @AshokDaparthi, please update that as well |
@neethajohn - I will explore what to update, i am not aware of sonic-mgmt tests. |
|
@stephenxs @neethajohn - Regarding sonic-mgmt test cases, i am not doing any new functionality, Do you want me to change existing test cases to remove the ABNF format reference? |
Yes |
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
2 times, most recently
from
1c096f4
to
d94b14e
Compare
|
@stephenxs @neethajohn - Updated the sonic-mgmt test cases sonic-net/sonic-mgmt#3824 |
|
@AshokDaparthi can you fix the conflicts |
|
As per the discussion in yang-subgroup-meeting (8/26) with @lguohan , we have decided to merge sonic-utilities PR (sonic-net/sonic-utilities#1626) 1st followed by sub-module update in sonic-buildimage. Then this sonic-swss PR (sonic-net/sonic-swss#1754) should be merged. Merge can happen in this order: |
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
from
d94b14e
to
569722a
Compare
Qos tables in config db and app db used ABNF format i.e "[TABLE_NAME|name] to refer fieldvalue other qos tables.
Example:
Config DB:
"Ethernet92|3": {
"scheduler": "[SCHEDULER|scheduler.1]",
"wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
},
"Ethernet0|0": {
"profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet0": {
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
"pfc_enable": "3,4",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
},
AppDB:
"BUFFER_QUEUE_TABLE:Ethernet88:3-4": {
"profile": "[BUFFER_PROFILE_TABLE:egress_lossless_profile]"
},
1#This format is not consistent with other DB schema followed in sonic.
2# Added db_migrator.py case to change from old format in config_db and appl_db to new format.
3#Modified the test case
Dependent pull requests:
sonic-net/sonic-buildimage#7752 - To modify platfrom files
sonic-net/sonic-buildimage#7281 - Yang model
sonic-net/sonic-swss#1754 - swss change to remove ABNF format
|
@AshokDaparthi, please resolve the merge conflicts |
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
from
569722a
to
011a918
Compare
|
@AshokDaparthi, how are these changes verified? Also you have only mentioned #7281 as a dependency in this PR. That contains only the SCHEDULER, WRED_PROFILE and QUEUE related changes. What about the other MMU tables (BUFFER PROFILE, BUFFER_POOL etc)? since this PR contains changes for all MMU/QOS attributes |
|
@neethajohn - #7281 this PR is YNAG PR. For ALL QOS YANG PR's are blocked by this DB format. These YNAG PR's for buffers will are opened by broadcom else once this PR's are merged i will push sonic YNAG PR's. |
neethajohn
changed the title
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
from
011a918
to
8311b3d
Compare
|
@AshokDaparthi , can you please mention the merge order that you had discussed with Prince in this PR |
|
@neethajohn - Merged order is below |
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
from
8311b3d
to
a8963a5
Compare
AshokDaparthi
force-pushed
the
sonic-yang-qos-fv-db-ref-remove
branch
from
a8963a5
to
3e4acdf
Compare
Qos tables in config db and app db used ABNF format i.e "[TABLE_NAME|name] to refer fieldvalue other qos tables.
Example:
Config DB:
"Ethernet92|3": {
"scheduler": "[SCHEDULER|scheduler.1]",
"wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
},
"Ethernet0|0": {
"profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet0": {
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
"pfc_enable": "3,4",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
},
AppDB:
"BUFFER_QUEUE_TABLE:Ethernet88:3-4": {
"profile": "[BUFFER_PROFILE_TABLE:egress_lossless_profile]"
},
1#This format is not consistent with other DB schema followed in sonic.
2# Added db_migrator.py case to change from old format in config_db and appl_db to new format.
3#Modified the test case
Dependent pull requests:
sonic-net/sonic-buildimage#7752 - To modify platfrom files
sonic-net/sonic-buildimage#7281 - Yang model
sonic-net/sonic-swss#1754 - swss change to remove ABNF format
Depends on sonic-net/sonic-utilities#1626
Depends on sonic-net/sonic-swss#1754
QOS tables in config db used ABNF format i.e "[TABLE_NAME|name] to refer fieldvalue to other qos tables.
Example:
Config DB:
"Ethernet92|3": {
"scheduler": "[SCHEDULER|scheduler.1]",
"wred_profile": "[WRED_PROFILE|AZURE_LOSSLESS]"
},
"Ethernet0|0": {
"profile": "[BUFFER_PROFILE|ingress_lossy_profile]"
},
"Ethernet0": {
"dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE]",
"pfc_enable": "3,4",
"pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
"tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
"tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE]"
},
This format is not consistent with other DB schema followed in sonic.
And also this reference in DB is not required, This is taken care by YANG "leafref".
Removed this format from all platform files to consistent with other sonic db schema.
Example:
"Ethernet92|3": {
"scheduler": "scheduler.1",
"wred_profile": "AZURE_LOSSLESS"
},
Dependent pull requests:
#7752 - To modify platfrom files
#7281 - Yang model
sonic-net/sonic-utilities#1626 - DB migration
sonic-net/sonic-swss#1754 - swss change to remove ABNF format