fog-maestrodev 1.14.0.20130806165225 → 1.15.0.20130829165835

data/tests/openstack/requests/compute/volume_tests.rb

@@ -4,35 +4,33 @@ Shindo.tests('Fog::Compute[:openstack] | volume requests', ['openstack']) do
 
   @volume_format = {
     'id'                  => String,
-    'name'                => String,
+    'displayName'         => String,
     'size'                => Integer,
-    'description'         => String,
+    'displayDescription'  => String,
     'status'              => String,
-    'snapshot_id'         => Fog::Nullable::String,
-    'availability_zone'   => String,
+    'snapshotId'          => Fog::Nullable::String,
+    'availabilityZone'    => String,
     'attachments'         => Array,
-    'volume_type'         => Fog::Nullable::String,
-    'created_at'          => Time
+    'volumeType'          => Fog::Nullable::String,
+    'createdAt'           => String,
+    'metadata'            => Hash
   }
 
   tests('success') do
-    tests('#create_volume').formats({'volume' => @volume_format}) do
-      pending unless Fog.mocking?
+    tests('#create_volume').data_matches_schema({'volume' => @volume_format}) do
       Fog::Compute[:openstack].create_volume('loud', 'this is a loud volume', 3).body
     end
 
-    tests('#list_volumes').formats({'volumes' => [@volume_format]}) do
+    tests('#list_volumes').data_matches_schema({'volumes' => [@volume_format]}) do
       Fog::Compute[:openstack].list_volumes.body
     end
 
-    tests('#get_volume_detail').formats({'volume' => @volume_format}) do
-      pending unless Fog.mocking?
+    tests('#get_volume_detail').data_matches_schema({'volume' => @volume_format}) do
       volume_id = Fog::Compute[:openstack].volumes.all.first.id
       Fog::Compute[:openstack].get_volume_details(volume_id).body
     end
 
     tests('#delete_volume').succeeds do
-      pending unless Fog.mocking?
       volume_id = Fog::Compute[:openstack].volumes.all.first.id
       Fog::Compute[:openstack].delete_volume(volume_id)
     end

data/tests/openstack/requests/image/image_tests.rb

@@ -1,15 +1,15 @@
 Shindo.tests('Fog::Image[:openstack] | image requests', ['openstack']) do
   openstack = Fog::Identity[:openstack]
   @image_attributes = {
-    'name'            => 'new image',
-    'owner'           => openstack.current_tenant['id'],
-    'is_public'       => 'true',
-    'copy_from'       => 'http://website.com/image.iso',
-    'disk_format'     => 'iso',
-    'properties'      =>
-      {'user_id'      => openstack.current_user['id'],
-       'owner_id'     => openstack.current_tenant['id']},
-    'container_format'=> 'bare' }
+    :name             => 'new image',
+    :owner            => openstack.current_tenant['id'],
+    :is_public        => true,
+    :copy_from        => 'http://website.com/image.iso',
+    :disk_format      => 'iso',
+    :properties       =>
+      {:user_id       => openstack.current_user['id'],
+       :owner_id      => openstack.current_tenant['id']},
+    :container_format => 'bare' }
 
   @image_format = {
     'name'             => String,
@@ -72,23 +72,38 @@ Shindo.tests('Fog::Image[:openstack] | image requests', ['openstack']) do
   ]
 
   tests('success') do
-    tests('#list_public_images').formats({'images' => [@image_format]}) do
+    tests('#list_public_images').data_matches_schema({'images' => [@image_format]}) do
       Fog::Image[:openstack].list_public_images.body
     end
 
-    tests('#list_public_images_detailed').formats({'images' => [@detailed_image_format]}) do
+    tests('#list_public_images_detailed').data_matches_schema({'images' => [@detailed_image_format]}) do
       Fog::Image[:openstack].list_public_images_detailed.body
     end
 
-    tests('#create_image').formats({'image' => @detailed_image_format}) do
-      @instance = Fog::Image[:openstack].create_image(@image_attributes).body
+    tests('#create_image').data_matches_schema({'image' => @detailed_image_format}) do
+      begin
+        if Fog.mocking?
+          image_attributes = @image_attributes
+        else
+          require 'tempfile'
+          image_attributes = @image_attributes.dup
+          image_attributes.delete(:copy_from)
+          test_iso = Tempfile.new(['fog_test_iso', '.iso'])
+          test_iso.write Fog::Mock.random_hex(32)
+          test_iso.close
+          image_attributes[:location] = test_iso.path
+        end
+        @instance = Fog::Image[:openstack].create_image(image_attributes).body
+      ensure
+        test_iso.delete if test_iso
+      end
     end
 
-    tests('#get_image').formats(@image_meta_format) do
+    tests('#get_image').data_matches_schema(@image_meta_format) do
        Fog::Image[:openstack].get_image(@instance['image']['id']).headers
     end
 
-    tests('#update_image').formats(@detailed_image_format) do
+    tests('#update_image').data_matches_schema(@detailed_image_format) do
        Fog::Image[:openstack].update_image({:id => @instance['image']['id'],
                                             :name => 'edit image'}).body['image']
     end

data/tests/rackspace/block_storage_tests.rb

@@ -105,10 +105,15 @@ Shindo.tests('Fog::Rackspace::BlockStorage', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Rackspace::BlockStorage.new  :rackspace_region => :ord
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad-token")
-    returns(200) { @service.list_volumes.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Rackspace::BlockStorage.new  :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad-token")
+      returns(200) { @service.list_volumes.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) {Fog::Rackspace::BlockStorage.new :rackspace_api_key => 'bad_key' }
+    end
   end
 
 end

data/tests/rackspace/cdn_tests.rb

@@ -96,6 +96,20 @@ Shindo.tests('Fog::CDN::Rackspace', ['rackspace']) do
     end
   end
 
+  tests('reauthentication') do
+    pending if Fog.mocking?
+
+    tests('should reauth with valid credentials') do
+      @service = Fog::CDN::Rackspace.new  :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad-token")
+      returns(true) { [200, 204].include? @service.get_containers.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::CDN::Rackspace.new :rackspace_api_key => 'bad_key' }
+    end
+  end
+
   pending if Fog.mocking?
   
   def container_meta_attributes

data/tests/rackspace/compute_tests.rb

@@ -91,9 +91,15 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service =  Fog::Compute::Rackspace.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad-token")
-    returns(true) { [200, 203].include?(@service.list_flavors.status) }
+    tests('should reauth with valid credentials') do
+      @service =  Fog::Compute::Rackspace.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad-token")
+      returns(true) { [200, 203].include?(@service.list_flavors.status) }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Compute::Rackspace.new :rackspace_api_key => 'bad_key' }
+    end
+
   end
 end

data/tests/rackspace/compute_v2_tests.rb

@@ -104,10 +104,15 @@ Shindo.tests('Fog::Compute::RackspaceV2', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Compute::RackspaceV2.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad_token")
-    returns(true) { [200, 203].include? @service.list_flavors.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Compute::RackspaceV2.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad_token")
+      returns(true) { [200, 203].include? @service.list_flavors.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Compute::RackspaceV2.new :rackspace_api_key => 'bad_key' }
+    end
   end
 
 end

data/tests/rackspace/databases_tests.rb

@@ -105,10 +105,15 @@ Shindo.tests('Fog::Rackspace::Databases', ['rackspace']) do |variable|
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Rackspace::Databases.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad_token")
-    returns(200) { @service.list_flavors.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Rackspace::Databases.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad_token")
+      returns(200) { @service.list_flavors.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Rackspace::Databases.new :rackspace_api_key => 'bad_key' }
+    end
   end
 
   @service = Fog::Rackspace::Databases.new

data/tests/rackspace/dns_tests.rb

@@ -85,10 +85,15 @@ Shindo.tests('Fog::DNS::Rackspace', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service =Fog::DNS::Rackspace.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad_token")
-    returns(200) { @service.list_domains.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::DNS::Rackspace.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad_token")
+      returns(200) { @service.list_domains.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::DNS::Rackspace.new :rackspace_api_key => 'bad_key' }
+    end
   end
 
   tests('array_to_query_string') do

data/tests/rackspace/helper.rb

@@ -66,5 +66,24 @@ module Shindo
       @flavor_id ||= Fog.credentials[:rackspace_flavor_id] || service.flavors.first.id
     end
 
-  end  
-end
+    # After a server has been successfully deleted they are still being reported as attached to a cloud network
+    # causing delete calls to fail. This method attempts to address that.
+    def delete_test_network(network)
+      return false if Fog.mocking? || network.nil?
+      attempt = 0
+      begin
+        network.destroy
+      rescue Fog::Compute::RackspaceV2::ServiceError => e
+        if attempt == 3
+           Fog::Logger.warning "Unable to delete #{network.label}"
+          return false
+        end
+         Fog::Logger.warning "Network #{network.label} Delete Fail Attempt #{attempt}- #{e.inspect}"
+        attempt += 1
+        sleep 60
+        retry
+      end
+      return true
+    end
+  end
+end

data/tests/rackspace/identity_tests.rb

@@ -16,10 +16,15 @@ Shindo.tests('Fog::Rackspace::Identity', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Rackspace::Identity.new  :rackspace_region => :ord
-    returns(true, "auth token populated") { !@service.auth_token.nil? }
-    @service.instance_variable_set("@auth_token", "bad-token")
-    returns(true) { [200, 203].include? @service.list_tenants.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Rackspace::Identity.new  :rackspace_region => :ord
+      returns(true, "auth token populated") { !@service.auth_token.nil? }
+      @service.instance_variable_set("@auth_token", "bad-token")
+      returns(true) { [200, 203].include? @service.list_tenants.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Rackspace::Identity.new :rackspace_api_key => 'bad_key' }
+    end
   end
 
 end

data/tests/rackspace/load_balancer_tests.rb

@@ -105,10 +105,14 @@ Shindo.tests('Fog::Rackspace::LoadBalancers', ['rackspace']) do
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Rackspace::LoadBalancers.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad-token")
-    returns(200) { @service.list_load_balancers.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Rackspace::LoadBalancers.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad-token")
+      returns(200) { @service.list_load_balancers.status }    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Rackspace::LoadBalancers.new:rackspace_api_key => 'bad_key' }
+    end
   end
 
   pending if Fog.mocking?

data/tests/rackspace/models/compute_v2/server_tests.rb

@@ -77,7 +77,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
      end
 
     tests('#update').succeeds do
-      @instance.name = "fog_server_update"
+      new_name = "fog_server_update#{Time.now.to_i.to_s}"
+      @instance.name = new_name
       @instance.access_ipv4_address= "10.10.0.1"
       @instance.access_ipv6_address= "::1"
       @instance.save
@@ -85,7 +86,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
       @instance.reload
       returns("10.10.0.1") { @instance.access_ipv4_address }
       returns("::1") { @instance.access_ipv6_address }
-      returns("fog_server_update") { @instance.name }
+      returns(new_name) { @instance.name }
     end
     
     tests('#reboot("SOFT")').succeeds do
@@ -98,18 +99,6 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
       @instance.reboot('HARD')
       returns('HARD_REBOOT') { @instance.state }
     end
-    
-    @instance.wait_for { ready? }
-    @test_image = nil
-    begin
-      tests('#create_image').succeeds do
-        @test_image = @instance.create_image('fog-test-image')
-        @test_image.reload
-        returns('SAVING') { @test_image.state }
-      end
-    ensure
-      @test_image.destroy unless @test_image.nil? || Fog.mocking?
-    end
 
     sleep 30 unless Fog.mocking?
     @instance.wait_for { ready? }
@@ -165,6 +154,18 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
       returns('somerandompassword') { @instance.password }
     end
 
+    @instance.wait_for { ready? }
+    @test_image = nil
+    begin
+      tests('#create_image').succeeds do
+        @test_image = @instance.create_image('fog-test-image')
+        @test_image.reload
+        returns('SAVING') { @test_image.state }
+      end
+    ensure
+      @test_image.destroy unless @test_image.nil? || Fog.mocking?
+    end
+
     tests('attachments') do
       begin
         @volume = cbs_service.volumes.create(:size => 100, :display_name => "fog-#{Time.now.to_i.to_s}")
@@ -189,13 +190,6 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     @instance.wait_for { ready? }
    end
 
-   wait_for_server_deletion(@instance)
-   sleep 60 unless Fog.mocking?
-
-   tests("delete network #{@network.label}").succeeds do
-     @network.destroy if @network
-   end
-
   #When after testing resize/resize_confirm we get a 409 when we try to resize_revert so I am going to split it into two blocks
   model_tests(service.servers, options, true) do
     @instance.wait_for { ready? }
@@ -211,4 +205,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
     @instance.wait_for { ready? }
   end
+
+  wait_for_server_deletion(@instance)
+  delete_test_network(@network)
 end

data/tests/rackspace/models/identity/service_catalog_tests.rb

@@ -3,35 +3,60 @@ require 'fog/rackspace/models/identity/service_catalog'
 Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
 
   tests('#from_response') do
-    before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"},
-    "serviceCatalog"=>[{"type"=>"volume", "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777"},
-    {"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"},
-    {"type"=>"rax:load-balancer", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"},
-    {"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudLoadBalancers"},
-    {"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
-    "tenantId"=>"Mosso777",
-    "publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
-    {"internalURL"=>"https://snet-storage101.ord1.clouddrive.com/v1/Mosso777", "region"=>"ORD",
-    "tenantId"=>"Mosso777",
-    "publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"}, {"type"=>"rax:database",
-    "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777"}, {"region"=>"ORD", "tenantId"=>"777",
-    "publicURL"=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDatabases"}, {"type"=>"rax:dns", "endpoints"=>[{"tenantId"=>"777",
-    "publicURL"=>"https://dns.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDNS"}, {"type"=>"compute", "endpoints"=>[{"versionId"=>"1.0", "tenantId"=>"777",
-    "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v1.0",
-    "publicURL"=>"https://servers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudServers"}, {"type"=>"compute", "endpoints"=>[{"region"=>"DFW", "versionId"=>"2",
-    "tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
-    "publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
-    "versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
-    "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
-    "publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudMonitoring"}, {"type"=>"rax:object-cdn", "endpoints"=>[{"region"=>"DFW",
-    "tenantId"=>"Mosso777", "publicURL"=>"https://cdn1.clouddrive.com/v1/Mosso777"},
-    {"region"=>"ORD", "tenantId"=>"Mosso777",
-    "publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"}], "user"=>{"roles"=>[{"description"=>"User Admin
-    Role.", "name"=>"identity:user-admin", "id"=>"3"}], "name"=>"joe-racker", "RAX-AUTH:defaultRegion"=>"", "id"=>"TK421"}}}
+    tests('missing serviceCatalog node') do
+      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}}}
+      after_hash = {}
+      service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
+      returns(after_hash) { service_catalog.catalog }
+    end
+
+    tests('missing serviceCatalog node') do
+      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}, "serviceCatalog"=>[{"type"=>"volume",  "name"=>"cloudBlockStorage", "endpoints" =>[{"region"=>"DFW", "tenantId"=>"777" }]}, {"type"=>"rax:load-balancer","name"=>"cloudLoadBalancers",  "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}] }] }}
+
+      after_hash = {:cloudBlockStorage=>nil, :cloudLoadBalancers=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}
+      service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
+      returns(after_hash) { service_catalog.catalog }
+    end
+
+    tests('missing region') do
+      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"}, "serviceCatalog"=> [{"type"=>"rax:load-balancer","name"=>"cloudLoadBalancers",  "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, {"tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}] }] }}
 
-    after_hash = {:cloudServers=>"https://servers.api.rackspacecloud.com/v1.0/777", :cloudServersOpenStack=>{:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, :cloudFiles=>{:dfw=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777", :ord=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}, :cloudBlockStorage=>{:dfw=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777", :ord=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}, :cloudMonitoring=>"https://monitoring.api.rackspacecloud.com/v1.0/777", :cloudLoadBalancers=>{:dfw=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, :cloudFilesCDN=>{:dfw=>"https://cdn1.clouddrive.com/v1/Mosso777", :ord=>"https://cdn2.clouddrive.com/v1/Mosso777"}, :cloudDatabases=>{:dfw=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}, :cloudDNS=>"https://dns.api.rackspacecloud.com/v1.0/777"}
-    @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
-    returns(after_hash) { @service_catalog.catalog }
+      after_hash = {:cloudLoadBalancers=>{:ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777", :global=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}}
+      service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
+      returns(after_hash) { service_catalog.catalog }
+    end
+
+    tests('successful') do
+      before_hash = {"access"=>{"token"=>{"expires"=>"2013-02-20T10:31:00.000-06:00", "tenant"=>{"name"=>"777", "id"=>"777"}, "id"=>"6ca10877-7c50-4a5c-b58f-004d835c39c3"},
+      "serviceCatalog"=>[{"type"=>"volume", "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777"},
+      {"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"},
+      {"type"=>"rax:load-balancer", "endpoints"=>[{"region"=>"ORD", "tenantId"=>"777", "publicURL"=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"},
+      {"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudLoadBalancers"},
+      {"type"=>"object-store", "endpoints"=>[{"internalURL"=>"https://snet-storage101.dfw1.clouddrive.com/v1/Mosso777", "region"=>"DFW",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777"},
+      {"internalURL"=>"https://snet-storage101.ord1.clouddrive.com/v1/Mosso777", "region"=>"ORD",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"}, {"type"=>"rax:database",
+      "endpoints"=>[{"region"=>"DFW", "tenantId"=>"777", "publicURL"=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777"}, {"region"=>"ORD", "tenantId"=>"777",
+      "publicURL"=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDatabases"}, {"type"=>"rax:dns", "endpoints"=>[{"tenantId"=>"777",
+      "publicURL"=>"https://dns.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudDNS"}, {"type"=>"compute", "endpoints"=>[{"versionId"=>"1.0", "tenantId"=>"777",
+      "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v1.0",
+      "publicURL"=>"https://servers.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudServers"}, {"type"=>"compute", "endpoints"=>[{"region"=>"DFW", "versionId"=>"2",
+      "tenantId"=>"777", "versionList"=>"https://dfw.servers.api.rackspacecloud.com/", "versionInfo"=>"https://dfw.servers.api.rackspacecloud.com/v2",
+      "publicURL"=>"https://dfw.servers.api.rackspacecloud.com/v2/777"}, {"region"=>"ORD", "versionId"=>"2", "tenantId"=>"777",
+      "versionList"=>"https://ord.servers.api.rackspacecloud.com/", "versionInfo"=>"https://ord.servers.api.rackspacecloud.com/v2",
+      "publicURL"=>"https://ord.servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}, {"type"=>"rax:monitor", "endpoints"=>[{"tenantId"=>"777",
+      "publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}], "name"=>"cloudMonitoring"}, {"type"=>"rax:object-cdn", "endpoints"=>[{"region"=>"DFW",
+      "tenantId"=>"Mosso777", "publicURL"=>"https://cdn1.clouddrive.com/v1/Mosso777"},
+      {"region"=>"ORD", "tenantId"=>"Mosso777",
+      "publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"}], "user"=>{"roles"=>[{"description"=>"User Admin
+      Role.", "name"=>"identity:user-admin", "id"=>"3"}], "name"=>"joe-racker", "RAX-AUTH:defaultRegion"=>"", "id"=>"TK421"}}}
+
+      after_hash = {:cloudServers=>"https://servers.api.rackspacecloud.com/v1.0/777", :cloudServersOpenStack=>{:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}, :cloudFiles=>{:dfw=>"https://storage101.dfw1.clouddrive.com/v1/Mosso777", :ord=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}, :cloudBlockStorage=>{:dfw=>"https://dfw.blockstorage.api.rackspacecloud.com/v1/777", :ord=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}, :cloudMonitoring=>"https://monitoring.api.rackspacecloud.com/v1.0/777", :cloudLoadBalancers=>{:dfw=>"https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.loadbalancers.api.rackspacecloud.com/v1.0/777"}, :cloudFilesCDN=>{:dfw=>"https://cdn1.clouddrive.com/v1/Mosso777", :ord=>"https://cdn2.clouddrive.com/v1/Mosso777"}, :cloudDatabases=>{:dfw=>"https://dfw.databases.api.rackspacecloud.com/v1.0/777", :ord=>"https://ord.databases.api.rackspacecloud.com/v1.0/777"}, :cloudDNS=>"https://dns.api.rackspacecloud.com/v1.0/777"}
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.from_response(nil, before_hash)
+      returns(after_hash) { @service_catalog.catalog }
+    end
   end
   
   tests('services') do
@@ -75,7 +100,7 @@ Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
     returns("http:///fake-endpoint.com") { service.service_catalog.get_endpoint :fakeService }
     service_catalog.reload
     raises(RuntimeError) { service_catalog.get_endpoint :fakeService }
-    raises(RuntimeError) { service.service_catalog.get_endpoint :fakeService }    
+    raises(RuntimeError) { service.service_catalog.get_endpoint :fakeService }
     
   end  
 end

data/tests/rackspace/models/load_balancers/load_balancer_tests.rb

@@ -20,6 +20,11 @@ Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer', ['rackspace']) do
       end
 
       @instance.wait_for { ready? }
+
+      tests('#stats').succeeds do
+        @instance.stats
+      end
+
       tests('#enable_connection_logging').succeeds do
         @instance.enable_connection_logging
         returns(true) { @instance.connection_logging }

data/tests/rackspace/models/monitoring/alarm_examples_tests.rb

@@ -1,5 +1,5 @@
 Shindo.tests('Fog::Rackspace::Monitoring | alarm_examples', ['rackspace','rackspace_monitoring']) do
-  pending if Fog.mocking? && !mocks_implemented
+  pending if Fog.mocking?
 
   service = Fog::Rackspace::Monitoring.new
   alarm_example_id = 'remote.http_body_match_1'

data/tests/rackspace/models/monitoring/alarm_tests.rb

@@ -17,10 +17,10 @@ Shindo.tests('Fog::Rackspace::Monitoring | alarm', ['rackspace','rackspace_monit
       check = Fog::Rackspace::Monitoring::Check.new(:id => check_id)
       check.entity = entity
       alarm = Fog::Rackspace::Monitoring::Alarm.new
-      alarm.check_id = check.id
+      alarm.check = check.id
       
       returns(Fog::Rackspace::Monitoring::Alarm) { alarm.class }
-      returns(check_id) { alarm.check_id }
+      returns(check_id) { alarm.check.id }
     end
   end
 

data/tests/rackspace/monitoring_tests.rb

@@ -63,10 +63,15 @@ Shindo.tests('Fog::Rackspace::Monitoring', ['rackspace','rackspace_monitoring'])
   tests('reauthentication') do
     pending if Fog.mocking?
 
-    @service = Fog::Rackspace::Monitoring.new
-    returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-    @service.instance_variable_set("@auth_token", "bad_token")
-    returns(true) { [200, 203].include? @service.list_entities.status }
+    tests('should reauth with valid credentials') do
+      @service = Fog::Rackspace::Monitoring.new
+      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
+      @service.instance_variable_set("@auth_token", "bad_token")
+      returns(true) { [200, 203].include? @service.list_entities.status }
+    end
+    tests('should terminate with incorrect credentials') do
+      raises(Excon::Errors::Unauthorized) { Fog::Rackspace::Monitoring.new :rackspace_api_key => 'bad_key' }
+    end
   end
 
 end

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

@@ -34,6 +34,12 @@ Shindo.tests('Fog::Compute::RackspaceV2 | flavor_tests', ['rackspace']) do
       body
     end
 
+    tests('#list_flavors_detail').formats(list_flavor_format) do
+      body = service.list_flavors_detail.body
+      flavor_id = body['flavors'][0]['id']
+      body
+    end
+
     tests('#get_flavor').formats(get_flavor_format) do
       service.get_flavor(flavor_id).body
     end

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

@@ -48,6 +48,10 @@ Shindo.tests('Fog::Compute::RackspaceV2 | image_tests', ['rackspace']) do
         service.list_images.body
       end
 
+      tests('#list_images_detail').formats(list_image_format) do
+        service.list_images_detail.body
+      end
+
       tests('#get_image').formats(get_image_format, false) do
         service.get_image(@image_id).body
       end

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

@@ -106,7 +106,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
     sleep 120 unless Fog.mocking?
     
     tests('#resize_server').succeeds do
-      resize_flavor_id = flavor_id
+      resize_flavor_id = Fog.mocking? ? flavor_id : service.flavors[1].id
       service.resize_server(server_id, resize_flavor_id)
     end
     wait_for_server_state(service, server_id, 'VERIFY_RESIZE', 'ACTIVE')
@@ -117,7 +117,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
     wait_for_server_state(service, server_id, 'ACTIVE', 'ERROR')
 
     tests('#resize_server').succeeds do
-      resize_flavor_id = flavor_id
+      resize_flavor_id = Fog.mocking? ? flavor_id : service.flavors[1].id
       service.resize_server(server_id, resize_flavor_id)
     end
     wait_for_server_state(service, server_id, 'VERIFY_RESIZE', 'ACTIVE')

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

@@ -0,0 +1,13 @@
+Shindo.tests('Fog::Rackspace::LoadBalancers | load_balancer_get_stats', ['rackspace']) do
+
+  given_a_load_balancer_service do
+    given_a_load_balancer do
+      tests('success') do
+        @lb.wait_for { ready? }
+        tests("#get_stats(#{@lb.id})").formats(LOAD_BALANCER_STATS_FORMAT) do
+          @service.get_stats(@lb.id).body
+        end
+      end
+    end
+  end
+end