fog 0.2.30 → 0.3.0

data/tests/bluebox/requests/{template_tests.rb → compute/template_tests.rb}

@@ -1,4 +1,4 @@
-Shindo.tests('Bluebox | template requests', ['bluebox']) do
+Shindo.tests('Bluebox::Compute | template requests', ['bluebox']) do
 
   @template_format = {
     'created'     => String,
@@ -12,19 +12,19 @@ Shindo.tests('Bluebox | template requests', ['bluebox']) do
     @template_id  = 'a00baa8f-b5d0-4815-8238-b471c4c4bf72' # Ubuntu 9.10 64bit
 
     tests("get_template('#{@template_id}')").formats(@template_format) do
-      Bluebox[:blocks].get_template(@template_id).body
+      Bluebox[:compute].get_template(@template_id).body
     end
 
     tests("get_templates").formats([@template_format]) do
-      Bluebox[:blocks].get_templates.body
+      Bluebox[:compute].get_templates.body
     end
 
   end
 
   tests('failure') do
 
-    tests("get_template('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::NotFound) do
-      Bluebox[:blocks].get_template('00000000-0000-0000-0000-000000000000')
+    tests("get_template('00000000-0000-0000-0000-000000000000')").raises(Fog::Bluebox::Compute::NotFound) do
+      Bluebox[:compute].get_template('00000000-0000-0000-0000-000000000000')
     end
 
   end

data/tests/linode/helper.rb

@@ -6,20 +6,24 @@ module Linode
         ![:linode_api_key].include?(k)
       end
       hash[key] = case key
-      when :linode
-        Fog::Linode.new(credentials)
+      when :compute
+        Fog::Linode::Compute.new(credentials)
       end
     end
     @@connections[service]
   end
 
-  module Formats
+  module Compute
 
-    BASIC = {
-      'ERRORARRAY'  => [],
-      'ACTION'      => String
-    }
+    module Formats
+
+      BASIC = {
+        'ERRORARRAY'  => [],
+        'ACTION'      => String
+      }
+
+    end
 
   end
 
-end
+end

data/tests/linode/requests/{datacenter_tests.rb → compute/datacenter_tests.rb}

@@ -1,6 +1,6 @@
-Shindo.tests('Linode | datacenter requests', ['linode']) do
+Shindo.tests('Linode::Compute | datacenter requests', ['linode']) do
 
-  @datacenters_format = Linode::Formats::BASIC.merge({
+  @datacenters_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
       'DATACENTERID'  => Integer,
       'LOCATION'      => String
@@ -10,7 +10,7 @@ Shindo.tests('Linode | datacenter requests', ['linode']) do
   tests('success') do
 
     tests('#avail_datacenters').formats(@datacenters_format) do
-      Linode[:linode].avail_datacenters.body
+      Linode[:compute].avail_datacenters.body
     end
 
   end

data/tests/linode/requests/{distribution_tests.rb → compute/distribution_tests.rb}

@@ -1,6 +1,6 @@
-Shindo.tests('Linode | distribution requests', ['linode']) do
+Shindo.tests('Linode::Compute | distribution requests', ['linode']) do
 
-  @distributions_format = Linode::Formats::BASIC.merge({
+  @distributions_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
       'CREATE_DT'           => String,
       'DISTRIBUTIONID'      => Integer,
@@ -16,13 +16,13 @@ Shindo.tests('Linode | distribution requests', ['linode']) do
     @distribution_id = nil
 
     tests('#avail_distributions').formats(@distributions_format) do
-      data = Linode[:linode].avail_distributions.body
+      data = Linode[:compute].avail_distributions.body
       @distribution_id = data['DATA'].first['DISTRIBUTIONID']
       data
     end
 
     tests("@avail_distributions(#{@distribution_id})").formats(@distributions_format) do
-      Linode[:linode].avail_distributions(@distribution_id).body
+      Linode[:compute].avail_distributions(@distribution_id).body
     end
 
   end

data/tests/linode/requests/{linode_tests.rb → compute/linode_tests.rb}

@@ -1,10 +1,10 @@
-Shindo.tests('Linode | linode requests', ['linode']) do
+Shindo.tests('Linode::Compute | linode requests', ['linode']) do
 
-  @linode_format = Linode::Formats::BASIC.merge({
+  @linode_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => { 'LinodeID' => Integer }
   })
 
-  @linodes_format = Linode::Formats::BASIC.merge({
+  @linodes_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{
       'ALERT_BWIN_ENABLED'      => Integer,
       'ALERT_CPU_THRESHOLD'     => Integer,
@@ -31,7 +31,7 @@ Shindo.tests('Linode | linode requests', ['linode']) do
     }]
   })
 
-  @reboot_format = Linode::Formats::BASIC.merge({
+  @reboot_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => { 'JobID' => Integer }
   })
 
@@ -41,37 +41,37 @@ Shindo.tests('Linode | linode requests', ['linode']) do
 
     # (2 => Dallas, TX, USA), (1 => 1 month), (1 => Linode 512)
     tests('#linode_create(2, 1, 1)').formats(@linode_format) do
-      data = Linode[:linode].linode_create(2, 1, 1).body
+      data = Linode[:compute].linode_create(2, 1, 1).body
       @linode_id = data['DATA']['LinodeID']
       data
     end
 
     tests("#linode_list(#{@linode_id})").formats(@linodes_format) do
-      Linode[:linode].linode_list(@linode_id).body
+      Linode[:compute].linode_list(@linode_id).body
     end
 
     tests('#linode_list').formats(@linodes_format) do
-      Linode[:linode].linode_list.body
+      Linode[:compute].linode_list.body
     end
 
     # tests("#linode_reboot(#{@linode_id})").formats(@reboot_format) do
-    #   Linode[:linode].linode_reboot(@linode_id).body
+    #   Linode[:compute].linode_reboot(@linode_id).body
     # end
 
     tests('#linode_delete(#{@linode_id})').succeeds do
-      Linode[:linode].linode_delete(@linode_id)
+      Linode[:compute].linode_delete(@linode_id)
     end
 
   end
 
   tests('failure') do
 
-    tests('#linode_reboot(0)').raises(Fog::Linode::NotFound) do
-      Linode[:linode].linode_reboot(0)
+    tests('#linode_reboot(0)').raises(Fog::Linode::Compute::NotFound) do
+      Linode[:compute].linode_reboot(0)
     end
 
-    tests('#linode_delete(0)').raises(Fog::Linode::NotFound) do
-      Linode[:linode].linode_delete(0)
+    tests('#linode_delete(0)').raises(Fog::Linode::Compute::NotFound) do
+      Linode[:compute].linode_delete(0)
     end
 
   end

data/tests/linode/requests/{linodeplans_tests.rb → compute/linodeplans_tests.rb}

@@ -1,6 +1,6 @@
-Shindo.tests('Linode | linodeplans requests', ['linode']) do
+Shindo.tests('Linode::Compute | linodeplans requests', ['linode']) do
 
-  @linodeplans_format = Linode::Formats::BASIC.merge({
+  @linodeplans_format = Linode::Compute::Formats::BASIC.merge({
     'DATA' => [{ 
       'AVAIL' => {
          '2' => Integer,
@@ -23,13 +23,13 @@ Shindo.tests('Linode | linodeplans requests', ['linode']) do
     @linodeplan_id = nil
 
     tests('#avail_linodeplans').formats(@linodeplans_format) do
-      data = Linode[:linode].avail_linodeplans.body
+      data = Linode[:compute].avail_linodeplans.body
       @linodeplan_id = data['DATA'].first['PLANID']
       data
     end
 
     tests("#avail_linodeplans(#{@linodeplan_id})").formats(@linodeplans_format) do
-      Linode[:linode].avail_linodeplans(@linodeplan_id).body
+      Linode[:compute].avail_linodeplans(@linodeplan_id).body
     end
 
   end

data/tests/rackspace/helper.rb

@@ -6,24 +6,16 @@ module Rackspace
         ![:rackspace_api_key, :rackspace_username].include?(k)
       end
       hash[key] = case key
-      when :files
-        Fog::Rackspace::Files.new(credentials)
-      when :servers
-        Fog::Rackspace::Servers.new(credentials)
+      when :compute
+        Fog::Rackspace::Compute.new(credentials)
+      when :storage
+        Fog::Rackspace::Storage.new(credentials)
       end
     end
     @@connections[service]
   end
 
-  module Files
-
-    module Formats
-
-    end
-
-  end
-
-  module Servers
+  module Compute
 
     module Formats
 

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

@@ -0,0 +1,40 @@
+Shindo.tests('Rackspace::Compute | address requests', ['rackspace']) do
+
+  tests('success') do
+
+    @server = Rackspace[:compute].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foglistaddresses')
+
+    tests("#list_addresses(#{@server.id})").formats({'addresses' => {'private' => [String], 'public' => [String]}}) do
+      Rackspace[:compute].list_addresses(@server.id).body
+    end
+
+    tests("#list_private_addresses(#{@server.id})").formats({'private' => [String]}) do
+      Rackspace[:compute].list_private_addresses(@server.id).body
+    end
+
+    tests("#list_public_addresses(#{@server.id})").formats({'public' => [String]}) do
+      Rackspace[:compute].list_public_addresses(@server.id).body
+    end
+
+    @server.wait_for { ready? }
+    @server.destroy
+
+  end
+
+  tests('failure') do
+
+    tests('#list_addresses(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].list_addresses(0)
+    end
+
+    tests('#list_private_addresses(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].list_private_addresses(0)
+    end
+
+    tests('#list_public_addresses(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].list_public_addresses(0)
+    end
+
+  end
+
+end

data/tests/rackspace/requests/compute/flavor_tests.rb

@@ -0,0 +1,34 @@
+Shindo.tests('Rackspace::Compute | flavor requests', ['rackspace']) do
+
+  @flavor_format = {
+    'disk'  => Integer,
+    'id'    => Integer,
+    'name'  => String,
+    'ram'   => Integer
+  }
+
+  tests('success') do
+
+    tests('#get_flavor_details(1)').formats(@flavor_format) do
+      Rackspace[:compute].get_flavor_details(1).body['flavor']
+    end
+
+    tests('#list_flavors').formats({'flavors' => [Rackspace::Compute::Formats::SUMMARY]}) do
+      Rackspace[:compute].list_flavors.body
+    end
+
+    tests('#list_flavors_detail').formats({'flavors' => [@flavor_format]}) do
+      Rackspace[:compute].list_flavors_detail.body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests('#get_flavor_details(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].get_flavor_details(0)
+    end
+
+  end
+
+end

data/tests/rackspace/requests/compute/image_tests.rb

@@ -0,0 +1,62 @@
+Shindo.tests('Rackspace::Compute | image requests', ['rackspace']) do
+
+  @images_format = {
+    'id'        => Integer,
+    'name'      => String,
+    'status'    => String,
+    'updated'   => String
+  }
+
+  @image_format = @images_format.merge({
+    'created'  => String,
+    'progress' => Integer,
+    'serverId'  => Integer,
+  })
+
+  tests('success') do
+
+    @server = Rackspace[:compute].servers.create(:flavor_id => 1, :image_id => 19, :name => 'foggetserverdetails')
+    @server.wait_for { ready? }
+    @image_id = nil
+
+    tests("#create_image(#{@server.id})").formats(@images_format) do
+      data = Rackspace[:compute].create_image(@server.id).body['image']
+      @image_id = data['id']
+      data
+    end
+
+    Rackspace[:compute].images.get(@image_id).wait_for { ready? }
+
+    tests("#get_image_details(#{@image_id})").formats(@image_format) do
+      Rackspace[:compute].get_image_details(@image_id).body['image']
+    end
+
+    tests('#list_images').formats({'images' => [Rackspace::Compute::Formats::SUMMARY]}) do
+      Rackspace[:compute].list_images.body
+    end
+
+    tests('#list_images_detail').formats({'images' => [@images_format]}) do
+      Rackspace[:compute].list_images_detail.body
+    end
+
+    tests("#delete_image(#{@image_id})").succeeds do
+      Rackspace[:compute].delete_image(@image_id)
+    end
+
+    @server.destroy
+
+  end
+
+  tests('failure') do
+
+    tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do
+      Rackspace[:compute].delete_image(0)
+    end
+
+    tests('#get_image_details(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].get_image_details(0)
+    end
+
+  end
+
+end

data/tests/rackspace/requests/{servers → compute}/server_tests.rb

@@ -1,4 +1,4 @@
-Shindo.tests('Rackspace::Servers | server requests', ['rackspace']) do
+Shindo.tests('Rackspace::Compute | server requests', ['rackspace']) do
 
   @server_format = {
     'addresses' => {
@@ -21,61 +21,61 @@ Shindo.tests('Rackspace::Servers | server requests', ['rackspace']) do
 
     tests('#create_server(1, 19)').formats(@server_format.merge('adminPass' => String)) do
       # 1 => 256MB, 19 => Gentoo
-      data = Rackspace[:servers].create_server(1, 19).body['server']
+      data = Rackspace[:compute].create_server(1, 19).body['server']
       @server_id = data['id']
       data
     end
 
-    Rackspace[:servers].servers.get(@server_id).wait_for { ready? }
+    Rackspace[:compute].servers.get(@server_id).wait_for { ready? }
 
     tests("#get_server_details(#{@server_id})").formats(@server_format) do
-      Rackspace[:servers].get_server_details(@server_id).body['server']
+      Rackspace[:compute].get_server_details(@server_id).body['server']
     end
 
-    tests('#list_servers').formats({'servers' => [Rackspace::Servers::Formats::SUMMARY]}) do
-      Rackspace[:servers].list_servers.body
+    tests('#list_servers').formats({'servers' => [Rackspace::Compute::Formats::SUMMARY]}) do
+      Rackspace[:compute].list_servers.body
     end
 
     tests('#list_servers_detail').formats({'servers' => [@server_format]}) do
-      Rackspace[:servers].list_servers_detail.body
+      Rackspace[:compute].list_servers_detail.body
     end
 
     tests("#update_server(#{@server_id}, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").succeeds do
-      Rackspace[:servers].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+      Rackspace[:compute].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
     tests("#reboot_server(#{@server_id}, 'HARD')").succeeds do
-      Rackspace[:servers].reboot_server(@server_id, 'HARD')
+      Rackspace[:compute].reboot_server(@server_id, 'HARD')
     end
 
     tests("#reboot_server(#{@server_id}, 'SOFT')").succeeds do
-      Rackspace[:servers].reboot_server(@server_id, 'SOFT')
+      Rackspace[:compute].reboot_server(@server_id, 'SOFT')
     end
 
-    Rackspace[:servers].servers.get(@server_id).wait_for { ready? }
+    Rackspace[:compute].servers.get(@server_id).wait_for { ready? }
 
     tests("#delete_server(#{@server_id})").succeeds do
-      Rackspace[:servers].delete_server(@server_id)
+      Rackspace[:compute].delete_server(@server_id)
     end
 
   end
 
   tests('failure') do
 
-    tests('#delete_server(0)').raises(Fog::Rackspace::Servers::NotFound) do
-      Rackspace[:servers].delete_server(0)
+    tests('#delete_server(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].delete_server(0)
     end
 
-    tests('#get_server_details(0)').raises(Fog::Rackspace::Servers::NotFound) do
-      Rackspace[:servers].get_server_details(0)
+    tests('#get_server_details(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].get_server_details(0)
     end
 
-    tests("#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").raises(Fog::Rackspace::Servers::NotFound) do
-      Rackspace[:servers].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+    tests("#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
-    tests('#reboot_server(0)').raises(Fog::Rackspace::Servers::NotFound) do
-      Rackspace[:servers].reboot_server(0)
+    tests('#reboot_server(0)').raises(Fog::Rackspace::Compute::NotFound) do
+      Rackspace[:compute].reboot_server(0)
     end
 
   end