fog 0.5.3 → 0.6.0

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_vapp_spec.rb

@@ -1,4 +1,4 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 shared_examples_for "a successful configure vapp" do
   specify { after_vapp_data.should == new_vapp_data }
@@ -13,7 +13,7 @@ shared_examples_for "a successful configure vapp" do
 end
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:configure_vapp) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/delete_internet_service_spec.rb

@@ -1,8 +1,8 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 #FIXME: Make this more sane with rspec2
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:delete_internet_service) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/delete_node_spec.rb

@@ -1,8 +1,8 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
   #FIXME: with rspec2
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:delete_node) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/delete_vapp_spec.rb

@@ -1,4 +1,4 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 shared_examples_for "a failed vapp deletion" do
   it "should not change the mock data" do
@@ -20,7 +20,7 @@ end
 
 #FIXME: Make this more sane with rspec2
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:delete_vapp) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_catalog_item_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_catalog_item) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_catalog_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_catalog) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_customization_options_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_customization_options) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_internet_services_spec.rb

@@ -1,4 +1,4 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
   shared_examples_for "a basic internet service" do
@@ -56,7 +56,7 @@ if Fog.mocking?
     specify { service[:BackupOf].should == "" }
   end
 
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_internet_services) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_network_ip_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_network_ip) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_network_ips_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_network_ips) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_network_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_network) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_node_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_node) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_nodes_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_nodes) }

data/spec/{vcloud → ecloud}/requests/get_organization_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe Fog::Vcloud, :type => :mock_vcloud_request do
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_organization) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_public_ip_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_public_ip) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_public_ips_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_public_ips) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_vapp_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_vapp) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/get_vdc_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:get_vdc) }

data/spec/ecloud/requests/get_versions_spec.rb

@@ -0,0 +1,57 @@
+require 'ecloud/spec_helper'
+
+shared_examples_for "real or mock get_versions requests" do
+  if Fog.mocking?
+
+    subject { @vcloud }
+
+    it { should respond_to(:get_versions) }
+
+    describe "#get_versions" do
+      subject { @vcloud.get_versions( @vcloud.versions_uri ) }
+
+      it_should_behave_like "all responses"
+
+      describe "body" do
+        subject { @vcloud.get_versions( @vcloud.versions_uri ).body }
+
+        it { should have(4).keys }
+        it_should_behave_like "it has the standard xmlns attributes"   # 2 keys
+
+        its(:xmlns) { should == "http://www.vmware.com/vcloud/versions" }
+
+        its(:VersionInfo) { should be_either_a_hash_or_array }
+
+        describe ":VersionInfo" do
+          subject { arrayify(@vcloud.get_versions( @vcloud.versions_uri ).body[:VersionInfo]) }
+
+          specify {
+            subject.each do |version_info|
+              version_info.should include(:LoginUrl)
+              version_info[:LoginUrl].should be_a_url
+              version_info.should include(:Version)
+              version_info[:Version].should be_an_instance_of(String)
+            end
+          }
+        end
+      end
+    end
+
+  end
+end
+
+if Fog.mocking?
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
+
+    it_should_behave_like "real or mock get_versions requests"
+
+    describe "body" do
+      subject { @vcloud.get_versions( @vcloud.versions_uri ).body }
+      its(:VersionInfo) { should == { :LoginUrl => @mock_version.login_url , :Version => @mock_version.version } }
+    end
+  end
+else
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
+    it_should_behave_like "real or mock get_versions requests"
+  end
+end

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/instantiate_vapp_template_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
+  describe "Fog::Ecloud, initialized w/ the TMRK Ecloud module", :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:instantiate_vapp_template) }
@@ -42,7 +42,7 @@ if Fog.mocking?
           before  { template_instantiation }
           subject { added_mock_data }
 
-          it { should be_an_instance_of(Fog::Vcloud::MockDataClasses::MockVirtualMachine) }
+          it { should be_an_instance_of(Fog::Ecloud::MockDataClasses::MockVirtualMachine) }
 
           its(:name) { should == new_vapp_data[:name] }
           its(:memory) { should == new_vapp_data[:memory] }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/login_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it_should_behave_like "all login requests"

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/power_off_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:power_off) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/power_on_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe Fog::Vcloud, :type => :mock_tmrk_ecloud_request do
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
     subject { @vcloud }
 
     it { should respond_to(:power_on) }

data/spec/{vcloud → ecloud}/spec_helper.rb

@@ -1,6 +1,10 @@
 require 'spec'
 require 'pp'
 
+require 'fog'
+require 'fog/bin'
+require 'fog/bin/ecloud'
+
 module Spec
   module Example
     module Subject
@@ -19,13 +23,8 @@ end
 #Initialize this to a known seed
 srand 1234
 
-require 'fog'
-require 'fog/bin'
-
 Fog.mock! if ENV['FOG_MOCK']
 
-require 'fog/bin/vcloud'
-
 def arrayify(item)
   item.is_a?(Array) ? item : [ item ]
 end
@@ -228,8 +227,8 @@ def setup_generic_mock_data
 end
 
 def setup_ecloud_mock_data
-  @base_url = Fog::Vcloud::Terremark::Ecloud::Mock.base_url
-  @mock_data = Fog::Vcloud::Terremark::Ecloud::Mock.data
+  @base_url = Fog::Ecloud::Compute::Mock.base_url
+  @mock_data = Fog::Ecloud::Compute::Mock.data
   setup_generic_mock_data
   @mock_vdc_service_collection = @mock_vdc.internet_service_collection
   @mock_public_ip_collection = @mock_vdc.public_ip_collection
@@ -247,43 +246,29 @@ def setup_ecloud_mock_data
 end
 
 def setup_vcloud_mock_data
-  @base_url = Fog::Vcloud::Mock.base_url
-  @mock_data = Fog::Vcloud::Mock.data
+  @base_url = Fog::Ecloud::Compute::Mock.base_url
+  @mock_data = Fog::Ecloud::Compute::Mock.data
   setup_generic_mock_data
 end
 
 Spec::Runner.configure do |config|
   config.after(:all) do
-    Fog::Vcloud::Mock.data_reset
+    Fog::Ecloud::Compute::Mock.data_reset
   end
 
   config.before(:each, :type => :vcloud_request) do
-    @vcloud = Fog::Vcloud::Terremark::Ecloud.new(Fog.credentials[:vcloud][:ecloud])
-  end
-
-  config.before(:all, :type => :mock_vcloud_model) do
-    Fog::Vcloud::Mock.data_reset
-    setup_vcloud_mock_data
-    @vcloud = Fog::Vcloud.new(:username => "foo", :password => "bar", :versions_uri => "http://fakey.com/api/versions")
-  end
-
-  config.before(:all, :type => :mock_vcloud_request) do
-    Fog::Vcloud::Mock.data_reset
-    setup_vcloud_mock_data
-    @vcloud = Fog::Vcloud.new(:username => "foo", :password => "bar", :versions_uri => "http://fakey.com/api/versions")
+    @vcloud = Fog::Ecloud::Compute.new(Fog.credentials[:vcloud][:ecloud])
   end
 
   config.before(:each, :type => :mock_tmrk_ecloud_request) do
-    Fog::Vcloud::Mock.data_reset
-    Fog::Vcloud::Terremark::Ecloud::Mock.data_reset
+    Fog::Ecloud::Compute::Mock.data_reset
     setup_ecloud_mock_data
-    @vcloud = Fog::Vcloud::Terremark::Ecloud.new(:username => "foo", :password => "bar", :versions_uri => "http://fakey.com/api/versions")
+    @vcloud = Fog::Ecloud::Compute.new(:ecloud_username => "foo", :ecloud_password => "bar", :ecloud_versions_uri => "http://fakey.com/api/versions")
   end
   config.before(:each, :type => :mock_tmrk_ecloud_model) do
-    Fog::Vcloud::Mock.data_reset
-    Fog::Vcloud::Terremark::Ecloud::Mock.data_reset
+    Fog::Ecloud::Compute::Mock.data_reset
     setup_ecloud_mock_data
-    @vcloud = Fog::Vcloud::Terremark::Ecloud.new(:username => "foo", :password => "bar", :versions_uri => "http://fakey.com/api/versions")
+    @vcloud = Fog::Ecloud::Compute.new(:ecloud_username => "foo", :ecloud_password => "bar", :ecloud_versions_uri => "http://fakey.com/api/versions")
   end
 end
 

data/spec/{vcloud → ecloud}/vcloud_spec.rb

@@ -1,10 +1,10 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe Fog::Vcloud, :type => :mock_vcloud_request do
-    subject { Fog::Vcloud.new(:username => "foo", :password => "bar", :versions_uri => "https://fakey.com/api/versions") }
+  describe Fog::Ecloud, :type => :mock_tmrk_ecloud_request do
+    subject { @vcloud }
 
-    it { should be_an_instance_of(Fog::Vcloud::Mock) }
+    it { should be_an_instance_of(Fog::Ecloud::Compute::Mock) }
 
     it { should respond_to(:default_organization_uri) }
 

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'spec'
 require 'open-uri'
 require 'fog'
 require 'fog/bin'
-require 'fog/bin/vcloud'
 
 if ENV["FOG_MOCK"] == "true"
   Fog.mock!

data/tests/compute/helper.rb

@@ -8,7 +8,8 @@ def compute_providers
     },
     Bluebox   => {
       :server_attributes => {
-        :image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
+        :image_id => 'a00baa8f-b5d0-4815-8238-b471c4c4bf72', # Ubuntu 9.10 64bit
+        :password => 'chunkybacon'
       },
       :mocked => false
     },
@@ -31,6 +32,16 @@ def compute_providers
         :name     => "fog_#{Time.now.to_i}"
       },
       :mocked => false
+    },
+    Voxel => {
+      :server_attributes => {
+        :name => "fog.#{Time.now.to_i}",
+        :disk_size => 10,
+        :processing_cores => 1,
+        :image_id => 55, # image 55 = Ubuntu 10.04 (Lucid), 64-bit, base install
+        :facility => "LDJ1"
+      },
+      :mocked => false
     }
   }
 end