fog 1.1.1 → 1.1.2

data/tests/vcloud/models/compute/organization_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests("Vcloud::Compute | organization", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+  instance = Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password').organizations.first
+  instance.reload
+
+  tests("#href").returns('https://vcloud.example.com/api/v1.0/org/1'){ instance.href }
+  tests("#name").returns('Org1'){ instance.name }
+  tests("#full_name").returns('My Full Name'){ instance.full_name }
+  tests("#description").returns("Some fancy\n\nDescription"){ instance.description }
+
+end

data/tests/vcloud/models/compute/organizations_tests.rb

@@ -0,0 +1,14 @@
+require 'fog/vcloud/models/compute/organizations'
+
+Shindo.tests("Vcloud::Compute | organizations", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+  instance = Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password').organizations
+
+  tests("collection") do
+    returns(2) { instance.size }
+    returns("https://vcloud.example.com/api/v1.0/org/1") { instance.first.href }
+  end
+
+end

data/tests/vcloud/models/compute/server_tests.rb

@@ -0,0 +1,136 @@
+require 'fog/vcloud/models/compute/servers'
+
+Shindo.tests("Vcloud::Compute | server", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+  instance = Fog::Vcloud::Compute::Servers.new(
+    :connection => Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password'),
+    :href       =>  "https://vcloud.example.com/api/v1.0/vApp/vapp-1"
+  ).first
+  instance.reload
+
+  tests("#href").returns("https://vcloud.example.com/api/v1.0/vApp/vm-2") { instance.href }
+  tests("#name").returns("vm2") { instance.name }
+  tests("#description").returns("Some VM Description") { instance.description }
+  tests("#status").returns('8') { instance.status }
+  tests("#deployed").returns(true) { instance.deployed }
+
+  tests("#os_desc").returns("Red Hat Enterprise Linux 5 (64-bit)") { instance.os_desc }
+  tests("#os_type").returns("rhel5_64Guest") { instance.os_type }
+  tests("#computer_name").returns("vm2") { instance.computer_name }
+
+  tests("cpu count").returns(1) { instance.cpus[:count] }
+
+  tests("amount of memory").returns(512){ instance.memory[:amount] }
+
+  tests("#disks") do
+    tests("#size").returns(2){ instance.disks.size }
+    tests("#number").returns(0){ instance.disks.first[:number] }
+    tests("#size").returns(1600){ instance.disks.first[:size] }
+    tests("#ElementName").returns("Hard disk 1"){ instance.disks.first[:disk_data][:'rasd:ElementName'] }
+    tests("#InstanceID").returns("2000"){ instance.disks.first[:disk_data][:'rasd:InstanceID'] }
+  end
+
+  tests("#vapp_scoped_local_id").returns("vmware_RHEL5-U5-64-small_v02") { instance.vapp_scoped_local_id }
+
+  tests("#friendly_status").returns('off') { instance.friendly_status }
+  tests("#on?").returns(false) { instance.on? }
+  tests("#off?").returns(true) { instance.off? }
+
+  tests("#network_connections") do
+    tests("#size").returns(2) { instance.network_connections.size }
+  end
+
+  #old tests
+  tests("#server.new('#{Vcloud::Compute::TestSupport::template}')").returns(true) do
+    pending if Fog.mocking?
+    @svr = Vcloud.servers.create :catalog_item_uri => Vcloud::Compute::TestSupport::template, :name => 'fog_test_run', :password => 'password'
+    print "Waiting for server to be ready"
+    @svr.wait_for(1200) { print '.' ; ready? }
+    puts ""
+    @svr.ready?
+  end
+
+  tests("#svr.power_on()").returns(true) do
+    pending if Fog.mocking?
+    @svr.power_on
+    @svr.wait_for { on? }
+    @svr.wait_for { ready? }
+    @svr.on?
+  end
+
+  tests("#svr.description(\"testing\")").returns("testing") do
+    pending if Fog.mocking?
+    @svr.wait_for { ready? }
+    @svr.description = "testing"
+    @svr.save
+    @svr.wait_for { ready? }
+    @svr.description
+  end
+
+  # Power off only stops the OS, doesn't free up resources. #undeploy is for this.
+  tests("#svr.undeploy()").returns(true) do
+    pending if Fog.mocking?
+    @svr.undeploy
+    @svr.wait_for { off? }
+    @svr.wait_for { ready? }
+    @svr.off?
+  end
+
+  tests("#svr.memory(384)").returns(384) do
+    pending if Fog.mocking?
+    raise 'Server template memory already 384m - change to something different' if @svr.memory[:amount] == 384
+    @svr.wait_for { ready? }
+    @svr.memory = 384
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.memory[:amount] == '384'
+      sleep 1
+    end
+    @svr.reload.memory[:amount]
+  end
+
+  tests("#svr.add_disk(4096)").returns([2, "4096"]) do
+    pending if Fog.mocking?
+    raise 'Server template already has two disks' if @svr.disks.size == 2
+    @svr.wait_for { ready? }
+    @svr.add_disk(4096)
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.disks.size == 2
+      sleep 1
+    end
+    [
+     @svr.disks.size,
+     @svr.disks[1][:resource][:vcloud_capacity]
+    ]
+  end
+
+  tests("#svr.delete_disk(1)").returns(1) do
+    pending if Fog.mocking?
+    raise "Server doesn't have two disks - did previous step fail? " if @svr.disks.size != 2
+    @svr.wait_for { ready? }
+    sleep 5 # otherwise complains about being busy
+    @svr.delete_disk 1
+    @svr.save
+    @svr.wait_for { ready? }
+    # Can take a little while for the VM to know it has different ram, and not tied to a task..
+    (1..20).each do |i|
+      break if @svr.reload.disks.size == 1
+      sleep 1
+    end
+    @svr.disks.size
+  end
+
+  tests("#svr.destroy").raises(Excon::Errors::Forbidden) do
+    pending if Fog.mocking?
+    @svr.destroy
+    sleep 5 # allow cleanup..
+    Vcloud.servers.get(@svr.href) == nil
+  end
+end

data/tests/vcloud/models/compute/servers_tests.rb

@@ -1,95 +1,16 @@
-Shindo.tests("Vcloud::Compute | servers", ['vcloud']) do
-
-  tests("#server.new('#{Vcloud::Compute::TestSupport::template}')").returns(true) do
-    pending if Fog.mocking?
-    @svr = Vcloud.servers.create :catalog_item_uri => Vcloud::Compute::TestSupport::template, :name => 'fog_test_run', :password => 'password'
-    print "Waiting for server to be ready"
-    @svr.wait_for(1200) { print '.' ; ready? }
-    puts ""
-    @svr.ready?
-  end
-
-  tests("#svr.power_on()").returns(true) do
-    pending if Fog.mocking?
-    @svr.power_on
-    @svr.wait_for { on? }
-    @svr.wait_for { ready? }
-    @svr.on?
-  end
-
-  tests("#svr.description(\"testing\")").returns("testing") do
-    pending if Fog.mocking?
-    @svr.wait_for { ready? }
-    @svr.description = "testing"
-    @svr.save
-    @svr.wait_for { ready? }
-    @svr.description
-  end
+require 'fog/vcloud/models/compute/servers'
 
-  # Power off only stops the OS, doesn't free up resources. #undeploy is for this.
-  tests("#svr.undeploy()").returns(true) do
-    pending if Fog.mocking?
-    @svr.undeploy
-    @svr.wait_for { off? }
-    @svr.wait_for { ready? }
-    @svr.off?
-  end
+Shindo.tests("Vcloud::Compute | servers", ['vcloud']) do
 
-  tests("#svr.memory(384)").returns(384) do
-    pending if Fog.mocking?
-    raise 'Server template memory already 384m - change to something different' if @svr.memory[:amount] == 384
-    @svr.wait_for { ready? }
-    @svr.memory = 384
-    @svr.save
-    @svr.wait_for { ready? }
-    # Can take a little while for the VM to know it has different ram, and not tied to a task..
-    (1..20).each do |i|
-      break if @svr.reload.memory[:amount] == '384'
-      sleep 1
-    end
-    @svr.reload.memory[:amount]
-  end
+  pending if Fog.mocking?
 
-  tests("#svr.add_disk(4096)").returns([2, "4096"]) do
-    pending if Fog.mocking?
-    raise 'Server template already has two disks' if @svr.disks.size == 2
-    @svr.wait_for { ready? }
-    @svr.add_disk(4096)
-    @svr.save
-    @svr.wait_for { ready? }
-    # Can take a little while for the VM to know it has different ram, and not tied to a task..
-    (1..20).each do |i|
-      break if @svr.reload.disks.size == 2
-      sleep 1
-    end
-    [
-     @svr.disks.size,
-     @svr.disks[1][:resource][:vcloud_capacity]
-    ]
-  end
+  instance = Fog::Vcloud::Compute::Servers.new(
+    :connection => Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password'),
+    :href       =>  "https://vcloud.example.com/api/v1.0/vApp/vapp-1"
+  )
 
-  tests("#svr.delete_disk(1)").returns(1) do
-    pending if Fog.mocking?
-    raise "Server doesn't have two disks - did previous step fail? " if @svr.disks.size != 2
-    @svr.wait_for { ready? }
-    sleep 5 # otherwise complains about being busy
-    @svr.delete_disk 1
-    @svr.save
-    @svr.wait_for { ready? }
-    # Can take a little while for the VM to know it has different ram, and not tied to a task..
-    (1..20).each do |i|
-      break if @svr.reload.disks.size == 1
-      sleep 1
-    end
-    @svr.disks.size
+  tests("collection") do
+    returns(2) { instance.size }
+    returns("https://vcloud.example.com/api/v1.0/vApp/vm-2") { instance.first.href }
   end
-
-  tests("#svr.destroy").raises(Excon::Errors::Forbidden) do
-    pending if Fog.mocking?
-    @svr.destroy
-    sleep 5 # allow cleanup..
-    Vcloud.servers.get(@svr.href) == nil
-  end
-
-
 end

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

@@ -0,0 +1,27 @@
+require 'fog/vcloud/models/compute/vapps'
+require 'fog/vcloud/models/compute/vapp'
+
+Shindo.tests("Vcloud::Compute | vapp", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+  instance = Fog::Vcloud::Compute::Vapps.new(
+    :connection => Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password'),
+    :href       =>  "https://vcloud.example.com/api/v1.0/vdc/1"
+  ).first
+  instance.reload
+
+  tests("#href").returns("https://vcloud.example.com/api/v1.0/vApp/vapp-1") { instance.href }
+  tests("#name").returns("vApp1") { instance.name }
+  tests("#description").returns("Some Description of a vApp") { instance.description }
+  tests("#status").returns('8') { instance.status }
+  tests("#deployed").returns(true) { instance.deployed }
+
+  tests("#children").returns(2) { instance.children.size }
+  tests("#servers").returns(2) { instance.servers.size }
+
+  tests("#friendly_status").returns('off') { instance.friendly_status }
+  tests("#on?").returns(false) { instance.on? }
+  tests("#off?").returns(true) { instance.off? }
+
+end

data/tests/vcloud/models/compute/vapps_tests.rb

@@ -0,0 +1,17 @@
+require 'fog/vcloud/models/compute/vapps'
+
+Shindo.tests("Vcloud::Compute | vapps", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+  instance = Fog::Vcloud::Compute::Vapps.new(
+    :connection => Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password'),
+    :href       =>  "https://vcloud.example.com/api/v1.0/vdc/1"
+  )
+
+  tests("collection") do
+    returns(2) { instance.size }
+    returns("https://vcloud.example.com/api/v1.0/vApp/vapp-1") { instance.first.href }
+  end
+
+end

data/tests/vcloud/models/compute/vdc_tests.rb

@@ -0,0 +1,42 @@
+require 'fog/vcloud/models/compute/vdcs'
+require 'fog/vcloud/models/compute/vdc'
+
+Shindo.tests("Vcloud::Compute | vdc", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+  instance = Fog::Vcloud::Compute::Vdcs.new(
+    :connection => Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password'),
+    :href       =>  "https://vcloud.example.com/api/v1.0/org/1"
+  ).first
+  instance.reload
+
+  tests("#href").returns("https://vcloud.example.com/api/v1.0/vdc/1") { instance.href }
+  tests("#name").returns("vDC1") { instance.name }
+  tests("#description").returns("Some Description") { instance.description }
+  tests("#network_quota").returns(10) { instance.network_quota }
+  tests("#nic_quota").returns(10) { instance.nic_quota }
+  tests("#vm_quota").returns(10) { instance.vm_quota }
+  tests("#is_enabled").returns(true) { instance.is_enabled }
+
+  tests("#available_networks") do
+    tests("#size").returns(2) { instance.available_networks.size }
+  end
+
+  tests("#storage_capacity") do
+    tests("units").returns("MB") { instance.storage_capacity[:Units] }
+    tests("allocated").returns("10240") { instance.storage_capacity[:Allocated] }
+  end
+
+  tests("#compute_capacity") do
+    tests("cpu") do
+      tests("allocated").returns("20000") { instance.compute_capacity[:Cpu][:Allocated] }
+      tests("units").returns("MHz") { instance.compute_capacity[:Cpu][:Units] }
+    end
+    tests("memory") do
+      tests("allocated").returns("1024") { instance.compute_capacity[:Memory][:Allocated] }
+      tests("units").returns("MB") { instance.compute_capacity[:Memory][:Units] }
+    end
+
+  end
+end

data/tests/vcloud/models/compute/vdcs_tests.rb

@@ -0,0 +1,17 @@
+require 'fog/vcloud/models/compute/vdcs'
+
+Shindo.tests("Vcloud::Compute | vdcs", ['vcloud']) do
+
+  pending if Fog.mocking?
+
+   instance = Fog::Vcloud::Compute::Vdcs.new(
+    :connection => Fog::Vcloud::Compute.new(:vcloud_host => 'vcloud.example.com', :vcloud_username => 'username', :vcloud_password => 'password'),
+    :href       =>  "https://vcloud.example.com/api/v1.0/org/1"
+   )
+
+  tests("collection") do
+    returns(1) { instance.size }
+    returns("https://vcloud.example.com/api/v1.0/vdc/1") { instance.first.href }
+  end
+
+end

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

@@ -1,10 +1,10 @@
 Shindo.tests("Fog::Compute[:vsphere] | vm_clone request", 'vsphere') do
   #require 'guid'
-  template = "50323f93-6835-1178-8b8f-9e2109890e1a"
+  template = "/Datacenters/Solutions/vm/Jeff/Templates/centos56gm2"
   compute = Fog::Compute[:vsphere]
 
   tests("The return value should") do
-    response = compute.vm_clone('instance_uuid' => template, 'name' => 'cloning_vm')
+    response = compute.vm_clone('path' => template, 'name' => 'cloning_vm')
     test("be a kind of Hash") { response.kind_of? Hash }
     %w{ vm_ref task_ref }.each do |key|
       test("have a #{key} key") { response.has_key? key }
@@ -12,10 +12,6 @@ Shindo.tests("Fog::Compute[:vsphere] | vm_clone request", 'vsphere') do
   end
   tests("When invalid input is presented") do
     raises(ArgumentError, 'it should raise ArgumentError') { compute.vm_clone(:foo => 1) }
-    raises(Fog::Vsphere::Errors::ServiceError,
-           'it should raise ServiceError if a VM already exists with the provided name') do
-      compute.vm_clone('instance_uuid' => '123', 'name' => 'jefftest')
-    end
     raises(Fog::Compute::Vsphere::NotFound, 'it should raise Fog::Compute::Vsphere::NotFound when the UUID is not a string') do
       pending # require 'guid'
       compute.vm_clone('instance_uuid' => Guid.from_s(template), 'name' => 'jefftestfoo')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2011-12-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &6100240 !ruby/object:Gem::Requirement
+  requirement: &8859140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6100240
+  version_requirements: *8859140
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &6099970 !ruby/object:Gem::Requirement
+  requirement: &8857350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.4
+        version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *6099970
+  version_requirements: *8857350
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &6099720 !ruby/object:Gem::Requirement
+  requirement: &8855090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *6099720
+  version_requirements: *8855090
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &6099490 !ruby/object:Gem::Requirement
+  requirement: &8854190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *6099490
+  version_requirements: *8854190
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &6099300 !ruby/object:Gem::Requirement
+  requirement: &8853620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6099300
+  version_requirements: *8853620
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &6099030 !ruby/object:Gem::Requirement
+  requirement: &8851850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *6099030
+  version_requirements: *8851850
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &6098780 !ruby/object:Gem::Requirement
+  requirement: &8850000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *6098780
+  version_requirements: *8850000
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &6098550 !ruby/object:Gem::Requirement
+  requirement: &8848270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *6098550
+  version_requirements: *8848270
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &6098360 !ruby/object:Gem::Requirement
+  requirement: &8847260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *6098360
+  version_requirements: *8847260
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &6098130 !ruby/object:Gem::Requirement
+  requirement: &8845360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6098130
+  version_requirements: *8845360
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &6097920 !ruby/object:Gem::Requirement
+  requirement: &8844260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6097920
+  version_requirements: *8844260
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &6097710 !ruby/object:Gem::Requirement
+  requirement: &8842790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6097710
+  version_requirements: *8842790
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &6097500 !ruby/object:Gem::Requirement
+  requirement: &8841400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *6097500
+  version_requirements: *8841400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6097250 !ruby/object:Gem::Requirement
+  requirement: &8840170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *6097250
+  version_requirements: *8840170
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &6097000 !ruby/object:Gem::Requirement
+  requirement: &8838210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *6097000
+  version_requirements: *8838210
 - !ruby/object:Gem::Dependency
   name: virtualbox
-  requirement: &6096770 !ruby/object:Gem::Requirement
+  requirement: &8837200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,7 +186,7 @@ dependencies:
         version: 0.9.1
   type: :development
   prerelease: false
-  version_requirements: *6096770
+  version_requirements: *8837200
 description: The Ruby cloud services library. Supports all major cloud providers including
   AWS, Rackspace, Linode, Blue Box, StormOnDemand, and many others. Full support for
   most AWS services including EC2, S3, CloudWatch, SimpleDB, ELB, and RDS.
@@ -370,6 +370,7 @@ files:
 - lib/fog/aws/parsers/compute/describe_addresses.rb
 - lib/fog/aws/parsers/compute/describe_availability_zones.rb
 - lib/fog/aws/parsers/compute/describe_images.rb
+- lib/fog/aws/parsers/compute/describe_instance_status.rb
 - lib/fog/aws/parsers/compute/describe_instances.rb
 - lib/fog/aws/parsers/compute/describe_key_pairs.rb
 - lib/fog/aws/parsers/compute/describe_placement_groups.rb
@@ -526,6 +527,7 @@ files:
 - lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
 - lib/fog/aws/parsers/storage/list_multipart_uploads.rb
 - lib/fog/aws/parsers/storage/list_parts.rb
+- lib/fog/aws/parsers/sts/get_session_token.rb
 - lib/fog/aws/rds.rb
 - lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb
 - lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb
@@ -608,6 +610,7 @@ files:
 - lib/fog/aws/requests/compute/describe_addresses.rb
 - lib/fog/aws/requests/compute/describe_availability_zones.rb
 - lib/fog/aws/requests/compute/describe_images.rb
+- lib/fog/aws/requests/compute/describe_instance_status.rb
 - lib/fog/aws/requests/compute/describe_instances.rb
 - lib/fog/aws/requests/compute/describe_key_pairs.rb
 - lib/fog/aws/requests/compute/describe_placement_groups.rb
@@ -792,6 +795,7 @@ files:
 - lib/fog/aws/requests/sqs/send_message.rb
 - lib/fog/aws/requests/sqs/set_queue_attributes.rb
 - lib/fog/aws/requests/storage/abort_multipart_upload.rb
+- lib/fog/aws/requests/storage/acl_utils.rb
 - lib/fog/aws/requests/storage/complete_multipart_upload.rb
 - lib/fog/aws/requests/storage/copy_object.rb
 - lib/fog/aws/requests/storage/delete_bucket.rb
@@ -814,7 +818,6 @@ files:
 - lib/fog/aws/requests/storage/get_object_url.rb
 - lib/fog/aws/requests/storage/get_request_payment.rb
 - lib/fog/aws/requests/storage/get_service.rb
-- lib/fog/aws/requests/storage/hash_to_acl.rb
 - lib/fog/aws/requests/storage/head_object.rb
 - lib/fog/aws/requests/storage/initiate_multipart_upload.rb
 - lib/fog/aws/requests/storage/list_multipart_uploads.rb
@@ -832,15 +835,19 @@ files:
 - lib/fog/aws/requests/storage/put_request_payment.rb
 - lib/fog/aws/requests/storage/sync_clock.rb
 - lib/fog/aws/requests/storage/upload_part.rb
+- lib/fog/aws/requests/sts/get_federation_token.rb
+- lib/fog/aws/requests/sts/get_session_token.rb
 - lib/fog/aws/ses.rb
 - lib/fog/aws/simpledb.rb
 - lib/fog/aws/sns.rb
 - lib/fog/aws/sqs.rb
 - lib/fog/aws/storage.rb
+- lib/fog/aws/sts.rb
 - lib/fog/bin.rb
 - lib/fog/bin/aws.rb
 - lib/fog/bin/bluebox.rb
 - lib/fog/bin/brightbox.rb
+- lib/fog/bin/clodo.rb
 - lib/fog/bin/dnsimple.rb
 - lib/fog/bin/dnsmadeeasy.rb
 - lib/fog/bin/dynect.rb
@@ -909,6 +916,10 @@ files:
 - lib/fog/brightbox/models/compute/account.rb
 - lib/fog/brightbox/models/compute/cloud_ip.rb
 - lib/fog/brightbox/models/compute/cloud_ips.rb
+- lib/fog/brightbox/models/compute/firewall_policies.rb
+- lib/fog/brightbox/models/compute/firewall_policy.rb
+- lib/fog/brightbox/models/compute/firewall_rule.rb
+- lib/fog/brightbox/models/compute/firewall_rules.rb
 - lib/fog/brightbox/models/compute/flavor.rb
 - lib/fog/brightbox/models/compute/flavors.rb
 - lib/fog/brightbox/models/compute/image.rb
@@ -969,6 +980,7 @@ files:
 - lib/fog/brightbox/requests/compute/list_zones.rb
 - lib/fog/brightbox/requests/compute/map_cloud_ip.rb
 - lib/fog/brightbox/requests/compute/move_servers_server_group.rb
+- lib/fog/brightbox/requests/compute/remove_firewall_policy.rb
 - lib/fog/brightbox/requests/compute/remove_listeners_load_balancer.rb
 - lib/fog/brightbox/requests/compute/remove_nodes_load_balancer.rb
 - lib/fog/brightbox/requests/compute/remove_servers_server_group.rb
@@ -989,6 +1001,28 @@ files:
 - lib/fog/brightbox/requests/compute/update_server_group.rb
 - lib/fog/brightbox/requests/compute/update_user.rb
 - lib/fog/cdn.rb
+- lib/fog/clodo.rb
+- lib/fog/clodo/compute.rb
+- lib/fog/clodo/models/compute/image.rb
+- lib/fog/clodo/models/compute/images.rb
+- lib/fog/clodo/models/compute/server.rb
+- lib/fog/clodo/models/compute/servers.rb
+- lib/fog/clodo/requests/compute/add_ip_address.rb
+- lib/fog/clodo/requests/compute/create_server.rb
+- lib/fog/clodo/requests/compute/delete_ip_address.rb
+- lib/fog/clodo/requests/compute/delete_server.rb
+- lib/fog/clodo/requests/compute/get_image_details.rb
+- lib/fog/clodo/requests/compute/get_server_details.rb
+- lib/fog/clodo/requests/compute/list_images.rb
+- lib/fog/clodo/requests/compute/list_images_detail.rb
+- lib/fog/clodo/requests/compute/list_servers.rb
+- lib/fog/clodo/requests/compute/list_servers_detail.rb
+- lib/fog/clodo/requests/compute/move_ip_address.rb
+- lib/fog/clodo/requests/compute/reboot_server.rb
+- lib/fog/clodo/requests/compute/rebuild_server.rb
+- lib/fog/clodo/requests/compute/server_action.rb
+- lib/fog/clodo/requests/compute/start_server.rb
+- lib/fog/clodo/requests/compute/stop_server.rb
 - lib/fog/compute.rb
 - lib/fog/compute/models/server.rb
 - lib/fog/core.rb
@@ -1465,6 +1499,7 @@ files:
 - lib/fog/rackspace/requests/load_balancers/delete_virtual_ip.rb
 - lib/fog/rackspace/requests/load_balancers/get_connection_logging.rb
 - lib/fog/rackspace/requests/load_balancers/get_connection_throttling.rb
+- lib/fog/rackspace/requests/load_balancers/get_error_page.rb
 - lib/fog/rackspace/requests/load_balancers/get_load_balancer.rb
 - lib/fog/rackspace/requests/load_balancers/get_load_balancer_usage.rb
 - lib/fog/rackspace/requests/load_balancers/get_monitor.rb
@@ -1478,10 +1513,12 @@ files:
 - lib/fog/rackspace/requests/load_balancers/list_protocols.rb
 - lib/fog/rackspace/requests/load_balancers/list_virtual_ips.rb
 - lib/fog/rackspace/requests/load_balancers/remove_connection_throttling.rb
+- lib/fog/rackspace/requests/load_balancers/remove_error_page.rb
 - lib/fog/rackspace/requests/load_balancers/remove_monitor.rb
 - lib/fog/rackspace/requests/load_balancers/remove_session_persistence.rb
 - lib/fog/rackspace/requests/load_balancers/set_connection_logging.rb
 - lib/fog/rackspace/requests/load_balancers/set_connection_throttling.rb
+- lib/fog/rackspace/requests/load_balancers/set_error_page.rb
 - lib/fog/rackspace/requests/load_balancers/set_monitor.rb
 - lib/fog/rackspace/requests/load_balancers/set_session_persistence.rb
 - lib/fog/rackspace/requests/load_balancers/update_load_balancer.rb
@@ -1642,14 +1679,19 @@ files:
 - lib/fog/vcloud/models/compute/catalog_item.rb
 - lib/fog/vcloud/models/compute/catalog_items.rb
 - lib/fog/vcloud/models/compute/catalogs.rb
+- lib/fog/vcloud/models/compute/helpers/status.rb
 - lib/fog/vcloud/models/compute/ip.rb
 - lib/fog/vcloud/models/compute/ips.rb
 - lib/fog/vcloud/models/compute/network.rb
 - lib/fog/vcloud/models/compute/networks.rb
+- lib/fog/vcloud/models/compute/organization.rb
+- lib/fog/vcloud/models/compute/organizations.rb
 - lib/fog/vcloud/models/compute/server.rb
 - lib/fog/vcloud/models/compute/servers.rb
 - lib/fog/vcloud/models/compute/task.rb
 - lib/fog/vcloud/models/compute/tasks.rb
+- lib/fog/vcloud/models/compute/vapp.rb
+- lib/fog/vcloud/models/compute/vapps.rb
 - lib/fog/vcloud/models/compute/vdc.rb
 - lib/fog/vcloud/models/compute/vdcs.rb
 - lib/fog/vcloud/requests/compute/clone_vapp.rb
@@ -1671,6 +1713,7 @@ files:
 - lib/fog/vcloud/requests/compute/get_network_ip.rb
 - lib/fog/vcloud/requests/compute/get_network_ips.rb
 - lib/fog/vcloud/requests/compute/get_organization.rb
+- lib/fog/vcloud/requests/compute/get_server.rb
 - lib/fog/vcloud/requests/compute/get_task.rb
 - lib/fog/vcloud/requests/compute/get_task_list.rb
 - lib/fog/vcloud/requests/compute/get_vapp.rb
@@ -1726,6 +1769,7 @@ files:
 - lib/fog/vsphere/models/compute/server.rb
 - lib/fog/vsphere/models/compute/servers.rb
 - lib/fog/vsphere/requests/compute/current_time.rb
+- lib/fog/vsphere/requests/compute/datacenters.rb
 - lib/fog/vsphere/requests/compute/find_vm_by_ref.rb
 - lib/fog/vsphere/requests/compute/list_virtual_machines.rb
 - lib/fog/vsphere/requests/compute/vm_clone.rb
@@ -1811,6 +1855,7 @@ files:
 - spec/ecloud/requests/power_on_spec.rb
 - spec/ecloud/spec_helper.rb
 - spec/ecloud/vcloud_spec.rb
+- spec/lib/fog/aws/parsers/sqs/receive_message_spec.rb
 - spec/spec_helper.rb
 - tests/aws/models/auto_scaling/activities_tests.rb
 - tests/aws/models/auto_scaling/configuration_test.rb
@@ -1903,10 +1948,12 @@ files:
 - tests/aws/requests/sqs/helper.rb
 - tests/aws/requests/sqs/message_tests.rb
 - tests/aws/requests/sqs/queue_tests.rb
+- tests/aws/requests/storage/acl_utils_tests.rb
 - tests/aws/requests/storage/bucket_tests.rb
-- tests/aws/requests/storage/hash_to_acl_tests.rb
 - tests/aws/requests/storage/multipart_upload_tests.rb
 - tests/aws/requests/storage/object_tests.rb
+- tests/aws/requests/sts/get_federation_token_tests.rb
+- tests/aws/requests/sts/session_token_tests.rb
 - tests/aws/signed_params_tests.rb
 - tests/bluebox/requests/compute/block_tests.rb
 - tests/bluebox/requests/compute/helper.rb
@@ -1925,6 +1972,8 @@ files:
 - tests/brightbox/requests/compute/server_type_tests.rb
 - tests/brightbox/requests/compute/user_tests.rb
 - tests/brightbox/requests/compute/zone_tests.rb
+- tests/clodo/requests/compute/image_tests.rb
+- tests/clodo/requests/compute/server_tests.rb
 - tests/compute/helper.rb
 - tests/compute/models/flavors_tests.rb
 - tests/compute/models/server_tests.rb
@@ -1985,14 +2034,15 @@ files:
 - tests/openstack/requests/compute/server_tests.rb
 - tests/rackspace/helper.rb
 - tests/rackspace/load_balancer_tests.rb
-- tests/rackspace/models/access_list_tests.rb
-- tests/rackspace/models/access_lists_tests.rb
-- tests/rackspace/models/load_balancer_tests.rb
-- tests/rackspace/models/load_balancers_tests.rb
-- tests/rackspace/models/node_tests.rb
-- tests/rackspace/models/nodes_tests.rb
-- tests/rackspace/models/virtual_ip_tests.rb
-- tests/rackspace/models/virtual_ips_tests.rb
+- tests/rackspace/models/dns/zone_tests.rb
+- tests/rackspace/models/load_balancers/access_list_tests.rb
+- tests/rackspace/models/load_balancers/access_lists_tests.rb
+- tests/rackspace/models/load_balancers/load_balancer_tests.rb
+- tests/rackspace/models/load_balancers/load_balancers_tests.rb
+- tests/rackspace/models/load_balancers/node_tests.rb
+- tests/rackspace/models/load_balancers/nodes_tests.rb
+- tests/rackspace/models/load_balancers/virtual_ip_tests.rb
+- tests/rackspace/models/load_balancers/virtual_ips_tests.rb
 - tests/rackspace/requests/compute/address_tests.rb
 - tests/rackspace/requests/compute/flavor_tests.rb
 - tests/rackspace/requests/compute/helper.rb
@@ -2006,6 +2056,7 @@ files:
 - tests/rackspace/requests/load_balancers/algorithm_tests.rb
 - tests/rackspace/requests/load_balancers/connection_logging_tests.rb
 - tests/rackspace/requests/load_balancers/connection_throttling_tests.rb
+- tests/rackspace/requests/load_balancers/error_page_tests.rb
 - tests/rackspace/requests/load_balancers/helper.rb
 - tests/rackspace/requests/load_balancers/load_balancer_tests.rb
 - tests/rackspace/requests/load_balancers/load_balancer_usage_tests.rb
@@ -2030,8 +2081,27 @@ files:
 - tests/storage/models/file_tests.rb
 - tests/storage/models/files_tests.rb
 - tests/storm_on_demand/requests/compute/server_tests.rb
+- tests/vcloud/data/api_+_v1.0_+_admin_+_network_+_2
+- tests/vcloud/data/api_+_v1.0_+_login
+- tests/vcloud/data/api_+_v1.0_+_network_+_1
+- tests/vcloud/data/api_+_v1.0_+_network_+_2
+- tests/vcloud/data/api_+_v1.0_+_org_+_1
+- tests/vcloud/data/api_+_v1.0_+_vApp_+_vapp-1
+- tests/vcloud/data/api_+_v1.0_+_vApp_+_vm-1
+- tests/vcloud/data/api_+_v1.0_+_vApp_+_vm-2
+- tests/vcloud/data/api_+_v1.0_+_vdc_+_1
+- tests/vcloud/models/compute/conn_helper.rb
 - tests/vcloud/models/compute/helper.rb
+- tests/vcloud/models/compute/network_tests.rb
+- tests/vcloud/models/compute/networks_tests.rb
+- tests/vcloud/models/compute/organization_tests.rb
+- tests/vcloud/models/compute/organizations_tests.rb
+- tests/vcloud/models/compute/server_tests.rb
 - tests/vcloud/models/compute/servers_tests.rb
+- tests/vcloud/models/compute/vapp_tests.rb
+- tests/vcloud/models/compute/vapps_tests.rb
+- tests/vcloud/models/compute/vdc_tests.rb
+- tests/vcloud/models/compute/vdcs_tests.rb
 - tests/vcloud/requests/compute/disk_configure_tests.rb
 - tests/voxel/requests/compute/image_tests.rb
 - tests/voxel/requests/compute/server_tests.rb
@@ -2063,7 +2133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -684062385
+      hash: -592665197
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -2125,6 +2195,7 @@ test_files:
 - spec/ecloud/requests/power_on_spec.rb
 - spec/ecloud/spec_helper.rb
 - spec/ecloud/vcloud_spec.rb
+- spec/lib/fog/aws/parsers/sqs/receive_message_spec.rb
 - spec/spec_helper.rb
 - tests/aws/models/auto_scaling/activities_tests.rb
 - tests/aws/models/auto_scaling/configuration_test.rb
@@ -2217,10 +2288,12 @@ test_files:
 - tests/aws/requests/sqs/helper.rb
 - tests/aws/requests/sqs/message_tests.rb
 - tests/aws/requests/sqs/queue_tests.rb
+- tests/aws/requests/storage/acl_utils_tests.rb
 - tests/aws/requests/storage/bucket_tests.rb
-- tests/aws/requests/storage/hash_to_acl_tests.rb
 - tests/aws/requests/storage/multipart_upload_tests.rb
 - tests/aws/requests/storage/object_tests.rb
+- tests/aws/requests/sts/get_federation_token_tests.rb
+- tests/aws/requests/sts/session_token_tests.rb
 - tests/aws/signed_params_tests.rb
 - tests/bluebox/requests/compute/block_tests.rb
 - tests/bluebox/requests/compute/helper.rb
@@ -2239,6 +2312,8 @@ test_files:
 - tests/brightbox/requests/compute/server_type_tests.rb
 - tests/brightbox/requests/compute/user_tests.rb
 - tests/brightbox/requests/compute/zone_tests.rb
+- tests/clodo/requests/compute/image_tests.rb
+- tests/clodo/requests/compute/server_tests.rb
 - tests/compute/helper.rb
 - tests/compute/models/flavors_tests.rb
 - tests/compute/models/server_tests.rb
@@ -2299,14 +2374,15 @@ test_files:
 - tests/openstack/requests/compute/server_tests.rb
 - tests/rackspace/helper.rb
 - tests/rackspace/load_balancer_tests.rb
-- tests/rackspace/models/access_list_tests.rb
-- tests/rackspace/models/access_lists_tests.rb
-- tests/rackspace/models/load_balancer_tests.rb
-- tests/rackspace/models/load_balancers_tests.rb
-- tests/rackspace/models/node_tests.rb
-- tests/rackspace/models/nodes_tests.rb
-- tests/rackspace/models/virtual_ip_tests.rb
-- tests/rackspace/models/virtual_ips_tests.rb
+- tests/rackspace/models/dns/zone_tests.rb
+- tests/rackspace/models/load_balancers/access_list_tests.rb
+- tests/rackspace/models/load_balancers/access_lists_tests.rb
+- tests/rackspace/models/load_balancers/load_balancer_tests.rb
+- tests/rackspace/models/load_balancers/load_balancers_tests.rb
+- tests/rackspace/models/load_balancers/node_tests.rb
+- tests/rackspace/models/load_balancers/nodes_tests.rb
+- tests/rackspace/models/load_balancers/virtual_ip_tests.rb
+- tests/rackspace/models/load_balancers/virtual_ips_tests.rb
 - tests/rackspace/requests/compute/address_tests.rb
 - tests/rackspace/requests/compute/flavor_tests.rb
 - tests/rackspace/requests/compute/helper.rb
@@ -2320,6 +2396,7 @@ test_files:
 - tests/rackspace/requests/load_balancers/algorithm_tests.rb
 - tests/rackspace/requests/load_balancers/connection_logging_tests.rb
 - tests/rackspace/requests/load_balancers/connection_throttling_tests.rb
+- tests/rackspace/requests/load_balancers/error_page_tests.rb
 - tests/rackspace/requests/load_balancers/helper.rb
 - tests/rackspace/requests/load_balancers/load_balancer_tests.rb
 - tests/rackspace/requests/load_balancers/load_balancer_usage_tests.rb
@@ -2344,8 +2421,27 @@ test_files:
 - tests/storage/models/file_tests.rb
 - tests/storage/models/files_tests.rb
 - tests/storm_on_demand/requests/compute/server_tests.rb
+- tests/vcloud/data/api_+_v1.0_+_admin_+_network_+_2
+- tests/vcloud/data/api_+_v1.0_+_login
+- tests/vcloud/data/api_+_v1.0_+_network_+_1
+- tests/vcloud/data/api_+_v1.0_+_network_+_2
+- tests/vcloud/data/api_+_v1.0_+_org_+_1
+- tests/vcloud/data/api_+_v1.0_+_vApp_+_vapp-1
+- tests/vcloud/data/api_+_v1.0_+_vApp_+_vm-1
+- tests/vcloud/data/api_+_v1.0_+_vApp_+_vm-2
+- tests/vcloud/data/api_+_v1.0_+_vdc_+_1
+- tests/vcloud/models/compute/conn_helper.rb
 - tests/vcloud/models/compute/helper.rb
+- tests/vcloud/models/compute/network_tests.rb
+- tests/vcloud/models/compute/networks_tests.rb
+- tests/vcloud/models/compute/organization_tests.rb
+- tests/vcloud/models/compute/organizations_tests.rb
+- tests/vcloud/models/compute/server_tests.rb
 - tests/vcloud/models/compute/servers_tests.rb
+- tests/vcloud/models/compute/vapp_tests.rb
+- tests/vcloud/models/compute/vapps_tests.rb
+- tests/vcloud/models/compute/vdc_tests.rb
+- tests/vcloud/models/compute/vdcs_tests.rb
 - tests/vcloud/requests/compute/disk_configure_tests.rb
 - tests/voxel/requests/compute/image_tests.rb
 - tests/voxel/requests/compute/server_tests.rb