fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -7,21 +7,22 @@ Shindo.tests('Fog::Compute[:rackspace] | flavor requests', ['rackspace']) do
     'ram'   => Integer
   }
 
-  tests('success') do
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)  
 
+  tests('success') do
     tests('#get_flavor_details(1)').formats(@flavor_format) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_flavor_details(1).body['flavor']
+       @service.get_flavor_details(1).body['flavor']
     end
 
     tests('#list_flavors').formats({'flavors' => [Rackspace::Compute::Formats::SUMMARY]}) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].list_flavors.body
+       @service.list_flavors.body
     end
 
     tests('#list_flavors_detail').formats({'flavors' => [@flavor_format]}) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].list_flavors_detail.body
+       @service.list_flavors_detail.body
     end
 
   end
@@ -30,7 +31,7 @@ Shindo.tests('Fog::Compute[:rackspace] | flavor requests', ['rackspace']) do
 
     tests('#get_flavor_details(0)').raises(Fog::Compute::Rackspace::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_flavor_details(0)
+       @service.get_flavor_details(0)
     end
 
   end

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

@@ -10,42 +10,44 @@ Shindo.tests('Fog::Compute[:rackspace] | image requests', ['rackspace']) do
     'updated'   => String
   }
 
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)  
+
   tests('success') do
 
-    @server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+    @server =  @service.servers.create(:flavor_id => 1, :image_id => 19)
     @server.wait_for { ready? }
     @image_id = nil
 
     tests("#create_image(#{@server.id})").formats(@image_format) do
-      data = Fog::Compute[:rackspace].create_image(@server.id).body['image']
+      data =  @service.create_image(@server.id).body['image']
       @image_id = data['id']
       data
     end
 
     unless Fog.mocking?
-      Fog::Compute[:rackspace].images.get(@image_id).wait_for { ready? }
+       @service.images.get(@image_id).wait_for { ready? }
     end
 
     tests("#get_image_details(#{@image_id})").formats(@image_format) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_image_details(@image_id).body['image']
+       @service.get_image_details(@image_id).body['image']
     end
 
     tests('#list_images').formats({'images' => [Rackspace::Compute::Formats::SUMMARY]}) do
-      Fog::Compute[:rackspace].list_images.body
+       @service.list_images.body
     end
 
     tests('#list_images_detail').formats({'images' => [@image_format]}) do
-      Fog::Compute[:rackspace].list_images_detail.body
+       @service.list_images_detail.body
     end
 
     unless Fog.mocking?
-      Fog::Compute[:rackspace].images.get(@image_id).wait_for { ready? }
+       @service.images.get(@image_id).wait_for { ready? }
     end
 
     tests("#delete_image(#{@image_id})").succeeds do
       pending if Fog.mocking? # because it will fail without the wait just above here, which won't work
-      Fog::Compute[:rackspace].delete_image(@image_id)
+       @service.delete_image(@image_id)
     end
 
     @server.destroy
@@ -55,12 +57,12 @@ Shindo.tests('Fog::Compute[:rackspace] | image requests', ['rackspace']) do
   tests('failure') do
 
     tests('#delete_image(0)').raises(Excon::Errors::BadRequest) do
-      Fog::Compute[:rackspace].delete_image(0)
+       @service.delete_image(0)
     end
 
     tests('#get_image_details(0)').raises(Fog::Compute::Rackspace::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].get_image_details(0)
+       @service.get_image_details(0)
     end
 
   end

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

@@ -1,27 +1,29 @@
 Shindo.tests('Fog::Compute[:rackspace] | resize request', ['rackspace']) do
 
-    @confirm_server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+    @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)
 
-    @revert_server = Fog::Compute[:rackspace].servers.create(:flavor_id => 1, :image_id => 19)
+    @confirm_server =  @service.servers.create(:flavor_id => 1, :image_id => 19)
+
+    @revert_server =  @service.servers.create(:flavor_id => 1, :image_id => 19)
 
     @confirm_server.wait_for { ready? }
     tests("#resize_server(#{@confirm_server.id}, 2) # to confirm").succeeds do
-      Fog::Compute[:rackspace].resize_server(@confirm_server.id, 2)
+       @service.resize_server(@confirm_server.id, 2)
     end
 
     @revert_server.wait_for { ready? }
     tests("#resize_server(#{@revert_server.id}, 2) # to revert").succeeds do
-      Fog::Compute[:rackspace].resize_server(@revert_server.id, 2)
+       @service.resize_server(@revert_server.id, 2)
     end
 
     @confirm_server.wait_for { state == 'VERIFY_RESIZE' }
     tests("#confirm_resized_server(#{@confirm_server.id})").succeeds do
-      Fog::Compute[:rackspace].confirm_resized_server(@confirm_server.id)
+       @service.confirm_resized_server(@confirm_server.id)
     end
 
     @revert_server.wait_for { state == 'VERIFY_RESIZE' }
     tests("#revert_resized_server(#{@revert_server.id})").succeeds do
-      Fog::Compute[:rackspace].revert_resized_server(@revert_server.id)
+       @service.revert_resized_server(@revert_server.id)
     end
 
     @confirm_server.wait_for { ready? }

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

@@ -14,6 +14,8 @@ Shindo.tests('Fog::Compute[:rackspace] | server requests', ['rackspace']) do
     'progress'  => Integer,
     'status'    => String
   }
+  
+  @service = Fog::Compute.new(:provider => :rackspace, :version => :v1)  
 
   tests('success') do
 
@@ -21,49 +23,49 @@ Shindo.tests('Fog::Compute[:rackspace] | server requests', ['rackspace']) do
 
     tests('#create_server(1, 19)').formats(@server_format.merge('adminPass' => String)) do
       # 1 => 256MB, 19 => Gentoo
-      data = Fog::Compute[:rackspace].create_server(1, 19).body['server']
+      data =  @service.create_server(1, 19).body['server']
       @server_id = data['id']
       data
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#get_server_details(#{@server_id})").formats(@server_format) do
-      Fog::Compute[:rackspace].get_server_details(@server_id).body['server']
+       @service.get_server_details(@server_id).body['server']
     end
 
     tests('#list_servers').formats({'servers' => [Rackspace::Compute::Formats::SUMMARY]}) do
-      Fog::Compute[:rackspace].list_servers.body
+       @service.list_servers.body
     end
 
     tests('#list_servers_detail').formats({'servers' => [@server_format]}) do
-      Fog::Compute[:rackspace].list_servers_detail.body
+       @service.list_servers_detail.body
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#update_server(#{@server_id}, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").succeeds do
-      Fog::Compute[:rackspace].update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+       @service.update_server(@server_id, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#reboot_server(#{@server_id}, 'HARD')").succeeds do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].reboot_server(@server_id, 'HARD')
+       @service.reboot_server(@server_id, 'HARD')
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#reboot_server(#{@server_id}, 'SOFT')").succeeds do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].reboot_server(@server_id, 'SOFT')
+       @service.reboot_server(@server_id, 'SOFT')
     end
 
-    Fog::Compute[:rackspace].servers.get(@server_id).wait_for { ready? }
+     @service.servers.get(@server_id).wait_for { ready? }
 
     tests("#delete_server(#{@server_id})").succeeds do
-      Fog::Compute[:rackspace].delete_server(@server_id)
+       @service.delete_server(@server_id)
     end
 
   end
@@ -71,20 +73,20 @@ Shindo.tests('Fog::Compute[:rackspace] | server requests', ['rackspace']) do
   tests('failure') do
 
     tests('#delete_server(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].delete_server(0)
+       @service.delete_server(0)
     end
 
     tests('#get_server_details(0)').raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].get_server_details(0)
+       @service.get_server_details(0)
     end
 
     tests("#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')").raises(Fog::Compute::Rackspace::NotFound) do
-      Fog::Compute[:rackspace].update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
+       @service.update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')
     end
 
     tests('#reboot_server(0)').raises(Fog::Compute::Rackspace::NotFound) do
       pending if Fog.mocking?
-      Fog::Compute[:rackspace].reboot_server(0)
+       @service.reboot_server(0)
     end
 
   end

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

@@ -0,0 +1,43 @@
+Shindo.tests('Fog::Compute::RackspaceV2 | address requests', ['rackspace']) do
+
+  @service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
+  
+  tests('success') do
+    unless Fog.mocking?
+      @server = @service.servers.create(:flavor_id => 2, :image_id => "8a3a9f96-b997-46fd-b7a8-a9e740796ffd", :name => "address-tests-#{Time.now.to_i}")
+      @server.wait_for(timeout=1200) { ready? }
+      @server_id = @server.id
+    else
+      @server_id = 42
+    end
+    
+    address_format =  { "addresses"=> { 
+      "private" => [{"addr" => String, "version" => Integer}], 
+      "public" => [{"addr" => String, "version" => Integer }, {"addr"=> String, "version" => Integer}]}
+      }
+
+    begin 
+      tests("#list_addresses(#{@server_id})").formats(address_format) do
+         @service.list_addresses(@server_id).body
+      end
+      
+      tests("#list_addresses_by_network(#{@server_id}, 'private')").formats(address_format["addresses"].reject {|k,v| k != "private"}) do
+        @service.list_addresses_by_network(@server_id, "private").body
+      end
+    ensure
+      @server.destroy if @server
+    end
+
+  end
+
+  tests('failure') do
+    tests('#list_addresses(0)').raises(Fog::Compute::RackspaceV2::NotFound) do
+       @service.list_addresses(0)
+    end
+    tests("#list_addresses_by_network(0, 'private')").raises(Fog::Compute::RackspaceV2::NotFound) do
+      @service.list_addresses_by_network(0, 'private')
+    end
+
+  end
+
+end

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

@@ -30,18 +30,46 @@ Shindo.tests('Fog::Compute::RackspaceV2 | image_tests', ['rackspace']) do
     'image' => IMAGE_FORMAT
   }
 
-  service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
-  image_id = nil
-
-  tests('success') do
-    tests('#list_images').formats(LIST_IMAGE_FORMAT) do
-      body = service.list_images.body
-      image_id = body['images'][0]['id']
-      body
+  begin
+    service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
+    test_time = Time.now.to_i.to_s
+    @server = service.servers.create(:name => "fog-image-tests_#{test_time}", :flavor_id => 2, :image_id => "3afe97b2-26dc-49c5-a2cc-a2fc8d80c001")
+    @server.wait_for { ready? }
+    @image_id = nil
+
+    tests('success') do
+
+      tests("#create_image(#{@server.id}, 'fog-test-image')").succeeds do
+        response = service.create_image(@server.id, "fog-test-image_#{test_time}")
+        @image_id = response.headers["Location"].match(/\/([^\/]+$)/)[1]
+      end
+
+      tests('#list_images').formats(LIST_IMAGE_FORMAT) do
+        service.list_images.body
+      end
+      
+      tests('#get_image').formats(GET_IMAGE_FORMAT, false) do
+        service.get_image(@image_id).body
+      end
+      
+      tests('#delete_image').succeeds do
+        service.delete_image(@image_id)
+      end
     end
+    
+    tests('failure') do
+      tests('#delete_image').raises(Excon::Errors::BadRequest) do
+        pending if Fog.mocking?        
+        Fog::Compute[:rackspace].delete_image(0)
+      end
 
-    tests('#get_image').formats(GET_IMAGE_FORMAT) do
-      service.get_image(image_id).body
+      tests('#get_image').raises(Fog::Compute::RackspaceV2::NotFound) do
+        pending if Fog.mocking?
+        service.get_image(0)
+      end
     end
+  ensure 
+    @image.destroy if @image
+    @server.destroy if @server    
   end
 end

data/tests/rackspace/requests/dns/helper.rb

@@ -2,24 +2,21 @@ SUBDOMAIN_FORMAT = {
   'name' => String,
   'id' => Integer,
   'created' => String,
-  'updated' => String
+  'updated' => String,
+  'emailAddress' => String
 }
 
+DOMAIN_FORMAT = SUBDOMAIN_FORMAT.merge({
+  'accountId' => Integer
+})
+
 LIST_SUBDOMAINS_FORMAT = {
   'domains' => [SUBDOMAIN_FORMAT],
   'totalEntries' => Integer
 }
 
 LIST_DOMAIN_FORMAT = {
-  'domains' => [
-    {
-      'name' => String,
-      'id' => Integer,
-      'accountId' => Integer,
-      'updated' => String,
-      'created' => String
-    }
-  ],
+  'domains' => [DOMAIN_FORMAT],
   'totalEntries' => Integer,
   'links' => [
     {
@@ -50,16 +47,10 @@ NAME_SERVERS_FORMAT = [{
   'name' => String
 }]
 
-BASIC_DOMAIN_DETAIL_FORMAT = {
-  'name' => String,
-  'id' => Integer,
-  'accountId' => Integer,
-  'updated' => String,
-  'created' =>String,
-  'ttl' => Integer,
-  'emailAddress' => String,
-  'nameservers' => NAME_SERVERS_FORMAT
-}
+BASIC_DOMAIN_DETAIL_FORMAT = DOMAIN_FORMAT.merge({
+  'nameservers' => NAME_SERVERS_FORMAT,
+  'ttl' => Integer
+})
 
 LIST_DOMAIN_DETAILS_WITH_RECORDS = BASIC_DOMAIN_DETAIL_FORMAT.merge({
   'recordsList' => RECORD_LIST_FORMAT
@@ -68,12 +59,7 @@ LIST_DOMAIN_DETAILS_WITH_RECORDS = BASIC_DOMAIN_DETAIL_FORMAT.merge({
 LIST_DOMAIN_DETAILS_WITH_RECORDS_AND_SUBDOMAINS_FORMAT = BASIC_DOMAIN_DETAIL_FORMAT.merge({
   'recordsList'     => RECORD_LIST_FORMAT,
   'subdomains'      => {
-    'domains'   => [{
-      'created' => String,
-      'name'    => String,
-      'id'      => Integer,
-      'updated' => String
-    }],
+    'domains'   => [SUBDOMAIN_FORMAT],
     'totalEntries'  => Integer
   }
 })

data/tests/rackspace/requests/dns/records_tests.rb

@@ -12,8 +12,8 @@ Shindo.tests('Fog::DNS[:rackspace] | dns records requests', ['rackspace', 'dns']
         Fog::DNS[:rackspace].list_records(@domain_id).body
       end
 
-      tests("add_records(#{@domain_id}, [{ :name => 'test1.#{domain_name}', :type => 'A', :data => '192.168.2.1'}])").formats(RECORD_LIST_FORMAT) do
-        response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, [{ :name => 'test1.' + domain_name, :type => 'A', :data => '192.168.2.1'}])
+      tests("add_records(#{@domain_id}, [{ :name => 'test1.#{domain_name}', :type => 'A', :data => '192.168.2.1', :ttl => 550}])").formats(RECORD_LIST_FORMAT) do
+        response = wait_for Fog::DNS[:rackspace], Fog::DNS[:rackspace].add_records(@domain_id, [{ :name => 'test1.' + domain_name, :type => 'A', :data => '192.168.2.1', :ttl => 550}])
         @record_id = response.body['response']['records'].first['id']
         response.body['response']
       end

data/tests/rackspace/requests/load_balancers/content_caching_tests.rb

@@ -0,0 +1,25 @@
+Shindo.tests('Fog::Rackspace::LoadBalancers | content_caching', ['rackspace']) do
+
+  pending if Fog.mocking?
+
+  given_a_load_balancer_service do
+    given_a_load_balancer do
+      tests('success') do
+        tests("#get_content_caching(#{@lb.id})").formats(CONTENT_CACHING_FORMAT) do
+          @service.get_content_caching(@lb.id).body
+        end
+
+        @lb.wait_for { ready? }
+        tests("#set_content_caching(#{@lb.id}, true)").succeeds do
+          @service.set_content_caching(@lb.id, true)
+        end
+      end
+
+      tests('failure') do
+        tests("#set_content_caching(#{@lb.id}, 'aaa')").raises(Fog::Rackspace::LoadBalancers::InternalServerError) do
+          @service.set_content_caching(@lb.id, 'aaa')
+        end
+      end
+    end
+  end
+end

data/tests/rackspace/requests/load_balancers/helper.rb

@@ -78,7 +78,11 @@ SESSION_PERSISTENCE_FORMAT = {
     'persistenceType' => Fog::Nullable::String
   }
 }
-
+CONTENT_CACHING_FORMAT = {
+  'contentCaching' => {
+    'enabled' => Fog::Boolean
+  }
+}
 ACCESS_LIST_FORMAT = {
   'accessList' => [
     {