fog 1.17.0 → 1.18.0

data/lib/tasks/changelog_task.rb

@@ -55,6 +55,7 @@ module Fog
             if [
               'Aaron Suggs',
               'Brian Hartsock',
+              'Chris Roberts',
               'Christopher Oliver',
               'Daniel Reichert',
               'Decklin Foster',
@@ -68,6 +69,7 @@ module Fog
               'Lincoln Stoll',
               'Luqman Amjad',
               'Michael Zeng',
+              'Mike Hagedorn',
               'Nat Welch',
               'Nick Osborn',
               'nightshade427',

data/tests/aws/requests/compute/internet_gateway_tests.rb

@@ -26,6 +26,11 @@ Shindo.tests('Fog::Compute[:aws] | internet_gateway requests', ['aws']) do
     tests('#describe_internet_gateways').formats(@internet_gateways_format) do
       Fog::Compute[:aws].describe_internet_gateways.body
     end
+    
+    tests('#describe_internet_gateways with tags').formats(@internet_gateways_format) do
+      Fog::Compute[:aws].create_tags @igw_id, {"environment" => "production"}
+      Fog::Compute[:aws].describe_internet_gateways.body
+    end
 
     tests("#attach_internet_gateway('#{@igw_id}, #{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].attach_internet_gateway(@igw_id, @vpc_id).body

data/tests/compute/helper.rb

@@ -21,17 +21,19 @@ def compute_providers
     },
     :ecloud => {
       :server_attributes => {
-        :name                 => "eugene",
-        :row                  => "eugene1",
-        :group                => "eugene-104",
+        :name                 => "VM4",
+        :row                  => "Layout Row 1",
+        :group                => "Layout Group 1",
         :catalog_network_name => "bridged",
         :description          => "blarg",
         :operating_system => {
           :name =>  "Red Hat Enterprise Linux 5 (64-bit)",
           :href => "/cloudapi/ecloud/operatingsystems/rhel5_64guest/computepools/963",
         },
+        :organization_uri => 'organizations/2'
       }.tap do |hash|
-        [:template_href, :network_uri, :environment_name].each do |k|
+        [:template_href, :network_uri,
+         :environment_name, :organization_uri].each do |k|
           key = "ecloud_#{k}".to_sym
           if Fog.credentials[key]
             hash[k]= Fog.credentials[key]

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

@@ -2,12 +2,13 @@ provider, config = :ecloud, compute_providers[:ecloud]
 
 Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s, "operations"]) do
   connection   = Fog::Compute[provider]
-  organization = connection.organizations.first
+  connection.base_path = '/cloudapi/spec'
+  config[:server_attributes][:organization_uri] ? organization = connection.organizations.get("#{connection.base_path}#{config[:server_attributes][:organization_uri]}") : organization = connection.organizations.first
   environment  = organization.environments.find{|e| e.name == config[:server_attributes][:environment_name]} || organization.environments.first
   public_ip    = environment.public_ips.first
   compute_pool = environment.compute_pools.first
   image_href   = Fog.credentials[:ecloud_image_href] || compute_pool.templates.first.href
-  ssh_key      = organization.admin.ssh_keys.detect { |key| key.name == "root" }
+  ssh_key      = organization.admin.ssh_keys.detect { |key| key.name == "root" } || organization.admin.ssh_keys.first
 
   @network = environment.networks.first
   options  = config[:server_attributes].merge(:network_uri => @network.href, :ssh_key_uri => ssh_key.href)
@@ -15,53 +16,45 @@ Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s, "operations
   #  options = options.merge(:ssh_key_uri => "/cloudapi/ecloud/admin/sshkeys/#{Fog.credentials[:ecloud_ssh_key_id]}")
   #end
 
-  @server = compute_pool.servers.create(image_href, options)
-
   tests('#create_server').succeeds do
-    @server.wait_for { ready? } # server
+    compute_pool.servers.create(image_href, options)
   end
 
+  # Use the Living Specification, VM2 has valid power state to delete disks
+  vm_uri = "#{connection.base_path}/virtualMachines/2"
+  @server = compute_pool.servers.get(vm_uri)
+
   tests('#environment_has_a_row_and_group_with_the_right_names').succeeds do
     row = environment.rows.detect { |r| r.name == options[:row] }
     returns(false, "row is not nil") { row.nil? }
     group = row.groups.detect { |g| g.name == options[:group] }
     returns(false, "group is not nil") { group.nil? }
-    server = group.servers.detect { |s| s.name == @server.name }
+    server = group.servers.detect { |s| s.name == options[:name] }
     returns(false, "group has server") { server.nil? }
   end
 
   tests('#get_server_flavor').succeeds do
-    @server.flavor_id == {:ram => 512, :cpus => 1}
+    @server.flavor_id == {:ram => 1024, :cpus => 2}
   end
 
   @hwc = @server.hardware_configuration
   tests('#add_disk_to_server').succeeds do
-    disk_count = @hwc.storage.is_a?(Hash) ? [@hwc.storage].count : @hwc.storage.count
-    @server.add_disk(25).wait_for { ready? }
-    @server.reload.wait_for { ready? }
-    returns(true, "disk count increased by 1") { @server.reload.hardware_configuration.storage.count == disk_count + 1 }
+    @server.add_disk(25)
   end
 
   tests('#detach_disk_from_server').succeeds do
-    disk_count = @hwc.reload.storage.is_a?(Hash) ? [@hwc.storage].count : @hwc.storage.count
-    @server.detach_disk(1).wait_for { ready? }
-    @server.reload.wait_for { ready? }
-    returns(true, "disk count decreased by 1") { @server.reload.hardware_configuration.storage.count == disk_count - 1 }
+    server = connection.servers.get("#{connection.base_path}/virtualMachines/1")
+    server.detach_disk(1)
   end
 
-  @detached_disk = compute_pool.reload.detached_disks.detect { |d| d.name == @server.name }
+  @detached_disk = compute_pool.reload.detached_disks.first
   tests('#attach_disk_to_server').succeeds do
-    disk_count = @hwc.reload.storage.is_a?(Hash) ? [@hwc.storage].count : @hwc.storage.count
-    @server.attach_disk(@detached_disk).wait_for { ready? }
-    @server.reload.wait_for { ready? }
-    returns(true, "disk count increased by 1") { @server.reload.hardware_configuration.storage.count == disk_count + 1 }
+    server = connection.servers.get("#{connection.base_path}/virtualMachines/1")
+    server.attach_disk(@detached_disk)
   end
 
   tests('#delete_disk').succeeds do
-    disk_count = @hwc.reload.storage.is_a?(Hash) ? [@hwc.storage].count : @hwc.storage.count
-    @server.delete_disk(1).wait_for { ready? }
-    @server.reload.wait_for { ready? }
-    returns(true, "disk count decreased by 1") { @server.reload.hardware_configuration.storage.count == disk_count - 1 }
+    @server.delete_disk(1)
   end
 
   @ip = @network.ips.reload.detect { |i| i.host.nil? && i.detected_on.nil? }
@@ -72,38 +65,37 @@ Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s, "operations
   service_name     = Fog.credentials[:ecloud_internet_service_name] || Fog::Mock.random_letters(6)
   service_port     = Fog.credentials[:ecloud_internet_service_port] || Fog::Mock.random_numbers(3).to_i
   service_protocol = Fog.credentials[:ecloud_internet_service_protocol]
-  @service = public_ip.internet_services.create(:name => service_name, :port => service_port, :protocol => service_protocol, :description => "", :enabled => true)
 
   tests('#create_internet_service').succeeds do
-    @service.wait_for { ready? }
+    @service = public_ip.internet_services.create(:name => service_name, :port => service_port, :protocol => service_protocol, :description => "", :enabled => true)
     returns(true, "is an internet service") { @service.is_a?(Fog::Compute::Ecloud::InternetService) }
   end
 
-  unless @server.ips.empty?
-    @ip_address = @server.ips.first
-    @ip         = @server.ips.first.network.ips.detect { |i| i.name == @ip_address.address.name }
-    @node       = @service.nodes.create(:name => @server.name, :port => service_port, :ip_address => @ip.href, :description => "", :enabled => true)
-    tests('#create_node_service').succeeds do
-      @node.wait_for { ready? }
-      returns(true, "is a node server") { @node.is_a?(Fog::Compute::Ecloud::Node) }
-    end
+  @service = public_ip.internet_services.first
 
-    tests('#destroy_node_service').succeeds do
-      @node.destroy.wait_for { ready? }
-    end
+  @ip_address = @server.ips.first
+  @ip         = @server.ips.first.network.ips.detect { |i| i.name == @ip_address.address.name }
+  @node       = @service.nodes.create(:name => @server.name, :port => service_port, :ip_address => @ip.href, :description => "", :enabled => true)
+  tests('#create_node_service').succeeds do
+    returns(true, "is a node server") { @node.is_a?(Fog::Compute::Ecloud::Node) }
+  end
+
+  tests('#destroy_node_service').succeeds do
+    @node.destroy
   end
 
   #tests('#delete_ip_from_server').succeeds do
   #  @server.delete_ip(:href => @network.href, :network_name => @network.name, :ip => @ip.name)
   #end
 
-  tests('#destroy_internet_service').succeeds do
-    @service.destroy.wait_for { ready? }
-  end
+  # NOTE(xtoddx): the Living Specification doesn't have any empty services
+  #tests('#destroy_internet_service').succeeds do
+  #  @service.destroy
+  #end
 
   @server_count = environment.servers.count
   tests('#destroy_server').succeeds do
-    @server.destroy.wait_for { ready? } # task
+    @server.destroy
   end
   @new_server_count = environment.servers.reload.count
 
@@ -129,6 +121,7 @@ end
 
 Shindo.tests("Fog::Compute[:#{provider}] | server", [provider.to_s, "attributes"]) do
   connection   = Fog::Compute[provider]
+  connection.base_path = '/cloudapi/spec'
   organization = connection.organizations.first
   environment  = organization.environments.find{|e| e.name == config[:server_attributes][:environment_name]} || organization.environments.first
   public_ip    = environment.public_ips.first

data/tests/hp/block_storage_tests.rb

@@ -0,0 +1,47 @@
+require 'date'
+
+Shindo.tests('Fog::HP::BlockStorage', ['hp', 'blockstorage']) do
+  credentials = {
+    :auth_token => 'auth_token',
+    :endpoint_url => 'http://127.0.0.1/bpath/',
+    :service_catalog => {
+      :"Block Storage" => {
+      :zone => 'http://127.0.0.1/bpath/'}},
+    :expires => (DateTime.now + 1).to_s
+  }
+  options = {
+    :hp_access_key => 'key',
+    :hp_secret_key => 'secret',
+    :hp_tenant_id => 'tenant',
+    :hp_avl_zone => 'zone',
+    :hp_auth_uri => 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens',
+    :credentials => credentials
+  }
+  tests('Test good credentials').returns(credentials) do
+    conn = Fog::HP::BlockStorage::Real.new(options)
+    conn.credentials
+  end
+  tests('Test expired credentials') do
+    credentials[:expires] = (DateTime.now - 1).to_s
+    raises(Excon::Errors::Unauthorized) { Fog::HP::BlockStorage::Real.new(options) }
+  end
+  tests('Test no expires') do
+    credentials[:expires] = nil
+    raises(Excon::Errors::Unauthorized) { Fog::HP::BlockStorage::Real.new(options) }
+  end
+  tests('Test no creds') do
+    options[:credentials] = nil
+    raises(Excon::Errors::Unauthorized) { Fog::HP::BlockStorage::Real.new(options) }
+  end
+  tests('Test no service') do
+    options[:credentials] = credentials
+    options[:credentials][:service_catalog] = {
+      :"CDN" => {
+      :zone => 'http://127.0.0.1/bpath/'}},
+    raises(Excon::Errors::Unauthorized) { Fog::HP::BlockStorage::Real.new(options) }
+  end
+  tests('Test no creds') do
+    options[:credentials][:service_catalog] = nil
+    raises(Excon::Errors::Unauthorized) { Fog::HP::BlockStorage::Real.new(options) }
+  end
+end

data/tests/hp/cdn_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests('Fog::CDN::HP', ['hp', 'cdn']) do
+  credentials = {
+    :auth_token => 'auth_token',
+    :endpoint_url => 'http://127.0.0.1/cdnpath/',
+    :cdn_endpoint_url => 'http://127.0.0.1/cdnpath/',
+    :service_catalog => {
+      :"CDN" => {
+      :zone => 'http://127.0.0.1/cdnpath/'}},
+    :expires => (DateTime.now + 1).to_s
+  }
+  options = {
+    :hp_access_key => 'key',
+    :hp_secret_key => 'secret',
+    :hp_tenant_id => 'tenant',
+    :hp_avl_zone => 'zone',
+    :hp_auth_uri => 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens',
+    :credentials => credentials
+  }
+  tests('Test cached CDN credentials').returns(credentials) do
+    conn = Fog::CDN::HP::Real.new(options)
+    conn.credentials
+  end
+end

data/tests/hp/compute_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests('Fog::Compute::HP', ['hp', 'compute']) do
+  credentials = {
+    :auth_token => 'auth_token',
+    :endpoint_url => 'http://127.0.0.1/computepath/',
+    :service_catalog => {
+      :"Compute" => {
+      :zone => 'http://127.0.0.1/computepath/'}},
+    :expires => (DateTime.now + 1).to_s
+  }
+  options = {
+    :hp_access_key => 'key',
+    :hp_secret_key => 'secret',
+    :hp_tenant_id => 'tenant',
+    :hp_avl_zone => 'zone',
+    :hp_auth_uri => 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens',
+    :credentials => credentials
+  }
+  tests('Test cached Compute credentials').returns(credentials) do
+    conn = Fog::Compute::HP::Real.new(options)
+    conn.credentials
+  end
+end

data/tests/hp/models/block_storage_v2/snapshot_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests("HP::BlockStorageV2 | snapshot model", ['hp', 'v2', 'block_storage', 'snapshots']) do
+
+  @volume = HP[:block_storage_v2].volumes.create(:name => 'testsnap2vol', :size => 1)
+  @volume.wait_for { ready? } unless Fog.mocking?
+
+  model_tests(HP[:block_storage_v2].snapshots, {:name => 'fogsnap2tests', :description => 'fogsnaptests-desc', :volume_id => @volume.id}, true) do
+    test("get(#{@instance.id})") do
+      HP[:block_storage_v2].snapshots.get(@instance.id) != nil?
+    end
+
+    test("update(#{@instance.id}") do
+      @instance.name = 'Updated'
+      @instance.save
+      @instance.reload
+      @instance.name == 'Updated'
+    end
+
+  end
+
+  @volume.destroy
+
+end

data/tests/hp/models/block_storage_v2/snapshots_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests("HP::BlockStorageV2 | snapshots collection", ['hp', 'v2', 'block_storage', 'snapshots']) do
+
+  @volume = HP[:block_storage_v2].volumes.create(:name => 'testsnap2vol', :size => 1)
+  @volume.wait_for { ready? } unless Fog.mocking?
+
+  collection_tests(HP[:block_storage_v2].snapshots, {:name => 'fogsnap2tests', :description => 'fogsnaptests-desc', :volume_id => @volume.id}, true)
+
+  @volume.destroy
+
+end

data/tests/hp/models/block_storage_v2/volume_backup_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests("HP::BlockStorage | volume backup model", ['hp', 'v2', 'block_storage', 'backup']) do
+
+  @volume = HP[:block_storage_v2].volumes.create(:name => 'fogvolbkp2tests', :description => 'fogvolbkp2tests-desc', :size => 1)
+  @volume.wait_for { ready? } unless Fog.mocking?
+
+  model_tests(HP[:block_storage_v2].volume_backups, {:name => 'fogbkp2tests', :description => 'fogbkp2tests-desc', :volume_id => @volume.id}, true) do
+
+    # restore to new volume
+    tests('restore()').succeeds do
+      @instance.restore
+    end
+
+    # restore to specified volume
+    tests("restore(#{@volume.id})").succeeds do
+      @instance.restore(@volume.id)
+    end
+
+  end
+
+  @volume.destroy
+
+end

data/tests/hp/models/block_storage_v2/volume_backups_tests.rb

@@ -0,0 +1,9 @@
+Shindo.tests("Fog::Compute::HPV2 | volume backups collection", ['hp', 'v2', 'block_storage', 'backup']) do
+
+  @volume = HP[:block_storage_v2].volumes.create(:name => 'fogvolbkp2tests', :description => 'fogvolbkp2tests-desc', :size => 1)
+  @volume.wait_for { ready? } unless Fog.mocking?
+
+  collection_tests(HP[:block_storage_v2].volume_backups, {:name => 'fogbkp2tests', :description => 'fogbkp2tests-desc', :volume_id => @volume.id}, true)
+
+  @volume.destroy
+end

data/tests/hp/models/block_storage_v2/volume_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests("HP::BlockStorage | volume model", ['hp', 'v2', 'block_storage', 'volumes']) do
+
+  model_tests(HP[:block_storage_v2].volumes, {:name => 'fogvol2tests', :description => 'fogvol2tests-desc', :size => 1}, true) do
+
+    test("get(#{@instance.id})") do
+      HP[:block_storage_v2].volumes.get(@instance.id) != nil?
+    end
+
+    test("update(#{@instance.id})") do
+      @instance.name = 'fogvol2tests Updated'
+      @instance.save
+      @instance.reload
+      @instance.name == 'fogvol2tests Updated'
+    end
+
+    test("has_attachments?") do
+      @instance.has_attachments? == false
+    end
+
+  end
+
+end

data/tests/hp/models/block_storage_v2/volumes_tests.rb

@@ -0,0 +1,5 @@
+Shindo.tests("HP::BlockStorage | volumes collection", ['hp', 'v2', 'block_storage', 'volumes']) do
+
+  collection_tests(HP[:block_storage_v2].volumes, {:name => 'fogvol2tests', :description => 'fogvol2tests-desc', :size => 1}, true)
+
+end

data/tests/hp/models/compute_v2/address_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests("Fog::Compute::HPV2 | address model", ['hp', 'v2', 'compute']) do
+
+  service = Fog::Compute.new(:provider => 'HP', :version => :v2)
+
+  @base_image_id = ENV['BASE_IMAGE_ID'] || '7f60b54c-cd15-433f-8bed-00acbcd25a17'
+
+  model_tests(service.addresses, {}, true) do
+
+    @server = service.servers.create(:name => 'fogseraddtests', :flavor_id => 100, :image_id => @base_image_id)
+    @server.wait_for { ready? }
+
+    tests('#server=').succeeds do
+      @instance.server = @server
+      test('server attached') do
+        @instance.instance_id == @server.id
+      end
+    end
+
+    @server.destroy
+
+  end
+
+end

data/tests/hp/models/compute_v2/addresses_tests.rb

@@ -0,0 +1,7 @@
+Shindo.tests("Fog::Compute::HPV2 | addresses collection", ['hp', 'v2', 'compute']) do
+
+  service = Fog::Compute.new(:provider => 'HP', :version => :v2)
+
+  collection_tests(service.addresses, {}, true)
+
+end

data/tests/hp/models/compute_v2/availability_zone_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests("Fog::Compute::HPV2 | availability zone model", ['hp', 'v2', 'compute']) do
+
+  service = Fog::Compute.new(:provider => 'HP', :version => :v2)
+
+  @zones = service.availability_zones
+
+  tests('#available?').succeeds do
+    @zones.first.respond_to?('available?')
+  end
+
+
+
+end

data/tests/hp/models/compute_v2/availability_zones_tests.rb

@@ -0,0 +1,13 @@
+Shindo.tests("Fog::Compute::HPV2 | availability zones collection", ['hp', 'v2', 'compute']) do
+
+  service = Fog::Compute.new(:provider => 'HP', :version => :v2)
+
+  tests('#all').succeeds do
+    @zones = service.availability_zones
+  end
+
+  tests('#get').succeeds do
+    @zones.get('az1').name == 'az1'
+  end
+
+end