diff --git a/ansible/group_vars/all/labinfo.json b/ansible/group_vars/all/labinfo.json
index abb4d3743a7..deefc789875 100644
--- a/ansible/group_vars/all/labinfo.json
+++ b/ansible/group_vars/all/labinfo.json
@@ -4,6 +4,7 @@
         "Arista-7508-Q288": "Arista",
         "Arista-7260QX-64": "Arista",
         "Arista-7060CX-32S": "Arista",
+        "Arista-7060CX-32S-C32": "Arista",
         "Arista-VM": "Arista",
         "Nexus-3064-NX": "Nexus",
         "Force10-S6100": "Force10",
diff --git a/ansible/roles/test/tasks/crm.yml b/ansible/roles/test/tasks/crm.yml
index 0173d361737..690e52dfb00 100644
--- a/ansible/roles/test/tasks/crm.yml
+++ b/ansible/roles/test/tasks/crm.yml
@@ -12,6 +12,9 @@
    - set_fact: crm_intf="{{minigraph_portchannel_interfaces[0].attachto}}"
      when: (testbed_type == "t0") or (testbed_type == "t1-lag")
 
+   - set_fact:
+        ansible_date_time: "{{ansible_date_time}}"
+
    - name: Set polling interval
      command: crm config polling interval 1
 
diff --git a/ansible/roles/test/tasks/link_flap/link_flap_helper.yml b/ansible/roles/test/tasks/link_flap/link_flap_helper.yml
index 83c48928ed3..dd20842b0c6 100644
--- a/ansible/roles/test/tasks/link_flap/link_flap_helper.yml
+++ b/ansible/roles/test/tasks/link_flap/link_flap_helper.yml
@@ -18,6 +18,7 @@
     - set_fact:
         peer_host: "{{device_info['mgmtip']}}"
         peer_hwsku: "{{device_info['HwSku']}}"
+        peer_type: "{{device_info['Type']}}"
 
     - set_fact:
         intfs_to_exclude: "{{interface}}"
@@ -28,6 +29,18 @@
         host: "{{peer_host}}"
         login: "{{switch_login[hwsku_map[peer_hwsku]]}}"
       connection: switch
+      when: peer_type == "FanoutLeaf"
+
+    - name: find interface name mapping
+      port_alias: hwsku="{{peer_hwsku}}"
+      delegate_to: "{{peer_host}}"
+      when: peer_type == "FanoutLeafSonic"
+
+    - name: Shutting down neighbor interface {{neighbor_interface}} on {{peer_host}}
+      become: true
+      shell: ip link set {{port_alias_map[neighbor_interface]}} down
+      delegate_to: "{{peer_host}}"
+      when: peer_type == "FanoutLeafSonic"
 
     - pause:
         seconds: 20
@@ -50,6 +63,13 @@
         host: "{{peer_host}}"
         login: "{{switch_login[hwsku_map[peer_hwsku]]}}"
       connection: switch
+      when: peer_type == "FanoutLeaf"
+
+    - name: Bring up neighbor interface {{neighbor_interface}} on {{peer_host}}
+      become: true
+      shell: ip link set {{port_alias_map[neighbor_interface]}} up
+      delegate_to: "{{peer_host}}"
+      when: peer_type == "FanoutLeafSonic"
 
     - pause:
         seconds: 20