From 97129717a561d1ede7127cc38014be0bc2cdcc4c Mon Sep 17 00:00:00 2001 From: Jack Adolph Date: Tue, 21 Apr 2020 13:23:44 +1000 Subject: [PATCH] Rename files to be valid python identifiers --- ...{bond-with-vlan.yml => bond_with_vlan.yml} | 0 ...dge-with-vlan.yml => bridge_with_vlan.yml} | 0 ...th-simple-auto.yml => eth_simple_auto.yml} | 0 ...th-with-802-1x.yml => eth_with_802_1x.yml} | 0 .../{eth-with-vlan.yml => eth_with_vlan.yml} | 0 ...tool-features.yml => ethtool_features.yml} | 0 ...fault.yml => ethtool_features_default.yml} | 0 tests/{get-coverage.sh => get_coverage.sh} | 4 ++-- tests/{get-coverage.yml => get_coverage.yml} | 0 ...otal-coverage.sh => get_total_coverage.sh} | 6 +++--- .../{merge-coverage.sh => merge_coverage.sh} | 0 tests/playbooks/tests_802_1x.yml | 4 ++-- tests/playbooks/tests_bridge.yml | 12 +++++------ tests/playbooks/tests_checkpoint_cleanup.yml | 8 ++++---- tests/playbooks/tests_ethernet.yml | 10 +++++----- tests/playbooks/tests_ethtool_features.yml | 8 ++++---- tests/playbooks/tests_reapply.yml | 8 ++++---- tests/playbooks/tests_states.yml | 16 +++++++-------- tests/playbooks/tests_vlan_mtu.yml | 12 +++++------ ...ce_absent.yml => assert_device_absent.yml} | 2 +- ..._present.yml => assert_device_present.yml} | 2 +- ...e_absent.yml => assert_profile_absent.yml} | 2 +- ...present.yml => assert_profile_present.yml} | 2 +- ...x_server.yml => cleanup_802_1x_server.yml} | 0 tests/tasks/create-and-remove-interface.yml | 20 ------------------- tests/tasks/create_and_remove_interface.yml | 20 +++++++++++++++++++ ...erfaces.yml => get_current_interfaces.yml} | 0 ...erface_stat.yml => get_interface_stat.yml} | 0 ...-profile_stat.yml => get_profile_stat.yml} | 0 ...nterface.yml => manage_test_interface.yml} | 3 +-- ..._1x_server.yml => setup_802_1x_server.yml} | 0 ...how-interfaces.yml => show_interfaces.yml} | 2 +- ...erts.yml => tests_helpers_and_asserts.yml} | 6 +++--- 33 files changed, 73 insertions(+), 74 deletions(-) rename examples/{bond-with-vlan.yml => bond_with_vlan.yml} (100%) rename examples/{bridge-with-vlan.yml => bridge_with_vlan.yml} (100%) rename examples/{eth-simple-auto.yml => eth_simple_auto.yml} (100%) rename examples/{eth-with-802-1x.yml => eth_with_802_1x.yml} (100%) rename examples/{eth-with-vlan.yml => eth_with_vlan.yml} (100%) rename examples/{ethtool-features.yml => ethtool_features.yml} (100%) rename examples/{ethtool-features-default.yml => ethtool_features_default.yml} (100%) rename tests/{get-coverage.sh => get_coverage.sh} (94%) rename tests/{get-coverage.yml => get_coverage.yml} (100%) rename tests/{get-total-coverage.sh => get_total_coverage.sh} (80%) rename tests/{merge-coverage.sh => merge_coverage.sh} (100%) rename tests/tasks/{assert-device_absent.yml => assert_device_absent.yml} (84%) rename tests/tasks/{assert-device_present.yml => assert_device_present.yml} (84%) rename tests/tasks/{assert-profile_absent.yml => assert_profile_absent.yml} (86%) rename tests/tasks/{assert-profile_present.yml => assert_profile_present.yml} (86%) rename tests/tasks/{cleanup-802_1x_server.yml => cleanup_802_1x_server.yml} (100%) delete mode 100644 tests/tasks/create-and-remove-interface.yml create mode 100644 tests/tasks/create_and_remove_interface.yml rename tests/tasks/{get-current_interfaces.yml => get_current_interfaces.yml} (100%) rename tests/tasks/{get-interface_stat.yml => get_interface_stat.yml} (100%) rename tests/tasks/{get-profile_stat.yml => get_profile_stat.yml} (100%) rename tests/tasks/{manage-test-interface.yml => manage_test_interface.yml} (95%) rename tests/tasks/{setup-802_1x_server.yml => setup_802_1x_server.yml} (100%) rename tests/tasks/{show-interfaces.yml => show_interfaces.yml} (74%) rename tests/{tests_helpers-and-asserts.yml => tests_helpers_and_asserts.yml} (80%) diff --git a/examples/bond-with-vlan.yml b/examples/bond_with_vlan.yml similarity index 100% rename from examples/bond-with-vlan.yml rename to examples/bond_with_vlan.yml diff --git a/examples/bridge-with-vlan.yml b/examples/bridge_with_vlan.yml similarity index 100% rename from examples/bridge-with-vlan.yml rename to examples/bridge_with_vlan.yml diff --git a/examples/eth-simple-auto.yml b/examples/eth_simple_auto.yml similarity index 100% rename from examples/eth-simple-auto.yml rename to examples/eth_simple_auto.yml diff --git a/examples/eth-with-802-1x.yml b/examples/eth_with_802_1x.yml similarity index 100% rename from examples/eth-with-802-1x.yml rename to examples/eth_with_802_1x.yml diff --git a/examples/eth-with-vlan.yml b/examples/eth_with_vlan.yml similarity index 100% rename from examples/eth-with-vlan.yml rename to examples/eth_with_vlan.yml diff --git a/examples/ethtool-features.yml b/examples/ethtool_features.yml similarity index 100% rename from examples/ethtool-features.yml rename to examples/ethtool_features.yml diff --git a/examples/ethtool-features-default.yml b/examples/ethtool_features_default.yml similarity index 100% rename from examples/ethtool-features-default.yml rename to examples/ethtool_features_default.yml diff --git a/tests/get-coverage.sh b/tests/get_coverage.sh similarity index 94% rename from tests/get-coverage.sh rename to tests/get_coverage.sh index 7f21f48..858a8cf 100755 --- a/tests/get-coverage.sh +++ b/tests/get_coverage.sh @@ -33,10 +33,10 @@ call_ansible() { remote_coverage_dir="$(mktemp -d /tmp/remote_coverage-XXXXXX)" trap "rm -rf '${remote_coverage_dir}'" EXIT -ansible-playbook -i "${host}", get-coverage.yml -e "test_playbook=${playbook} destdir=${remote_coverage_dir}" +ansible-playbook -i "${host}", get_coverage.yml -e "test_playbook=${playbook} destdir=${remote_coverage_dir}" #COVERAGE_FILE=remote-coverage coverage combine remote-coverage/tests_*/*/root/.coverage -./merge-coverage.sh coverage "${coverage_data}"-tmp $(find "${remote_coverage_dir}" -type f | tr , _) +./merge_coverage.sh coverage "${coverage_data}"-tmp $(find "${remote_coverage_dir}" -type f | tr , _) cat > tmp_merge_coveragerc <- TEST: I can configure the MTU for a vlan interface without autoconnect. debug: @@ -38,10 +38,10 @@ ip: dhcp4: false auto6: false - - include_tasks: tasks/assert-device_present.yml + - include_tasks: tasks/assert_device_present.yml vars: interface: "{{ vlan_interface }}" - - include_tasks: tasks/assert-profile_present.yml + - include_tasks: tasks/assert_profile_present.yml vars: profile: "{{ item }}" loop: @@ -62,6 +62,6 @@ persistent_state: absent state: down ignore_errors: true - - include_tasks: tasks/manage-test-interface.yml + - include_tasks: tasks/manage_test_interface.yml vars: state: absent diff --git a/tests/tasks/assert-device_absent.yml b/tests/tasks/assert_device_absent.yml similarity index 84% rename from tests/tasks/assert-device_absent.yml rename to tests/tasks/assert_device_absent.yml index 67b83ad..39fa30a 100644 --- a/tests/tasks/assert-device_absent.yml +++ b/tests/tasks/assert_device_absent.yml @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- include: get-interface_stat.yml +- include: get_interface_stat.yml - name: "assert that interface {{ interface }} is absent" assert: that: not interface_stat.stat.exists diff --git a/tests/tasks/assert-device_present.yml b/tests/tasks/assert_device_present.yml similarity index 84% rename from tests/tasks/assert-device_present.yml rename to tests/tasks/assert_device_present.yml index e0d4097..583b729 100644 --- a/tests/tasks/assert-device_present.yml +++ b/tests/tasks/assert_device_present.yml @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- include: get-interface_stat.yml +- include: get_interface_stat.yml - name: "assert that interface {{ interface }} is present" assert: that: interface_stat.stat.exists diff --git a/tests/tasks/assert-profile_absent.yml b/tests/tasks/assert_profile_absent.yml similarity index 86% rename from tests/tasks/assert-profile_absent.yml rename to tests/tasks/assert_profile_absent.yml index e7a6fde..05dc3fc 100644 --- a/tests/tasks/assert-profile_absent.yml +++ b/tests/tasks/assert_profile_absent.yml @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- include: get-profile_stat.yml +- include: get_profile_stat.yml - name: "assert that profile '{{ profile }}' is absent" assert: that: not profile_stat.stat.exists diff --git a/tests/tasks/assert-profile_present.yml b/tests/tasks/assert_profile_present.yml similarity index 86% rename from tests/tasks/assert-profile_present.yml rename to tests/tasks/assert_profile_present.yml index c84c080..2691c9e 100644 --- a/tests/tasks/assert-profile_present.yml +++ b/tests/tasks/assert_profile_present.yml @@ -1,6 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- include: get-profile_stat.yml +- include: get_profile_stat.yml - name: "assert that profile '{{ profile }}' is present" assert: that: profile_stat.stat.exists diff --git a/tests/tasks/cleanup-802_1x_server.yml b/tests/tasks/cleanup_802_1x_server.yml similarity index 100% rename from tests/tasks/cleanup-802_1x_server.yml rename to tests/tasks/cleanup_802_1x_server.yml diff --git a/tests/tasks/create-and-remove-interface.yml b/tests/tasks/create-and-remove-interface.yml deleted file mode 100644 index 9bebf6e..0000000 --- a/tests/tasks/create-and-remove-interface.yml +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause ---- -- include_tasks: show-interfaces.yml -- include_tasks: manage-test-interface.yml - vars: - state: absent -- include_tasks: show-interfaces.yml -- include_tasks: assert-device_absent.yml - -- include_tasks: manage-test-interface.yml - vars: - state: present -- include_tasks: show-interfaces.yml -- include_tasks: assert-device_present.yml - -- include_tasks: manage-test-interface.yml - vars: - state: absent -- include_tasks: show-interfaces.yml -- include_tasks: assert-device_absent.yml diff --git a/tests/tasks/create_and_remove_interface.yml b/tests/tasks/create_and_remove_interface.yml new file mode 100644 index 0000000..7ed96d4 --- /dev/null +++ b/tests/tasks/create_and_remove_interface.yml @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: BSD-3-Clause +--- +- include_tasks: show_interfaces.yml +- include_tasks: manage_test_interface.yml + vars: + state: absent +- include_tasks: show_interfaces.yml +- include_tasks: assert_device_absent.yml + +- include_tasks: manage_test_interface.yml + vars: + state: present +- include_tasks: show_interfaces.yml +- include_tasks: assert_device_present.yml + +- include_tasks: manage_test_interface.yml + vars: + state: absent +- include_tasks: show_interfaces.yml +- include_tasks: assert_device_absent.yml diff --git a/tests/tasks/get-current_interfaces.yml b/tests/tasks/get_current_interfaces.yml similarity index 100% rename from tests/tasks/get-current_interfaces.yml rename to tests/tasks/get_current_interfaces.yml diff --git a/tests/tasks/get-interface_stat.yml b/tests/tasks/get_interface_stat.yml similarity index 100% rename from tests/tasks/get-interface_stat.yml rename to tests/tasks/get_interface_stat.yml diff --git a/tests/tasks/get-profile_stat.yml b/tests/tasks/get_profile_stat.yml similarity index 100% rename from tests/tasks/get-profile_stat.yml rename to tests/tasks/get_profile_stat.yml diff --git a/tests/tasks/manage-test-interface.yml b/tests/tasks/manage_test_interface.yml similarity index 95% rename from tests/tasks/manage-test-interface.yml rename to tests/tasks/manage_test_interface.yml index e7b40f0..61f68d1 100644 --- a/tests/tasks/manage-test-interface.yml +++ b/tests/tasks/manage_test_interface.yml @@ -8,8 +8,7 @@ msg: "type needs to be dummy, tap or veth, not '{{ type }}'" when: type not in ["dummy", "tap", "veth"] -# - include: get-current_interfaces.yml -- include: show-interfaces.yml +- include: show_interfaces.yml - name: Install iproute package: diff --git a/tests/tasks/setup-802_1x_server.yml b/tests/tasks/setup_802_1x_server.yml similarity index 100% rename from tests/tasks/setup-802_1x_server.yml rename to tests/tasks/setup_802_1x_server.yml diff --git a/tests/tasks/show-interfaces.yml b/tests/tasks/show_interfaces.yml similarity index 74% rename from tests/tasks/show-interfaces.yml rename to tests/tasks/show_interfaces.yml index 704e8c5..6c2fbec 100644 --- a/tests/tasks/show-interfaces.yml +++ b/tests/tasks/show_interfaces.yml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- include: get-current_interfaces.yml +- include: get_current_interfaces.yml - debug: msg: "current_interfaces: {{ current_interfaces }}" diff --git a/tests/tests_helpers-and-asserts.yml b/tests/tests_helpers_and_asserts.yml similarity index 80% rename from tests/tests_helpers-and-asserts.yml rename to tests/tests_helpers_and_asserts.yml index b8ed257..5514182 100644 --- a/tests/tests_helpers-and-asserts.yml +++ b/tests/tests_helpers_and_asserts.yml @@ -4,13 +4,13 @@ hosts: all tasks: - name: test veth interface management - include_tasks: tasks/create-and-remove-interface.yml + include_tasks: tasks/create_and_remove_interface.yml vars: type: veth interface: veth1298 - name: test veth interface management - include_tasks: tasks/create-and-remove-interface.yml + include_tasks: tasks/create_and_remove_interface.yml vars: type: dummy interface: dummy1298 @@ -18,7 +18,7 @@ # FIXME: when: does not seem to work with include_tasks, therefore this cannot # be safely tested for now # - name: test tap interfaces -# include_tasks: tasks/create-and-remove-interface.yml +# include_tasks: tasks/create_and_remove_interface.yml # vars: # - type: tap # - interface: tap1298