fog 1.18.0 → 1.19.0

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

@@ -1,9 +1,12 @@
 Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
 
+  model_tests(Fog::Compute[:google].disks, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+
   tests('servers') do
     @instance = nil
     test('#bootstrap') do
-      @instance = Fog::Compute[:google].servers.bootstrap
+      attributes = Fog.mocking? ? {:public_key_path => nil, :private_key_path => nil} : {}
+      @instance = Fog::Compute[:google].servers.bootstrap(attributes)
       @instance.ready?
     end
 
@@ -13,6 +16,7 @@ Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
     end
 
     test('#ssh') do
+      pending if Fog.mocking?
       @instance.ssh("uname") == "Linux"
     end
 

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

@@ -0,0 +1,5 @@
+Shindo.tests("Fog::Compute[:google] | servers", ['google']) do
+
+  collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+
+end

data/tests/google/requests/compute/disk_tests.rb

@@ -65,10 +65,11 @@ Shindo.tests('Fog::Compute[:google] | disk requests', ['google']) do
     disk_name = 'new-disk-test'
     disk_size = '2'
     zone_name = 'us-central1-a'
+    image_name = 'centos-6-v20130813'
 
     # These will all fail if errors happen on insert
     tests("#insert_disk").formats(@insert_disk_format) do
-      @google.insert_disk(disk_name, disk_size, zone_name).body
+      @google.insert_disk(disk_name, zone_name, image_name).body
     end
 
     tests("#get_disk").formats(@get_disk_format) do

data/tests/google/requests/compute/firewall_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Fog::Compute[:google] | firewall requests', ['google']) do
+  pending if Fog.mocking?
 
   @google = Fog::Compute[:google]
 

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

@@ -58,10 +58,12 @@ Shindo.tests('Fog::Compute[:google] | image requests', ['google']) do
     source = 'https://www.google.com/images/srpr/logo4w.png'
 
     tests("#insert_image").formats(@insert_image_format) do
+      pending if Fog.mocking?
       @google.insert_image(image_name, source).body
     end
 
     tests("#get_image").formats(@get_image_format) do
+      pending if Fog.mocking?
       @google.insert_image(image_name, source)
       @google.get_image(image_name).body
     end
@@ -71,6 +73,7 @@ Shindo.tests('Fog::Compute[:google] | image requests', ['google']) do
     end
 
     tests("#delete_image").formats(@delete_image_format) do
+      pending if Fog.mocking?
       @google.insert_image(image_name, source)
       @google.delete_image(image_name).body
     end

data/tests/google/requests/compute/network_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Fog::Compute[:google] | network requests', ['google']) do
+  pending if Fog.mocking?
 
   @google = Fog::Compute[:google]
 

data/tests/google/requests/compute/operation_tests.rb

@@ -1,4 +1,5 @@
 Shindo.tests('Fog::Compute[:google] | operation requests', ['google']) do
+  pending if Fog.mocking?
 
   @google = Fog::Compute[:google]
 

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

@@ -54,16 +54,15 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
   tests('success') do
 
     server_name = 'new-server-test'
-    image_name = "gcel-12-04-v20130325"
+    image_name = "centos-6-v20130813"
     machine_type = "n1-standard-1"
     zone_name = "us-central1-a"
 
     tests("#insert_server").formats(@insert_server_format) do
       @google.insert_server(
         server_name,
-        image_name,
         zone_name,
-        machine_type
+        { 'image' => image_name, 'machineType' => machine_type }
       ).body
     end
 

data/tests/google/requests/compute/zone_tests.rb

@@ -10,12 +10,7 @@ Shindo.tests('Fog::Compute[:google] | zone requests', ['google']) do
       'name' => String,
       'description' => String,
       'status' => String,
-      'maintenanceWindows' => [{
-        'name' => String,
-        'description' => String,
-        'beginTime' => String,
-        'endTime' => String,
-      }],
+      'maintenanceWindows' => Fog::Nullable::Array,
       'quotas' => [{
         'metric' => String,
         'limit' => Float,

data/tests/helpers/collection_helper.rb

@@ -36,11 +36,19 @@ def collection_tests(collection, params = {}, mocks_implemented = true)
     tests('Enumerable') do
       pending if Fog.mocking? && !mocks_implemented
 
-      [
+      methods = [
         'all?', 'any?', 'find',  'detect', 'collect', 'map',
         'find_index', 'flat_map', 'collect_concat', 'group_by',
         'none?', 'one?'
-      ].each do |enum_method|
+      ]
+
+      # JRuby 1.7.5+ issue causes a SystemStackError: stack level too deep
+      # https://github.com/jruby/jruby/issues/1265
+      if RUBY_PLATFORM == "java" and JRUBY_VERSION =~ /1\.7\.[5-8]/
+        methods.delete('all?')
+      end
+
+      methods.each do |enum_method|
         if collection.respond_to?(enum_method)
           tests("##{enum_method}").succeeds do
             block_called = false

data/tests/helpers/mock_helper.rb

@@ -43,10 +43,9 @@ if Fog.mock?
     :go_grid_shared_secret            => 'go_grid_shared_secret',
     :google_storage_access_key_id     => 'google_storage_access_key_id',
     :google_storage_secret_access_key => 'google_storage_secret_access_key',
-    # Commented out till there are mocks for google/compute
-    #:google_project                   => 'google_project_name',
-    #:google_client_email              => 'fake@developer.gserviceaccount.com',
-    #:google_key_location              => '~/fake.p12',
+    :google_project                   => 'google_project_name',
+    :google_client_email              => 'fake@developer.gserviceaccount.com',
+    :google_key_location              => '~/fake.p12',
     :hp_access_key                    => 'hp_access_key',
     :hp_secret_key                    => 'hp_secret_key',
     :hp_tenant_id                     => 'hp_tenant_id',
@@ -83,7 +82,7 @@ if Fog.mock?
     :vcloud_host                      => 'vcloud_host',
     :vcloud_password                  => 'vcloud_password',
     :vcloud_username                  => 'vcloud_username',
-    :vcloud_director_host             => 'vcloud_director_host',
+    :vcloud_director_host             => 'vcloud-director-host',
     :vcloud_director_password         => 'vcloud_director_password',
     :vcloud_director_username         => 'vcd_user@vcd_org_name',
     :voxel_api_key                    => 'voxel_api_key',

data/tests/local/models/directories_tests.rb

@@ -0,0 +1,17 @@
+Shindo.tests('Storage[:local] | directories', ["local"]) do
+
+  pending if Fog.mocking?
+
+  @options = { :local_root => "/tmp/fogtests" }
+  @collection = Fog::Storage::Local.new(@options).directories
+
+  collection_tests(@collection, {:key => "fogdirtests"}, true)
+
+  tests("#all") do
+    tests("succeeds when :local_root does not exist").succeeds do
+      FileUtils.rm_rf(@options[:local_root])
+      @collection.all
+    end
+  end
+
+end

data/tests/openstack/models/compute/security_group_tests.rb

@@ -0,0 +1,54 @@
+Shindo.tests("Fog::Compute[:openstack] | security_group", ['openstack']) do
+  tests('success') do
+    begin
+      fog = Fog::Compute[:openstack]
+
+      security_group = fog.security_groups.create(
+        :name        => 'my_group',
+        :description => 'my group'
+      )
+
+      tests('#create').succeeds do
+        security_group = fog.security_groups.create(
+          :name        => 'my_group',
+          :description => 'my group'
+        )
+
+        returns('my_group') { security_group.name }
+        returns('my group') { security_group.description }
+        returns([])         { security_group.security_group_rules }
+        returns(true)       { security_group.tenant_id != nil }
+      end
+
+      tests('#rules').succeeds do
+        tests("#create").succeeds do
+          rules_count = security_group.security_group_rules.count
+          rule        = security_group.security_group_rules.create(
+            :parent_group_id => security_group.id,
+            :ip_protocol     => 'tcp',
+            :from_port       => 1234,
+            :to_port         => 1234,
+            :ip_range        => { "cidr" => "0.0.0.0/0" }
+          )
+          returns(true) { security_group.security_group_rules.count == (rules_count + 1) }
+          security_group_rule = security_group.security_group_rules.detect { |r| r.id == rule.id }
+          returns(true) { security_group_rule.attributes == rule.attributes }
+        end
+
+        tests("#destroy").succeeds do
+          rule        = security_group.security_group_rules.create(
+            :parent_group_id => security_group.id,
+            :ip_protocol     => 'tcp',
+            :from_port       => 1234,
+            :to_port         => 1234,
+            :ip_range        => { "cidr" => "0.0.0.0/0" }
+          )
+          rule.destroy
+          returns(true) { rule.reload == nil }
+        end
+      end
+    ensure
+      security_group.destroy if security_group
+    end
+  end
+end

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

@@ -10,23 +10,26 @@ Shindo.tests('Fog::Compute[:openstack] | security group requests', ['openstack']
   }
 
   @security_group_rule_format = {
-    "id"          => Integer,
-    "from_port"   => Integer,
-    "to_port"     => Integer,
-    "ip_protocol" => String,
-    "group"       => Hash,
-    "ip_range"    => Hash,
+    "id"              => Integer,
+    "from_port"       => Integer,
+    "to_port"         => Integer,
+    "ip_protocol"     => String,
+    "group"           => Hash,
+    "ip_range"        => Hash,
     "parent_group_id" => Integer
   }
 
   tests('success') do
     tests('#create_security_group(name, description)').formats({"security_group" => @security_group_format}) do
-      Fog::Compute[:openstack].create_security_group('from_shindo_test', 'this is from the shindo test').body
+      security_group = Fog::Compute[:openstack].create_security_group('from_shindo_test', 'this is from the shindo test').body
+      @security_group_id = security_group['security_group']['id']
+      security_group
     end
 
     tests('#create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id=nil)').formats({"security_group_rule" => @security_group_rule_format}) do
-      parent_group_id = Fog::Compute[:openstack].list_security_groups.body['security_groups'].last['id']
-      Fog::Compute[:openstack].create_security_group_rule(parent_group_id, "tcp", 2222, 3333, "20.20.20.20/24").body
+      security_group_rule = Fog::Compute[:openstack].create_security_group_rule(@security_group_id, "tcp", 2222, 3333, "20.20.20.20/24").body
+      @security_group_rule_id = security_group_rule['security_group_rule']['id']
+      security_group_rule
     end
 
     tests('#list_security_groups').formats({"security_groups" => [@security_group_format]}) do
@@ -34,25 +37,24 @@ Shindo.tests('Fog::Compute[:openstack] | security group requests', ['openstack']
     end
 
     tests('#get_security_group(security_group_id)').formats({"security_group" => @security_group_format}) do
-      group_id = Fog::Compute[:openstack].list_security_groups.body['security_groups'].last['id']
-      Fog::Compute[:openstack].get_security_group(group_id).body
+      Fog::Compute[:openstack].get_security_group(@security_group_id).body
+    end
+
+    tests('#get_security_group_rule').formats({"security_group_rule" => @security_group_rule_format}) do
+      Fog::Compute[:openstack].create_security_group_rule(@security_group_id, "tcp", 2222, 3333, "20.20.20.20/24").body
+      Fog::Compute[:openstack].get_security_group_rule(@security_group_rule_id).body
     end
 
     tests('#delete_security_group_rule(security_group_rule_id)').succeeds do
-      security_group_rule_id = Fog::Compute[:openstack].list_security_groups.body['security_groups'].last['rules'].last['id']
-      Fog::Compute[:openstack].delete_security_group_rule(security_group_rule_id)
+      Fog::Compute[:openstack].delete_security_group_rule(@security_group_rule_id)
     end
 
     tests('#delete_security_group(security_group_id)').succeeds do
-      compute = Fog::Compute[:openstack]
-
-      group_id = compute.list_security_groups.body['security_groups'].last['id']
-
-      compute.delete_security_group(group_id)
+      Fog::Compute[:openstack].delete_security_group(@security_group_id)
 
       returns(false) {
-        groups = compute.list_security_groups.body['security_groups']
-        groups.any? { |group| group['id'] == group_id }
+        groups = Fog::Compute[:openstack].list_security_groups.body['security_groups']
+        groups.any? { |group| group['id'] == @security_group_id }
       }
     end
   end # tests('success')

data/tests/openstack/requests/network/network_tests.rb

@@ -1,13 +1,13 @@
 Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
 
   @network_format = {
-    'id'                        => String,
-    'name'                      => String,
-    'subnets'                   => Array,
-    'shared'                    => Fog::Boolean,
-    'status'                    => String,
-    'admin_state_up'            => Fog::Boolean,
-    'tenant_id'                 => String
+    'id'              => String,
+    'name'            => String,
+    'subnets'         => Array,
+    'shared'          => Fog::Boolean,
+    'status'          => String,
+    'admin_state_up'  => Fog::Boolean,
+    'tenant_id'       => String,
   }
 
   @network_format_extensions = {
@@ -98,7 +98,7 @@ Shindo.tests('Fog::Network[:openstack] | network requests', ['openstack']) do
       Fog::Network[:openstack].delete_network(0)
     end
   end
-      
+
   # Cleaning up the mess
   Fog::Network[:openstack].networks.each do |n|
     Fog::Network[:openstack].delete_network(n.id)

data/tests/rackspace/compute_tests.rb

@@ -81,11 +81,6 @@ Shindo.tests('Rackspace | Compute', ['rackspace']) do
       returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
       returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /my-custom-endpoint\.com/) != nil }
     end
-    tests('rackspace_servicenet') do
-      @service = Fog::Compute::Rackspace.new :rackspace_servicenet => true
-      returns(true, "auth token populated") { !@service.send(:auth_token).nil? }
-      returns(true, "uses custom endpoint") { (@service.instance_variable_get("@uri").host =~ /snet-/) != nil }
-    end
   end
 
   tests('reauthentication') do

data/tests/rackspace/helper.rb

@@ -54,17 +54,22 @@ module Shindo
       until current_state == state
         current_state = service.get_server(server_id).body['server']['status']
         if error_states
-          error_states = Array(error_states)           
-          raise "ERROR! Server should have transitioned to '#{state}' not '#{current_state}'" if error_states.include?(current_state)
+          error_states = Array(error_states)
+          if error_states.include?(current_state)
+            Fog::Logger.warning caller
+            Fog::Logger.warning "ERROR! Server should have transitioned to '#{state}' not '#{current_state}'"
+            return
+          end
         end
         sleep 10 unless Fog.mocking?
       end
       sleep 30 unless Fog.mocking?
     end
 
-    def rackspace_test_image_id(service) 
+    def rackspace_test_image_id(service)
+      image_id  = Fog.credentials[:rackspace_image_id]
       # I chose to use the first Ubuntu because it will work with the smallest flavor and it doesn't require a license
-      @image_id ||= Fog.credentials[:rackspace_image_id] || service.images.find {|img| img.name =~ /Ubuntu/ }.id
+      image_id ||= Fog.mocking? ? service.images.first.id : service.images.find {|image| image.name =~ /Ubuntu/}.id # use the first Ubuntu image
     end
 
     def rackspace_test_flavor_id(service)

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

@@ -195,7 +195,35 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server', ['rackspace']) do
     end
 
     @instance.wait_for { ready? }
-   end
+  end
+
+  tests('#setup') do
+    perform_setup = lambda { |attributes|
+      Fog::SSH::Mock.data.clear
+
+      server = Fog::Compute::RackspaceV2::Server.new(attributes)
+
+      address = 123
+
+      server.ipv4_address = address
+      server.identity = "bar"
+      server.public_key = "baz"
+
+      server.setup
+
+      Fog::SSH::Mock.data[address].first[:commands]
+    }
+
+    test("leaves user unlocked only when requested") do
+      perform_setup.call(:service => service, :no_passwd_lock => true)
+                   .none? { |c| c =~ /passwd\s+-l\s+root/ } 
+    end
+
+    test("locks user by default") do
+      perform_setup.call(:service => service)
+                   .one? { |c| c =~ /passwd\s+-l\s+root/ }
+    end
+  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

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

@@ -2,30 +2,6 @@ require 'fog/rackspace/models/identity/service_catalog'
 
 Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
 
-  tests('#from_response') do
-    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 = {: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"},
@@ -46,47 +22,90 @@ Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
       "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://ord.servers.api.rackspacecloud.com/v2/777"}, {"versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v2", "publicURL"=>"https://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
+      "publicURL"=>"https://cdn2.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFilesCDN"},
+
+      {"type"=>"not_here", "name" => "not_here", "endpoints"=>[{"tenantId"=>"777", "region" => "LON",
+      "publicURL"=>"https://monitoring.api.rackspacecloud.com/v1.0/777"}]}
+      ],
+
+      "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
-    services = ["cloudBlockStorage", "cloudDNS", "cloudDatabases", "cloudFiles", "cloudFilesCDN", "cloudLoadBalancers", "cloudMonitoring", "cloudServers", "cloudServersOpenStack"]
-    returns(services) { @service_catalog.services.collect {|s| s.to_s }.sort }
-  end
+    tests('services') do
+      services = ["cloudBlockStorage", "cloudDNS", "cloudDatabases", "cloudFiles", "cloudFilesCDN", "cloudLoadBalancers", "cloudMonitoring", "cloudServers", "cloudServersOpenStack", "not_here"]
+
+      returns(services) { @service_catalog.services.collect {|s| s.to_s }.sort }
+    end
   
   tests('get_endpoints') do
-    endpoints = {:dfw=>"https://dfw.servers.api.rackspacecloud.com/v2/777", :ord=>"https://ord.servers.api.rackspacecloud.com/v2/777"}
+    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"}, {"versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v2", "publicURL"=>"https://servers.api.rackspacecloud.com/v2/777"}]
     returns(endpoints) { @service_catalog.get_endpoints(:cloudServersOpenStack) }
     returns(endpoints) { @service_catalog.get_endpoints('cloudServersOpenStack') }
-    returns(nil) { @service_catalog.get_endpoints('non-existent') }
+    returns({}) { @service_catalog.get_endpoints('non-existent') }
   end
   
   tests('get_endpoint') do
     tests('service with mulitple endpoints') do
       returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :dfw) }
-      returns("https://ord.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord) }      
+      returns("https://ord.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord) }
       returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint(:cloudServersOpenStack, 'dfw') }
       returns("https://dfw.servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint('cloudServersOpenStack', 'dfw') }
+      returns("https://servers.api.rackspacecloud.com/v2/777") { @service_catalog.get_endpoint('cloudServersOpenStack', :global) }
     end
     
     tests('with one endpoint') do
-      returns("https://monitoring.api.rackspacecloud.com/v1.0/777") { @service_catalog.get_endpoint(:cloudMonitoring, 'dfw') }
+      tests('catalog contains global endpoint') do
+        catalog_hash =  [{"type"=>"volume", "endpoints"=>[{"tenantId"=>"777", "publicURL"=>"https://blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"}]
+        @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+        tests('no region specifed').returns("https://blockstorage.api.rackspacecloud.com/v1/777") do
+          @service_catalog.get_endpoint(:cloudBlockStorage)
+        end
+        tests('region specifed').returns("https://blockstorage.api.rackspacecloud.com/v1/777") do
+          @service_catalog.get_endpoint(:cloudBlockStorage, :ord)
+        end
+      end
+      tests('catalog does not contain global endpoint') do
+        catalog_hash =   [{"type"=>"volume", "endpoints"=>[{"region" => "ORD", "tenantId"=>"777", "publicURL"=>"https://ord.blockstorage.api.rackspacecloud.com/v1/777"}], "name"=>"cloudBlockStorage"}]
+        @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+        tests('non-existing region') do
+          raises(RuntimeError) { @service_catalog.get_endpoint(:cloudBlockStorage, :dfw) }
+        end
+        tests('existing region').returns("https://ord.blockstorage.api.rackspacecloud.com/v1/777") do
+          @service_catalog.get_endpoint(:cloudBlockStorage, :ord)
+        end
+      end
+    end
+
+    tests('endpoint type') do
+      catalog_hash =  [{"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"}]
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+
+      returns("https://storage101.ord1.clouddrive.com/v1/Mosso777") { @service_catalog.get_endpoint(:cloudFiles, :ord) }
+      returns("https://snet-storage101.ord1.clouddrive.com/v1/Mosso777") { @service_catalog.get_endpoint(:cloudFiles, :ord, true) }
+      returns("https://storage101.ord1.clouddrive.com/v1/Mosso777") { @service_catalog.get_endpoint(:cloudFiles, :ord, false) }
     end
     
     tests('error conditions') do
       raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack) }
       raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack, :sat) }
+      raises(RuntimeError) { @service_catalog.get_endpoint(:cloudServersOpenStack, :sat, true) }
+      raises(RuntimeError) { @service_catalog.get_endpoint(:not_here, :dfw) }
       raises(RuntimeError) { @service_catalog.get_endpoint('non-existent') }
+      raises(RuntimeError)  { @service_catalog.get_endpoint(:cloudServersOpenStack, :ord, true) }
     end    
   end
   
@@ -95,12 +114,41 @@ Shindo.tests('Fog::Rackspace::ServiceCatalog | users', ['rackspace']) do
 
     service = Fog::Identity[:rackspace]
     service_catalog = service.service_catalog
-    service_catalog.catalog[:fakeService] = "http:///fake-endpoint.com"
+    service_catalog.catalog << {"name"=>"fakeService", "endpoints"=>[{ "publicURL"=>"http:///fake-endpoint.com"}]}
     returns("http:///fake-endpoint.com") { service_catalog.get_endpoint :fakeService }
     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 }
+  end
+
+  tests('display_service_regions') do
+
+    tests('with global endpoint').returns(":dfw, :ord, :global") do
+      catalog_hash =  [{"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"}, {"versionId"=>"2", "tenantId"=>"777", "versionList"=>"https://servers.api.rackspacecloud.com/", "versionInfo"=>"https://servers.api.rackspacecloud.com/v2", "publicURL"=>"https://servers.api.rackspacecloud.com/v2/777"}], "name"=>"cloudServersOpenStack"}]
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
 
-  end  
+     @service_catalog.display_service_regions(:cloudServersOpenStack)
+    end
+
+    tests('endpoint types') do
+      catalog_hash =  [{"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"},
+      { "region"=>"ORD",
+      "tenantId"=>"Mosso777",
+      "publicURL"=>"https://storage101.ord1.clouddrive.com/v1/Mosso777"}], "name"=>"cloudFiles"},]
+      @service_catalog = Fog::Rackspace::Identity::ServiceCatalog.new(:service => nil, :catalog => catalog_hash)
+      tests('public').returns(":dfw, :ord") do
+        @service_catalog.display_service_regions(:cloudFiles)
+      end
+      tests('private').returns(":dfw") do
+        @service_catalog.display_service_regions(:cloudFiles, true)
+      end
+    end
+  end
 end