From 35f777f819ce8816030057cdb4266fac7c36f23a Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 3 Jan 2018 19:19:15 +0000 Subject: [PATCH 1/5] [cleanup] deprecate unused variable sensor_hwskus --- ansible/group_vars/sonic/vars | 2 -- 1 file changed, 2 deletions(-) diff --git a/ansible/group_vars/sonic/vars b/ansible/group_vars/sonic/vars index 8154122deb3..25345901c12 100644 --- a/ansible/group_vars/sonic/vars +++ b/ansible/group_vars/sonic/vars @@ -8,8 +8,6 @@ mellanox_hwskus: [ 'ACS-MSN2700' ] cavium_hwskus: [ "AS7512", "XP-SIM" ] -sensor_hwskus: [ "ACS-MSN2700", "Force10-S6000" ] - ## Note: ## Docker volumes should be list instead of dict. However, if we want to keep code DRY, we ## need to merge dictionaries, and convert them to list From 50469908918b7dbb9931a7951bb8b76744b000ab Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 3 Jan 2018 19:20:57 +0000 Subject: [PATCH 2/5] [test cases] fix a typo s/bgp_fact.yml/fdb.yml/ --- ansible/roles/test/vars/testcases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml index cb9ffe32c0a..0d8b41ac2f5 100644 --- a/ansible/roles/test/vars/testcases.yml +++ b/ansible/roles/test/vars/testcases.yml @@ -73,7 +73,7 @@ testcases: testbed_type: fdb: - filename: bgp_fact.yml + filename: fdb.yml topologies: [t0, t0-64, t0-64-32, t0-116] execvars: ptf_host: From 9da5939cf2230d0bbe696d3e86cfd4980ee68c72 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 3 Jan 2018 19:47:35 +0000 Subject: [PATCH 3/5] [test cases] add t0 and t0-116 to decap test --- ansible/roles/test/vars/testcases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml index 0d8b41ac2f5..d84485afd53 100644 --- a/ansible/roles/test/vars/testcases.yml +++ b/ansible/roles/test/vars/testcases.yml @@ -39,7 +39,7 @@ testcases: decap: filename: decap.yml - topologies: [t1, t1-lag, t1-64-lag] + topologies: [t1, t1-lag, t1-64-lag, t0, t0-116] execvars: ptf_host: testbed_type: From a7a8fdef53c4007d403fac584ade24a0cf9aebe4 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 3 Jan 2018 19:50:19 +0000 Subject: [PATCH 4/5] [test case] rename test case sensors_check to sensors To match the existing tag name. --- ansible/roles/test/vars/testcases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml index d84485afd53..8bdf7fa5491 100644 --- a/ansible/roles/test/vars/testcases.yml +++ b/ansible/roles/test/vars/testcases.yml @@ -122,7 +122,7 @@ testcases: filename: reboot.yml topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] - sensors_check: + sensors: filename: sensors_check.yml topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] From a08a0971752a436d07f28e0587cb2e27ecb945f4 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Wed, 3 Jan 2018 19:51:36 +0000 Subject: [PATCH 5/5] [test cases] cosmetic changes Add a space before t0-116 topology. --- ansible/roles/test/vars/testcases.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/test/vars/testcases.yml b/ansible/roles/test/vars/testcases.yml index 8bdf7fa5491..7d6feb2e665 100644 --- a/ansible/roles/test/vars/testcases.yml +++ b/ansible/roles/test/vars/testcases.yml @@ -92,11 +92,11 @@ testcases: link_flap: filename: link_flap.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] mem_check: filename: mem_check.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] neighbour: filename: neighbour.yml @@ -112,7 +112,7 @@ testcases: pfc_wd: filename: pfc_wd.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] qos: filename: qos.yml @@ -120,17 +120,17 @@ testcases: reboot: filename: reboot.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] sensors: filename: sensors_check.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] snmp: filename: snmp.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] syslog: filename: syslog.yml - topologies: [t0, t0-64, t0-64-32,t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64] + topologies: [t0, t0-64, t0-64-32, t0-116, t1, t1-lag, t1-64-lag, ptf32, ptf64]