[vcloud_director] Remove vcr.

.gitignore

@@ -22,5 +22,3 @@ spec/credentials.yml
 vendor/*
 tags
 tests/digitalocean/fixtures/
-tests/vcloud_director/fixtures/vcloud/v1.5/schema/*.xsd
-tests/vcloud_director/vcr_cassettes/

fog.gemspec

@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency('fission')
   s.add_development_dependency('pry')
   s.add_development_dependency('google-api-client', '~>0.6.2')
-  s.add_development_dependency('vcr', '~>2.6')
   s.add_development_dependency('webmock', '~>1.14')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 

tests/vcloud_director/models/compute/catalog_items_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests("Compute::VcloudDirector | catalog_items", ['vclouddirector', 'all']) do
-
-  Shindo.tests("Compute::VcloudDirector | catalog_items", ['vclouddirector', 'all']) do
   pending if Fog.mocking?
   tests("#There is more than one catalog").returns(true){ catalog.catalog_items.size >= 1 }
 
@@ -38,5 +36,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests("#get_by_name").returns(catalog_item.name) { catalog_items.get_by_name(catalog_item.name).name }
     tests("#get").returns(catalog_item.id) { catalog_items.get(catalog_item.id).id }
   end
-  end
 end

tests/vcloud_director/models/compute/catalogs_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests("Compute::VcloudDirector | catalogs", ['vclouddirector', 'all']) do
-
-  Shindo.tests("Compute::VcloudDirector | catalogs", ['vclouddirector', 'all']) do
   pending if Fog.mocking?
   tests("#There is one or more catalog").returns(true){ organization.catalogs.size >= 1 }
 
@@ -38,5 +36,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests("#get_by_name").returns(catalog.name) { catalogs.get_by_name(catalog.name).name }
     tests("#get").returns(catalog.id) { catalogs.get(catalog.id).id }
   end
-  end
 end

tests/vcloud_director/models/compute/helper.rb

@@ -1,12 +1,5 @@
-require 'vcr'
 require 'fog/vcloud_director/compute'
 
-VCR.configure do |c|
-  c.cassette_library_dir = 'tests/vcloud_director/vcr_cassettes'
-  c.hook_into :webmock
-  c.allow_http_connections_when_no_cassette = true
-end
-
 def boolean?(item)
   [TrueClass, FalseClass].include?(item.class)
 end

tests/vcloud_director/models/compute/media_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests('Compute::VcloudDirector | media', ['vclouddirector']) do
-
-  Shindo.tests('Compute::VcloudDirector | media', ['vclouddirector']) do
   pending if Fog.mocking?
 
   medias = vdc.medias
@@ -44,5 +42,4 @@ VCR.use_cassette(File.basename(__FILE__)) 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
-  end
 end

tests/vcloud_director/models/compute/organizations_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests("Compute::VcloudDirector | organizations", ['vclouddirector', 'all']) do
-
-  Shindo.tests("Compute::VcloudDirector | organizations", ['vclouddirector', 'all']) do
   organizations = vcloud_director.organizations
   tests("#There is at least one organization").returns(true) { organizations.size >= 1 }
 
@@ -17,6 +15,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests("#get_by_name").returns(org.name) { organizations.get_by_name(org.name).name }
     tests("#get").returns(org.id) { organizations.get(org.id).id }
   end
-  end
-
 end

tests/vcloud_director/models/compute/tasks_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests('Compute::VcloudDirector | tasks', ['vclouddirector']) do
-
-  Shindo.tests('Compute::VcloudDirector | tasks', ['vclouddirector']) do
   pending if Fog.mocking?
 
   tasks = organization.tasks
@@ -25,5 +23,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests('#get_by_name').returns(task.name) { tasks.get_by_name(task.name).name }
     tests('#get').returns(task.id) { tasks.get(task.id).id }
   end
-  end
 end

tests/vcloud_director/models/compute/vapp_life_cycle_tests.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-
 VAPP_NAME = "shindo07"
 NETWORK_NAME = "DevOps - Dev Network Connection"
 NETWORK_MODE = "POOL"
@@ -8,10 +7,7 @@ CATALOG_NAME = "Public VM Templates"
 CATALOG_ITEM_NAME = "DEVWEB"
 TAGS = { :company => "acme", :environment => "testing" }
 
-
+Shindo.tests("Compute::VcloudDirector | vapp", ['vclouddirector', 'creation']) do
-VCR.use_cassette(File.basename(__FILE__)) do
-
-  Shindo.tests("Compute::VcloudDirector | vapp", ['vclouddirector', 'creation']) do
   pending if Fog.mocking?
   pending # FIXME: vCloud environment needs to be set up in advance
   tests("#it creates a vApp from a catalog item").returns(true){ the_catalog_item.instantiate(VAPP_NAME, { :network_id => the_network.id, :network_name => NETWORK_NAME}) }
@@ -94,5 +90,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     end
 
   end
-  end
 end

tests/vcloud_director/models/compute/vapp_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests("Compute::VcloudDirector | vapps", ['vclouddirector', 'all']) do
-
-  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 }
 
@@ -38,5 +36,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests("#get_by_name").returns(vapp.name) { vapps.get_by_name(vapp.name).name }
     tests("#get").returns(vapp.id) { vapps.get(vapp.id).id }
   end
-  end
 end

tests/vcloud_director/models/compute/vdcs_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests("Compute::VcloudDirector | vdcs", ['vclouddirector', 'all']) do
-
-  Shindo.tests("Compute::VcloudDirector | vdcs", ['vclouddirector', 'all']) do
   pending if Fog.mocking?
   tests("#There is one or more vdc").returns(true){ organization.vdcs.size >= 1 }
 
@@ -40,6 +38,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests("#get_by_name").returns(vdc.name) { vdcs.get_by_name(vdc.name).name }
     tests("#get").returns(vdc.id) { vdcs.get(vdc.id).id }
   end
-  end
-
 end

tests/vcloud_director/models/compute/vms_tests.rb

@@ -1,8 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
-VCR.use_cassette(File.basename(__FILE__)) do
+Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
-
-  Shindo.tests("Compute::VcloudDirector | vms", ['vclouddirector', 'all']) do
   pending if Fog.mocking?
   vapp = vapps.detect {|v| v.vms.size >= 1}
 
@@ -84,6 +82,4 @@ VCR.use_cassette(File.basename(__FILE__)) do
     tests("#collection").returns(Fog::Compute::VcloudDirector::Tags){ tags.class }
   end
 
-
-  end
 end

tests/vcloud_director/models/tools/reduced_vcr_requests.rb

@@ -1,27 +0,0 @@
-#!/usr/local/bin/ruby
-
-# TO FIX: it reduces the number of requests but it make the tests to faile
-require 'yaml'
-PATH = ARGV.shift
-vcr_cassete = YAML.load_file(PATH)
-
-@num_request = 0
-@pending_requests = {}
-
-reduced_requests = vcr_cassete["http_interactions"].reject do |i| 
-  @num_request += 1
-  if i["response"]["body"]["string"] =~ /running/ && i["response"]["headers"]["Content-Type"].to_s == 'application/vnd.vmware.vcloud.task+xml;version=1.5'
-    @pending_requests[@num_request]=true  
-    @pending_requests[@num_request] && @pending_requests[@num_request-1] && @pending_requests[@num_request-2]
-  else
-    @pending_requests[@num_request]=false
-  end
-end
-
-cleaned = vcr_cassete["http_interactions"].size - reduced_requests.size
-puts "cleaned: #{cleaned} requests"
-
-vcr_cassete["http_interactions"] = reduced_requests
-
-File.open(PATH, 'w') {|f| f.write(vcr_cassete.to_yaml) }
-