fog 1.10.0 → 1.10.1

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

@@ -1,60 +1,41 @@
 Shindo.tests("Storage[:internet_archive] | file", ["internet_archive"]) do
 
+  # Fog.mock!
+
   require 'tempfile'
 
   file_attributes = {
     :key => 'fog_file_tests',
     :body => lorem_file,
-    :public => true
+    :public => true,
+    :auto_make_bucket => 1,
   }
 
   directory_attributes = {
     # Add a random suffix to prevent collision
-    :key => "fogfilestests-#{rand(65536)}"
+    :key => "fogfilestests-#{rand(65536)}",
+    :collections => ['test_collection']
   }
 
   @directory = Fog::Storage[:internetarchive].directories.create(directory_attributes)
 
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
-    tests("#version") do
-      tests("#version should be null if versioning isn't enabled").returns(nil) do
-        @instance.version
-      end
-    end
-
-  end
+    tests("#set_metadata_array_headers") do
 
-  @directory.versioning = true
+      @instance.collections = ['test_collection', 'opensource']
+      @options = {}
+      @instance.set_metadata_array_headers(:collections, @options)
 
-  model_tests(@directory.files, file_attributes, Fog.mocking?) do
-
-    tests("#version") do
-      tests("#version should not be null if versioning is enabled").returns(false) do
-        @instance.version == nil
+      tests("#set_metadata_array_headers should set options").returns(true) do
+        @options['x-archive-meta01-collection'] == 'opensource' &&
+        @options['x-archive-meta02-collection'] == 'test_collection'
       end
     end
 
+  end
 
-    @directory.files.create(:key => @instance.key)
-    @instance.destroy
-
-    tests("#versions") do
-      tests('#versions.size includes versions (including DeleteMarkers) for all keys').returns(3) do
-        @instance.versions.size
-      end
-
-      tests('#versions are all for the correct key').returns(true) do
-        @instance.versions.all? { |v| v.key == @instance.key }
-      end
-    end
-
-    tests("#destroy") do
-      tests("#destroy a specific version should delete the version, not create a DeleteMarker").returns(2) do
-        @instance.destroy('versionId' => @instance.version)
-        @instance.versions.all.size
-      end
-    end
+  model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
     tests("multipart upload") do
       pending if Fog.mocking?
@@ -74,7 +55,7 @@ Shindo.tests("Storage[:internet_archive] | file", ["internet_archive"]) do
 
   end
 
-  @directory.versions.each(&:destroy)
+  # @directory.versions.each(&:destroy)
   @directory.destroy
 
 end

data/tests/internet_archive/models/storage/files_tests.rb

@@ -3,54 +3,56 @@ Shindo.tests("Storage[:internet_archive] | files", ["internet_archive"]) do
   file_attributes = {
       :key => 'fog_file_tests',
       :body => lorem_file,
-      :public => true
+      :public => true,
+      :auto_make_bucket => 1,
+      :collections => ['test_collection']
   }
 
   directory_attributes = {
-      :key => 'fogfilestests'
+      :key => "fogfilestests-#{rand(65536)}"
   }
 
   @directory = Fog::Storage[:internetarchive].directories.create(directory_attributes)
-  @directory.versioning = true
+  # @directory.versioning = true
 
   model_tests(@directory.files, file_attributes, Fog.mocking?) do
 
-    v1 = @instance.version
-    v2 = @directory.connection.put_object(@directory.key, @instance.key, 'version 2 content').headers['x-amz-version-id']
-    v3 = @directory.connection.delete_object(@directory.key, @instance.key).headers['x-amz-version-id']
-    v4 = @directory.connection.put_object(@directory.key, @instance.key, 'version 3 content').headers['x-amz-version-id']
+    @instance
+    # v2 = @directory.connection.put_object(@directory.key, @instance.key, 'version 2 content').headers['x-amz-version-id']
+    # v3 = @directory.connection.delete_object(@directory.key, @instance.key).headers['x-amz-version-id']
+    # v4 = @directory.connection.put_object(@directory.key, @instance.key, 'version 3 content').headers['x-amz-version-id']
 
-    tests("#get") do
-      tests("#get without version fetches the latest version").returns(v4) do
-        @directory.files.get(@instance.key).version
-      end
+    # tests("#get") do
+    #   tests("#get without version fetches the latest version").returns(v4) do
+    #     @directory.files.get(@instance.key).version
+    #   end
 
-      tests("#get with version fetches that exact version").returns(v2) do
-        @directory.files.get(@instance.key, 'versionId' => v2).version
-      end
+    #   tests("#get with version fetches that exact version").returns(v2) do
+    #     @directory.files.get(@instance.key, 'versionId' => v2).version
+    #   end
 
-      tests("#get with a deleted version returns nil").returns(nil) do
-        @directory.files.get(@instance.key, 'versionId' => v3)
-      end
-    end
+    #   tests("#get with a deleted version returns nil").returns(nil) do
+    #     @directory.files.get(@instance.key, 'versionId' => v3)
+    #   end
+    # end
 
-    tests("#head") do
-      tests("#head without version fetches the latest version").returns(v4) do
-        @directory.files.head(@instance.key).version
-      end
+    # tests("#head") do
+    #   tests("#head without version fetches the latest version").returns(v4) do
+    #     @directory.files.head(@instance.key).version
+    #   end
 
-      tests("#head with version fetches that exact version").returns(v2) do
-        @directory.files.head(@instance.key, 'versionId' => v2).version
-      end
+    #   tests("#head with version fetches that exact version").returns(v2) do
+    #     @directory.files.head(@instance.key, 'versionId' => v2).version
+    #   end
 
-      tests("#head with a deleted version returns nil").returns(nil) do
-        @directory.files.head(@instance.key, 'versionId' => v3)
-      end
-    end
+    #   tests("#head with a deleted version returns nil").returns(nil) do
+    #     @directory.files.head(@instance.key, 'versionId' => v3)
+    #   end
+    # end
 
   end
 
-  @directory.versions.each(&:destroy)
-  @directory.destroy
+  # @directory.versions.each(&:destroy)
+  # @directory.destroy
 
 end

data/tests/internet_archive/models/storage/url_tests.rb

@@ -20,7 +20,7 @@ Shindo.tests('InternetArchive | url', ["internet_archive"]) do
   end
 
   tests('#url w/ response-cache-control').returns(
-    "https://fognonbucket.s3.us.archive.org/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
+    "http://fognonbucket.s3.us.archive.org/test.txt?response-cache-control=No-cache&AWSAccessKeyId=123&Signature=#{signature}&Expires=1356998400"
   ) do
     @file.url(@expires, :query => { 'response-cache-control' => 'No-cache' })
   end

data/tests/internet_archive/requests/storage/bucket_tests.rb

@@ -18,8 +18,7 @@ Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internet_arch
           'DisplayName' => String,
           'ID'          => String
         },
-        'Size' => Integer,
-        'StorageClass' => String
+        'Size' => Integer
       }]
     }
     @bucket_lifecycle_format = {
@@ -52,6 +51,7 @@ Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internet_arch
       Fog::Storage[:internetarchive].get_service.body
     end
 
+    dirs = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name)
     file = Fog::Storage[:internetarchive].directories.get(@ia_bucket_name).files.create(:body => 'y', :key => 'x')
 
     tests("#get_bucket('#{@ia_bucket_name}')").formats(@bucket_format) do
@@ -239,11 +239,6 @@ Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internet_arch
         Fog::Storage[:internetarchive].put_bucket_lifecycle(@ia_bucket_name, lifecycle)
         Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name).body
       end
-      lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'Expiration' => {'Days' => 42}, 'Transition' => {'Days' => 6, 'StorageClass'=>'GLACIER'}}]}
-      tests('transition').returns(lifecycle) do
-        Fog::Storage[:internetarchive].put_bucket_lifecycle(@ia_bucket_name, lifecycle)
-        Fog::Storage[:internetarchive].get_bucket_lifecycle(@ia_bucket_name).body
-      end
       lifecycle = {'Rules' => [{'ID' => 'test rule', 'Prefix' => '/prefix', 'Enabled' => true, 'Expiration' => {'Date' => '2012-12-31T00:00:00.000Z'}}]}
       tests('date').returns(lifecycle) do
         Fog::Storage[:internetarchive].put_bucket_lifecycle(@ia_bucket_name, lifecycle)
@@ -281,48 +276,49 @@ Shindo.tests('Fog::Storage[:internetarchive] | bucket requests', ["internet_arch
 
   end
 
-  tests('failure') do
+  # tests('failure') do
 
-    tests("#delete_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:internetarchive].delete_bucket('fognonbucket')
-    end
+  #   tests("#delete_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
+  #     Fog::Storage[:internetarchive].delete_bucket('fognonbucket')
+  #   end
 
-    @bucket = Fog::Storage[:internetarchive].directories.create(:key => 'fognonempty')
-    @file = @bucket.files.create(:key => 'foo', :body => 'bar')
+  #   @fognonempty = "fognonempty-#{rand(65536)}"
+  #   @bucket = Fog::Storage[:internetarchive].directories.create(:key => "fognonempty-#{rand(65536)}")
+  #   @file = @bucket.files.create(:key => 'foo', :body => 'bar')
 
-    tests("#delete_bucket('fognonempty')").raises(Excon::Errors::Conflict) do
-      Fog::Storage[:internetarchive].delete_bucket('fognonempty')
-    end
+  #   tests("#delete_bucket('fognonempty')").raises(Excon::Errors::Conflict) do
+  #     Fog::Storage[:internetarchive].delete_bucket('fognonempty')
+  #   end
 
-    @file.destroy
-    @bucket.destroy
+  #   @file.destroy
+  #   @bucket.destroy
 
-    tests("#get_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:internetarchive].get_bucket('fognonbucket')
-    end
+  #   tests("#get_bucket('fognonbucket')").raises(Excon::Errors::NotFound) do
+  #     Fog::Storage[:internetarchive].get_bucket('fognonbucket')
+  #   end
 
-    tests("#get_bucket_location('fognonbucket')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:internetarchive].get_bucket_location('fognonbucket')
-    end
+  #   tests("#get_bucket_location('fognonbucket')").raises(Excon::Errors::NotFound) do
+  #     Fog::Storage[:internetarchive].get_bucket_location('fognonbucket')
+  #   end
 
-    tests("#get_request_payment('fognonbucket')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:internetarchive].get_request_payment('fognonbucket')
-    end
+  #   tests("#get_request_payment('fognonbucket')").raises(Excon::Errors::NotFound) do
+  #     Fog::Storage[:internetarchive].get_request_payment('fognonbucket')
+  #   end
 
-    tests("#put_request_payment('fognonbucket', 'Requester')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:internetarchive].put_request_payment('fognonbucket', 'Requester')
-    end
+  #   tests("#put_request_payment('fognonbucket', 'Requester')").raises(Excon::Errors::NotFound) do
+  #     Fog::Storage[:internetarchive].put_request_payment('fognonbucket', 'Requester')
+  #   end
 
-    tests("#put_bucket_acl('fognonbucket', 'invalid')").raises(Excon::Errors::BadRequest) do
-      Fog::Storage[:internetarchive].put_bucket_acl('fognonbucket', 'invalid')
-    end
+  #   tests("#put_bucket_acl('fognonbucket', 'invalid')").raises(Excon::Errors::BadRequest) do
+  #     Fog::Storage[:internetarchive].put_bucket_acl('fognonbucket', 'invalid')
+  #   end
 
-    tests("#put_bucket_website('fognonbucket', 'index.html')").raises(Excon::Errors::NotFound) do
-      Fog::Storage[:internetarchive].put_bucket_website('fognonbucket', 'index.html')
-    end
+  #   tests("#put_bucket_website('fognonbucket', 'index.html')").raises(Excon::Errors::NotFound) do
+  #     Fog::Storage[:internetarchive].put_bucket_website('fognonbucket', 'index.html')
+  #   end
 
-  end
+  # end
 
   # don't keep the bucket around
-  Fog::Storage[:internetarchive].delete_bucket(@ia_bucket_name) rescue nil
+  # Fog::Storage[:internetarchive].delete_bucket(@ia_bucket_name) rescue nil
 end

data/tests/internet_archive/requests/storage/multipart_upload_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Fog::Storage[:internetarchive] | multipart upload requests', ["internet_archive"]) do
 
-  @directory = Fog::Storage[:internetarchive].directories.create(:key => 'fogmultipartuploadtests')
+  @directory = Fog::Storage[:internetarchive].directories.create(:key => "fogmultipartuploadtests-#{rand(65536)}")
 
   tests('success') do
 

data/tests/openstack/models/network/network_tests.rb

@@ -10,6 +10,23 @@ Shindo.tests("Fog::Network[:openstack] | network", ['openstack']) do
       !@instance.id.nil?
     end
     
+    tests('#create+extensions').succeeds do
+      net = Fog::Network[:openstack].networks.create(
+        :name => 'net_name',
+        :shared => false,
+        :admin_state_up => true,
+        :tenant_id => 'tenant_id',
+        :router_external => true,
+        # local, gre, vlan. Depends on the provider.
+        # May rise an exception if the network_type isn't valid:
+        # QuantumError: "Invalid input for operation: provider:physical_network"
+        :provider_network_type => 'gre',
+        :provider_segmentation_id => 22
+      )
+      net.destroy
+      net.provider_network_type == 'gre'
+    end
+    
     tests('have attributes') do
       attributes = [ 
         :name,

data/tests/openstack/models/network/router_tests.rb

@@ -0,0 +1,38 @@
+Shindo.tests("Fog::Network[:openstack] | router", ['openstack']) do
+
+  tests('success') do
+
+    tests('#create').succeeds do
+      @instance = Fog::Network[:openstack].routers.create(
+        :name => 'router_name',
+        :admin_state_up => true
+      )
+      !@instance.id.nil?
+    end
+
+    tests('#update') do
+      test 'router name' do
+        @instance.name = 'new_name'
+        @instance.update.name == 'new_name'
+      end
+      # Needs code from issue #1598
+      #test 'external_gateway_info' do
+      #  net = Fog::Network[:openstack].networks.create(
+      #    :name => 'net_name',
+      #    :shared => false,
+      #    :admin_state_up => true,
+      #    :tenant_id => 'tenant_id',
+      #    :router_external => true,
+      #  )
+      #  @instance.external_gateway_info = net
+      #  @instance.update
+      #end
+    end
+
+    tests('#destroy').succeeds do
+      @instance.destroy == true
+    end
+
+  end
+
+end

data/tests/openstack/models/network/routers_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests("Fog::Network[:openstack] | routers", ['openstack']) do
+  @router = Fog::Network[:openstack].routers.create(
+    :name => 'router_name',
+    :admin_state_up => true
+  )
+  @routers = Fog::Network[:openstack].routers
+
+  tests('success') do
+
+    tests('#all').succeeds do
+      @routers.all
+    end
+
+    tests('#get').succeeds do
+      @routers.get @router.id
+    end
+
+  end
+
+  @router.destroy
+end

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

@@ -1,19 +1,47 @@
 Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
 
   @network_format = {
-    'id'             => String,
-    'name'           => String,
-    'subnets'        => Array,
-    'shared'         => Fog::Boolean,
-    'status'         => String,
-    'admin_state_up' => Fog::Boolean,
-    'tenant_id'      => String,
+    'id'                        => String,
+    'name'                      => String,
+    'subnets'                   => Array,
+    'shared'                    => Fog::Boolean,
+    'status'                    => String,
+    'admin_state_up'            => Fog::Boolean,
+    'tenant_id'                 => String
+  }
+
+  @network_format_extensions = {
+    'router:external'           => Fog::Boolean,
+    'provider:network_type'     => String,
+    'provider:physical_network' => Fog::Nullable::String,
+    'provider:segmentation_id'  => Integer
   }
 
   tests('success') do
     tests('#create_network').formats({'network' => @network_format}) do
-      attributes = {:name => 'net_name', :shared => false,
-                    :admin_state_up => true, :tenant_id => 'tenant_id'}
+      attributes = {
+        :name => 'net_name',
+        :shared => false,
+        :admin_state_up => true,
+        :tenant_id => 'tenant_id'
+      }
+      Fog::Network[:openstack].create_network(attributes).body
+    end
+    tests('#create_network+provider extensions').formats(
+      {'network' => @network_format.merge(@network_format_extensions)}
+    ) do
+      attributes = {
+        :name => 'net_name',
+        :shared => false,
+        :admin_state_up => true,
+        :tenant_id => 'tenant_id',
+        :router_external => true,
+        # local, gre, vlan. Depends on the provider.
+        # May rise an exception if the network_type isn't valid:
+        # QuantumError: "Invalid input for operation: provider:physical_network"
+        :provider_network_type => 'gre',
+        :provider_segmentation_id => 22,
+      }
       Fog::Network[:openstack].create_network(attributes).body
     end
 
@@ -40,6 +68,24 @@ Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
   end
 
   tests('failure') do
+    tests('#create_network+provider extensions').raises(
+      Excon::Errors::BadRequest
+    ) do
+      pending if Fog.mocking?
+
+      attributes = {
+        :name => 'net_name',
+        :shared => false,
+        :admin_state_up => true,
+        :tenant_id => 'tenant_id',
+        :router_external => true,
+        # QuantumError: "Invalid input for operation: provider:physical_network"
+        :provider_network_type => 'foobar',
+        :provider_segmentation_id => 22,
+      }
+      Fog::Network[:openstack].create_network(attributes)
+    end
+
     tests('#get_network').raises(Fog::Network::OpenStack::NotFound) do
       Fog::Network[:openstack].get_network(0)
     end
@@ -52,5 +98,10 @@ Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
       Fog::Network[:openstack].delete_network(0)
     end
   end
+      
+  # Cleaning up the mess
+  Fog::Network[:openstack].networks.each do |n|
+    Fog::Network[:openstack].delete_network(n.id)
+  end
 
-end
+end