fog 1.18.0 → 1.19.0

data/tests/rackspace/models/queues/message_tests.rb

@@ -32,4 +32,20 @@ Shindo.tests('Fog::Rackspace::Queues | message', ['rackspace']) do
   ensure
     queue.destroy
   end
+
+  tests('identity') do
+    tests('nil') do
+      message = Fog::Rackspace::Queues::Message.new :href => nil
+      returns(nil) { message.id }
+    end
+    tests('with claim id') do
+      message = Fog::Rackspace::Queues::Message.new :href => '/v1/queues/queue1/messages/528b7e4bb04a584f2eb805a3?claim_id=528b7e6aef913e6d2977ee6d'
+      returns('528b7e4bb04a584f2eb805a3') { message.id }
+    end
+    tests('without claim id') do
+      message = Fog::Rackspace::Queues::Message.new :href => '/v1/queues/queue1/messages/528b7e4bb04a584f2eb805a3'
+      returns('528b7e4bb04a584f2eb805a3') { message.id }
+    end
+  end
+
 end

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

@@ -314,6 +314,35 @@ Shindo.tests('Fog::Rackspace::Storage | file', ['rackspace']) do
 
     end
 
+    tests("#content_encoding") do
+
+      tests("#content_encoding should default to nil").returns(nil) do
+        @instance.save
+        @instance.content_encoding
+      end
+
+      @instance.content_encoding = 'gzip'
+      @instance.save
+      tests("#content_encoding should return the content encoding").returns('gzip') do
+        @instance.content_encoding
+      end
+      @instance.attributes.delete('content_encoding')
+
+      @instance.content_encoding = 'foo'
+      @instance.save
+      tests("#content_encoding= should update content_encoding").returns('bar') do
+        @instance.content_encoding = 'bar'
+        @instance.save
+        @instance.content_encoding
+      end
+
+      tests("#content_encoding= should not blow up on nil") do
+        @instance.content_encoding = nil
+        @instance.save
+      end
+
+    end
+
   end
 
   @directory.destroy

data/tests/rackspace/requests/compute_v2/address_tests.rb

@@ -1,10 +1,12 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | address requests', ['rackspace']) do
 
   @service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
+  image_id  = rackspace_test_image_id(@service)
+  flavor_id = rackspace_test_flavor_id(@service)
   
   tests('success') do
     unless Fog.mocking?
-      @server = @service.servers.create(:flavor_id => 2, :image_id => "8a3a9f96-b997-46fd-b7a8-a9e740796ffd", :name => "address-tests-#{Time.now.to_i}")
+      @server = @service.servers.create(:flavor_id => flavor_id, :image_id => image_id, :name => "address-tests-#{Time.now.to_i}")
       @server.wait_for { ready? }
       @server_id = @server.id
     else

data/tests/rackspace/requests/compute_v2/metadata_tests.rb

@@ -1,6 +1,8 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | metadata_tests', ['rackspace']) do
   
   @service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
+  image_id  = rackspace_test_image_id(@service)
+  flavor_id = rackspace_test_flavor_id(@service)
   
   tests('success') do
     begin
@@ -9,8 +11,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata_tests', ['rackspace']) do
       unless Fog.mocking?
         name = "fog-server-metadata-#{Time.now.to_i}"
         @server = @service.servers.create(:name => name, 
-                                          :flavor_id => 2,
-                                          :image_id => '3afe97b2-26dc-49c5-a2cc-a2fc8d80c001',
+                                          :flavor_id => flavor_id,
+                                          :image_id => image_id,
                                           :metadata => metadata)
         @server.wait_for { ready? }
         

data/tests/rackspace/requests/compute_v2/server_tests.rb

@@ -1,8 +1,5 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
   service   = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
-  image_id  = Fog.credentials[:rackspace_image_id]
-  image_id ||= Fog.mocking? ? service.images.first.id : service.images.find {|image| image.name =~ /Ubuntu/}.id # use the first Ubuntu image
-  flavor_id = Fog.credentials[:rackspace_flavor_id] || service.flavors.first.id
 
   link_format = {
     'href' => String,
@@ -62,8 +59,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
 
     server_id = nil
     server_name = "fog#{Time.now.to_i.to_s}"
-    image_id = image_id
-    flavor_id = flavor_id
+    image_id = rackspace_test_image_id(service)
+    flavor_id = rackspace_test_flavor_id(service)
 
     tests("#create_server(#{server_name}, #{image_id}, #{flavor_id}, 1, 1)").formats(create_server_format) do
       body = service.create_server(server_name, image_id, flavor_id, 1, 1).body
@@ -117,7 +114,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
     wait_for_server_state(service, server_id, 'ACTIVE', 'ERROR')
 
     tests('#resize_server').succeeds do
-      resize_flavor_id = Fog.mocking? ? flavor_id : service.flavors[1].id
+      resize_flavor_id = Fog.mocking? ? flavor_id : service.flavors[2].id
       service.resize_server(server_id, resize_flavor_id)
     end
     wait_for_server_state(service, server_id, 'VERIFY_RESIZE', 'ACTIVE')

data/tests/vcloud_director/models/compute/media_tests.rb

@@ -4,8 +4,17 @@ Shindo.tests('Compute::VcloudDirector | media', ['vclouddirector']) do
   pending if Fog.mocking?
 
   medias = vdc.medias
-  pending if medias.all.empty?
-  media = medias.first
+  media_name = VcloudDirector::Compute::Helper.test_name
+
+  tests('Compute::VcloudDirector | media', ['create']) do
+    tests('#create').returns(Fog::Compute::VcloudDirector::Media) do
+      File.open(VcloudDirector::Compute::Helper.fixture('test.iso'), 'rb') do |iso|
+        medias.create(media_name, iso).class
+      end
+    end
+  end
+
+  media = medias.get_by_name(media_name)
 
   tests('Compute::VcloudDirector | media') do
     tests('#href').returns(String) { media.href.class }
@@ -21,9 +30,9 @@ Shindo.tests('Compute::VcloudDirector | media', ['vclouddirector']) do
   end
 
   tests('Compute::VcloudDirector | media', ['load on demand']) do
-    tests("#description is not loaded yet").returns(NonLoaded) { media.attributes[:description] }
-    tests("#description is loaded on demand").returns(String) { media.description.class }
-    tests("#description is now loaded").returns(true) { media.attributes[:description] != NonLoaded }
+    tests('#description is not loaded yet').returns(NonLoaded) { media.attributes[:description] }
+    tests('#description is loaded on demand').returns(String) { media.description.class }
+    tests('#description is now loaded').returns(true) { media.attributes[:description] != NonLoaded }
   end
 
   tests('Compute::VcloudDirector | media', ['lazy load attrs']) do
@@ -42,4 +51,8 @@ Shindo.tests('Compute::VcloudDirector | media', ['vclouddirector']) do
     tests('#get_by_name').returns(media.name) { medias.get_by_name(media.name).name }
     tests('#get').returns(media.id) { medias.get(media.id).id }
   end
+
+  tests('Compute::VcloudDirector | media', ['destroy']) do
+    tests('#destroy').returns(true) { media.destroy }
+  end
 end

data/tests/vcloud_director/models/compute/vapp_tests.rb

@@ -2,7 +2,9 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 Shindo.tests("Compute::VcloudDirector | vapps", ['vclouddirector', 'all']) do
   pending if Fog.mocking?
-  tests("#There is more than one vapp").returns(true){ vdc.vapps.size >= 1 }
+
+  # unless there is atleast one vapp we cannot run these tests
+  pending if vdc.vapps.empty?
 
   vapps = vdc.vapps
   vapp = vapps.first

data/tests/vcloud_director/models/compute/vms_tests.rb

@@ -4,7 +4,8 @@ Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
   pending if Fog.mocking?
   vapp = vapps.detect {|v| v.vms.size >= 1}
 
-  tests("#There is more than one vm").returns(true){ vapp.vms.size >= 1 }
+  # we can't run these tests if there is no vapps with a vm in them
+  pending unless vapp
 
   vms = vapp.vms
   vm = vms.first

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

@@ -34,11 +34,17 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
   @service = Fog::Compute::VcloudDirector.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
 
-  tests('Get first vDC') do
-    link = @org[:Link].detect do |l|
-      l[:type] == 'application/vnd.vmware.vcloud.vdc+xml'
+  tests('Get first vDC with an EdgeGatewayRecord') do
+    @org[:Link].each do |l|
+      if l[:type] == 'application/vnd.vmware.vcloud.vdc+xml'
+        id = l[:href].split('/').last
+        edge_gateways = @service.get_org_vdc_gateways(id).body
+        if edge_gateways && edge_gateways[:EdgeGatewayRecord].size >= 1 
+          @vdc_id = id
+          break
+        end
+      end
     end
-    @vdc_id = link[:href].split('/').last
   end
 
   tests('#get_org_vdc_gateways').data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_RECORDS_TYPE) do
@@ -52,21 +58,24 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
 
   @edge_gateways[:EdgeGatewayRecord].each do |result|
     tests("each EdgeGatewayRecord").
-      data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_EDGE_GATEWAY_RECORD_TYPE) { result }
+      data_matches_schema(VcloudDirector::Compute::Schema::QUERY_RESULT_EDGE_GATEWAY_RECORD_TYPE) do
+        result
+      end
   end
 
   tests('#get_edge_gateway').data_matches_schema(VcloudDirector::Compute::Schema::GATEWAY_TYPE) do
     @edge_gateway_id = @edge_gateways[:EdgeGatewayRecord].first[:href].split('/').last
-    @orginal_gateway_conf = @service.get_edge_gateway(@edge_gateway_id).body
+    @original_gateway_conf = @service.get_edge_gateway(@edge_gateway_id).body
   end
 
+
   tests('#configure_edge_gateway_services') do
 
-    rule = @orginal_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID }
+    rule = @original_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID }
     raise('fail fast if our test firewall rule already exists - its likely left over from a broken test run') if rule
 
     response = @service.post_configure_edge_gateway_services(@edge_gateway_id, @new_edge_gateway_configuration)
-    @service.process_task(response.body) unless Fog.mocking?
+    @service.process_task(response.body)
 
     tests('#check for new firewall rule').returns(@new_edge_gateway_configuration[:FirewallService][:FirewallRule]) do
       edge_gateway = @service.get_edge_gateway(@edge_gateway_id).body
@@ -75,8 +84,8 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
 
     tests('#remove the firewall rule added by test').returns(nil) do
       response = @service.post_configure_edge_gateway_services(@edge_gateway_id,
-                                                               @orginal_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration])
-      @service.process_task(response.body) unless Fog.mocking?
+                                                               @original_gateway_conf[:Configuration][:EdgeGatewayServiceConfiguration])
+      @service.process_task(response.body)
       edge_gateway = @service.get_edge_gateway(@edge_gateway_id).body
       edge_gateway[:Configuration][:EdgeGatewayServiceConfiguration][:FirewallService][:FirewallRule].find { |rule| rule[:Id] == FIREWALL_RULE_ID }
     end

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

@@ -1,3 +1,6 @@
+
+require 'pp'
+
 Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) do
 
   GET_NETWORK_FORMAT = {
@@ -7,7 +10,7 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     :id => String,
     :description => Fog::Nullable::String,
     :is_inherited => Fog::Boolean,
-    :gateway => String,
+    :gateway => Fog::Nullable::String,
     :netmask => String,
     :dns1 => Fog::Nullable::String,
     :dns2 => Fog::Nullable::String,
@@ -20,6 +23,19 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
 
   @service = Fog::Compute::VcloudDirector.new
   @org = VcloudDirector::Compute::Helper.current_org(@service)
+  @created_net_id = nil
+
+  tests('Create network in non-existent vDC').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    @service.post_create_org_vdc_network('00000000-0000-0000-0000-000000000000', 'bob')
+  end
+
+  tests('Delete non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    @service.delete_network('00000000-0000-0000-0000-000000000000')
+  end
+
+  tests('Retrieve non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
+    @service.get_network('00000000-0000-0000-0000-000000000000')
+  end
 
   tests('#get_network').data_matches_schema(GET_NETWORK_FORMAT) do
     link = @org[:Link].detect do |l|
@@ -36,8 +52,53 @@ Shindo.tests('Compute::VcloudDirector | network requests', ['vclouddirector']) d
     @service.get_network_metadata(@network_id).body
   end
 
-  tests('Retrieve non-existent OrgNetwork').raises(Fog::Compute::VcloudDirector::Forbidden) do
-    @service.get_network('00000000-0000-0000-0000-000000000000')
+  tests('#post_create_org_vdc_network') do
+    pending unless Fog.mocking?
+    link = @org[:Link].detect do |l|
+      l[:rel] == 'down' && l[:type] == 'application/vnd.vmware.vcloud.vdc+xml'
+    end
+
+    vdc_id = link[:href].split('/').last
+    name = VcloudDirector::Compute::Helper.test_name
+
+    options = {
+      :Description => "Testing post_create_org_vdc_network #{name}",
+      :Configuration => {
+        :IpScopes => {
+          :IpScope => {
+            :IsInherited => 'false',
+            :Gateway => '198.51.100.1',
+            :Netmask => '255.255.255.0',
+            :Dns1    => '198.51.100.2',
+            :Dns2    => '198.51.100.3',
+            :DnsSuffix => 'example.com',
+            :IpRanges => [
+              { :IpRange => { :StartAddress => '198.51.100.10', :EndAddress => '198.51.100.20' } },
+              { :IpRange => { :StartAddress => '198.51.100.30', :EndAddress => '198.51.100.40' } },
+            ]
+          },
+        },
+        :FenceMode => 'isolated',
+      }
+    }
+
+    body = @service.post_create_org_vdc_network(vdc_id, name, options).body
+    @created_net_id = body[:href].split('/').last if body[:href]
+    @service.process_task(body[:Tasks][:Task]) if body && body.key?(:Tasks)
+
+    tests('fetched name matches created name').returns(name) do
+      net = @service.get_network(@created_net_id).body
+      net[:name]
+    end
+  end
+
+  tests('#delete_network') do
+    pending unless Fog.mocking?
+    @delete_task = @service.delete_network(@created_net_id).body
+    @service.process_task(@delete_task)
+    tests('created network has been deleted').raises(Fog::Compute::VcloudDirector::Forbidden) do
+      @service.get_network(@created_net_id)
+    end
   end
 
 end

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

@@ -11,23 +11,88 @@ Shindo.tests('Compute::VcloudDirector | query requests', ['vclouddirector']) do
     end
   end
 
-  pending if Fog.mocking?
-
+  # for each queriable type, query and check that each available format 
+  # returns a result that matches the base schema
+  #
   @query_list[:Link].select do |link|
     link[:rel] == 'down'
   end.sort_by do |link|
     [link[:name], link[:href]]
   end.each do |link|
+
     href = Nokogiri::XML.fragment(link[:href])
     query = CGI.parse(URI.parse(href.text).query)
     type = query['type'].first
     format = query['format'].first
     next if %w[right role strandedUser].include?(type)
     tests("type => #{type}, format => #{format}") do
+
+      pending if Fog.mocking? && (format != 'records' || type != 'orgVdcNetwork')
+
       tests("#get_execute_query").data_matches_schema(VcloudDirector::Compute::Schema::CONTAINER_TYPE) do
         @body = @service.get_execute_query(type, :format => format).body
       end
       tests("resource type").returns(link[:type]) { @body[:type] }
+
+      unless ( type == 'event' || type == 'edgeGateway' )
+        records_key = @body.keys.detect {|key| key.to_s =~ /Record|Reference$/}
+        if records = @body[records_key]
+          records.first do |record|
+            case format
+            when 'records'
+              tests("record is correct schema").data_matches_schema(VcloudDirector::Compute::Schema::REFERENCE_TYPE) do
+                record
+              end
+            end
+          end
+        end
+      end
+
+    end
+  end
+
+  if Fog.mocking?
+    tests('ensure Mock logic is sound') do
+      tests('#get_execute_query') do
+        tests('orgVdcNetwork') do
+          output = @service.get_execute_query('orgVdcNetwork').body
+          tests('all records').returns(@service.data[:networks].size) do
+            output[:OrgVdcNetworkRecords].size
+          end
+          output = @service.get_execute_query('orgVdcNetwork', :filter => 'name==vDC1 backend network').body
+          tests(':filter by name').returns(1) do
+            output[:OrgVdcNetworkRecords].size
+          end
+          tests(':page option is ok if :page == 1').returns(@service.data[:networks].size) do
+            output = @service.get_execute_query('orgVdcNetwork', :page => '1').body
+            output[:OrgVdcNetworkRecords].size
+          end
+          tests('AND expression in :filter raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :filter => 'name==Default Network;thing==wibble')
+          end
+          tests('OR expression in :filter raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :filter => 'name==Default Network,thing==wibble')
+          end
+          tests('sortAsc option raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :sortAsc => 'name')
+          end
+          tests('sortDesc option raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :sortDesc => 'name')
+          end
+          tests('page option raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :page => '2')
+          end
+          tests('pageSize option raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :pageSize => '50')
+          end
+          tests('offset option raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :offset => '5')
+          end
+          tests('fields option raises MockNotImplemented').raises(Fog::Errors::MockNotImplemented) do
+            @service.get_execute_query('orgVdcNetwork', :fields => 'name,thing')
+          end
+        end 
+      end
     end
   end
 

data/tests/vsphere/requests/compute/set_vm_customvalue_tests.rb

@@ -0,0 +1,21 @@
+Shindo.tests('Fog::Compute[:vsphere] | set_vm_customvalue request', ['vsphere']) do
+
+  compute = Fog::Compute[:vsphere]
+
+  instance_uuid = '50137835-88a1-436e-768e-9b2677076e67'
+  custom_key = nil
+  custom_value = nil
+
+  tests('The response should') do
+    response = compute.set_vm_customvalue(instance_uuid, custom_key, custom_value)
+    test('be nil') { response.nil? }
+  end
+
+  tests('The expected options') do
+    raises(ArgumentError, 'raises ArgumentError when instance_uuid option is missing') { compute.set_vm_customvalue }
+    raises(ArgumentError, 'raises ArgumentError when custom_key option is missing') { compute.set_vm_customvalue(instance_uuid) }
+    raises(ArgumentError, 'raises ArgumentError when custom_value option is missing') { compute.set_vm_customvalue(instance_uuid, custom_key) }
+  end
+
+end
+