fog 0.5.3 → 0.6.0

data/spec/{vcloud/terremark/ecloud → ecloud}/models/internet_service_spec.rb

@@ -1,11 +1,11 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::InternetService", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::InternetService", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud.vdcs[0].public_ips[0].internet_services[0] }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::InternetService }
+      subject { Fog::Ecloud::Compute::InternetService }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :name, :id, :protocol, :port, :enabled, :description, :public_ip, :timeout, :redirect_url, :monitor, :backup_service_data]) }
@@ -13,7 +13,7 @@ if Fog.mocking?
 
     context "with no uri" do
 
-      subject { Fog::Vcloud::Terremark::Ecloud::InternetService.new() }
+      subject { Fog::Ecloud::Compute::InternetService.new() }
       it { should have_all_attributes_be_nil }
 
     end
@@ -29,7 +29,7 @@ if Fog.mocking?
       let(:composed_public_ip_data) { @vcloud.vdcs[0].public_ips[0].internet_services[0].send(:_compose_ip_data) }
       let(:composed_service_data) { @vcloud.vdcs[0].public_ips[0].internet_services[0].send(:_compose_service_data) }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::InternetService) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::InternetService) }
 
       its(:href)               { should == @mock_service.href }
       its(:identity)           { should == @mock_service.href }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/internet_services_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::InternetServices", :type => :mock_tmrk_ecloud_model do
     context "as an attribute of a VDC" do
       subject { @vcloud.vdcs[0] }
 
@@ -9,7 +9,7 @@ if Fog.mocking?
 
       describe :class do
         subject { @vcloud.vdcs[0].internet_services.class }
-        its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::InternetService }
+        its(:model)       { should == Fog::Ecloud::Compute::InternetService }
       end
 
       describe :internet_services do
@@ -17,7 +17,7 @@ if Fog.mocking?
 
         it { should respond_to(:create) }
 
-        it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::InternetServices) }
+        it { should be_an_instance_of(Fog::Ecloud::Compute::InternetServices) }
 
         its(:length) { should == 4 }
 

data/spec/{vcloud/terremark/ecloud → ecloud}/models/ip_spec.rb

@@ -1,18 +1,18 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Ip", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Ip", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::Ip }
+      subject { Fog::Ecloud::Compute::Ip }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :name, :status, :server, :rnat, :id]) }
     end
 
     context "with no uri" do
-      subject { Fog::Vcloud::Terremark::Ecloud::Ip.new() }
+      subject { Fog::Ecloud::Compute::Ip.new() }
 
       it { should have_all_attributes_be_nil }
     end
@@ -20,7 +20,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @ip = @vcloud.vdcs[0].networks[0].ips[0] }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Ip) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::Ip) }
 
       its(:name) { should == @mock_data.network_ip_from_href(@ip.href).name }
       its(:status) { should == @mock_data.network_ip_from_href(@ip.href).status }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/ips_spec.rb

@@ -1,21 +1,21 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Ips", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Ips", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     it { should respond_to(:ips) }
 
     describe :class do
       subject { @vcloud.vdcs[0].networks[0].ips.class }
-      its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::Ip }
+      its(:model)       { should == Fog::Ecloud::Compute::Ip }
     end
 
     describe :ips do
       subject { @vcloud.vdcs[0].networks[0].ips.reload }
       it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Ips) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::Ips) }
 
       its(:length) { should == 252 }
 

data/spec/{vcloud/terremark/ecloud → ecloud}/models/network_spec.rb

@@ -1,11 +1,11 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Network", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Network", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::Network }
+      subject { Fog::Ecloud::Compute::Network }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :name, :features, :links, :type, :gateway, :broadcast, :address, :rnat, :extension_href, :network_type, :vlan, :friendly_name]) }
@@ -13,7 +13,7 @@ if Fog.mocking?
 
     context "with no uri" do
 
-      subject { Fog::Vcloud::Terremark::Ecloud::Network.new() }
+      subject { Fog::Ecloud::Compute::Network.new() }
 
       it { should have_all_attributes_be_nil }
     end
@@ -21,7 +21,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @vcloud.vdcs[0].networks[0].reload }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Network) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::Network) }
 
       its(:href)                  { should == @mock_network.href }
       its(:identity)              { should == @mock_network.href }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/networks_spec.rb

@@ -1,21 +1,21 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Networks", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Networks", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     it { should respond_to(:networks) }
 
     describe :class do
       subject { @vcloud.networks.class }
-      its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::Network }
+      its(:model)       { should == Fog::Ecloud::Compute::Network }
     end
 
     describe :networks do
       subject { @vcloud.vdcs[0].networks }
       it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Networks) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::Networks) }
 
       its(:length) { should == 2 }
 

data/spec/{vcloud/terremark/ecloud → ecloud}/models/node_spec.rb

@@ -1,12 +1,12 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Node", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Node", :type => :mock_tmrk_ecloud_model do
 
     subject { @vcloud.vdcs.first.public_ips.first.internet_services.first.nodes.first }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::Node }
+      subject { Fog::Ecloud::Compute::Node }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :ip_address, :description, :name, :port, :enabled, :id]) }
@@ -14,7 +14,7 @@ if Fog.mocking?
 
     context "with no uri" do
 
-      subject { Fog::Vcloud::Terremark::Ecloud::Node.new() }
+      subject { Fog::Ecloud::Compute::Node.new() }
       it { should have_all_attributes_be_nil }
 
     end
@@ -22,7 +22,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @vcloud.vdcs.first.public_ips.first.internet_services.first.nodes.first.reload }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Node) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::Node) }
 
       its(:href)                  { should == @mock_node.href }
       its(:identity)              { should == @mock_node.href }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/nodes_spec.rb

@@ -1,7 +1,7 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::InternetServices", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::InternetServices", :type => :mock_tmrk_ecloud_model do
     context "as an attribute of an internet_service" do
       subject { @vcloud.vdcs.first.public_ips.first.internet_services.first }
 
@@ -9,7 +9,7 @@ if Fog.mocking?
 
       describe :class do
         subject { @vcloud.vdcs.first.public_ips.first.internet_services.first.nodes.class }
-        its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::Node }
+        its(:model)       { should == Fog::Ecloud::Compute::Node }
       end
 
       describe :nodes do
@@ -17,7 +17,7 @@ if Fog.mocking?
 
         it { should respond_to(:create) }
 
-        it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Nodes) }
+        it { should be_an_instance_of(Fog::Ecloud::Compute::Nodes) }
 
         its(:length) { should == 3 }
 

data/spec/{vcloud/terremark/ecloud → ecloud}/models/public_ip_spec.rb

@@ -1,11 +1,11 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::PublicIp", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::PublicIp", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::PublicIp }
+      subject { Fog::Ecloud::Compute::PublicIp }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:name, :id, :href]) }
@@ -13,7 +13,7 @@ if Fog.mocking?
 
     context "with no uri" do
 
-      subject { Fog::Vcloud::Terremark::Ecloud::PublicIp.new() }
+      subject { Fog::Ecloud::Compute::PublicIp.new() }
 
       it { should have_all_attributes_be_nil }
     end
@@ -21,7 +21,7 @@ if Fog.mocking?
     context "as a collection member" do
       subject { @vcloud.vdcs[0].public_ips[0].reload; @vcloud.vdcs[0].public_ips[0] }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::PublicIp) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::PublicIp) }
 
       its(:href)                  { should == @mock_public_ip.href }
       its(:identity)              { should == @mock_public_ip.href }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/public_ips_spec.rb

@@ -1,21 +1,21 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::PublicIps", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::PublicIps", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     it { should respond_to(:public_ips) }
 
     describe :class do
       subject { @vcloud.public_ips.class }
-      its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::PublicIp }
+      its(:model)       { should == Fog::Ecloud::Compute::PublicIp }
     end
 
     describe :public_ips do
       subject { @vcloud.vdcs[0].public_ips }
       it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::PublicIps) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::PublicIps) }
 
       its(:length) { should == 3 }
 

data/spec/{vcloud/terremark/ecloud → ecloud}/models/server_spec.rb

@@ -1,18 +1,18 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Vdc", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::Server }
+      subject { Fog::Ecloud::Compute::Server }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :type, :name, :status, :network_connections, :os, :virtual_hardware, :storage_size, :links]) }
     end
 
     context "with no uri" do
-      subject { Fog::Vcloud::Terremark::Ecloud::Server.new() }
+      subject { Fog::Ecloud::Compute::Server.new() }
 
       it { should have_all_attributes_be_nil }
     end

data/spec/{vcloud/terremark/ecloud → ecloud}/models/vdc_spec.rb

@@ -1,13 +1,13 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Vdc", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Vdc", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     it { should respond_to(:get_vdc) }
 
     describe :class do
-      subject { Fog::Vcloud::Terremark::Ecloud::Vdc }
+      subject { Fog::Ecloud::Compute::Vdc }
 
       it { should have_identity(:href) }
       it { should have_only_these_attributes([:href, :name, :type, :description, :other_links, :compute_capacity, :storage_capacity, :available_networks,
@@ -16,7 +16,7 @@ if Fog.mocking?
 
     context "with no uri" do
 
-      subject { Fog::Vcloud::Terremark::Ecloud::Vdc.new() }
+      subject { Fog::Ecloud::Compute::Vdc.new() }
 
       it { should have_all_attributes_be_nil }
     end
@@ -27,7 +27,7 @@ if Fog.mocking?
       its(:href)                  { should == @mock_vdc.href }
       its(:identity)              { should == @mock_vdc.href }
       its(:name)                  { should == @mock_vdc.name }
-      its(:public_ips)            { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::PublicIps) }
+      its(:public_ips)            { should be_an_instance_of(Fog::Ecloud::Compute::PublicIps) }
       its(:other_links)           { should have(4).items }
       its(:resource_entities)     { should have(3).items }
       its(:available_networks)    { should have(2).items }

data/spec/{vcloud/terremark/ecloud → ecloud}/models/vdcs_spec.rb

@@ -1,21 +1,21 @@
-require 'vcloud/spec_helper'
+require 'ecloud/spec_helper'
 
 if Fog.mocking?
-  describe "Fog::Vcloud::Terremark::Ecloud::Vdcs", :type => :mock_tmrk_ecloud_model do
+  describe "Fog::Ecloud::Compute::Vdcs", :type => :mock_tmrk_ecloud_model do
     subject { @vcloud }
 
     it { should respond_to(:vdcs) }
 
     describe :class do
       subject { @vcloud.vdcs.class }
-      its(:model)       { should == Fog::Vcloud::Terremark::Ecloud::Vdc }
+      its(:model)       { should == Fog::Ecloud::Compute::Vdc }
     end
 
     describe :vdcs do
       subject { @vcloud.vdcs }
       it { should_not respond_to(:create) }
 
-      it { should be_an_instance_of(Fog::Vcloud::Terremark::Ecloud::Vdcs) }
+      it { should be_an_instance_of(Fog::Ecloud::Compute::Vdcs) }
 
       its(:length) { should == 2 }
 

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/add_backup_internet_service_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(:add_backup_internet_service) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/add_internet_service_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(:add_internet_service) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/add_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(:add_node) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_internet_service_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(:configure_internet_service) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_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(:configure_network_ip) }

data/spec/{vcloud/terremark/ecloud → ecloud}/requests/configure_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(:configure_node) }