openstack_taster 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a2216a1227c110a1f9b252dcce6c1722c32d66
-  data.tar.gz: 9841da2981dc1fd82e1802c163d42d0faa9ab114
+  metadata.gz: 05a553071d6d302a7fe9e703b5ac460b017ed0d8
+  data.tar.gz: a82133b64313108f02b673512bbc359fe0e1bdce
 SHA512:
-  metadata.gz: 0e1282ef3506e2bc619c79c96f9a9bb60a6de3d15277ac2b6ae008bb2778e48d71b5588bf70d8dc97269bd638b73a35db965131b2b316170429b25333bd87930
-  data.tar.gz: 40b7a43e131aefa39410c701eb887e62bdfb8eb186696ba36b555a068fd249fce5070d71f8a47bfa6d2c65bf4b89af7274b0341b726bc75b96be5f46403b5107
+  metadata.gz: 41bd0949cdca2c50661844235fbd9a074e27be8dc1a24f6ef8176c76db3f3a3f237ebdaac763b15af70513636d78cb9f1bc5172535f34377074e46196e82f3ed
+  data.tar.gz: f6ae5f21e1eebc08bf489f555c858d5bb60139d89e71cbeff99d2f2e61c996b055bf0fc95c43ad23a286697c3b55ae62d6a40f9ad611426711f122d96e30f668

data/lib/openstack_taster.rb

@@ -279,37 +279,37 @@ class OpenStackTaster
     if volume_attach?(instance, volume)
       vdev = @volume_service.volumes.find_by_id(volume.id).attachments.first['device']
       mkfs_command = [
-        ["sudo parted --script #{vdev} mklabel gpt mkpart primary 1 100%", ''],
-        ["sudo mkfs.#{VOLUME_FILESYSTEM} -Fq #{vdev}1", '']
+        ["sudo parted --script #{vdev} mklabel gpt mkpart primary 1 100%", /^$/],
+        ["sudo mkfs.#{VOLUME_FILESYSTEM} -Fq #{vdev}1", /(^$)|(done\n)?/]
       ]
       with_ssh(instance, username) do |ssh|
         mkfs_command.each do |command, expected|
           result = ssh.exec!(command)
-          next unless result != expected
+          next unless result !~ expected
           error_log(
             instance.logger,
             'error',
             "Failure while running '#{command}':\n\texpected '#{expected}'\n\tgot '#{result}'",
             true
           )
+          _detach = volume_detach?(instance, volume)
+          volume_delete(instance, volume)
           return false
         end
       end
       mount = volume_mount_unmount?(instance, username, volume)
       detach = volume_detach?(instance, volume)
+      volume_delete(instance, volume)
     else
       error_log(instance.logger, 'error', "Volume '#{volume.id}' failed to attach.", true)
+      volume_delete(instance, volume)
       return false
     end
 
     if mount && detach
-      error_log(instance.logger, 'info', "Deleting volume #{volume.id}.", true)
-      volume.destroy if volume.ready?
       error_log(instance.logger, 'info', "\nVolume testing passed!.", true)
       true
     else
-      error_log(instance.logger, 'info', "Deleting volume #{volume.id}.", true)
-      volume.destroy if volume.ready?
       error_log(
         instance.logger,
         'error',
@@ -468,4 +468,22 @@ class OpenStackTaster
     error_log(instance.logger, 'error', e.message)
     false
   end
+
+  # Delete volume
+  # @param instance [Fog::Compute::OpenStack::Server] the instance from which to detach
+  # @param volume [Fog::Volume::OpenStack::Volume] the volume to detach
+  def volume_delete(instance, volume)
+    error_log(instance.logger, 'info', "Deleting volume #{volume.name}.", true)
+    loop do
+      volume.reload
+      sleep 2
+      break if volume.ready?
+      error_log(instance.logger, 'info', "volume #{volume.name} not ready, waiting...", true)
+    end
+    volume.destroy
+    error_log(instance.logger, 'info', "Deleted volume #{volume.name}.", true)
+  rescue Excon::Error => e
+    puts 'Failed to delete. check log for details.'
+    error_log(instance.logger, 'error', e.message)
+  end
 end

data/tests/inspec.yml

@@ -4,4 +4,4 @@ maintainer: OSU Open Source Lab
 copyright: Oregon State University
 license: Apache License, Version 2.0
 summary: Verify that an image has correctly configured security settings.
-version: 1.1.3
+version: 1.1.4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstack_taster
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - OSU Open Source Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec