Merged PR 698: Revert 'Add a hotfix for BCM SAI 7.1.0'

**The hotfix is no longer required after PR sonic-net/sonic-buildimage#10962 is merged** Add a hotfix for BCM SAI 7.1.0 We are seeing Mux tunnel creation failure after BCM SAI is upgrated to `7.1.0` in PR sonic-net/sonic-buildimage#10583. This PR is to patch the `bcm.config` for `dualtor` deployment to workaround this issue until the issue is fixed in image. This PR will add `sai_remap_prio_on_tnl_egress=1` into `bcm.config` if the device is running `master` image, and deployment is `dualtor`, and the SKU contains `arista`. The change is validated by manually running `./testbed-cli.sh deploy-mg vms24-dual-t0-7050-2 str2 password.txt ` Signed-off-by: bingwang <bingwang@microsoft.com> Reverts !577
StormLiangMS · Jul 1, 2022 · 1bf7f04 · 1bf7f04
2 parents 26f1e50 + ed8bb72
commit 1bf7f04
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 90 deletions.
diff --git a/ansible/config_sonic_basedon_testbed.yml b/ansible/config_sonic_basedon_testbed.yml
@@ -487,12 +487,6 @@
         shell: systemctl start topology.service
         when: start_topo_service is defined and start_topo_service|bool == true
 
-      # Remove me when the sai_remap_prio_on_tnl_egress=1 is integrated into image
-      - name: Patch bcm.config to workaround BCM SAI issue
-        bcm_sai_patch:
-        ignore_errors: yes
-        become: true
-
       - name: Patch rsyslog.conf to stop sending syslog to production
         lineinfile:
           path: "{{ rsyslog_conf_path }}"

diff --git a/ansible/library/bcm_sai_patch.py b/ansible/library/bcm_sai_patch.py