From 25a069c2d41328f98036d0f5005678ad09141ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20K=C3=A4mmerling?= Date: Tue, 23 Feb 2021 11:42:11 +0100 Subject: [PATCH] Fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lukas Kämmerling --- .../integration/targets/hcloud_floating_ip/defaults/main.yml | 4 ++-- .../targets/hcloud_floating_ip_info/defaults/main.yml | 2 +- .../targets/hcloud_load_balancer/defaults/main.yml | 2 +- .../targets/hcloud_load_balancer_info/defaults/main.yml | 4 ++-- .../targets/hcloud_load_balancer_network/defaults/main.yml | 4 ++-- .../targets/hcloud_load_balancer_service/defaults/main.yml | 2 +- .../targets/hcloud_load_balancer_target/defaults/main.yml | 4 ++-- tests/integration/targets/hcloud_network/defaults/main.yml | 2 +- tests/integration/targets/hcloud_rdns/defaults/main.yml | 4 ++-- tests/integration/targets/hcloud_route/defaults/main.yml | 2 +- tests/integration/targets/hcloud_server/defaults/main.yml | 2 +- .../integration/targets/hcloud_server_info/defaults/main.yml | 2 +- .../targets/hcloud_server_network/defaults/main.yml | 4 ++-- tests/integration/targets/hcloud_ssh_key/defaults/main.yml | 2 +- .../integration/targets/hcloud_ssh_key_info/defaults/main.yml | 2 +- tests/integration/targets/hcloud_subnetwork/defaults/main.yml | 2 +- tests/integration/targets/hcloud_volume/defaults/main.yml | 4 ++-- .../integration/targets/hcloud_volume_info/defaults/main.yml | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/integration/targets/hcloud_floating_ip/defaults/main.yml b/tests/integration/targets/hcloud_floating_ip/defaults/main.yml index fc60d28..5e878d6 100644 --- a/tests/integration/targets/hcloud_floating_ip/defaults/main.yml +++ b/tests/integration/targets/hcloud_floating_ip/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_floating_ip_name: "{{hcloud_prefix}}-integration" -hcloud_server_name: "{{hcloud_prefix}}-fip-tests" \ No newline at end of file +hcloud_floating_ip_name: "{{hcloud_prefix}}-i" +hcloud_server_name: "{{hcloud_prefix}}-fip-t" diff --git a/tests/integration/targets/hcloud_floating_ip_info/defaults/main.yml b/tests/integration/targets/hcloud_floating_ip_info/defaults/main.yml index 2a21de7..f4c6a9f 100644 --- a/tests/integration/targets/hcloud_floating_ip_info/defaults/main.yml +++ b/tests/integration/targets/hcloud_floating_ip_info/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_floating_ip_name: "{{hcloud_prefix}}-integration" +hcloud_floating_ip_name: "{{hcloud_prefix}}-i" diff --git a/tests/integration/targets/hcloud_load_balancer/defaults/main.yml b/tests/integration/targets/hcloud_load_balancer/defaults/main.yml index 38e96f6..7f431cd 100644 --- a/tests/integration/targets/hcloud_load_balancer/defaults/main.yml +++ b/tests/integration/targets/hcloud_load_balancer/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_load_balancer_name: "{{hcloud_prefix}}-integration" +hcloud_load_balancer_name: "{{hcloud_prefix}}-i" diff --git a/tests/integration/targets/hcloud_load_balancer_info/defaults/main.yml b/tests/integration/targets/hcloud_load_balancer_info/defaults/main.yml index b5e5328..d82c213 100644 --- a/tests/integration/targets/hcloud_load_balancer_info/defaults/main.yml +++ b/tests/integration/targets/hcloud_load_balancer_info/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_load_balancer_name: "{{hcloud_prefix}}-integration" -hcloud_server_name: "{{hcloud_prefix}}-lb-info" +hcloud_load_balancer_name: "{{hcloud_prefix}}-i" +hcloud_server_name: "{{hcloud_prefix}}-lb-i" diff --git a/tests/integration/targets/hcloud_load_balancer_network/defaults/main.yml b/tests/integration/targets/hcloud_load_balancer_network/defaults/main.yml index 8747bff..6abf9ce 100644 --- a/tests/integration/targets/hcloud_load_balancer_network/defaults/main.yml +++ b/tests/integration/targets/hcloud_load_balancer_network/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_network_name: "{{hcloud_prefix}}-load_balancer-network" -hcloud_load_balancer_name: "{{hcloud_prefix}}-load_balancer-network" +hcloud_network_name: "{{hcloud_prefix}}-lb-n" +hcloud_load_balancer_name: "{{hcloud_prefix}}-lb-n" diff --git a/tests/integration/targets/hcloud_load_balancer_service/defaults/main.yml b/tests/integration/targets/hcloud_load_balancer_service/defaults/main.yml index 0876695..ebf4563 100644 --- a/tests/integration/targets/hcloud_load_balancer_service/defaults/main.yml +++ b/tests/integration/targets/hcloud_load_balancer_service/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_load_balancer_name: "{{hcloud_prefix}}-load_balancer-target" +hcloud_load_balancer_name: "{{hcloud_prefix}}-lb-target" diff --git a/tests/integration/targets/hcloud_load_balancer_target/defaults/main.yml b/tests/integration/targets/hcloud_load_balancer_target/defaults/main.yml index bb38666..b6bc252 100644 --- a/tests/integration/targets/hcloud_load_balancer_target/defaults/main.yml +++ b/tests/integration/targets/hcloud_load_balancer_target/defaults/main.yml @@ -2,6 +2,6 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_server_name: "{{hcloud_prefix}}-lb-target" -hcloud_load_balancer_name: "{{hcloud_prefix}}-load_balancer-target" +hcloud_server_name: "{{hcloud_prefix}}-lb-t" +hcloud_load_balancer_name: "{{hcloud_prefix}}-lb-target" hcloud_testing_ip: "176.9.59.39" diff --git a/tests/integration/targets/hcloud_network/defaults/main.yml b/tests/integration/targets/hcloud_network/defaults/main.yml index ecfa6a7..081eb14 100644 --- a/tests/integration/targets/hcloud_network/defaults/main.yml +++ b/tests/integration/targets/hcloud_network/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_network_name: "{{hcloud_prefix}}-integ" +hcloud_network_name: "{{hcloud_prefix}}-i" diff --git a/tests/integration/targets/hcloud_rdns/defaults/main.yml b/tests/integration/targets/hcloud_rdns/defaults/main.yml index fb46d1e..420b04d 100644 --- a/tests/integration/targets/hcloud_rdns/defaults/main.yml +++ b/tests/integration/targets/hcloud_rdns/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_server_name: "{{hcloud_prefix}}-rdns" -hcloud_floating_ip_name: "{{hcloud_prefix}}-rdns" +hcloud_server_name: "{{hcloud_prefix}}" +hcloud_floating_ip_name: "{{hcloud_prefix}}" diff --git a/tests/integration/targets/hcloud_route/defaults/main.yml b/tests/integration/targets/hcloud_route/defaults/main.yml index 6215627..c93c749 100644 --- a/tests/integration/targets/hcloud_route/defaults/main.yml +++ b/tests/integration/targets/hcloud_route/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_network_name: "{{hcloud_prefix}}-routes" +hcloud_network_name: "{{hcloud_prefix}}-ro" diff --git a/tests/integration/targets/hcloud_server/defaults/main.yml b/tests/integration/targets/hcloud_server/defaults/main.yml index b9a9a8d..96b5287 100644 --- a/tests/integration/targets/hcloud_server/defaults/main.yml +++ b/tests/integration/targets/hcloud_server/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_server_name: "{{hcloud_prefix}}-integration" +hcloud_server_name: "{{hcloud_prefix}}-i" diff --git a/tests/integration/targets/hcloud_server_info/defaults/main.yml b/tests/integration/targets/hcloud_server_info/defaults/main.yml index b9a9a8d..0c4dba2 100644 --- a/tests/integration/targets/hcloud_server_info/defaults/main.yml +++ b/tests/integration/targets/hcloud_server_info/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_server_name: "{{hcloud_prefix}}-integration" +hcloud_server_name: "{{hcloud_prefix}}-ii" diff --git a/tests/integration/targets/hcloud_server_network/defaults/main.yml b/tests/integration/targets/hcloud_server_network/defaults/main.yml index 1d62e5d..9a6bc8e 100644 --- a/tests/integration/targets/hcloud_server_network/defaults/main.yml +++ b/tests/integration/targets/hcloud_server_network/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_network_name: "{{hcloud_prefix}}-server-network" -hcloud_server_name: "{{hcloud_prefix}}-server-network" +hcloud_network_name: "{{hcloud_prefix}}-sn" +hcloud_server_name: "{{hcloud_prefix}}-sn" diff --git a/tests/integration/targets/hcloud_ssh_key/defaults/main.yml b/tests/integration/targets/hcloud_ssh_key/defaults/main.yml index aa2c739..d8c30fa 100644 --- a/tests/integration/targets/hcloud_ssh_key/defaults/main.yml +++ b/tests/integration/targets/hcloud_ssh_key/defaults/main.yml @@ -3,6 +3,6 @@ --- hcloud_prefix: "tests" hcloud_server_name: "{{hcloud_prefix}}" -hcloud_ssh_key_name: "{{hcloud_prefix}}-integration" +hcloud_ssh_key_name: "{{hcloud_prefix}}" hcloud_ssh_key_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDnaTPfKaX1QKcRLOfr34buVLh5FhJAThI9NYB0xNdXsMd4Y0zLyyCQzHbx4eWCVZxym/s6csWSeLaAhO1GOHeAw3hQFMqf1oTBx6Y8g0pKpeotKPa/PDSUzdZF9Lc+DadtpQd8kFVHAu1Kd3zoEUnk1u6kP7I4qu4Z/6F9qBDF+M3aobiPVxdS7GwaVRW3nZu+FcQDLiBiNOjuRDyjHcDfEUkoh2SOu25RrFtGPzFu5mGmBJwotKpWAocLGfHzyn/fAHxgw3jKZVH/t+XWQFnl82Ie8yE3Z1EZ7oDkNRqFQT9AdXEQOLycTTYTQMJZpgeFTv3sAo6lPRCusiFmmLcf ci@ansible.hetzner.cloud" hcloud_ssh_key_fingerprint: "56:89:c4:d6:a7:4a:79:82:f4:c2:58:9c:e1:d2:2d:4e" diff --git a/tests/integration/targets/hcloud_ssh_key_info/defaults/main.yml b/tests/integration/targets/hcloud_ssh_key_info/defaults/main.yml index 06c1471..15188e1 100644 --- a/tests/integration/targets/hcloud_ssh_key_info/defaults/main.yml +++ b/tests/integration/targets/hcloud_ssh_key_info/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_ssh_key_name: "{{hcloud_prefix}}-ssh_key_facts" +hcloud_ssh_key_name: "{{hcloud_prefix}}-f" diff --git a/tests/integration/targets/hcloud_subnetwork/defaults/main.yml b/tests/integration/targets/hcloud_subnetwork/defaults/main.yml index 51a123d..79f0d87 100644 --- a/tests/integration/targets/hcloud_subnetwork/defaults/main.yml +++ b/tests/integration/targets/hcloud_subnetwork/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_network_name: "{{hcloud_prefix}}-subnet" +hcloud_network_name: "{{hcloud_prefix}}-s" hetzner_vswitch_id: 15311 diff --git a/tests/integration/targets/hcloud_volume/defaults/main.yml b/tests/integration/targets/hcloud_volume/defaults/main.yml index a8f03b4..3a9fb02 100644 --- a/tests/integration/targets/hcloud_volume/defaults/main.yml +++ b/tests/integration/targets/hcloud_volume/defaults/main.yml @@ -2,5 +2,5 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_volume_name: "{{hcloud_prefix}}-integ" -hcloud_server_name: "{{hcloud_prefix}}-volume-server" +hcloud_volume_name: "{{hcloud_prefix}}-i" +hcloud_server_name: "{{hcloud_prefix}}-vs" diff --git a/tests/integration/targets/hcloud_volume_info/defaults/main.yml b/tests/integration/targets/hcloud_volume_info/defaults/main.yml index d308c95..5c589a8 100644 --- a/tests/integration/targets/hcloud_volume_info/defaults/main.yml +++ b/tests/integration/targets/hcloud_volume_info/defaults/main.yml @@ -2,4 +2,4 @@ # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) --- hcloud_prefix: "tests" -hcloud_volume_name: "{{hcloud_prefix}}-facts" +hcloud_volume_name: "{{hcloud_prefix}}-i"