Merge EVERFLOW test updates

ansible/ansible.cfg

@@ -157,7 +157,7 @@ callback_whitelist = profile_tasks
 # current IP information.
 fact_caching = jsonfile
 fact_caching_connection = ~/.ansible/cache
-fact_caching_timeout = 600
+fact_caching_timeout = 1200
 
 
 # retry files

ansible/group_vars/sonic/sku-sensors-data.yml

@@ -49,14 +49,14 @@ sensors_checks:
     compares:
       fan: []
       power:
-      - - SMF_S6100_ON-isa-0000/Psu1 Input/power1_input
-        - SMF_S6100_ON-isa-0000/Psu1 Input/power1_max
-      - - SMF_S6100_ON-isa-0000/Psu1 Output/power2_input
-        - SMF_S6100_ON-isa-0000/Psu1 Output/power2_max
-      - - SMF_S6100_ON-isa-0000/Psu2 Input/power3_input
-        - SMF_S6100_ON-isa-0000/Psu2 Input/power3_max
-      - - SMF_S6100_ON-isa-0000/Psu2 Output/power4_input
-        - SMF_S6100_ON-isa-0000/Psu2 Output/power4_max
+      - - SMF_S6100_ON-isa-0000/PSU1 Input  Power/power1_input
+        - SMF_S6100_ON-isa-0000/PSU1 Input  Power/power1_max
+      - - SMF_S6100_ON-isa-0000/PSU1 Output Power/power2_input
+        - SMF_S6100_ON-isa-0000/PSU1 Output Power/power2_max
+      - - SMF_S6100_ON-isa-0000/PSU2 Input  Power/power3_input
+        - SMF_S6100_ON-isa-0000/PSU2 Input  Power/power3_max
+      - - SMF_S6100_ON-isa-0000/PSU2 Output Power/power4_input
+        - SMF_S6100_ON-isa-0000/PSU2 Output Power/power4_max
       temp:
       - - coretemp-isa-0000/Core 0/temp2_input
         - coretemp-isa-0000/Core 0/temp2_crit
@@ -78,10 +78,10 @@ sensors_checks:
         - SMF_S6100_ON-isa-0000/Front GE/temp10_crit
       - - SMF_S6100_ON-isa-0000/Front SFP+/temp11_input
         - SMF_S6100_ON-isa-0000/Front SFP+/temp11_crit
-      - - SMF_S6100_ON-isa-0000/PSU 1/temp14_input
-        - SMF_S6100_ON-isa-0000/PSU 1/temp14_crit
-      - - SMF_S6100_ON-isa-0000/PSU 2/temp15_input
-        - SMF_S6100_ON-isa-0000/PSU 2/temp15_crit
+      - - SMF_S6100_ON-isa-0000/PSU1 Temp/temp14_input
+        - SMF_S6100_ON-isa-0000/PSU1 Temp/temp14_max
+      - - SMF_S6100_ON-isa-0000/PSU2 Temp/temp15_input
+        - SMF_S6100_ON-isa-0000/PSU2 Temp/temp15_max
     non_zero:
       fan:
       - SMF_S6100_ON-isa-0000/Tray1 Fan1/fan1_input
@@ -121,10 +121,10 @@ sensors_checks:
        - SMF_S6100_ON-isa-0000/PSU1 VOUT/in30_input
        - SMF_S6100_ON-isa-0000/PSU2 VIN/in31_input
        - SMF_S6100_ON-isa-0000/PSU2 VOUT/in32_input
-       - SMF_S6100_ON-isa-0000/Psu1 Input/power1_input
-       - SMF_S6100_ON-isa-0000/Psu1 Output/power2_input
-       - SMF_S6100_ON-isa-0000/Psu2 Input/power3_input
-       - SMF_S6100_ON-isa-0000/Psu2 Output/power4_input
+       - SMF_S6100_ON-isa-0000/PSU1 Input  Power/power1_input
+       - SMF_S6100_ON-isa-0000/PSU1 Output Power/power2_input
+       - SMF_S6100_ON-isa-0000/PSU2 Input  Power/power3_input
+       - SMF_S6100_ON-isa-0000/PSU2 Output Power/power4_input
        - SMF_S6100_ON-isa-0000/XP1R0V/curr21_input
        - SMF_S6100_ON-isa-0000/XP1R0V_ROV/curr22_input
       temp:
@@ -139,14 +139,12 @@ sensors_checks:
        - SMF_S6100_ON-isa-0000/U2 Switch board?/temp9_input
        - SMF_S6100_ON-isa-0000/Front GE/temp10_input
        - SMF_S6100_ON-isa-0000/Front SFP+/temp11_input
-       - SMF_S6100_ON-isa-0000/BCM Internal/temp12_input
-       - SMF_S6100_ON-isa-0000/CPU Internal/temp13_input
-       - SMF_S6100_ON-isa-0000/PSU 1/temp14_input
-       - SMF_S6100_ON-isa-0000/PSU 2/temp15_input
+       - SMF_S6100_ON-isa-0000/PSU1 Temp/temp14_input
+       - SMF_S6100_ON-isa-0000/PSU2 Temp/temp15_input
 
     psu_skips: {}
 
-  Force10-Z9100:
+  Force10-Z9100-C32:
     alarms:
       fan:
       - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_alarm
@@ -217,14 +215,14 @@ sensors_checks:
       - - coretemp-isa-0000/Core 3/temp5_input
         - coretemp-isa-0000/Core 3/temp5_crit
       power:
-      - - SMF_Z9100_ON-isa-0000/Psu1 Input/power1_input
-        - SMF_Z9100_ON-isa-0000/Psu1 Input/power1_max
-      - - SMF_Z9100_ON-isa-0000/Psu1 Output/power2_input
-        - SMF_Z9100_ON-isa-0000/Psu1 Output/power2_max
-      - - SMF_Z9100_ON-isa-0000/Psu2 Input/power3_input
-        - SMF_Z9100_ON-isa-0000/Psu2 Input/power3_max
-      - - SMF_Z9100_ON-isa-0000/Psu2 Output/power4_input
-        - SMF_Z9100_ON-isa-0000/Psu2 Output/power4_max
+      - - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_max
+      - - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_max
       fan: []
     non_zero:
       fan:
@@ -241,10 +239,10 @@ sensors_checks:
       - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_input
       - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_input
       power:
-      - SMF_Z9100_ON-isa-0000/Psu1 Input/power1_input
-      - SMF_Z9100_ON-isa-0000/Psu1 Output/power2_input
-      - SMF_Z9100_ON-isa-0000/Psu2 Input/power3_input
-      - SMF_Z9100_ON-isa-0000/Psu2 Output/power4_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
       - SMF_Z9100_ON-isa-0000/PSU1 VIN/in29_input
       - SMF_Z9100_ON-isa-0000/PSU1 VOUT/in30_input
       - SMF_Z9100_ON-isa-0000/PSU2 VIN/in31_input
@@ -262,8 +260,135 @@ sensors_checks:
       - SMF_Z9100_ON-isa-0000/Front BCM On-Board (U2)/temp4_input
       - "SMF_Z9100_ON-isa-0000/BCM Switch On-Board #1 (U38)/temp6_input"
       - SMF_Z9100_ON-isa-0000/Rear (U2900)/temp9_input
-      - SMF_Z9100_ON-isa-0000/PSU 1/temp14_input
-      - SMF_Z9100_ON-isa-0000/PSU 2/temp15_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Temp/temp14_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Temp/temp15_input
+
+    psu_skips: {}
+
+  Force10-Z9100-C8D48:
+    alarms:
+      fan:
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_alarm
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_fault
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan2/fan2_alarm
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan2/fan2_fault
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan1/fan3_alarm
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan1/fan3_fault
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan2/fan4_alarm
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan2/fan4_fault
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan1/fan5_alarm
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan1/fan5_fault
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan2/fan6_alarm
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan2/fan6_fault
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan1/fan7_alarm
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan1/fan7_fault
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan2/fan8_alarm
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan2/fan8_fault
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan1/fan9_alarm
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan1/fan9_fault
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan2/fan10_alarm
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan2/fan10_fault
+      - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_alarm
+      - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_fault
+      - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_alarm
+      - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_fault
+      temp:
+      - coretemp-isa-0000/Core 0/temp2_crit_alarm
+      - coretemp-isa-0000/Core 1/temp3_crit_alarm
+      - coretemp-isa-0000/Core 2/temp4_crit_alarm
+      - coretemp-isa-0000/Core 3/temp5_crit_alarm
+      power:
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_EARLY/in1_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP5R0V_CP/in2_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_STD/in3_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_CP /in4_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_STD/in3_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP3R3V_CP /in4_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP0R75V_VTT_A/in5_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP0R75V_VTT_B/in6_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R07V_CPU/in7_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R0V_CPU/in8_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP12R0V/in9_alarm
+      - SMF_Z9100_ON-isa-0000/CPU VDDR_CPU_2/in10_alarm
+      - SMF_Z9100_ON-isa-0000/CPU VDDR_CPU_1/in11_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R5V_CLK/in12_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R35V_CPU/in13_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R8V_CPU/in14_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R0V_CPU_VNN/in15_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R0V_CPU_VCC/in16_alarm
+      - SMF_Z9100_ON-isa-0000/CPU XP1R5V_EARLY/in17_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP3R3V_MON/in19_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R8V_MON/in20_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R25V_MON/in21_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R2V_MON/in22_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R0V_SW_MON/in23_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R0V_ROV_SW_MON/in24_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP5V_MB_MON/in25_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP1R8V_FPGA_MON/in26_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP3R3V_FPGA_MON/in27_alarm
+      - SMF_Z9100_ON-isa-0000/SW XP3R3V_EARLY_MON/in28_alarm
+
+    compares:
+      temp:
+      - - coretemp-isa-0000/Core 0/temp2_input
+        - coretemp-isa-0000/Core 0/temp2_crit
+      - - coretemp-isa-0000/Core 1/temp3_input
+        - coretemp-isa-0000/Core 1/temp3_crit
+      - - coretemp-isa-0000/Core 2/temp4_input
+        - coretemp-isa-0000/Core 2/temp4_crit
+      - - coretemp-isa-0000/Core 3/temp5_input
+        - coretemp-isa-0000/Core 3/temp5_crit
+      power:
+      - - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_max
+      - - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+        - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_max
+      - - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
+        - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_max
+      fan: []
+    non_zero:
+      fan:
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan1/fan1_input
+      - SMF_Z9100_ON-isa-0000/Tray1 Fan2/fan2_input
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan1/fan3_input
+      - SMF_Z9100_ON-isa-0000/Tray2 Fan2/fan4_input
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan1/fan5_input
+      - SMF_Z9100_ON-isa-0000/Tray3 Fan2/fan6_input
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan1/fan7_input
+      - SMF_Z9100_ON-isa-0000/Tray4 Fan2/fan8_input
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan1/fan9_input
+      - SMF_Z9100_ON-isa-0000/Tray5 Fan2/fan10_input
+      - SMF_Z9100_ON-isa-0000/Psu1 Fan/fan11_input
+      - SMF_Z9100_ON-isa-0000/Psu2 Fan/fan12_input
+      power:
+      - SMF_Z9100_ON-isa-0000/PSU1 Input  Power/power1_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Output Power/power2_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Input  Power/power3_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Output Power/power4_input
+      - SMF_Z9100_ON-isa-0000/PSU1 VIN/in29_input
+      - SMF_Z9100_ON-isa-0000/PSU1 VOUT/in30_input
+      - SMF_Z9100_ON-isa-0000/PSU2 VIN/in31_input
+      - SMF_Z9100_ON-isa-0000/PSU2 VOUT/in32_input
+      - SMF_Z9100_ON-isa-0000/XP1R0V/curr21_input
+      - SMF_Z9100_ON-isa-0000/XP1R0V_ROV/curr22_input
+
+      temp:
+      - coretemp-isa-0000/Core 0/temp2_input
+      - coretemp-isa-0000/Core 1/temp3_input
+      - coretemp-isa-0000/Core 2/temp4_input
+      - coretemp-isa-0000/Core 3/temp5_input
+      - SMF_Z9100_ON-isa-0000/CPU On-board (U2900)/temp1_input
+      - "SMF_Z9100_ON-isa-0000/BCM Switch On-Board #1 (U44)/temp2_input"
+      - SMF_Z9100_ON-isa-0000/Front BCM On-Board (U4)/temp3_input
+      - SMF_Z9100_ON-isa-0000/Front BCM On-Board (U2)/temp4_input
+      - "SMF_Z9100_ON-isa-0000/BCM Switch On-Board #1 (U38)/temp6_input"
+      - SMF_Z9100_ON-isa-0000/Rear (U2900)/temp9_input
+      - SMF_Z9100_ON-isa-0000/PSU1 Temp/temp14_input
+      - SMF_Z9100_ON-isa-0000/PSU2 Temp/temp15_input
 
     psu_skips: {}
 

ansible/library/minigraph_facts.py

@@ -478,7 +478,7 @@ def parse_xml(filename, hostname):
         s100G_ports = [x for x in range(24, 40, 4)] + [x for x in range(88, 104, 4)]
 
         for i in s50G_ports:
-            alias = "etp%d" % (i / 4 + 1) + "a" if i % 4 == 0 else "b"
+            alias = "etp%d" % (i / 4 + 1) + ("a" if i % 4 == 0 else "b")
             port_alias_map[alias] = "Ethernet%d" % i
         for i in s100G_ports:
             alias = "etp%d" % (i / 4 + 1)

ansible/linkstate/testbed_inv.py

@@ -25,7 +25,7 @@ def read_config():
 def parse_testbed_configuration(filename, target):
     with open(filename) as fp:
         for line in fp:
-            if line.startswith(target):
+            if line.startswith(target + ','):
                 splitted_line = line.split(",")
                 ptf_name = splitted_line[1]
                 topo_name = splitted_line[2]

ansible/plugins/connection/switch.py

@@ -71,7 +71,7 @@ def _spawn_connect(self):
                 self._display.vvv("SSH: EXEC {0}".format(' '.join(cmd)),
                               host=self.host)
                 last_user = user
-                client = pexpect.spawn(' '.join(cmd), env={'TERM': 'dumb'})
+                client = pexpect.spawn(' '.join(cmd), env={'TERM': 'dumb'}, timeout=60)
                 i = client.expect(['[Pp]assword:', pexpect.EOF])
                 if i == 1:
                     self._display.vvv("Server closed the connection, retry in %d seconds" % self.connection_retry_interval, host=self.host)

ansible/roles/eos/tasks/main.yml

@@ -50,6 +50,22 @@
 - name: build a startup config
   template: src="{{ topo }}-{{ props.swrole }}.j2"
             dest=/mnt/flash/startup-config
-  when: configuration is defined
-  notify:
-    - Restart the box
+  when: hostname in configuration
+
+- name: Restart the box
+  command: /sbin/shutdown -r now "Ansible updates triggered"
+  when: hostname in configuration
+
+- name: Pause for reboot
+  pause: seconds=30
+  when: hostname in configuration
+
+- name: Wait for VM to come up
+  wait_for:
+    host: "{{ ansible_ssh_host }}"
+    port: 22
+    state: started
+    delay: 10
+    timeout: 600
+  connection: local
+  when: hostname in configuration

ansible/roles/eos/templates/t0-64-leaf.j2

@@ -38,6 +38,8 @@ route-map DEFAULT_ROUTES permit
 {% for podset in range(0, props.podset_number) %}
 {% for tor in range(0, props.tor_number) %}
 {% for subnet in range(0, props.tor_subnet_number) %}
+{# Skip tor 0 podset 0 #}
+{% if podset != 0 or tor != 0 %}
 {% set suffix = ( (podset * props.tor_number * props.max_tor_subnet_number * props.tor_subnet_size) +
                   (tor * props.max_tor_subnet_number * props.tor_subnet_size) +
                   (subnet * props.tor_subnet_size) ) %}
@@ -49,6 +51,7 @@ route-map DEFAULT_ROUTES permit
 {% set prefixlen_v4 = (32 - ((props.tor_subnet_size | log(2))) | int) %}
 ip route {{ octet1 }}.{{ octet2 }}.{{ octet3 }}.{{ octet4 }}/{{ prefixlen_v4 }} {{ props.nhipv4 }}
 ipv6 route {{ '20%02x' % octet1 }}:{{ '%02X%02X' % (octet2, octet3) }}:0:{{ '%02X' % octet4 }}::/64 {{ props.nhipv6 }}
+{% endif %}
 {% endfor %}
 {% endfor %}
 {% endfor %}

ansible/roles/fanout/tasks/fanout_mlnx.yml

@@ -0,0 +1,51 @@
+##############################################################################################
+### playbook to deploy the fanout swtich
+### Use this playbook to deploy the VLAN configurations of fanout leaf switch in SONiC testbed
+### This playbook will run based on hardware flatform. Each fanout switch hardware type has its
+### own unique feature and configuration command or format. Unless you use the hardware swtich
+### specified in this playbook, you would need to come up with your own fanout switch deployment
+### playbook
+################################################################################################
+  # Gather minigraph facts
+- name: Gathering lab graph facts about the device
+  conn_graph_facts: host={{ inventory_hostname }}
+  connection: local
+  tags: always
+
+- name: prepare fanout switch admin login info
+  set_fact: ansible_ssh_user={{ fanout_admin_user }} ansible_ssh_pass={{ fanout_admin_password }} peer_hwsku={{device_info['HwSku']}}
+  tags: always
+
+- set_fact:
+    fanout_root_user: "user"
+    fanout_root_pass: "password"
+  tags: deploy,pfcwd_config,check_pfcwd_config
+
+ ##########################################################
+ # deploy tasks to deploy default configuration on fanout #
+ ##########################################################
+- block:
+  - debug: msg={{ inventory_hostname }}
+  - name: build fanout startup config for fanout mlnx-os-switch
+    action: apswitch template=mlnx_fanout.j2
+    connection: switch
+    args:
+      login: "{{ switch_login['MLNX-OS'] }}"
+    vars:
+      action_variable: "deploy"
+    when: peer_hwsku == "MLNX-OS"
+    tags: deploy
+
+ ###################################################################
+ # build, deploy and start docker images for the PFC WD test       #
+ ###################################################################
+- include: mlnx/deploy_pfcwd_fanout.yml
+  when: peer_hwsku == "MLNX-OS"
+  tags: deploy,pfcwd_config
+
+ ###################################################################
+ # check and recover docker images for the PFC WD test             #
+ ###################################################################
+- include: mlnx/check_pfcwd_fanout.yml
+  when: peer_hwsku == "MLNX-OS"
+  tags: check_pfcwd_config