fix: cleanup and adjust test suite

Signed-off-by: Paul Kroeher <paul.kroeher@cyberus-technology.de>

On-behalf-of: SAP paul.kroeher@sap.com

Author: pkr4711

modules/testing/default.nix

@@ -38,18 +38,21 @@ let
         ];
 
         environment.variables = adminEnv;
+        # pw: root
+        users.users.root.hashedPassword = lib.mkForce "$y$j9T$HiT/m702z/73g4Dt5RzbW0$b3SaYI1FoyT/ORV/qFR/s9zonJBKDn4p2XKyYM2wp1.";
+        users.users.root.hashedPasswordFile = null;
 
         # enable easy access to test VMs with ssh
-        users.users.root.openssh.authorizedKeys.keys = [
-          "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMjGRp1/vaTxGiGbZnaSv4wu4LUUP7lGSGDFKfF31xw paul.kroeher@cyberus-technology.de"
-        ];
+        # users.users.root.openssh.authorizedKeys.keys = [
+        #
+        # ];
 
         services.openssh = {
           enable = true;
           ports = [ 22 ];
           settings = {
             PasswordAuthentication = true;
-            PermitRootLogin = "without-password"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
+            PermitRootLogin = "yes"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
           };
         };
 
@@ -165,9 +168,9 @@ in
 
             openstack image create --disk-format raw --container-format bare --public --file ${image_raw} cirros
             openstack flavor create --public m1.nano --id auto --ram 256 --disk 0 --vcpus 1
-            openstack volume qos create --consumer "front-end" --property "total_iops_sec=20000" iops
-            openstack volume qos associate iops __DEFAULT__
-            openstack volume create --image cirros --size 1 --bootable vol
+            # openstack volume qos create --consumer "front-end" --property "total_iops_sec=20000" iops
+            # openstack volume qos associate iops __DEFAULT__
+            # openstack volume create --image cirros --size 1 --bootable vol
 
             openstack security group rule create --proto icmp default
             openstack security group rule create --proto tcp --dst-port 22 default

tests/openstack-default-setup.nix

@@ -112,7 +112,9 @@ pkgs.nixosTest {
       controllerVM.wait_for_unit("nova-conductor.service")
 
       # check all services on storageVM
-      storageVM.wait_for_unit("tgtd.service")
+      ## tgtd is only used in LVM setup
+      ## storageVM.wait_for_unit("tgtd.service")
+      storageVM.wait_for_unit("nfs-server.service")
       storageVM.wait_for_unit("cinder-volume.service")
 
       assert wait_for_openstack()
@@ -140,7 +142,7 @@ pkgs.nixosTest {
       # attach volume to VM
       controllerVM.execute("openstack server add volume test_vm test_vol")
       # wait until volume is attached
-      time.sleep(20)
+      retry_until_succeed(controllerVM, "openstack volume show test_vol -f value -c status | grep 'in-use'", 20)
 
       retry_until_succeed(controllerVM, f"ip netns exec {net_ns} sshpass -p gocubsgo ssh cirros@{vm_ip} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null lsblk", 60)
       # check second block device of VM