fog 1.34.0 → 1.35.0

data/spec/fog/openstack/image_v2_spec.rb

@@ -0,0 +1,285 @@
+require 'fog/openstack/image_v2'
+
+if RUBY_VERSION =~ /1.8/
+  require File.expand_path('../shared_context', __FILE__)
+else
+  require_relative './shared_context'
+end
+
+RSpec.describe Fog::Image::OpenStack do
+
+  spec_data_folder = 'spec/fog/openstack/image_v2'
+
+  include_context 'OpenStack specs with VCR'
+  before :all do
+    setup_vcr_and_service(
+        :vcr_directory => spec_data_folder,
+        # :service_class => Fog::Image::OpenStack::V2
+        :service_class => Fog::Image::OpenStack # No need to be explicit - Fog will choose the latest available version
+    )
+  end
+
+  def cleanup_image image, image_name=nil, image_id=nil
+    # Delete the image
+    image.destroy if image
+    image_by_id = @service.images.find_by_id(image_id) rescue false if image_id
+    image_by_id.destroy if image_by_id
+    @service.images.all(:name => image_name).each do |image|
+      image.destroy
+    end if image_name
+    # Check that the deletion worked
+    expect { @service.images.find_by_id image_id }.to raise_error(Fog::Image::OpenStack::NotFound) if image_id
+    expect(@service.images.all(:name => image_name).length).to be 0 if image_name
+  end
+
+  it "CRUD & list images" do
+    VCR.use_cassette('image_v2_crud') do
+      image_name = 'foobar'
+      image_rename = 'baz'
+
+      expect(@service.images.all).to_not be_nil
+      begin
+        # Create an image called foobar
+        foobar_image = @service.images.create(:name => image_name)
+        foobar_id = foobar_image.id
+        expect(@service.images.all(:name => image_name).length).to be 1
+        expect(foobar_image.status).to eq 'queued'
+
+        # Rename it to baz
+        foobar_image.update(:name => image_rename) # see "Patch images" test below - for now this will be a simple synthesis of a JSON patch with op = 'replace'
+        expect(foobar_image.name).to eq image_rename
+        baz_image = @service.images.find_by_id foobar_id
+        expect(baz_image).to_not be_nil
+        expect(baz_image.id).to eq foobar_id
+        expect(baz_image.name).to eq image_rename
+
+        # Read the image freshly by listing images filtered by the new name
+        images = @service.images.all(:name => image_rename)
+        expect(images.length).to be 1
+        expect(images.first.id).to eq baz_image.id
+
+      ensure
+        cleanup_image baz_image
+        @service.images.all.select { |image| [image_name, image_rename].include? image.name }.each do |image|
+          image.destroy
+        end
+        # Check that the deletion worked
+        expect(@service.images.all.select { |image| [image_name, image_rename].include? image.name }.length).to be 0
+      end
+    end
+  end
+
+  it "Image creation with ID" do
+    VCR.use_cassette('image_v2_create_id') do
+      image_name = 'foobar_id'
+
+      # Here be dragons - highly recommend not to supply an ID when creating
+      begin
+        # increment this identifier when running test more than once, unless the VCR recording is being used
+        identifier = '11111111-2222-3333-aaaa-bbbbbbccccdf'
+
+        # Create an image with a specified ID
+        foobar_image = @service.images.create(:name => 'foobar_id', :id => identifier)
+        foobar_id = foobar_image.id
+        expect(@service.images.all(:name => image_name).length).to be 1
+        expect(foobar_image.status).to eq 'queued'
+        expect(foobar_id).to eq identifier
+
+        get_image = @service.images.find_by_id(identifier)
+        expect(get_image.name).to eq image_name
+
+      ensure
+        cleanup_image foobar_image, image_name, foobar_id
+      end
+    end
+  end
+
+  it "Image creation with specified location" do
+    VCR.use_cassette('image_v2_create_location') do
+
+      begin
+        # Create image with location of image data
+        pending "Figure out 'Create image with location of image data'"
+        fail
+
+      ensure
+      end
+    end
+  end
+
+  it "Image upload & download in bulk" do
+    VCR.use_cassette('image_v2_upload_download') do
+      image_name = 'foobar_up1'
+      begin
+        image_path = "#{spec_data_folder}/minimal.ova" # "no-op" virtual machine image, 80kB .ova file containing 64Mb dynamic disk
+
+        foobar_image = @service.images.create(:name => image_name,
+                                              :container_format => 'ovf',
+                                              :disk_format => 'vmdk'
+        )
+        foobar_id = foobar_image.id
+
+        # Upload data from File or IO object
+        foobar_image.upload_data File.new(image_path, 'r')
+
+        # Status should be saving or active
+        expect(@service.images.find_by_id(foobar_id).status).to satisfy { |value| ['saving', 'active'].include? value }
+
+        # Get an IO object from which to download image data - wait until finished saving though
+        while @service.images.find_by_id(foobar_id).status == 'saving' do
+          sleep 1
+        end
+        expect(@service.images.find_by_id(foobar_id).status).to eq 'active'
+
+        # Bulk download
+        downloaded_data = foobar_image.download_data
+        expect(downloaded_data.size).to eq File.size(image_path)
+
+      ensure
+        cleanup_image foobar_image, image_name
+      end
+    end
+  end
+
+  it "Deactivates and activates an image" do
+    VCR.use_cassette('image_v2_activation') do
+      image_name = 'foobar3a'
+      image_path = "spec/fog/openstack/image_v2/minimal.ova" # "no-op" virtual machine image, 80kB .ova file containing 64Mb dynamic disk
+
+      begin
+        # Create an image called foobar2
+        foobar_image = @service.images.create(:name => image_name,
+                                              :container_format => 'ovf',
+                                              :disk_format => 'vmdk'
+        )
+        foobar_id = foobar_image.id
+        foobar_image.upload_data File.new(image_path, 'r')
+        while @service.images.find_by_id(foobar_id).status == 'saving' do
+          sleep 1
+        end
+
+        foobar_image.deactivate
+        expect { foobar_image.download_data }.to raise_error(Excon::Errors::Forbidden)
+
+        foobar_image.reactivate
+        expect { foobar_image.download_data }.not_to raise_error
+      ensure
+        cleanup_image foobar_image, image_name
+      end
+    end
+  end
+
+  it "Adds and deletes image tags" do
+    VCR.use_cassette('image_v2_tags') do
+      image_name = 'foobar3'
+      begin
+        # Create an image
+        foobar_image = @service.images.create(:name => image_name,
+                                              :container_format => 'ovf',
+                                              :disk_format => 'vmdk'
+        )
+        foobar_id = foobar_image.id
+
+        foobar_image.add_tag 'tag1'
+        expect(@service.images.find_by_id(foobar_id).tags).to contain_exactly('tag1')
+
+        foobar_image.add_tags ['tag2', 'tag3', 'tag4']
+        expect(@service.images.find_by_id(foobar_id).tags).to contain_exactly('tag1', 'tag2', 'tag3', 'tag4')
+
+        foobar_image.remove_tag 'tag2'
+        expect(@service.images.find_by_id(foobar_id).tags).to contain_exactly('tag1', 'tag3', 'tag4')
+
+        foobar_image.remove_tags ['tag1', 'tag3']
+        expect(@service.images.find_by_id(foobar_id).tags).to contain_exactly('tag4')
+
+      ensure
+        cleanup_image foobar_image, image_name
+      end
+    end
+  end
+
+  it "CRUD and list image members" do
+    VCR.use_cassette('image_v2_member_crudl') do
+      image_name = 'foobar4'
+      tenant_id = 'tenant1'
+      begin
+        # Create an image called foobar
+        foobar_image = @service.images.create(:name => image_name)
+        foobar_id = foobar_image.id
+
+        expect(foobar_image.members.size).to be 0
+        foobar_image.add_member tenant_id
+        expect(foobar_image.members.size).to be 1
+
+        member = foobar_image.member tenant_id
+        expect(member).to_not be_nil
+        expect(member['status']).to eq 'pending'
+
+        member['status'] = 'accepted'
+        foobar_image.update_member member
+        expect(foobar_image.member(tenant_id)['status']).to eq 'accepted'
+
+        foobar_image.remove_member member['member_id']
+        expect(foobar_image.members.size).to be 0
+      ensure
+        cleanup_image foobar_image, image_name
+      end
+    end
+  end
+
+  it "Gets JSON schemas for 'images', 'image', 'members', 'member'" do
+    VCR.use_cassette('image_v2_schemas') do
+      pending 'Fetching JSON schemas: to be implemented'
+      fail
+    end
+  end
+
+  it "CRUD resource types" do
+    VCR.use_cassette('image_v2_resource_type_crud') do
+      pending 'CRUD resource types: to be implemented'
+      fail
+    end
+  end
+
+  it "CRUD namespace metadata definition" do
+    VCR.use_cassette('image_v2_namespace_metadata_crud') do
+      pending 'CRUD namespace metadata definition: to be implemented'
+      fail
+    end
+  end
+
+  it "CRUD property metadata definition" do
+    VCR.use_cassette('image_v2_property_metadata_crud') do
+      pending 'CRUD property metadata definition: to be implemented'
+      fail
+    end
+  end
+
+  it "CRUD object metadata definition" do
+    VCR.use_cassette('image_v2_object_metadata_crud') do
+      pending 'CRUD object metadata definition: to be implemented'
+      fail
+    end
+  end
+
+  it "CRUD tag metadata definition" do
+    VCR.use_cassette('image_v2_tag_metadata_crud') do
+      pending 'CRUD tag metadata definition: to be implemented'
+      fail
+    end
+  end
+
+  it "CRUD schema metadata definition" do
+    VCR.use_cassette('image_v2_schema_metadata_crud') do
+      pending 'CRUD schema metadata definition: to be implemented'
+      fail
+    end
+  end
+
+  it "Creates, lists & gets tasks" do
+    VCR.use_cassette('image_v2_task_clg') do
+      pending 'Creates, lists & gets tasks: to be implemented'
+      fail
+    end
+  end
+end

data/spec/fog/openstack/image_v2_upload_spec.rb

@@ -0,0 +1,74 @@
+require 'fog/openstack/identity_v3'
+require 'fog/openstack/image_v2'
+
+RSpec.describe Fog::Image::OpenStack do
+
+  it "Upload/download image data using chunked IO" do
+    if ENV['OS_AUTH_URL'] # We only run this against a live system, because VCR's use of Webmock stops Excon :response_block from working correctly
+
+      @os_auth_url = ENV['OS_AUTH_URL']
+
+# allow us to ignore dev certificates on servers
+      Excon.defaults[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false'
+
+# setup the service object
+      @service = Fog::Image::OpenStack.new({
+                                               :openstack_auth_url => "#{@os_auth_url}/auth/tokens",
+                                               :openstack_region => ENV['OS_REGION_NAME'] || 'RegionOne',
+                                               :openstack_api_key => ENV['OS_PASSWORD'] || 'password',
+                                               :openstack_username => ENV['OS_USERNAME'] || 'admin',
+                                               :openstack_domain_name => ENV['OS_USER_DOMAIN_NAME'] || 'Default',
+                                               :openstack_project_name => ENV['OS_PROJECT_NAME'] || 'admin'
+                                           }) unless @service
+
+      spec_data_folder = 'spec/fog/openstack/image_v2'
+
+      begin
+        ####
+        ## Upload & download data using request/response blocks so we can stream data effectively
+        ####
+        image_path = "#{spec_data_folder}/minimal.ova" # "no-op" virtual machine image, 80kB .ova file containing 64Mb dynamic disk
+
+        foobar_image = @service.images.create(:name => 'foobar_up2',
+                                              :container_format => 'ovf',
+                                              :disk_format => 'vmdk'
+        )
+        foobar_id = foobar_image.id
+
+        data_file = File.new(image_path, 'r')
+        chunker = lambda do
+          # Excon.defaults[:chunk_size] defaults to 1048576, ie 1MB
+          # to_s will convert the nil received after everything is read to the final empty chunk
+          data_file.read(Excon.defaults[:chunk_size]).to_s
+        end
+        foobar_image.upload_data(:request_block => chunker)
+
+        # Make sure the upload is finished
+        while @service.images.find_by_id(foobar_id).status == 'saving' do
+          sleep 1
+        end
+        expect(@service.images.find_by_id(foobar_id).status).to eq 'active'
+
+        size = 0
+        read_block = lambda do |chunk, remaining, total|
+          size += chunk.size
+        end
+        foobar_image.download_data(:response_block => read_block)
+        expect(size).to eq File.size(image_path)
+
+      ensure
+        # Delete the image
+        foobar_image.destroy if foobar_image
+
+        @service.images.all(:name => 'foobar_up2').each do |image|
+          image.destroy
+        end
+
+        # Check that the deletion worked
+        expect { @service.images.find_by_id foobar_id }.to raise_error(Fog::Image::OpenStack::NotFound) if foobar_id
+        expect(@service.images.all(:name => 'foobar_up2').length).to be 0
+      end
+    end
+  end
+
+end

data/spec/fog/openstack/shared_context.rb

@@ -3,6 +3,9 @@ require 'rspec/expectations'
 require 'vcr'
 require 'fog/openstack/identity'
 require 'fog/openstack/identity_v3'
+require 'fog/openstack/image'
+require 'fog/openstack/image_v1'
+require 'fog/openstack/image_v2'
 require 'fog/openstack/network'
 
 #
@@ -40,7 +43,7 @@ RSpec.shared_context 'OpenStack specs with VCR' do
       Fog.interval = 0
       # use an auth URL that matches our VCR recordings (IdentityV2 for most
       # services, but IdentityV3 test obviously needs IdentityV3 auth URL)
-      if [Fog::Identity::OpenStack::V3, Fog::Network::OpenStack].include? @service_class
+      if [Fog::Identity::OpenStack::V3, Fog::Image::OpenStack, Fog::Image::OpenStack::V1, Fog::Network::OpenStack].include? @service_class
         @os_auth_url = 'http://devstack.openstack.stack:5000/v3'
       else
         @os_auth_url = 'http://devstack.openstack.stack:5000/v2.0'
@@ -73,19 +76,20 @@ RSpec.shared_context 'OpenStack specs with VCR' do
       if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3')
         options = {
           :openstack_auth_url     => "#{@os_auth_url}/auth/tokens",
-          :openstack_region       => ENV['OS_REGION_NAME']      || 'RegionOne',
-          :openstack_api_key      => ENV['OS_PASSWORD']         || 'password',
-          :openstack_username     => ENV['OS_USERNAME']         || 'admin',
-          :openstack_domain_name  => ENV['OS_USER_DOMAIN_NAME'] || 'Default',
-          :openstack_project_name => ENV['OS_PROJECT_NAME']     || 'admin'
+          :openstack_region       => ENV['OS_REGION_NAME'] || options[:region_name]     || 'RegionOne',
+          :openstack_api_key      => ENV['OS_PASSWORD']    || options[:password]        || 'password',
+          :openstack_username     => ENV['OS_USERNAME']    || options[:username]        || 'admin',
+          :openstack_domain_name  => ENV['OS_USER_DOMAIN_NAME']|| options[:domain_name] || 'Default',
+          :openstack_project_name => ENV['OS_PROJECT_NAME']|| options[:project_name]    || 'admin'
         }
+        options[:openstack_service_type] = [ENV['OS_AUTH_SERVICE']] if ENV['OS_AUTH_SERVICE']
       else
         options = {
           :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'
+          :openstack_region         => ENV['OS_REGION_NAME']  || options[:region_name]  || 'RegionOne',
+          :openstack_api_key        => ENV['OS_PASSWORD']     || options[:password]     || 'devstack',
+          :openstack_username       => ENV['OS_USERNAME']     || options[:username]     || 'admin',
+          :openstack_tenant         => ENV['OS_PROJECT_NAME'] || options[:project_name] || 'admin'
           # FIXME: Identity V3 not properly supported by other services yet
           # :openstack_user_domain    => ENV['OS_USER_DOMAIN_NAME']    || 'Default',
           # :openstack_project_domain => ENV['OS_PROJECT_DOMAIN_NAME'] || 'Default',

data/tests/compute/helper.rb

@@ -109,9 +109,6 @@ def compute_providers
         :name     => "fog_#{Time.now.to_i}"
       },
       :mocked => true
-    },
-    :xenserver => {
-      :mocked => false
     }
   }
 end

data/tests/digitalocean/requests/compute_v2/list_flavors_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Compute::DigitalOceanV2 | list_flavors request', ['digitalocean', 'compute']) do
+  service = Fog::Compute.new(:provider => 'DigitalOcean', :version => 'V2')
+
+  size_format = {
+    'slug' => String,
+    'memory' => Integer,
+    'vcpus' => Integer,
+    'disk' => Integer,
+    'transfer' => Float,
+    'price_monthly' => Float,
+    'price_hourly' => Float,
+    'regions' => Array,
+    'available' => Fog::Boolean,
+  }
+
+  tests('success') do
+    tests('#list_flavors') do
+      service.list_flavors.body['sizes'].each do |size|
+        tests('format').data_matches_schema(size_format) do
+          size
+        end
+      end
+    end
+  end
+end

data/tests/digitalocean/requests/compute_v2/list_images_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Compute::DigitalOceanV2 | list_images request', ['digitalocean', 'compute']) do
+  service = Fog::Compute.new(:provider => 'DigitalOcean', :version => 'V2')
+
+  image_format = {
+    'id' => Integer,
+    'name' => String,
+    'type' => String,
+    'distribution' => String,
+    'slug' => Fog::Nullable::String,
+    'public' => Fog::Boolean,
+    'regions' => Array,
+    'min_disk_size' => Fog::Nullable::Integer,
+    'created_at' => String,
+  }
+
+  tests('success') do
+    tests('#list_images') do
+      service.list_images.body['images'].each do |image|
+        tests('format').data_matches_schema(image_format) do
+          image
+        end
+      end
+    end
+  end
+end