From 957ab02e524631a237a8ff9f22b0637aaa063e9d Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Thu, 15 Mar 2018 17:52:54 +0530 Subject: [PATCH] Ensure network_cli nxos test is run only once - remove unnecessary files (#37462) Signed-off-by: Trishna Guha --- test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml | 4 ---- test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_ntp/tests/cli/sanity.yaml | 4 ---- test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml | 4 ---- .../integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_overlay_global/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_overlay_global/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_pim_interface/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_pim_interface/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml | 4 ---- .../integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_snmp_community/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_snmp_community/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_snmp_location/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_snmp_location/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_snmp_user/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_static_route/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_static_route/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_udld/tests/cli/sanity.yaml | 4 ---- test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_udld_interface/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_udld_interface/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_vpc/tests/cli/sanity.yaml | 4 ---- test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_vpc_interface/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_vpc_interface/tests/nxapi/sanity.yaml | 4 ---- test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml | 4 ---- test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml | 4 ---- .../targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml | 4 ---- .../targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml | 4 ---- 32 files changed, 128 deletions(-) delete mode 100644 test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_ntp/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_static_route/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_udld/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_vpc/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml delete mode 100644 test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml delete mode 100644 test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml diff --git a/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml b/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml deleted file mode 100644 index 413b3df3ac8..00000000000 --- a/test/integration/targets/nxos_hsrp/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_hsrp/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml deleted file mode 100644 index 7718b7c8582..00000000000 --- a/test/integration/targets/nxos_hsrp/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_hsrp/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_ntp/tests/cli/sanity.yaml b/test/integration/targets/nxos_ntp/tests/cli/sanity.yaml deleted file mode 100644 index c28f9d61456..00000000000 --- a/test/integration/targets/nxos_ntp/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_ntp/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml deleted file mode 100644 index 7e6a8bd9dbe..00000000000 --- a/test/integration/targets/nxos_ntp/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_ntp/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml b/test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml deleted file mode 100644 index 57109695e42..00000000000 --- a/test/integration/targets/nxos_ospf_vrf/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_ospf_vrf/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml deleted file mode 100644 index 1c3f845c164..00000000000 --- a/test/integration/targets/nxos_ospf_vrf/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_ospf_vrf/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml b/test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml deleted file mode 100644 index 420af7420e9..00000000000 --- a/test/integration/targets/nxos_overlay_global/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml deleted file mode 100644 index e30ea6eaf70..00000000000 --- a/test/integration/targets/nxos_overlay_global/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml b/test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml deleted file mode 100644 index 420af7420e9..00000000000 --- a/test/integration/targets/nxos_pim_interface/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml deleted file mode 100644 index e30ea6eaf70..00000000000 --- a/test/integration/targets/nxos_pim_interface/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml b/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml deleted file mode 100644 index b73edf246d7..00000000000 --- a/test/integration/targets/nxos_snapshot/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_snapshot/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml deleted file mode 100644 index a13de83ac73..00000000000 --- a/test/integration/targets/nxos_snapshot/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_snapshot/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml b/test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml deleted file mode 100644 index 420af7420e9..00000000000 --- a/test/integration/targets/nxos_snmp_community/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml deleted file mode 100644 index e30ea6eaf70..00000000000 --- a/test/integration/targets/nxos_snmp_community/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml b/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml deleted file mode 100644 index 420af7420e9..00000000000 --- a/test/integration/targets/nxos_snmp_location/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml deleted file mode 100644 index e30ea6eaf70..00000000000 --- a/test/integration/targets/nxos_snmp_location/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: "{{ role_path }}/tests/common/sanity.yaml" diff --git a/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml b/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml deleted file mode 100644 index ddc152e3093..00000000000 --- a/test/integration/targets/nxos_snmp_user/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_snmp_user/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml deleted file mode 100644 index 1ae7b202c4a..00000000000 --- a/test/integration/targets/nxos_snmp_user/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_snmp_user/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml b/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml deleted file mode 100644 index ad856f1460d..00000000000 --- a/test/integration/targets/nxos_static_route/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_static_route/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml deleted file mode 100644 index 5b4e0f8732e..00000000000 --- a/test/integration/targets/nxos_static_route/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_static_route/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_udld/tests/cli/sanity.yaml b/test/integration/targets/nxos_udld/tests/cli/sanity.yaml deleted file mode 100644 index 50c7c43faf9..00000000000 --- a/test/integration/targets/nxos_udld/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_udld/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml deleted file mode 100644 index 2eecada20dd..00000000000 --- a/test/integration/targets/nxos_udld/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_udld/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml b/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml deleted file mode 100644 index 50cbac84947..00000000000 --- a/test/integration/targets/nxos_udld_interface/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_udld_interface/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml deleted file mode 100644 index 5cfe70cc646..00000000000 --- a/test/integration/targets/nxos_udld_interface/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_udld_interface/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vpc/tests/cli/sanity.yaml b/test/integration/targets/nxos_vpc/tests/cli/sanity.yaml deleted file mode 100644 index c1cb1acb1a0..00000000000 --- a/test/integration/targets/nxos_vpc/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_vpc/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml deleted file mode 100644 index d04b6a422bd..00000000000 --- a/test/integration/targets/nxos_vpc/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_vpc/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml b/test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml deleted file mode 100644 index e490d8e5978..00000000000 --- a/test/integration/targets/nxos_vpc_interface/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_vpc_interface/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml deleted file mode 100644 index dea9331d126..00000000000 --- a/test/integration/targets/nxos_vpc_interface/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_vpc_interface/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml b/test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml deleted file mode 100644 index 47b06c4a1d2..00000000000 --- a/test/integration/targets/nxos_vrf_af/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_vrf_af/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml deleted file mode 100644 index ec7fd8ebc79..00000000000 --- a/test/integration/targets/nxos_vrf_af/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_vrf_af/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml b/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml deleted file mode 100644 index 3cb3ee6c49c..00000000000 --- a/test/integration/targets/nxos_vxlan_vtep_vni/tests/cli/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ cli }}" - -- import_tasks: targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml diff --git a/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml b/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml deleted file mode 100644 index 1c0c43c5ac4..00000000000 --- a/test/integration/targets/nxos_vxlan_vtep_vni/tests/nxapi/sanity.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- set_fact: connection="{{ nxapi }}" - -- import_tasks: targets/nxos_vxlan_vtep_vni/tests/common/sanity.yaml