-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[sonic-cfggen]: Add DEVICE_NEIGHBOR_METADATA field and move msn27xx template #1025
Conversation
@andriymoroz-mlnx could you provide me with a sample minigraph file and the corresponding output? so that I could add the unit test to this pull request. Thanks. |
{%- for local_port in DEVICE_NEIGHBOR -%} | ||
{%- if local_port == port_name -%} | ||
{%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%} | ||
{%- set neighbor_role = DEVICE_NEIGHBOR[neighbor]['type'] -%} |
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.
should be in DEVICE_NEIGHBOR_METADATA?
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.
fixed
@@ -31,5 +31,6 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] | |||
COPY ["ipinip.json.j2", "/usr/share/sonic/templates/"] | |||
COPY ["mirror.json.j2", "/usr/share/sonic/templates/"] | |||
COPY ["ports.json.j2", "/usr/share/sonic/templates/"] | |||
COPY ["msn27xx.32ports.buffers.json.j2", "/usr/share/sonic/templates/msn27xx.32ports.buffers.json.j2"] |
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.
Destination filename not necessary, as we're not renaming the file. Please either remove it or add destination filenames to all copies for consistency.
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.
thanks. updated.
…emplate This field contains all neighbor devices information using the device hostname as the key and having lo_addr, mgmt_addr, hwsku, type as the attributes. Move the file msn27xx.32ports.buffers.json.j2 from sonic-swss repository to this repository so that we could add unit test for this file. Unit test is added for platform ACS-MSN2700. Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
@andriymoroz-mlnx could you check? |
{%- set cable_len = [] -%} | ||
{%- for local_port in DEVICE_NEIGHBOR -%} | ||
{%- if local_port == port_name -%} | ||
{%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%} |
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.
this condition doesn't work because DEVICE_NEIGHBOR[local_port].name is equal ARISTA07T0, for example, and corresponding key in DEVICE_NEIGHBOR_METADATA is "ARISTA07T0" (with quotes)
There was a fix in the minigraph.py in the old code: 8f3b658
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.
Or remove quotes in minigraph generation
https://github.com/Azure/sonic-mgmt/blob/master/ansible/templates/topo/t0.j2#L192 (and other j2 files in this directory):
<Hostname>"{{ dev }}"</Hostname>
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.
ah yes. then i think we will need to remove the quotes in the minigraph generation.
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.
sonic-net/sonic-mgmt#301 please check.
Submodule src/sonic-platform-daemons 42f64d8..1039764: > Merge pull request sonic-net#42 from keboliu/backport-state-machine Submodule src/sonic-swss 950e9db..384c21e: > [Orchagent]: Fixbug segmentfault at routeorch (sonic-net#1025) Signed-off-by: Ying Xie <ying.xie@microsoft.com>
Sonic-swss-common: aaa8133 - 2019-10-12 : Add VRF object table in state_db (#312) [Tyler Li] 91aceb1 - 2019-10-11 : [schema] Update schema to support debug counters (#308) [Danny Allen] 9bcd5ca - 2019-09-28 : [multi-DB] fix vs test, should NOT replace old DBConnector API with new DBConnector API since vs test docker has no database_config.josn (#311) [Dong Zhang] 599155a - 2019-09-25 : [multi-DB] Part 2: C++ interface API changes / swsscommon unit test / LOGLEVEL_DB apply new API (#301) [Dong Zhang] 379ac73 - 2019-09-20 : add bulkremove for consumer_table_pops.lua (#306) [Dong Zhang] 6b805d3 - 2019-09-19 : timerfd return 0 with errno =0 - handle as False alarm. (#302) [Renuka Manavalan] e455891 - 2019-09-03 : Add VLAN_SUB_INTERFACE in CONFIG_DB schema (#284) [Wenda Ni] Sonic-swss 731a8f5 - 2019-10-17 : [copporch]: fix the endless loop problem when removing copp table group. (#1038) [wangshengjun] 1623219 - 2019-10-14 : Enable C++ unit test during build (#1092) [Qi Luo] 629c9d3 - 2019-10-14 : [vstest]: Revert back to 2 sec, and check if we got more than expected number of syslogs (#1091) [Prince Sunny] 80b2ace - 2019-10-11 : sonic-swss/orchagent: Add new protocol trap name support (#1087) [jpxjlrldgit] 9f765f7 - 2019-10-11 : [aclorch]: Check for existing mirror table only when creating a new table (#1089) [Danny Allen] 4c10260 - 2019-10-11 : [vstest]: Update Route test to check for added entry (#1088) [Prince Sunny] e658b64 - 2019-10-11 : [chassisorch]: Add everflow feature for chassis (#1024) [Ze Gan] 5b13387 - 2019-10-10 : [changelog]: Revert changelog that was done for passing VS test. (#1080) [Prince Sunny] 90a690d - 2019-10-10 : [aclorch]: Simplify the TCP flags matching code and support exact value match (#1072) [Shuotian Cheng] 3461710 - 2019-10-09 : Single VRF for ingress and egress flows, skip route replication (#1045) [Prince Sunny] 953474a - 2019-10-03 : [swss]: Do not use namespace in header files (#1081) [Wenda Ni] bd36751 - 2019-10-03 : Change nexthop key to ip & ifname (#977) [tylerlinp] fee1aaa - 2019-10-02 : [teamsyncd]: Check if LAG exists before removing (#1069) [Shuotian Cheng] 175f3de - 2019-09-30 : Update ECMP NHopGroup for Port Channel oper down (#1030) [Sumukha Tumkur Vani] 182940d - 2019-09-26 : [mirrororch]: Remove mirror session state after it is remvoed (#1066) [Shuotian Cheng] d823dd1 - 2019-09-20 : [MirrorOrch]: Mirror Session Retention across Warm Reboot (#1054) [Shuotian Cheng] a5b6e7c - 2019-09-19 : Ignore link local neighbors (#1065) [Prince Sunny] 0ddaba3 - 2019-09-19 : Adopt to signature change of Selectable::readData, which switched (#1061) [Renuka Manavalan] 543bd98 - 2019-09-18 : [aclorch]: Fix table name in counter table for mirror rules (#1060) [Shuotian Cheng] 12c29b4 - 2019-09-19 : Cannot ping to link-local ipv6 interface address of the switch. (#774) [Kiran Kumar Kella] 4d8e08d - 2019-09-18 : change in fpmsyncd to skip the lookup for the Master device name if the route object table value is zero (#1048) [Arvindsrinivasan Lakshmi narasimhan] da514f5 - 2019-09-18 : Do not update lag mtu from teamsyncd (netlink) (#1053) [Prince Sunny] 3fb22e1 - 2019-09-16 : Check warmboot flag during initialization (#1057) [Prince Sunny] d98d1e9 - 2019-09-16 : [aclorch]: Egress mirror action support and action ASIC support check (#963) [Stepan Blyshchak] 313ef5c - 2019-09-09 : Warmboot Vlan neigh restore fix (#1040) [Prince Sunny] 5841e06 - 2019-09-06 : Add dot1p to tc mapping support (#871) [Wenda Ni] 39fe568 - 2019-08-30 : [aclorch]: Revise ACL rule creation/removal logs (#1042) [Shuotian Cheng] c461911 - 2019-08-27 : [copporch]: Fix the typo - mld_v1_done (#1037) [wangshengjun] 34915de - 2019-08-22 : [portsyncd]: Add default catch block in portsyncd (#1033) [SuvarnaMeenakshi] dc81a21 - 2019-08-20 : [vnet]: Fix FDB related failure in "vnet_bitmap" virtual switch test (#1034) [Volodymyr Samotiy] 5ae4226 - 2019-08-19 : [test]: Adjust stale timer for warm-reboot neighborsync test cases (#1031) [zhenggen-xu] 65cbd55 - 2019-08-16 : [build]: Fix compiling warnings using ARM 32 bit compiler (#1015) [arheneus@marvell.com] b611808 - 2019-08-16 : [Orchagent]: Fixbug segmentfault at routeorch (#1025) [Ze Gan]
The log statement will cause segmentfault if `observerEntry->second.routeTable` is empty. Signed-off-by: Ze Gan <ganze718@gmail.com>
Needed when testing sairedis recordings from production devices on VS
This field contains all neighbor devices information using the device
hostname as the key and having lo_addr, mgmt_addr, hwsku, type as the
attributes.
Move the file msn27xx.32ports.buffers.json.j2 from sonic-swss repository to
this repository so that we could add unit test for this file later.
Signed-off-by: Shu0T1an ChenG shuche@microsoft.com