Update cucumber testsuite module to match new naming convention (#1662)

README_ADVANCED.md

@@ -42,7 +42,7 @@ Note: on clients and minions only, the version number can be omitted to take the
 A libvirt example follows:
 
 ```hcl
-module "suse-minion" {
+module "suse_minion" {
   source = "./modules/minion"
   base_configuration = module.base.configuration
 
@@ -108,7 +108,7 @@ ln -sfn ../backend_modules/<BACKEND> modules/backend
 Some modules, for example clients and minions, support a `quantity` variable that allows you to create several instances at once. For example:
 
 ```hcl
-module "suse-minion" {
+module "suse_minion" {
   source = "./modules/minion"
   base_configuration = module.base.configuration
 
@@ -493,7 +493,7 @@ User root
 You can specify an Activation Key string for minions to use at onboarding time to a SUSE Manager Server. An example follows:
 
 ```hcl
-module "suse-minion" {
+module "suse_minion" {
   source = "./modules/minion"
   base_configuration = module.base.configuration
 
@@ -526,7 +526,7 @@ module "proxy" {
   server_configuration = module.server.configuration
 }
 
-module "suse-client" {
+module "suse_client" {
   source = "./modules/client"
   base_configuration = module.base.configuration
 
@@ -626,7 +626,7 @@ Building Kiwi images is needed for starting PXE boot hosts (see below) in Retail
 An example follows:
 
 ```hcl
-module "build-host"
+module "build_host"
 {
   source = "./modules/build_host"
   base_configuration = module.base.configuration
@@ -649,7 +649,7 @@ They are connected only to the private network.
 An example follows:
 
 ```hcl
-module "pxeboot-minion"
+module "pxeboot_minion"
 {
   source = "./modules/pxe_boot"
   base_configuration = module.base.configuration
@@ -682,7 +682,7 @@ module "server" {
 You can specify additional custom repos and packages to be installed at deploy time for a specific host:
 
 ```hcl
-module "suse-minion" {
+module "suse_minion" {
   source = "./modules/minion"
   base_configuration = module.base.configuration
 
@@ -977,7 +977,7 @@ module "cucumber_testsuite" {
 A libvirt example is:
 
 ```hcl
-module "opensuse155arm-minion" {
+module "opensuse155arm_minion" {
   source = "./modules/minion"
   ...
   name = "nue-min-opensuse155arm"

README_TESTING.md

@@ -112,11 +112,11 @@ host_settings = {
     additional_packages = [ "venv-salt-minion" ]
     install_salt_bundle = true
   }
-  suse-client = {
+  suse_client = {
     additional_packages = [ "venv-salt-minion" ]
     install_salt_bundle = true
   }
-  suse-minion = {
+  suse_minion = {
     additional_packages = [ "venv-salt-minion" ]
     install_salt_bundle = true
   }
@@ -132,23 +132,23 @@ Several test hosts are optional and can be activated via a `host_settings` block
 host_settings = {
   proxy = {
   }
-  suse-client = {
+  suse_client = {
   }
-  suse-minion = {
+  suse_minion = {
   }
-  suse-sshminion = {
+  suse_sshminion = {
   }
-  redhat-minion = {
+  redlike_minion = {
   }
-  debian-minion = {
+  deblike_minion = {
   }
-  build-host = {
+  build_host = {
   }
-  pxeboot-minion = {
+  pxeboot_minion = {
   }
-  kvm-host = {
+  kvm_host = {
   }
-  monitoring-server = {
+  monitoring_server = {
   }
 }
 ```
@@ -157,9 +157,9 @@ The default value for `host_settings` block has a SUSE family traditional client
 
 ```hcl
 host_settings = {
-  suse-client = {
+  suse_client = {
   }
-  suse-minion = {
+  suse_minion = {
   }
 }
 ```
@@ -290,7 +290,7 @@ You may need to change the KVM image download. To do it, use the `additional_gra
 
 ```hcl
 host_settings = {
-  kvm-host = {
+  kvm_host = {
     additional_grains = {
       hvm_disk_image = {
         leap = {

main.tf.aws-testsuite.example

@@ -31,15 +31,15 @@ module "cucumber_testsuite" {
     controller = {}
     server = {}
     proxy = {}
-    suse-client = {
+    suse_client = {
       image = "opensuse154"
       name = "cli-opensuse154"
     }
-    suse-minion = {
+    suse_minion = {
       image = "opensuse154"
       name = "min-opensuse154"
     }
-    suse-sshminion = {
+    suse_sshminion = {
       image = "opensuse154"
       name = "minssh-opensuse154"
     }
@@ -69,24 +69,24 @@ output "aws_proxy_private_name" {
   value = module.cucumber_testsuite.configuration.proxy.hostname
 }
 
-output "aws_suse-minion_private_names" {
-  value = module.cucumber_testsuite.configuration.suse-minion.hostnames
+output "aws_suse_minion_private_names" {
+  value = module.cucumber_testsuite.configuration.suse_minion.hostnames
 }
 
-output "aws_suse-client_private_names" {
-  value = module.cucumber_testsuite.configuration.suse-client.hostnames
+output "aws_suse_client_private_names" {
+  value = module.cucumber_testsuite.configuration.suse_client.hostnames
 }
 
-output "aws_suse-sshminion_private_names" {
-  value = module.cucumber_testsuite.configuration.suse-sshminion.hostnames
+output "aws_suse_sshminion_private_names" {
+  value = module.cucumber_testsuite.configuration.suse_sshminion.hostnames
 }
 
-output "aws_redhat-minion_private_names" {
-  value = module.cucumber_testsuite.configuration.redhat-minion.hostnames
+output "aws_rhlike_minion_private_names" {
+  value = module.cucumber_testsuite.configuration.rhlike_minion.hostnames
 }
 
-output "aws_debian-minion_private_names" {
-  value = module.cucumber_testsuite.configuration.debian-minion.hostnames
+output "aws_deblike_minion_private_names" {
+  value = module.cucumber_testsuite.configuration.deblike_minion.hostnames
 }
 
 output "aws_controller_private_name" {

main.tf.libvirt-testsuite.example

@@ -70,7 +70,7 @@ module "cucumber_testsuite" {
   # define which VMs should be created and adjust their settings.
   # if you do not need a minion just comment it out.
   # example:
-  # suse-minion = {
+  # suse_minion = {
   #    image = "sles15sp4o"
   #    name = "minion"
   #    provider_settings = {
@@ -101,38 +101,38 @@ module "cucumber_testsuite" {
     proxy = {
       name = "proxy"
     }
-    suse-client = {
+    suse_client = {
       image = "sles15sp4o"
     }
-    suse-minion = {
+    suse_minion = {
       image = "sles15sp4o"
       name = "minion"
     }
-    suse-sshminion = {
+    suse_sshminion = {
       image = "sles15sp4o"
       name = "sshminion"
     }
-    redhat-minion = {
+    rhlike_minion = {
       image = "centos7o"
       name = "centos"
     }
-    debian-minion = {
+    deblike_minion = {
       image = "ubuntu2204o"
       name = "ubuntu"
     }
-    build-host = {
+    build_host = {
       image = "sles15sp4o"
       name = "build"
     }
-    pxeboot-minion = {
+    pxeboot_minion = {
       image = "sles15sp4o"
       name = "pxeboot"
     }
-    kvm-host = {
+    kvm_host = {
       image = "opensuse156o"
       name = "kvmhost"
     }
-    monitoring-server = {
+    monitoring_server = {
       image = "sles15sp4o"
       name = "monitoring"
     }

main.tf.libvirt-testsuite.example.Manager-43

@@ -67,9 +67,9 @@ module "cucumber_testsuite" {
   # define which VMs should be created and adjust their settings.
   # if you do not need a minion just comment it out.
   # example:
-  # suse-minion = {
+  # suse_minion = {
   #    image = "sles15sp4o"
-  #    name = "minion"
+  #    name = "suse-minion"
   #    provider_settings = {
   #      mac = "aa:bb:cc:dd:ee:ff"
   #      memory = 1024
@@ -92,36 +92,36 @@ module "cucumber_testsuite" {
     proxy = {
       name = "proxy"
     }
-    suse-client = {
+    suse_client = {
       image = "sles15sp4o"
     }
-    suse-minion = {
+    suse_minion = {
       image = "sles15sp4o"
-      name = "minion"
+      name = "suse-minion"
     }
-    suse-sshminion = {
+    suse_sshminion = {
       image = "sles15sp4o"
-      name = "sshminion"
+      name = "suse-sshminion"
     }
-    redhat-minion = {
+    rhlike_minion = {
       image = "rocky9o"
-      name = "centos"
+      name = "rhlike-minion"
     }
-    debian-minion = {
+    deblike_minion = {
       image = "ubuntu2204o"
-      name = "ubuntu"
+      name = "deblike-minion"
     }
-    build-host = {
+    build_host = {
       image = "sles15sp4o"
-      name = "build"
+      name = "build-host"
     }
-    pxeboot-minion = {
+    pxeboot_minion = {
       image = "sles15sp4o"
-      name = "pxeboot"
+      name = "pxeboot-minion"
     }
-    kvm-host = {
+    kvm_host = {
       image = "opensuse156o"
-      name = "kvmhost"
+      name = "kvm-host"
     }
     monitoring-server = {
       image = "sles15sp4o"