fog 1.32.0 → 1.33.0

data/spec/fog/openstack/volume_spec.rb

@@ -2,61 +2,69 @@ require 'fog/openstack/compute'
 require 'fog/openstack/identity'
 require 'fog/openstack/identity_v3'
 require 'fog/openstack/volume'
-require 'rspec/core'
-require 'rspec/expectations'
-require 'vcr'
+
+if RUBY_VERSION =~ /1.8/
+  require File.expand_path('../shared_context', __FILE__)
+else
+  require_relative './shared_context'
+end
 
 RSpec.describe Fog::Volume::OpenStack do
 
+  include_context 'OpenStack specs with VCR'
   before :all do
-    # FIXME code duplication with "before :all" of identity_v3_spec.rb
-    @os_auth_url = ENV['OS_AUTH_URL']
-
-    if @os_auth_url
-      # if OS_AUTH_URL is set but FOG_MOCK is not, don't record anything and just pass through the requests
-      VCR.configure do |c|
-        c.ignore_request do |request|
-          ENV['FOG_MOCK']!='true' && !ENV['OS_AUTH_URL'].nil?
-        end
-      end
-    else
-      # Fail-safe URL which matches the VCR recordings
-      @os_auth_url = 'http://devstack.openstack.stack:5000/v2.0'
-      # when using the cassettes, there is no need to sleep in wait_for()
-      Fog.interval = 0
-    end
+    setup_vcr_and_service(
+      :vcr_directory => 'spec/fog/openstack/volume',
+      :service_class => Fog::Volume::OpenStack
+    )
+  end
+
+  def setup_test_object(options)
+    type = options.delete(:type)
+    case type
+      when :volume
+        puts "Checking for leftovers..." if ENV['DEBUG_VERBOSE']
+        volume_name = options[:display_name]
+        # if this fails, cleanup this object (it was left over from a failed test run)
+        expect(@service.volumes.all(:display_name => volume_name).length).to be(0)
+
+        puts "Creating volume #{volume_name}..." if ENV['DEBUG_VERBOSE']
+        return @service.volumes.create(options)
 
-    VCR.configure do |config|
-      config.allow_http_connections_when_no_cassette = true
-      config.hook_into :webmock
+      when :transfer
+        puts "Checking for leftovers..." if ENV['DEBUG_VERBOSE']
+        transfer_name = options[:name]
+        # if this fails, cleanup this object (it was left over from a failed test run)
+        expect(@service.transfers.all(:name => transfer_name).length).to be(0)
+
+        puts "Creating transfer #{transfer_name}..." if ENV['DEBUG_VERBOSE']
+        return @service.transfers.create(options)
 
-      if ENV['DEBUG']
-        config.ignore_request do |request|
-          false && !ENV['OS_AUTH_URL'].nil?
-        end
-        config.cassette_library_dir = "spec/debug"
-        config.default_cassette_options.merge! :record => :all
       else
-        config.cassette_library_dir = "spec/fog/openstack/volume"
-        config.default_cassette_options = {:record => :none}
-        config.default_cassette_options.merge! :match_requests_on => [:method, :uri, :body] unless RUBY_VERSION =~ /1.8/ # Ruby 1.8.7 encodes JSON differently, which screws up request matching
-      end
+        raise ArgumentError, "don't know how to setup a test object of type #{type.inspect}"
     end
+  end
 
-    # Allow us to ignore dev certificates on servers
-    Excon.defaults[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false'
+  def cleanup_test_object(collection, id)
+    # has the object already been deleted?
+    begin
+      object = collection.get(id)
+    rescue Fog::Compute::OpenStack::NotFound # "Compute", not "Volume"; see issue #3618
+      true
+    end
 
-    VCR.use_cassette('volume_common_setup') do
-      @service = Fog::Volume::OpenStack.new(
-        :openstack_auth_url       => "#{@os_auth_url}/tokens",
-        :openstack_region         => ENV['OS_REGION_NAME']         || 'RegionOne',
-        :openstack_api_key        => ENV['OS_PASSWORD']            || 'devstack',
-        :openstack_username       => ENV['OS_USERNAME']            || 'admin',
-        :openstack_tenant         => ENV['OS_PROJECT_NAME']        || 'admin'
-        # FIXME: Identity V3 not properly supported by this call yet
-        # :openstack_user_domain    => ENV['OS_USER_DOMAIN_NAME']    || 'Default',
-        # :openstack_project_domain => ENV['OS_PROJECT_DOMAIN_NAME'] || 'Default',
-      ) unless @service
+    puts "Deleting object #{object.class} #{id}..." if ENV['DEBUG_VERBOSE']
+    object.destroy
+
+    # wait for the object to be deleted
+    Fog.wait_for do
+      begin
+        object = collection.get(id)
+        puts "Current status: #{object ? object.status : 'deleted'}" if ENV['DEBUG_VERBOSE']
+        false
+      rescue Fog::Compute::OpenStack::NotFound # "Compute", not "Volume"; see issue #3618
+        true
+      end
     end
   end
 
@@ -67,18 +75,13 @@ RSpec.describe Fog::Volume::OpenStack do
       volume_description = 'This is the volume description.'
       volume_size = 1 # in GB
 
-      # if any of these expectations fail, that means you have left-over
-      # objects from your previous failed test run
-      puts "Checking for leftovers..." if ENV['DEBUG_VERBOSE']
-      expect(@service.volumes.all(:display_name => volume_name).length).to be 0
-
       # create volume
-      puts "Creating volume..." if ENV['DEBUG_VERBOSE']
-      volume_id = @service.volumes.create(
+      volume_id = setup_test_object(:type => :volume,
         :display_name        => volume_name,
         :display_description => volume_description,
         :size                => volume_size
       ).id
+
       expect(@service.volumes.all(:display_name => volume_name).length).to be 1
 
       # check retrieval of volume by ID
@@ -99,8 +102,9 @@ RSpec.describe Fog::Volume::OpenStack do
       puts "Retrieving volume by name..." if ENV['DEBUG_VERBOSE']
 
       volumes = @service.volumes.all(:display_name => volume_name)
-      expect(volumes).to contain_exactly(an_instance_of(Fog::Volume::OpenStack::Volume))
+      expect(volumes.length).to be 1
       volume = volumes[0]
+      expect(volume).to be_a(Fog::Volume::OpenStack::Volume)
 
       expect(volume.id).to eq(volume_id)
       expect(volume.display_name).to eq(volume_name)
@@ -108,20 +112,7 @@ RSpec.describe Fog::Volume::OpenStack do
       expect(volume.size).to eq(volume_size)
 
       # delete volume
-      puts "Deleting volume..." if ENV['DEBUG_VERBOSE']
-
-      @service.delete_volume(volume_id)
-
-      Fog.wait_for do # wait for the volume to be deleted
-        begin
-          volume = @service.volumes.get(volume_id)
-          puts "Current volume status: #{volume ? volume.status : 'deleted'}" if ENV['DEBUG_VERBOSE']
-          false
-        rescue Fog::Compute::OpenStack::NotFound # FIXME: Why is this "Compute", not "Volume"? Copy-paste error?
-          true
-        end
-      end
-
+      cleanup_test_object(@service.volumes, volume_id)
     end
   end
 
@@ -159,6 +150,180 @@ RSpec.describe Fog::Volume::OpenStack do
     end
   end
 
+  it 'can extend volumes' do
+    VCR.use_cassette('volume_extend') do
+
+      volume_size_small  = 1 # in GB
+      volume_size_large  = 2 # in GB
+
+      volume = setup_test_object(:type => :volume,
+        :display_name => 'fog-testvolume-1',
+        :size         => volume_size_small
+      )
+      volume.wait_for { ready? and size == volume_size_small }
+
+      # extend volume
+      puts "Extending volume..." if ENV['DEBUG_VERBOSE']
+      volume.extend(volume_size_large)
+      volume.wait_for { ready? and size == volume_size_large }
+
+      # shrinking is not allowed in OpenStack
+      puts "Shrinking volume should fail..." if ENV['DEBUG_VERBOSE']
+      expect { volume.extend(volume_size_small) }.to raise_error(Excon::Errors::BadRequest, /Invalid input received: New size for extend must be greater than current size./)
+
+      # delete volume
+      cleanup_test_object(@service.volumes, volume.id)
+
+      # check that extending a non-existing volume fails
+      puts "Extending deleted volume should fail..." if ENV['DEBUG_VERBOSE']
+      expect { @service.extend_volume(volume.id, volume_size_small) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+    end
+  end
+
+  it 'can create and accept volume transfers' do
+    VCR.use_cassette('volume_transfer_and_accept') do
+
+      transfer_name = 'fog-testtransfer-1'
+
+      # create volume object
+      volume = setup_test_object(:type => :volume,
+        :display_name => 'fog-testvolume-1',
+        :size         => 1
+      )
+      volume.wait_for { ready? }
+
+      # create transfer object
+      transfer = setup_test_object(:type => :transfer,
+        :name      => transfer_name,
+        :volume_id => volume.id
+      )
+      # we need to save the auth_key NOW, it's only present in the response
+      # from the create_transfer request
+      auth_key    = transfer.auth_key
+      transfer_id = transfer.id
+
+      # check retrieval of transfer by ID
+      puts 'Retrieving transfer by ID...' if ENV['DEBUG_VERBOSE']
+
+      transfer = @service.transfers.get(transfer_id)
+      expect(transfer).to be_a(Fog::Volume::OpenStack::Transfer)
+
+      expect(transfer.id).to eq(transfer_id)
+      expect(transfer.name).to eq(transfer_name)
+      expect(transfer.volume_id).to eq(volume.id)
+
+      # check retrieval of transfer by name
+      puts 'Retrieving transfer by name...' if ENV['DEBUG_VERBOSE']
+
+      transfers = @service.transfers.all(:name => transfer_name)
+      expect(transfers.length).to be(1)
+      transfer = transfers[0]
+      expect(transfer).to be_a(Fog::Volume::OpenStack::Transfer)
+
+      expect(transfer.id).to eq(transfer_id)
+      expect(transfer.name).to eq(transfer_name)
+      expect(transfer.volume_id).to eq(volume.id)
+
+      # to accept the transfer, we need a second connection to a different project
+      puts 'Checking object visibility from different projects...' if ENV['DEBUG_VERBOSE']
+      other_service = Fog::Volume::OpenStack.new(
+        :openstack_auth_url       => "#{@os_auth_url}/tokens",
+        :openstack_region         => ENV['OS_REGION_NAME']         || 'RegionOne',
+        :openstack_api_key        => ENV['OS_PASSWORD_OTHER']      || 'devstack',
+        :openstack_username       => ENV['OS_USERNAME_OTHER']      || 'demo',
+        :openstack_tenant         => ENV['OS_PROJECT_NAME_OTHER']  || 'demo'
+      )
+
+      # check that recipient cannot see the transfer object
+      expect { other_service.transfers.get(transfer.id) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+      expect(other_service.transfers.all(:name => transfer_name).length).to be(0)
+
+      # # check that recipient cannot see the volume before transfer
+      # expect { other_service.volumes.get(volume.id) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+      # expect(other_service.volumes.all(:display_name => volume_name).length).to be(0)
+
+      # The recipient can inexplicably see the volume even before the
+      # transfer, so to confirm that the transfer happens, we record its tenant ID.
+      expect(volume.tenant_id).to match(/^[0-9a-f-]+$/) # should look like a UUID
+      source_tenant_id = volume.tenant_id
+
+      # check that accept_transfer fails without valid transfer ID and auth key
+      bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # generated by Fog::UUID.uuid, but fixed to play nice with VCR
+      expect { other_service.transfers.accept(bogus_uuid, auth_key) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+      expect { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.to raise_error(Excon::Errors::BadRequest)
+
+      # accept transfer
+      puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE']
+      transfer = other_service.transfers.accept(transfer.id, auth_key)
+      expect(transfer).to be_a(Fog::Volume::OpenStack::Transfer)
+
+      expect(transfer.id).to eq(transfer_id)
+      expect(transfer.name).to eq(transfer_name)
+
+      # check that recipient can see the volume
+      volume = other_service.volumes.get(volume.id)
+      expect(volume).to be_a(Fog::Volume::OpenStack::Volume)
+
+      # # check that sender cannot see the volume anymore
+      # expect { @service.volumes.get(volume.id) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+      # expect(@service.volumes.all(:display_name => volume_name).length).to be(0)
+
+      # As noted above, both users seem to be able to see the volume at all times.
+      # Check change of ownership by looking at the tenant_id, instead.
+      expect(volume.tenant_id).to match(/^[0-9a-f-]+$/) # should look like a UUID
+      expect(volume.tenant_id).not_to eq(source_tenant_id)
+
+      # check that the transfer object is gone on both sides
+      [ @service, other_service ].each do |service|
+        expect { service.transfers.get(transfer.id) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+        expect(service.transfers.all(:name => transfer_name).length).to be(0)
+      end
+
+      # cleanup volume
+      cleanup_test_object(other_service.volumes, volume.id)
+    end
+  end
+
+  it 'can create and delete volume transfers' do
+    VCR.use_cassette('volume_transfer_and_delete') do
+      # create volume object
+      volume = setup_test_object(:type => :volume,
+        :display_name => 'fog-testvolume-1',
+        :size         => 1
+      )
+      volume.wait_for { ready? }
+
+      # create transfer object
+      transfer = setup_test_object(:type => :transfer,
+        :name      => 'fog-testtransfer-1',
+        :volume_id => volume.id
+      )
+      # we need to save the auth_key NOW, it's only present in the response
+      # from the create_transfer request
+      auth_key    = transfer.auth_key
+      transfer_id = transfer.id
+
+      # to try to accept the transfer, we need a second connection to a different project
+      other_service = Fog::Volume::OpenStack.new(
+        :openstack_auth_url       => "#{@os_auth_url}/tokens",
+        :openstack_region         => ENV['OS_REGION_NAME']         || 'RegionOne',
+        :openstack_api_key        => ENV['OS_PASSWORD_OTHER']      || 'devstack',
+        :openstack_username       => ENV['OS_USERNAME_OTHER']      || 'demo',
+        :openstack_tenant         => ENV['OS_PROJECT_NAME_OTHER']  || 'demo'
+      )
+
+      # delete transfer again
+      transfer.destroy
+
+      # check that transfer cannot be accepted when it has been deleted
+      puts 'Checking that accepting a deleted transfer fails...' if ENV['DEBUG_VERBOSE']
+      expect { other_service.transfers.accept(transfer_id, auth_key) }.to raise_error(Fog::Compute::OpenStack::NotFound)
+
+      # cleanup volume
+      cleanup_test_object(@service.volumes, volume.id)
+    end
+  end
+
   # TODO: tests for snapshots
   # TODO: tests for quotas
 

data/tests/openstack/models/storage/file_tests.rb

@@ -156,6 +156,32 @@ Shindo.tests('Fog::OpenStack::Storage | file', ['openstack']) do
 
     end
 
+    tests("#delete_at") do
+      @delete_at_time = (Time.now + 300).to_i
+
+      tests("#delete_at should default to nil").returns(nil) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = @delete_at_time
+      @instance.save
+      tests("#delete_at should return delete_at attribute").returns(@delete_at_time) do
+        @instance.delete_at
+      end
+
+      @instance.delete_at = @delete_at_time
+      @instance.save
+      tests("#delete_at= should update delete_at").returns(@delete_at_time + 100) do
+        @instance.delete_at = @delete_at_time + 100
+        @instance.save
+        @instance.delete_at
+      end
+
+      tests("#delete_at= should not blow up on nil") do
+        @instance.delete_at = nil
+        @instance.save
+      end
+    end
   end
 
   model_tests(@directory.files, file_attributes, Fog.mocking?) do

data/tests/openstack/requests/compute/availability_zone_tests.rb

@@ -0,0 +1,18 @@
+Shindo.tests('Fog::Compute[:openstack] | availability zone requests', ['openstack']) do
+
+  @flavor_format = {
+    'zoneName'    => String,
+    'hosts'       => Fog::Nullable::Hash,
+    'zoneState'   => Hash,
+  }
+
+  tests('success') do
+    tests('#list_zones').data_matches_schema({'availabilityZoneInfo' => [@flavor_format]}) do
+      Fog::Compute[:openstack].list_zones.body
+    end
+
+    tests('#list_zones_detailed').data_matches_schema({'availabilityZoneInfo' => [@flavor_format]}) do
+      Fog::Compute[:openstack].list_zones_detailed.body
+    end
+  end
+end

data/tests/openstack/requests/compute/server_tests.rb

@@ -232,6 +232,18 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
 
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
 
+    tests("#shelve_server(#{@server_id})").succeeds do
+      Fog::Compute[:openstack].shelve_server(@server_id)
+    end
+
+    Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
+
+    tests("#unshelve_server(#{@server_id})").succeeds do
+      Fog::Compute[:openstack].unshelve_server(@server_id)
+    end
+
+    Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?
+
     #DELETE
     tests("#delete_server(#{@server_id})").succeeds do
       Fog::Compute[:openstack].delete_server(@server_id)

data/tests/openstack/requests/network/subnet_tests.rb

@@ -38,8 +38,8 @@ Shindo.tests('Fog::Network[:openstack] | subnet requests', ['openstack']) do
     tests('#update_subnet').formats({'subnet' => @subnet_format}) do
       subnet_id = Fog::Network[:openstack].subnets.all.first.id
       attributes = {:name => 'subnet_name', :gateway_ip => '10.2.2.1',
-                    :dns_nameservers => [], :host_routes => [],
-                    :enable_dhcp => true}
+                    :allocation_pools => [], :dns_nameservers => [],
+                    :host_routes => [], :enable_dhcp => true}
       Fog::Network[:openstack].update_subnet(subnet_id, attributes).body
     end
 

data/tests/openstack/requests/volume/availability_zone_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Fog::Volume[:openstack] | availability zone requests', ['openstack']) do
+
+  @flavor_format = {
+    'zoneName'  => String,
+    'zoneState' => Hash,
+  }
+
+  tests('success') do
+    tests('#list_zones').data_matches_schema({'availabilityZoneInfo' => [@flavor_format]}) do
+      Fog::Volume[:openstack].list_zones.body
+    end
+  end
+end

data/tests/vcloud_director/requests/compute/edge_gateway_tests.rb

@@ -20,7 +20,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
     :GatewayIpsecVpnService => 
       {
         :IsEnabled => "true",
-        :Tunnel => {
+        :Tunnel => [{
           :Name => "test vpn",
           :PeerIpAddress => "110.110.110.110",
           :PeerId => "1223-123UDH-12321",
@@ -41,7 +41,7 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
             :Gateway => "192.168.90.254",
             :Netmask => "255.255.255.0"
           }]
-        }
+        }]
       }
   }