Revert "Multi-ASIC implementation (#3888)"

This reverts commit 2e87a16.

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/sai.profile

@@ -1,5 +1,2 @@
-SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
-SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=32

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/sai.profile

@@ -1,5 +1,2 @@
-SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
-SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=32

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/sai.profile

@@ -1,5 +1,2 @@
-SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
-SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=32

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/sai.profile

@@ -1,5 +1,2 @@
-SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
-SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=32

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/sai.profile

@@ -1,5 +1,2 @@
-SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
-SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=32

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/sai.profile

@@ -1,5 +1,2 @@
-SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
-SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
-SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
-SAI_VS_HOSTIF_USE_TAP_DEVICE=true
-SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-s6000-32x40G.config.bcm
+SAI_NUM_ECMP_MEMBERS=32

device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/topology.sh

@@ -14,10 +14,9 @@ start () {
     # eth48 - eth63: asic5
     for ASIC in `seq $FIRST_FRONTEND_ASIC $LAST_FRONTEND_ASIC`; do
         for NUM in `seq 1 16`; do
-            ORIG="eth$((16 * $ASIC + $NUM))"
+            ORIG="eth$((16 * $ASIC + $NUM - 1))"
             TEMP="ethTemp999"
-            NEW="eth$(($NUM))"
-            echo "$ASIC : $NEW old $ORIG"
+            NEW="eth$(($NUM + 16))"
             ip link set dev $ORIG down
             ip link set dev $ORIG name $TEMP # rename to prevent conflicts before renaming in new namespace
             ip link set dev $TEMP netns asic$ASIC
@@ -30,9 +29,8 @@ start () {
     for BACKEND in `seq $FIRST_BACKEND_ASIC $LAST_BACKEND_ASIC`; do
         for FRONTEND in `seq $FIRST_FRONTEND_ASIC $LAST_FRONTEND_ASIC`; do
             for LINK in `seq 1 8`; do
-		FRONT_NAME="eth$((8 * $(($BACKEND - $FIRST_BACKEND_ASIC)) + $LINK + 16))"
-		BACK_NAME="eth$((8 * $FRONTEND + $LINK))"
-		echo "$FRONTEND:$FRONT_NAME - $BACKEND:$BACK_NAME"
+                BACK_NAME="eth$((8 * $FRONTEND + $LINK))"
+		FRONT_NAME="eth$((8 * $(($LAST_BACKEND_ASIC - $BACKEND)) + $LINK))" 
                 TEMP_BACK="ethBack999"
                 TEMP_FRONT="ethFront999"
 
@@ -54,7 +52,7 @@ stop() {
     for ASIC in `seq $FIRST_FRONTEND_ASIC $LAST_FRONTEND_ASIC`; do
         for NUM in `seq 1 16`; do
             TEMP="eth999"
-            OLD="eth$((16 * $ASIC + $NUM))"
+            OLD="eth$(($NUM + 16))"
             NAME="eth$((16 * $ASIC + $NUM - 1))"
             sudo ip netns exec asic$ASIC ip link set dev $OLD down
             sudo ip netns exec asic$ASIC ip link set dev $OLD name $TEMP
@@ -80,3 +78,4 @@ case "$1" in
         echo "Usage: $0 {start|stop}"
         ;;
 esac
+

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

@@ -23,20 +23,6 @@ route-map TO_BGP_PEER_V4 permit 100
 !
 route-map TO_BGP_PEER_V6 permit 100
 !
-{% if DEVICE_METADATA['localhost']['type'] == 'InternalFrontend' %}
-route-map HIDE_INTERNAL permit 10
-  set community local-AS
-!
-{% endif %}
-{% if DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
-route-map OVERRIDE_ORIGINATOR_ID permit 10
-{% for (name, prefix) in LOOPBACK_INTERFACE|pfx_filter %}
-{% if prefix | ipv4 and name == 'Loopback0' %}
-  set originator-id {{ prefix | ip }}
-{% endif %}
-{% endfor %}
-!
-{% endif %}
 {% if BGP_MONITORS is defined and BGP_MONITORS|length > 0 %}
 route-map FROM_BGPMON deny 10
 !
@@ -51,9 +37,6 @@ route-map set-next-hop-global-v6 permit 10
   set ipv6 next-hop prefer-global
 !
 router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
-{% if DEVICE_METADATA['localhost']['type'] == 'InternalFrontend' %}
-  redistribute connected route-map HIDE_INTERNAL
-{% endif %}
   bgp log-neighbor-changes
   bgp bestpath as-path multipath-relax
   no bgp default ipv4-unicast
@@ -168,9 +151,6 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   neighbor {{ neighbor_addr }} peer-group BGPMON
   neighbor {{ neighbor_addr }} description {{ bgp_session['name'] }}
   neighbor {{ neighbor_addr }} activate
-{% if DEVICE_METADATA['localhost']['type'] == 'InternalBackend' %}
-  neighbor {{ neighbor_addr }} route-map OVERRIDE_ORIGINATOR_ID in
-{% endif %}
   address-family ipv6
     neighbor {{ neighbor_addr }} activate
   exit-address-family