fog 0.0.71 → 0.0.72

data/tests/rackspace/helper.rb

@@ -57,6 +57,11 @@ module Rackspace
         'status'    => String
       }
 
+      SUMMARY = {
+        'id'    => Integer,
+        'name'  => String
+      }
+
     end
 
   end

data/tests/rackspace/requests/servers/create_image_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Rackspace::Servers#create_image', 'rackspace') do
   tests('success') do
 
     before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateserver').body['server']['id']
+      @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateimage').body['server']['id']
       wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
       @data = Rackspace[:servers].create_image(@server_id).body['image']
       @image_id = @data['id']

data/tests/rackspace/requests/servers/delete_image_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Rackspace::Servers#delete_image', 'rackspace') do
   tests('success') do
 
     before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateserver').body['server']['id']
+      @server_id = Rackspace[:servers].create_server(1, 3, 'fogdeleteimage').body['server']['id']
       @image_id = Rackspace[:servers].create_image(@server_id).body['image']['id']
     end
 

data/tests/rackspace/requests/servers/delete_server_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Rackspace::Servers#delete_server', 'rackspace') do
   tests('success') do
 
     before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateserver').body['server']['id']
+      @server_id = Rackspace[:servers].create_server(1, 3, 'fogdeleteserver').body['server']['id']
     end
 
     test('has proper output format') do

data/tests/rackspace/requests/servers/get_server_details_tests.rb

@@ -2,7 +2,7 @@ Shindo.tests('Rackspace::Servers#get_server_details', 'rackspace') do
   tests('success') do
 
     before do
-      @server_id = Rackspace[:servers].create_server(1, 3, 'fogcreateserver').body['server']['id']
+      @server_id = Rackspace[:servers].create_server(1, 3, 'foggetserverdetails').body['server']['id']
       @data = Rackspace[:servers].get_server_details(@server_id).body['server']
     end
 

data/tests/rackspace/requests/servers/list_addresses_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests('Rackspace::Servers#list_addresses', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistaddresses').body['server']['id']
+      @data = Rackspace[:servers].list_addresses(@server_id).body
+    end
+
+    after do
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    test('has proper output format') do
+      validate_format(@data, {'private' => [String], 'public' => [String]})
+    end
+
+  end
+  tests('failure') do
+
+    test('raises NotFound error if server does not exist') do
+      begin
+        Rackspace[:servers].list_addresses(0)
+        false
+      rescue Excon::Errors::NotFound
+        true
+      end
+    end
+
+  end
+
+end

data/tests/rackspace/requests/servers/list_flavors_detail_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Rackspace::Servers#list_flavors_detail', 'rackspace') do
+  tests('success') do
+
+    before do
+      @data = Rackspace[:servers].list_flavors_detail.body['flavors']
+    end
+
+    test('has proper output format') do
+      validate_format(@data, [Rackspace::Servers::Formats::FLAVOR])
+    end
+
+  end
+end

data/tests/rackspace/requests/servers/list_flavors_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Rackspace::Servers#list_flavors', 'rackspace') do
+  tests('success') do
+
+    before do
+      @data = Rackspace[:servers].list_flavors.body['flavors']
+    end
+
+    test('has proper output format') do
+      validate_format(@data, Rackspace::Servers::Formats::SUMMARY)
+    end
+
+  end
+end

data/tests/rackspace/requests/servers/list_images_detail_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Rackspace::Servers#list_images_detail', 'rackspace') do
+  tests('success') do
+
+    before do
+      @data = Rackspace[:servers].list_images_detail.body['images']
+    end
+
+    test('has proper output format') do
+      validate_format(@data, Rackspace::Servers::Formats::IMAGE)
+    end
+
+  end
+end

data/tests/rackspace/requests/servers/list_images_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests('Rackspace::Servers#list_images', 'rackspace') do
+  tests('success') do
+
+    before do
+      @data = Rackspace[:servers].list_images.body['images']
+    end
+
+    test('has proper output format') do
+      validate_format(@data, Rackspace::Servers::Formats::SUMMARY)
+    end
+
+  end
+end

data/tests/rackspace/requests/servers/list_private_addresses_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests('Rackspace::Servers#list_private_addresses', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistprivateaddresses').body['server']['id']
+      @data = Rackspace[:servers].list_private_addresses(@server_id).body
+    end
+
+    after do
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    test('has proper output format') do
+      validate_format(@data, [String])
+    end
+
+  end
+  tests('failure') do
+
+    test('raises NotFound error if server does not exist') do
+      begin
+        Rackspace[:servers].list_private_addresses(0)
+        false
+      rescue Excon::Errors::NotFound
+        true
+      end
+    end
+
+  end
+
+end

data/tests/rackspace/requests/servers/list_public_addresses_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests('Rackspace::Servers#list_public_addresses', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistpublicaddresses').body['server']['id']
+      @data = Rackspace[:servers].list_public_addresses(@server_id).body
+    end
+
+    after do
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    test('has proper output format') do
+      validate_format(@data, [String])
+    end
+
+  end
+  tests('failure') do
+
+    test('raises NotFound error if server does not exist') do
+      begin
+        Rackspace[:servers].list_public_addresses(0)
+        false
+      rescue Excon::Errors::NotFound
+        true
+      end
+    end
+
+  end
+
+end

data/tests/rackspace/requests/servers/list_servers_detail_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('Rackspace::Servers#list_servers_detail', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistserversdetail').body['server']['id']
+      @data = Rackspace[:servers].list_servers_detail.body['servers']
+    end
+
+    after do
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    test('has proper output format') do
+      validate_format(@data, Rackspace::Servers::Formats::SERVER)
+    end
+
+  end
+end

data/tests/rackspace/requests/servers/list_servers_tests.rb

@@ -0,0 +1,19 @@
+Shindo.tests('Rackspace::Servers#list_servers', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'foglistservers').body['server']['id']
+      @data = Rackspace[:servers].list_servers.body['servers']
+    end
+
+    after do
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    test('has proper output format') do
+      validate_format(@data, Rackspace::Servers::Formats::SUMMARY)
+    end
+
+  end
+end

data/tests/rackspace/requests/servers/reboot_server_tests.rb

@@ -0,0 +1,41 @@
+Shindo.tests('Rackspace::Servers#reboot_server', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'fogrebootserver').body['server']['id']
+    end
+
+    after do
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    tests('HARD') do
+      test('has proper output format') do
+        wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+        Rackspace[:servers].reboot_server(@server_id, 'HARD')
+      end
+    end
+
+    tests('SOFT') do
+      test('has proper output format') do
+        wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+        Rackspace[:servers].reboot_server(@server_id, 'SOFT')
+      end
+    end
+
+  end
+  tests('failure') do
+
+    test('raises NotFound error if server does not exist') do
+      begin
+        Rackspace[:servers].reboot_server(0)
+        false
+      rescue Excon::Errors::NotFound
+        true
+      end
+    end
+
+  end
+
+end

data/tests/rackspace/requests/servers/update_server_tests.rb

@@ -0,0 +1,32 @@
+Shindo.tests('Rackspace::Servers#update_server', 'rackspace') do
+  tests('success') do
+
+    before do
+      @server_id = Rackspace[:servers].create_server(1, 3, 'fogupdateserver').body['server']['id']
+      wait_for { Rackspace[:servers].get_server_details(@server_id).body['server']['status'] == 'ACTIVE' }
+      @data = Rackspace[:servers].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+    end
+
+    after do
+      Rackspace[:servers].delete_server(@server_id)
+    end
+
+    test('has proper output format') do
+      validate_format(@data, {'name' => String, 'adminPass' => String})
+    end
+
+  end
+  tests('failure') do
+
+    test('raises NotFound error if server does not exist') do
+      begin
+        Rackspace[:servers].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+        false
+      rescue Excon::Errors::NotFound
+        true
+      end
+    end
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 71
-  version: 0.0.71
+  - 72
+  version: 0.0.72
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-09 00:00:00 -07:00
+date: 2010-04-13 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -412,23 +412,6 @@ files:
 - spec/rackspace/requests/files/head_object_spec.rb
 - spec/rackspace/requests/files/put_container_spec.rb
 - spec/rackspace/requests/files/put_object_spec.rb
-- spec/rackspace/requests/servers/create_image_spec.rb
-- spec/rackspace/requests/servers/create_server_spec.rb
-- spec/rackspace/requests/servers/delete_image_spec.rb
-- spec/rackspace/requests/servers/delete_server_spec.rb
-- spec/rackspace/requests/servers/get_flavor_details_spec.rb
-- spec/rackspace/requests/servers/get_server_details_spec.rb
-- spec/rackspace/requests/servers/list_addresses_spec.rb
-- spec/rackspace/requests/servers/list_flavors_detail_spec.rb
-- spec/rackspace/requests/servers/list_flavors_spec.rb
-- spec/rackspace/requests/servers/list_images_detail_spec.rb
-- spec/rackspace/requests/servers/list_images_spec.rb
-- spec/rackspace/requests/servers/list_private_addresses_spec.rb
-- spec/rackspace/requests/servers/list_public_addresses_spec.rb
-- spec/rackspace/requests/servers/list_servers_detail_spec.rb
-- spec/rackspace/requests/servers/list_servers_spec.rb
-- spec/rackspace/requests/servers/reboot_server_spec.rb
-- spec/rackspace/requests/servers/update_server_spec.rb
 - spec/shared_examples/flavors_examples.rb
 - spec/shared_examples/server_examples.rb
 - spec/shared_examples/servers_examples.rb
@@ -446,6 +429,17 @@ files:
 - tests/rackspace/requests/servers/get_flavor_details_tests.rb
 - tests/rackspace/requests/servers/get_image_details_tests.rb
 - tests/rackspace/requests/servers/get_server_details_tests.rb
+- tests/rackspace/requests/servers/list_addresses_tests.rb
+- tests/rackspace/requests/servers/list_flavors_detail_tests.rb
+- tests/rackspace/requests/servers/list_flavors_tests.rb
+- tests/rackspace/requests/servers/list_images_detail_tests.rb
+- tests/rackspace/requests/servers/list_images_tests.rb
+- tests/rackspace/requests/servers/list_private_addresses_tests.rb
+- tests/rackspace/requests/servers/list_public_addresses_tests.rb
+- tests/rackspace/requests/servers/list_servers_detail_tests.rb
+- tests/rackspace/requests/servers/list_servers_tests.rb
+- tests/rackspace/requests/servers/reboot_server_tests.rb
+- tests/rackspace/requests/servers/update_server_tests.rb
 - tests/slicehost/helper.rb
 - tests/slicehost/requests/create_slice_tests.rb
 - tests/slicehost/requests/delete_slice_tests.rb
@@ -569,23 +563,6 @@ test_files:
 - spec/rackspace/requests/files/head_object_spec.rb
 - spec/rackspace/requests/files/put_container_spec.rb
 - spec/rackspace/requests/files/put_object_spec.rb
-- spec/rackspace/requests/servers/create_image_spec.rb
-- spec/rackspace/requests/servers/create_server_spec.rb
-- spec/rackspace/requests/servers/delete_image_spec.rb
-- spec/rackspace/requests/servers/delete_server_spec.rb
-- spec/rackspace/requests/servers/get_flavor_details_spec.rb
-- spec/rackspace/requests/servers/get_server_details_spec.rb
-- spec/rackspace/requests/servers/list_addresses_spec.rb
-- spec/rackspace/requests/servers/list_flavors_detail_spec.rb
-- spec/rackspace/requests/servers/list_flavors_spec.rb
-- spec/rackspace/requests/servers/list_images_detail_spec.rb
-- spec/rackspace/requests/servers/list_images_spec.rb
-- spec/rackspace/requests/servers/list_private_addresses_spec.rb
-- spec/rackspace/requests/servers/list_public_addresses_spec.rb
-- spec/rackspace/requests/servers/list_servers_detail_spec.rb
-- spec/rackspace/requests/servers/list_servers_spec.rb
-- spec/rackspace/requests/servers/reboot_server_spec.rb
-- spec/rackspace/requests/servers/update_server_spec.rb
 - spec/shared_examples/flavors_examples.rb
 - spec/shared_examples/server_examples.rb
 - spec/shared_examples/servers_examples.rb

data/spec/rackspace/requests/servers/create_image_spec.rb

@@ -1,26 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Rackspace::Servers.create_image' do
-  describe 'success' do
-
-    before(:each) do
-      # flavor 1 = 256, image 3 = gentoo 2008.0
-      @server_id = Rackspace[:servers].create_server(1, 3, 'name').body['server']['id']
-    end
-
-    after(:each) do
-      eventually(128) do
-        Rackspace[:servers].delete_server(@server_id)
-      end
-      Rackspace[:servers].delete_image(@image_id)
-    end
-
-    it "should return proper attributes" do
-      actual = Rackspace[:servers].create_image(@server_id).body['image']
-      @image_id = actual['id']
-      actual['id'].should be_an(Integer)
-      actual['serverId'].should be_an(Integer)
-    end
-
-  end
-end

data/spec/rackspace/requests/servers/create_server_spec.rb

@@ -1,33 +0,0 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
-
-describe 'Rackspace::Servers.create_server' do
-  describe 'success' do
-
-    after(:each) do
-      eventually(128) do
-        Rackspace[:servers].delete_server(@server_id)
-      end
-    end
-
-    it "should return proper attributes" do
-      # flavor 1 = 256, image 3 = gentoo 2008.0
-      actual = Rackspace[:servers].create_server(1, 3, 'name').body['server']
-      @server_id = actual['id']
-      actual['addresses'].should be_a(Hash)
-      actual['addresses']['private'].should be_an(Array)
-      actual['addresses']['private'].first.should be_a(String)
-      actual['addresses']['public'].should be_an(Array)
-      actual['addresses']['public'].first.should be_a(String)
-      actual['adminPass'].should be_a(String)
-      actual['flavorId'].should be_an(Integer)
-      actual['hostId'].should be_a(String)
-      actual['id'].should be_an(Integer)
-      actual['imageId'].should be_an(Integer)
-      actual['metadata'].should be_a(Hash)
-      actual['name'].should be_a(String)
-      # actual['progress'].should be_an(Integer)
-      actual['status'].should be_a(String)
-    end
-
-  end
-end