Revert "Support snmp on FRR for LNOS"

This reverts commit 4ed334d.

 Conflicts:
	dockers/docker-fpm-frr/daemons.conf
	src/sonic-frr/frr

Author: zhenggen-xu

dockers/docker-fpm-frr/Dockerfile.j2

@@ -41,7 +41,6 @@ COPY ["start.sh", "config.sh", "/usr/bin/"]
 COPY ["daemons", "/etc/frr/"]
 COPY ["daemons.conf", "/etc/frr/"]
 COPY ["vtysh.conf", "/etc/frr/"]
-COPY ["snmp.conf", "/etc/snmp/frr.conf"]
 
 ENTRYPOINT /usr/bin/config.sh   \
         && /usr/bin/start.sh    \

dockers/docker-fpm-frr/daemons.conf

@@ -4,8 +4,8 @@
 # Check /etc/pam.d/frr if you intend to use "vtysh"!
 #
 vtysh_enable=yes
-zebra_options="  -s 90000000 --daemon -K 30 -A 127.0.0.1 -M fpm -M snmp"
-bgpd_options="   --daemon -A 127.0.0.1 -M snmp"
+zebra_options="  -s 90000000 --daemon -K 30 -A 127.0.0.1 -M fpm"
+bgpd_options="   --daemon -A 127.0.0.1"
 ospfd_options="  --daemon -A 127.0.0.1"
 ospf6d_options=" --daemon -A ::1"
 ripd_options="   --daemon -A 127.0.0.1"

dockers/docker-fpm-frr/frr.conf.j2

@@ -11,7 +11,6 @@ hostname {{ DEVICE_METADATA['localhost']['hostname'] }}
 password zebra
 log syslog informational
 log facility local4
-agentx
 ! enable password {# {{ en_passwd }} TODO: param needed #}
 {% endblock system_init %}
 !

dockers/docker-snmp-sv2/snmpd.conf.j2

@@ -118,14 +118,6 @@ load   12 10 5
 #
                                            #  Run as an AgentX master agent
 master          agentx
-# internal socket to allow extension to other docker containers
-# Currently the other container using this is docker-fpm-frr
-# make sure this line matches bgp:/etc/snmp/frr.conf 
-# please see testing procedure in the same file to verify this works
-# to verify the SNMP docker side look for the following string in the log file:
-# INFO snmp-subagent [ax_interface] INFO: Using agentx socket type tcp with path tcp:localhost:3161
-# INFO supervisord snmp-subagent INFO:ax_interface:Using agentx socket type tcp with path tcp:localhost:3161
-agentxsocket    tcp:localhost:3161
 
 #
 #  SysDescription pass-through

rules/frr.mk

@@ -5,7 +5,6 @@ export FRR_VERSION
 
 FRR = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
 $(FRR)_DEPENDS += $(LIBSNMP_DEV)
-$(FRR)_RDEPENDS += $(LIBSNMP)
 $(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr
 SONIC_MAKE_DEBS += $(FRR)
 

src/sonic-config-engine/tests/sample_output/frr.conf

@@ -8,7 +8,6 @@ hostname switch-t0
 password zebra
 log syslog informational
 log facility local4
-agentx
 ! enable password !
 ! Enable link-detect (default disabled)
 interface PortChannel01