For Chassis Adverstise chassis hostname if present.

Signed-off-by: Abhishek Dosi <[email protected]>
abdosi · May 25, 2024 · 6545569 · 6545569
1 parent 5b11785
commit 6545569
Show file tree

Hide file tree

Showing 29 changed files with 32 additions and 29 deletions.
diff --git a/dockers/docker-lldp/lldpmgrd b/dockers/docker-lldp/lldpmgrd
@@ -245,7 +245,10 @@ class LldpManager(daemon_base.DaemonBase):
         if not op in ["SET", "DEL"]:
             return
         self.log_info("Device Config Opcode: {} Dict {} Key {}".format(op, device_dict, key))
-        hostname = device_dict.get("hostname")
+        try:
+            hostname = device_dict["chassis_hostname"]
+        except:
+            hostname = device_dict.get("hostname")
         if not self.hostname == hostname:
             self.log_info("Hostname changed old {0}, new {1}".format(self.hostname, hostname))
             self.update_hostname(hostname)

diff --git a/platform/barefoot/sonic-platform-modules-arista b/platform/barefoot/sonic-platform-modules-arista
diff --git a/platform/broadcom/saibcm-modules-dnx b/platform/broadcom/saibcm-modules-dnx
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
diff --git a/platform/broadcom/sonic-platform-modules-nokia b/platform/broadcom/sonic-platform-modules-nokia
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
diff --git a/src/dhcpmon b/src/dhcpmon
diff --git a/src/dhcprelay b/src/dhcprelay
diff --git a/src/linkmgrd b/src/linkmgrd
diff --git a/src/ptf-py3 b/src/ptf-py3
diff --git a/src/sonic-dbsyncd b/src/sonic-dbsyncd
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
diff --git a/src/sonic-gnmi b/src/sonic-gnmi
diff --git a/src/sonic-host-services b/src/sonic-host-services
diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
diff --git a/src/sonic-mgmt-common b/src/sonic-mgmt-common
diff --git a/src/sonic-mgmt-framework b/src/sonic-mgmt-framework
diff --git a/src/sonic-p4rt/sonic-pins b/src/sonic-p4rt/sonic-pins
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
diff --git a/src/sonic-platform-pde b/src/sonic-platform-pde
diff --git a/src/sonic-restapi b/src/sonic-restapi
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
diff --git a/src/sonic-swss b/src/sonic-swss
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
diff --git a/src/sonic-utilities b/src/sonic-utilities
diff --git a/src/sonic-ztp b/src/sonic-ztp
diff --git a/src/wpasupplicant/sonic-wpa-supplicant b/src/wpasupplicant/sonic-wpa-supplicant
+0 −6		.pylintrc
+1 −1		Makefile
+2 −2		README.md
+1 −1		arista/cli/actions/fabric/clean.py
+1 −1		arista/cli/actions/fabric/power.py
+1 −1		arista/cli/actions/fabric/setup.py
+0 −5		arista/components/asic/xgs/tomahawk5.py
+5 −6		arista/components/cpld.py
+0 −33		arista/components/cpu/shearwater.py
+1 −1		arista/components/denali/card.py
+4 −4		arista/components/denali/linecard.py
+0 −4		arista/components/eeprom.py
+0 −38		arista/components/pali.py
+0 −15		arista/components/psu/delta.py
+0 −30		arista/components/scd.py
+0 −8		arista/components/vrm/mp8796b.py
+3 −3		arista/core/asic.py
+1 −1		arista/core/component/__init__.py
+1 −16		arista/core/config.py
+2 −2		arista/core/daemon.py
+0 −3		arista/core/hwapi.py
+1 −3		arista/core/onie.py
+60 −90		arista/core/platform.py
+4 −7		arista/core/register.py
+3 −33		arista/core/tests/registers.py
+2 −7		arista/core/utils.py
+4 −7		arista/drivers/eeprom.py
+9 −27		arista/drivers/microsemi.py
+0 −5		arista/drivers/pali.py
+3 −2		arista/platforms/__init__.py
+0 −11		arista/platforms/chassis/maunakea.py
+22 −34		arista/platforms/cpu/puffin.py
+0 −75		arista/platforms/cpu/shearwater.py
+15 −0		arista/platforms/eagleville.py
+0 −10		arista/platforms/linecard/wolverine.py
+41 −125		arista/platforms/lodoga.py
+0 −184		arista/platforms/quicksilver.py
+11 −18		arista/utils/rpc/client.py
+1 −5		arista/utils/rpc/server.py
+0 −26		arista/utils/rpc/tests/server.py
+3 −4		arista/utils/sonic_platform/chassis.py
+1 −1		lib/sfp-eeprom-info-c-gen.py
+0 −1		src/Makefile
+0 −989		src/pali-fan-cpld.c
+0 −6		src/scd-mdio.c
+3 −1		utils/boot-eos
+1 −0		.azure-pipelines/build.yml
+1 −1		objects.mk
+182 −11		src/dhcp_device.cpp
+24 −0		src/dhcp_device.h
+0 −22		.github/workflows/semgrep.yml
+1 −1		src/DbInterface.cpp
+0 −28		src/common/MuxConfig.h
+0 −9		src/common/MuxPortConfig.h
+1 −50		src/link_manager/LinkManagerStateMachineActiveStandby.cpp
+0 −22		src/link_manager/LinkManagerStateMachineActiveStandby.h
+0 −30		test/LinkManagerStateMachineTest.cpp
+23 −18		.github/workflows/build.yml
+0 −38		.github/workflows/pypi.yml
+0 −3		.gitignore
+0 −8		CI/install-nnpy.sh
+1 −1		CI/travis/check-nnpy.py
+0 −0		CI/travis/common.sh
+0 −0		CI/travis/install-nanomsg.sh
+8 −0		CI/travis/install-nnpy.sh
+0 −0		CI/travis/run_tests.sh
+13 −4		README.md
+7 −13		ptf
+4 −1		ptf_nn/ptf_nn_agent.py
+0 −14		pyproject.toml
+2 −0		requirements-dev.txt
+1 −0		requirements.txt
+0 −27		setup.cfg
+42 −3		setup.py
+0 −7		src/ptf/__init__.py
+24 −36		src/ptf/dataplane.py
+1 −1		src/ptf/mask.py
+1 −1		src/ptf/ptfutils.py
+2 −5		src/ptf/testutils.py
+6 −13		azure-pipelines.yml
+0 −2		src/lldp_syncd/daemon.py
+1 −40		tests/test_lldpSyncDaemon.py
+1 −1		bfdd/bfd_packet.c
+2 −0		bfdd/bfdd_nb.c
+3 −0		bfdd/bfdd_nb.h
+38 −0		bfdd/bfdd_nb_config.c
+3 −7		bgpd/bgp_aspath.c
+112 −93		bgpd/bgp_attr.c
+1 −1		bgpd/bgp_attr.h
+0 −1		bgpd/bgp_conditional_adv.c
+3 −7		bgpd/bgp_damp.c
+2 −3		bgpd/bgp_debug.c
+1 −4		bgpd/bgp_evpn.c
+1 −8		bgpd/bgp_evpn_vty.c
+0 −12		bgpd/bgp_fsm.c
+2 −2		bgpd/bgp_mplsvpn.c
+0 −1		bgpd/bgp_mplsvpn.h
+7 −9		bgpd/bgp_packet.c
+20 −44		bgpd/bgp_route.c
+2 −3		bgpd/bgp_route.h
+2 −2		bgpd/bgp_routemap.c
+3 −6		bgpd/bgp_updgrp_adv.c
+9 −15		bgpd/bgp_vty.c
+25 −97		bgpd/bgpd.c
+0 −27		bgpd/rfapi/rfapi.c
+25 −28		bgpd/rfapi/rfapi_import.c
+0 −19		bgpd/rfapi/rfapi_rib.c
+0 −1		bgpd/rfapi/rfapi_vty.c
+1 −1		configure.ac
+0 −18		debian/changelog
+0 −7		doc/user/bgp.rst
+1 −1		doc/user/pbr.rst
+2 −0		doc/user/zebra.rst
+3 −2		eigrpd/eigrp_interface.c
+2 −6		lib/command.c
+6 −7		lib/link_state.c
+0 −1		lib/nexthop.c
+0 −6		lib/nexthop.h
+2 −4		lib/prefix.c
+57 −67		lib/routemap.c
+18 −2		lib/thread.c
+6 −22		ospf6d/ospf6_message.c
+1 −3		ospf6d/ospf6_neighbor.c
+0 −1		ospf6d/ospf6_neighbor.h
+5 −21		ospfd/ospf_apiserver.c
+4 −17		ospfd/ospf_interface.c
+0 −6		ospfd/ospf_ldp_sync.c
+1 −2		ospfd/ospf_lsa.c
+5 −11		ospfd/ospf_opaque.c
+1 −1		ospfd/ospf_packet.c
+5 −7		ospfd/ospf_vty.c
+22 −26		ospfd/ospfd.c
+1 −6		pbrd/pbr_vty.c
+3 −5		pimd/pim_nb_config.c
+2 −4		pimd/pim_neighbor.c
+0 −25		pimd/pim_oil.c
+0 −1		pimd/pim_oil.h
+2 −2		pimd/pim_pim.c
+1 −9		pimd/pim_register.c
+1 −112		redhat/frr.spec.in
+8 −0		ripd/ripd.c
+7 −0		ripngd/ripngd.c
+1 −2		tests/topotests/bgp_aigp/r2/bgpd.conf
+1 −2		tests/topotests/bgp_aigp/r3/bgpd.conf
+2 −3		tests/topotests/bgp_aigp/r4/bgpd.conf
+2 −3		tests/topotests/bgp_aigp/r5/bgpd.conf
+1 −1		tests/topotests/bgp_aigp/r6/bgpd.conf
+1 −1		tests/topotests/bgp_aigp/r7/bgpd.conf
+20 −22		tests/topotests/bgp_aigp/test_bgp_aigp.py
+0 −0		tests/topotests/bgp_conditional_advertisement_static_route/__init__.py
+0 −10		tests/topotests/bgp_conditional_advertisement_static_route/r1/frr.conf
+0 −39		tests/topotests/bgp_conditional_advertisement_static_route/r2/frr.conf
+0 −19		tests/topotests/bgp_conditional_advertisement_static_route/r3/frr.conf
+0 −118		tests/topotests/bgp_conditional_advertisement_static_route/test_bgp_conditional_advertisement_static_route.py
+1 −194		tests/topotests/ospfapi/test_ospf_clientapi.py
+0 −2		tools/etc/frr/support_bundle_commands.conf
+2 −7		tools/frr-reload.py
+4 −4		tools/frrcommon.sh.in
+0 −59		vtysh/vtysh.c
+8 −4		vtysh/vtysh_config.c
+6 −9		vtysh/vtysh_user.c
+1 −2		zebra/dplane_fpm_nl.c
+3 −1		zebra/interface.c
+2 −9		zebra/rib.h
+27 −22		zebra/rt_netlink.c
+2 −6		zebra/tc_netlink.c
+18 −13		zebra/zapi_msg.c
+3 −36		zebra/zebra_dplane.c
+6 −15		zebra/zebra_evpn_mac.c
+22 −33		zebra/zebra_nhg.c
+25 −70		zebra/zebra_rib.c
+3 −3		zebra/zebra_routemap.c
+17 −37		Makefile
+17 −31		azure-pipelines.yml
+5 −24		dialout/dialout_client/dialout_client.go
+50 −68		dialout/dialout_client/dialout_client_test.go
+11 −23		gnmi_server/client_subscribe.go
+3 −13		gnmi_server/connection_manager.go
+0 −108		gnmi_server/debug.go
+24 −164		gnmi_server/server.go
+642 −1,177		gnmi_server/server_test.go
+0 −1,091		gnmi_server/transl_sub_test.go
+4 −25		go.mod
+121 −40		go.sum
+3 −40		patches/gnmi_get.patch
+2 −20		patches/gnmi_set.patch
+0 −395		proto/gnoi/sonic_debug.pb.go
+0 −39		proto/gnoi/sonic_debug.proto
+73 −236		proto/sonic_internal.pb.go
+1 −9		proto/sonic_internal.proto
+0 −3		pytest.ini
+324 −632		sonic_data_client/client_test.go
+20 −91		sonic_data_client/db_client.go
+3 −13		sonic_data_client/events_client.go
+378 −384		sonic_data_client/json_client.go
+211 −695		sonic_data_client/mixed_db_client.go
+1 −2		sonic_data_client/non_db_client.go
+283 −237		sonic_data_client/transl_data_client.go
+0 −386		sonic_data_client/transl_subscriber.go
+6 −20		sonic_data_client/virtual_db.go
+139 −313		sonic_db_config/db_config.go
+25 −282		sonic_db_config/db_config_test.go
+144 −429		telemetry/telemetry.go
+0 −866		telemetry/telemetry_test.go
+25 −208		test/test_gnmi_appldb.py
+25 −77		test/test_gnmi_configdb.py
+0 −21		test/test_gnmi_countersdb.py
+0 −487		test/test_gnmi_dpu_appldb.py
+0 −14		test/utils.py
+0 −5		test_utils/memcheck_disable.go
+0 −15		test_utils/memcheck_enable.go
+0 −49		test_utils/test_utils.go
+0 −12		testdata/CONFIG_DHCP_SERVER.txt
+56 −59		testdata/CONFIG_PFCWD_PORTS.txt
+0 −34		testdata/NEIGH_STATE_TABLE_MAP.txt
+0 −30		testdata/NEIGH_STATE_TABLE_MAP_2.txt
+0 −4		testdata/NEIGH_STATE_TABLE_key_deletion_57.txt
+0 −4		testdata/NEIGH_STATE_TABLE_key_deletion_59.txt
+0 −4		testdata/NEIGH_STATE_TABLE_key_deletion_61.txt
+0 −4		testdata/certs/.gitignore
+0 −73		testdata/database_config_dpu.json
+0 −12		testdata/database_global_dpu.json
+0 −22		.github/workflows/semgrep.yml
+28 −5		azure-pipelines.yml
+0 −6		data/.gitignore
+0 −19		data/README.md
+0 −5		data/debian/changelog
+0 −1		data/debian/compat
+0 −11		data/debian/control
+0 −0		data/debian/copyright
+0 −2		data/debian/install
+0 −24		data/debian/rules
+0 −14		data/debian/sonic-host-services-data.aaastatsd.service
+0 −12		data/debian/sonic-host-services-data.aaastatsd.timer
+0 −15		data/debian/sonic-host-services-data.caclmgrd.service
+0 −12		data/debian/sonic-host-services-data.determine-reboot-cause.service
+0 −10		data/debian/sonic-host-services-data.featured.service
+0 −12		data/debian/sonic-host-services-data.featured.timer
+0 −11		data/debian/sonic-host-services-data.hostcfgd.service
+0 −12		data/debian/sonic-host-services-data.hostcfgd.timer
+0 −14		data/debian/sonic-host-services-data.procdockerstatsd.service
+0 −8		data/debian/sonic-host-services-data.process-reboot-cause.service
+0 −9		data/debian/sonic-host-services-data.process-reboot-cause.timer
+0 −16		data/debian/sonic-host-services-data.sonic-hostservice.service
+0 −18		data/org.sonic.hostservice.conf
+0 −92		data/templates/common-auth-sonic.j2
+0 −43		data/templates/common-password.j2
+0 −17		data/templates/ldap.conf.j2
+0 −69		data/templates/limits.conf.j2
+0 −41		data/templates/nslcd.conf.j2
+0 −12		data/templates/pam_limits.j2
+0 −3		data/templates/pam_radius_auth.conf.j2
+0 −58		data/templates/radius_nss.conf.j2
+0 −60		data/templates/tacplus_nss.conf.j2
+0 −30		host_modules/gcu.py
+0 −6		scripts/caclmgrd
+0 −579		scripts/featured
+554 −494		scripts/hostcfgd
+0 −80		scripts/ldap.py
+12 −25		scripts/procdockerstatsd
+6 −10		scripts/process-reboot-cause
+2 −15		setup.py
+2 −7		tests/caclmgrd/caclmgrd_bfd_test.py
+0 −56		tests/caclmgrd/caclmgrd_default_rule_test.py
+0 −5		tests/caclmgrd/caclmgrd_vxlan_test.py
+0 −68		tests/caclmgrd/test_default_rule_vectors.py
+7 −15		tests/common/mock_configdb.py
+0 −0		tests/featured/__init__.py
+0 −493		tests/featured/featured_test.py
+0 −1,218		tests/featured/test_vectors.py
+0 −74		tests/host_modules/gcu_test.py
+0 −116		tests/hostcfgd/hostcfgd_ldap_test.py
+3 −2		tests/hostcfgd/hostcfgd_passwh_test.py
+3 −2		tests/hostcfgd/hostcfgd_radius_test.py
+2 −1		tests/hostcfgd/hostcfgd_rsyslog_test.py
+0 −167		tests/hostcfgd/hostcfgd_ssh_server_test.py
+3 −46		tests/hostcfgd/hostcfgd_tacacs_test.py
+452 −88		tests/hostcfgd/hostcfgd_test.py
+0 −21		tests/hostcfgd/sample_output/LDAP/common-auth-sonic
+0 −21		tests/hostcfgd/sample_output/LDAP/ldap.conf
+0 −116		tests/hostcfgd/sample_output/LDAP/login
+0 −116		tests/hostcfgd/sample_output/LDAP/login.old
+0 −40		tests/hostcfgd/sample_output/LDAP/nslcd.conf
+0 −18		tests/hostcfgd/sample_output/LDAP/nsswitch.conf
+0 −18		tests/hostcfgd/sample_output/LDAP/nsswitch.conf.old
+0 −56		tests/hostcfgd/sample_output/LDAP/radius_nss.conf
+0 −55		tests/hostcfgd/sample_output/LDAP/sshd
+0 −55		tests/hostcfgd/sample_output/LDAP/sshd.old
+0 −40		tests/hostcfgd/sample_output/LDAP/tacplus_nss.conf
+1 −1		tests/hostcfgd/sample_output/PASSWORD_HARDENING_enable_digits_class/common-password
+1 −1		tests/hostcfgd/sample_output/PASSWORD_HARDENING_enable_feature/common-password
+0 −121		tests/hostcfgd/sample_output/SSH_SERVER/sshd_config.old
+0 −121		tests/hostcfgd/sample_output/SSH_SERVER_default_values/sshd_config
+0 −122		tests/hostcfgd/sample_output/SSH_SERVER_modify_all/sshd_config
+0 −121		tests/hostcfgd/sample_output/SSH_SERVER_modify_authentication_retries/sshd_config
+0 −121		tests/hostcfgd/sample_output/SSH_SERVER_modify_login_timeout/sshd_config
+0 −123		tests/hostcfgd/sample_output/SSH_SERVER_modify_ports/sshd_config
+0 −128		tests/hostcfgd/test_ldap_vectors.py
+0 −170		tests/hostcfgd/test_ssh_server_vectors.py
+1,282 −22		tests/hostcfgd/test_vectors.py
+3 −69		tests/procdockerstatsd_test.py
+0 −22		.github/workflows/semgrep.yml
+35 −70		CLI/actioner/cli_client.py
+9 −11		CLI/actioner/cli_log.py
+245 −154		CLI/actioner/sonic-cli-acl.py
+122 −87		CLI/actioner/sonic-cli-if.py
+64 −29		CLI/actioner/sonic-cli-lldp.py
+120 −66		CLI/actioner/sonic-cli-sys.py
+1 −1		CLI/clitree/cli-xml/interface.xml
+2 −17		CLI/klish/Makefile
+1 −1		CLI/klish/clish_start
+3 −4		CLI/renderer/scripts/rpipe_utils.py
+6 −6		CLI/renderer/templates/lldp_neighbor_show.j2
+1 −1		CLI/renderer/templates/lldp_show.j2
+8 −8		CLI/renderer/templates/show_access_group.j2
+13 −13		CLI/renderer/templates/show_access_list.j2
+1 −1		CLI/renderer/templates/system_processes_show.j2
+2 −4		azure-pipelines.yml
+1 −0		debian/sonic-mgmt-framework.install
+4 −35		go.mod
+26 −57		go.sum
+4 −0		models/codegen.config
+63 −21		models/openapi_codegen.mk
+8 −27		models/yang_to_openapi.mk
+1 −18		rest/Makefile
+14 −2		rest/main/main.go
+1 −0		rest/main/main_test.go
+1 −7		rest/server/handler.go
+10 −71		rest/server/handler_test.go
+1 −1		rest/server/pamAuth_test.go
+2 −129		rest/server/query.go
+15 −152		rest/server/query_test.go
+2 −14		rest/server/restconf.go
+0 −11		rest/server/restconf_test.go
+0 −0		tools/.gitkeep
+0 −24		tools/codegen/go-server/src/openapi/routes.go
+0 −41		tools/codegen/go-server/templates-yang/controllers-api.j2
+0 −22		tools/codegen/go-server/templates-yang/routers.j2
+0 −29		tools/openapi_tests/Makefile
+0 −457		tools/openapi_tests/ietf-inet-types.yang
+0 −196		tools/openapi_tests/ietf-snmp-common.yang
+0 −234		tools/openapi_tests/ietf-snmp-community.yang
+0 −155		tools/openapi_tests/ietf-snmp-proxy.yang
+0 −207		tools/openapi_tests/ietf-snmp-target.yang
+0 −8,990		tools/openapi_tests/ietf-snmp.no-oneof.yang.expect
+0 −59		tools/openapi_tests/ietf-snmp.yang
+0 −9,168		tools/openapi_tests/ietf-snmp.yang.expect
+0 −474		tools/openapi_tests/ietf-yang-types.yang
+0 −1,092		tools/openapi_tests/test-data-nodes.yang
+0 −12,727		tools/openapi_tests/test-data-nodes.yang.expect
+0 −74		tools/openapi_tests/test-rpc.yang
+0 −214		tools/openapi_tests/test-rpc.yang.expect
+0 −435		tools/openapi_tests/test-yang-types.yang
+386 −811		tools/pyang/pyang_plugins/openapi.py
+0 −42		tools/restconf_doc_tools/index.py
+0 −186		tools/restconf_doc_tools/index.template
+0 −374		tools/restconf_doc_tools/url_diff.py
+0 −26		tools/restconf_doc_tools/utils/json_delta/LICENSE
+0 −16		tools/restconf_doc_tools/utils/json_delta/README.md
+0 −238		tools/restconf_doc_tools/utils/json_delta/__init__.py
+0 −488		tools/restconf_doc_tools/utils/json_delta/_diff.py
+0 −82		tools/restconf_doc_tools/utils/json_delta/_patch.py
+0 −519		tools/restconf_doc_tools/utils/json_delta/_udiff.py
+0 −220		tools/restconf_doc_tools/utils/json_delta/_upatch.py
+0 −814		tools/restconf_doc_tools/utils/json_delta/_util.py
+1 −1		tools/swagger_codegen/.gitignore
+0 −24		tools/swagger_codegen/go-server/src/openapi/routes.go
+1 −2		tools/swagger_codegen/go-server/templates-nonyang/routers.mustache
+0 −5		tools/swagger_codegen/go-server/templates-yang/controller-api.mustache
+1 −2		tools/swagger_codegen/go-server/templates-yang/routers.mustache
+0 −3		tools/swagger_codegen/go-server/templates-yang/swagger.mustache
+1 −1		tools/test/apt_requirements.txt
+3 −0		tools/test/cli.sh
+1 −1		install_dependencies.sh
+1 −1		p4rt_app/p4runtime/p4runtime_impl.cc
+1 −1		p4rt_app/sonic/app_db_acl_def_table_manager.cc
+1 −1		p4rt_app/sonic/app_db_acl_def_table_manager_test.cc
+1 −1		p4rt_app/sonic/app_db_manager.cc
+1 −1		p4rt_app/sonic/app_db_manager.h
+1 −1		p4rt_app/sonic/app_db_to_pdpi_ir_translator.cc
+1 −1		p4rt_app/sonic/hashing.cc
+1 −1		p4rt_app/tests/p4_programs_test.cc