fog 1.25.0 → 1.26.0

data/spec/fog/bin/vmfusion_spec.rb

@@ -0,0 +1,10 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+require "helpers/bin"
+
+describe Vmfusion do
+  include Fog::BinSpec
+
+  let(:subject) { Vmfusion }
+end

data/spec/fog/bin/voxel_spec.rb

@@ -0,0 +1,10 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+require "helpers/bin"
+
+describe Voxel do
+  include Fog::BinSpec
+
+  let(:subject) { Voxel }
+end

data/spec/fog/bin/vsphere_spec.rb

@@ -0,0 +1,10 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+require "helpers/bin"
+
+describe Vsphere do
+  include Fog::BinSpec
+
+  let(:subject) { Vsphere }
+end

data/spec/fog/bin/xenserver_spec.rb

@@ -0,0 +1,10 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+require "helpers/bin"
+
+describe XenServer do
+  include Fog::BinSpec
+
+  let(:subject) { XenServer }
+end

data/spec/fog/bin/zerigo_spec.rb

@@ -0,0 +1,10 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+require "helpers/bin"
+
+describe Zerigo do
+  include Fog::BinSpec
+
+  let(:subject) { Zerigo }
+end

data/spec/fog/bin_spec.rb

@@ -0,0 +1,165 @@
+require "minitest/autorun"
+require "fog"
+require "fog/bin"
+
+describe Fog do
+  describe "#providers" do
+    it "includes existing providers" do
+      assert_equal "Atmos", Fog.providers[:atmos]
+      assert_equal "AWS", Fog.providers[:aws]
+      assert_equal "BareMetalCloud", Fog.providers[:baremetalcloud]
+      assert_equal "Bluebox", Fog.providers[:bluebox]
+      assert_equal "Brightbox", Fog.providers[:brightbox]
+      assert_equal "Clodo", Fog.providers[:clodo]
+      assert_equal "CloudSigma", Fog.providers[:cloudsigma]
+      assert_equal "Cloudstack", Fog.providers[:cloudstack]
+      assert_equal "DigitalOcean", Fog.providers[:digitalocean]
+      assert_equal "DNSimple", Fog.providers[:dnsimple]
+      assert_equal "DNSMadeEasy", Fog.providers[:dnsmadeeasy]
+      assert_equal "Dreamhost", Fog.providers[:dreamhost]
+      assert_equal "Dynect", Fog.providers[:dynect]
+      assert_equal "Ecloud", Fog.providers[:ecloud]
+      assert_equal "Fogdocker", Fog.providers[:fogdocker]
+      assert_equal "Glesys", Fog.providers[:glesys]
+      assert_equal "GoGrid", Fog.providers[:gogrid]
+      assert_equal "Google", Fog.providers[:google]
+      assert_equal "HP", Fog.providers[:hp]
+      assert_equal "IBM", Fog.providers[:ibm]
+      assert_equal "InternetArchive", Fog.providers[:internetarchive]
+      assert_equal "Joyent", Fog.providers[:joyent]
+      assert_equal "Libvirt", Fog.providers[:libvirt]
+      assert_equal "Linode", Fog.providers[:linode]
+      assert_equal "Local", Fog.providers[:local]
+      assert_equal "Ninefold", Fog.providers[:ninefold]
+      assert_equal "OpenNebula", Fog.providers[:opennebula]
+      assert_equal "OpenStack", Fog.providers[:openstack]
+      assert_equal "Openvz", Fog.providers[:openvz]
+      assert_equal "Ovirt", Fog.providers[:ovirt]
+      assert_equal "ProfitBricks", Fog.providers[:profitbricks]
+      assert_equal "Rackspace", Fog.providers[:rackspace]
+      assert_equal "Rage4", Fog.providers[:rage4]
+      assert_equal "RiakCS", Fog.providers[:riakcs]
+      assert_equal "SakuraCloud", Fog.providers[:sakuracloud]
+      assert_equal "Serverlove", Fog.providers[:serverlove]
+      assert_equal "Softlayer", Fog.providers[:softlayer]
+      assert_equal "StormOnDemand", Fog.providers[:stormondemand]
+      assert_equal "Vcloud", Fog.providers[:vcloud]
+      assert_equal "VcloudDirector", Fog.providers[:vclouddirector]
+      assert_equal "Vmfusion", Fog.providers[:vmfusion]
+      assert_equal "Voxel", Fog.providers[:voxel]
+      assert_equal "Vsphere", Fog.providers[:vsphere]
+      assert_equal "XenServer", Fog.providers[:xenserver]
+      assert_equal "Zerigo", Fog.providers[:zerigo]
+    end
+  end
+
+  describe "#registered_providers" do
+    it "includes existing providers" do
+      assert_includes Fog.registered_providers, "Atmos"
+      assert_includes Fog.registered_providers, "AWS"
+      assert_includes Fog.registered_providers, "BareMetalCloud"
+      assert_includes Fog.registered_providers, "Bluebox"
+      assert_includes Fog.registered_providers, "Brightbox"
+      assert_includes Fog.registered_providers, "Clodo"
+      assert_includes Fog.registered_providers, "CloudSigma"
+      assert_includes Fog.registered_providers, "Cloudstack"
+      assert_includes Fog.registered_providers, "DigitalOcean"
+      assert_includes Fog.registered_providers, "DNSimple"
+      assert_includes Fog.registered_providers, "DNSMadeEasy"
+      assert_includes Fog.registered_providers, "Dreamhost"
+      assert_includes Fog.registered_providers, "Dynect"
+      assert_includes Fog.registered_providers, "Ecloud"
+      assert_includes Fog.registered_providers, "Fogdocker"
+      assert_includes Fog.registered_providers, "Glesys"
+      assert_includes Fog.registered_providers, "GoGrid"
+      assert_includes Fog.registered_providers, "Google"
+      assert_includes Fog.registered_providers, "HP"
+      assert_includes Fog.registered_providers, "IBM"
+      assert_includes Fog.registered_providers, "InternetArchive"
+      assert_includes Fog.registered_providers, "Joyent"
+      assert_includes Fog.registered_providers, "Libvirt"
+      assert_includes Fog.registered_providers, "Linode"
+      assert_includes Fog.registered_providers, "Local"
+      assert_includes Fog.registered_providers, "Ninefold"
+      assert_includes Fog.registered_providers, "OpenNebula"
+      assert_includes Fog.registered_providers, "OpenStack"
+      assert_includes Fog.registered_providers, "Openvz"
+      assert_includes Fog.registered_providers, "Ovirt"
+      assert_includes Fog.registered_providers, "ProfitBricks"
+      assert_includes Fog.registered_providers, "Rackspace"
+      assert_includes Fog.registered_providers, "Rage4"
+      assert_includes Fog.registered_providers, "RiakCS"
+      assert_includes Fog.registered_providers, "SakuraCloud"
+      assert_includes Fog.registered_providers, "Serverlove"
+      assert_includes Fog.registered_providers, "Softlayer"
+      assert_includes Fog.registered_providers, "StormOnDemand"
+      assert_includes Fog.registered_providers, "Vcloud"
+      assert_includes Fog.registered_providers, "VcloudDirector"
+      assert_includes Fog.registered_providers, "Vmfusion"
+      assert_includes Fog.registered_providers, "Voxel"
+      assert_includes Fog.registered_providers, "Vsphere"
+      assert_includes Fog.registered_providers, "XenServer"
+      assert_includes Fog.registered_providers, "Zerigo"
+    end
+  end
+
+  describe "#available_providers" do
+    it "includes existing providers" do
+      assert_includes Fog.available_providers, "Atmos" if Atmos.available?
+      assert_includes Fog.available_providers, "AWS" if AWS.available?
+      assert_includes Fog.available_providers, "BareMetalCloud" if BareMetalCloud.available?
+      assert_includes Fog.available_providers, "Bluebox" if Bluebox.available?
+      assert_includes Fog.available_providers, "Brightbox" if Brightbox.available?
+      assert_includes Fog.available_providers, "Clodo" if Clodo.available?
+      assert_includes Fog.available_providers, "CloudSigma" if CloudSigma.available?
+      assert_includes Fog.available_providers, "Cloudstack" if Cloudstack.available?
+      assert_includes Fog.available_providers, "DigitalOcean" if DigitalOcean.available?
+      assert_includes Fog.available_providers, "DNSimple" if DNSimple.available?
+      assert_includes Fog.available_providers, "DNSMadeEasy" if DNSMadeEasy.available?
+      assert_includes Fog.available_providers, "Dreamhost" if Dreamhost.available?
+      assert_includes Fog.available_providers, "Dynect" if Dynect.available?
+      assert_includes Fog.available_providers, "Ecloud" if Ecloud.available?
+      assert_includes Fog.available_providers, "Fogdocker" if Fogdocker.available?
+      assert_includes Fog.available_providers, "Glesys" if Glesys.available?
+      assert_includes Fog.available_providers, "GoGrid" if GoGrid.available?
+      assert_includes Fog.available_providers, "Google" if Google.available?
+      assert_includes Fog.available_providers, "HP" if HP.available?
+      assert_includes Fog.available_providers, "IBM" if IBM.available?
+      assert_includes Fog.available_providers, "InternetArchive" if InternetArchive.available?
+      assert_includes Fog.available_providers, "Joyent" if Joyent.available?
+      assert_includes Fog.available_providers, "Libvirt" if Libvirt.available?
+      assert_includes Fog.available_providers, "Linode" if Linode.available?
+      assert_includes Fog.available_providers, "Local" if Local.available?
+      assert_includes Fog.available_providers, "Ninefold" if Ninefold.available?
+      assert_includes Fog.available_providers, "OpenNebula" if OpenNebula.available?
+      assert_includes Fog.available_providers, "OpenStack" if OpenStack.available?
+      assert_includes Fog.available_providers, "Openvz" if Openvz.available?
+      assert_includes Fog.available_providers, "Ovirt" if Ovirt.available?
+      assert_includes Fog.available_providers, "ProfitBricks" if ProfitBricks.available?
+      assert_includes Fog.available_providers, "Rackspace" if Rackspace.available?
+      assert_includes Fog.available_providers, "Rage4" if Rage4.available?
+      assert_includes Fog.available_providers, "RiakCS" if RiakCS.available?
+      assert_includes Fog.available_providers, "SakuraCloud" if SakuraCloud.available?
+      assert_includes Fog.available_providers, "Serverlove" if Serverlove.available?
+      assert_includes Fog.available_providers, "Softlayer" if Softlayer.available?
+      assert_includes Fog.available_providers, "StormOnDemand" if StormOnDemand.available?
+      assert_includes Fog.available_providers, "Vcloud" if Vcloud.available?
+      assert_includes Fog.available_providers, "VcloudDirector" if VcloudDirector.available?
+      assert_includes Fog.available_providers, "Vmfusion" if Vmfusion.available?
+      assert_includes Fog.available_providers, "Voxel" if Voxel.available?
+      assert_includes Fog.available_providers, "Vsphere" if Vsphere.available?
+      assert_includes Fog.available_providers, "XenServer" if XenServer.available?
+      assert_includes Fog.available_providers, "Zerigo" if Zerigo.available?
+    end
+  end
+
+  describe "#services" do
+    it "returns Hash of services" do
+      assert_kind_of Hash, Fog.services
+      assert_includes Fog.services, :cdn
+      assert_includes Fog.services, :compute
+      assert_includes Fog.services, :dns
+      assert_includes Fog.services, :storage
+    end
+  end
+end

data/spec/fog/compute_spec.rb

@@ -0,0 +1,8 @@
+require "minitest/autorun"
+require "fog"
+
+describe Fog::Compute do
+  it "responds to []" do
+    assert_respond_to Fog::Compute, :[]
+  end
+end

data/spec/helpers/bin.rb

@@ -0,0 +1,30 @@
+module Fog
+  module BinSpec
+    extend Minitest::Spec::DSL
+
+    it "responds to available?" do
+      assert_respond_to subject, :available?
+    end
+
+    it "responds to class_for" do
+      assert_respond_to subject, :class_for
+    end
+
+    it "#class_for raises ArgumentError for unknown services" do
+      assert_raises(ArgumentError) { subject.class_for(:unknown) }
+    end
+
+    it "responds to collections" do
+      skip if subject == ::Google
+      assert_respond_to subject, :collections
+    end
+
+    it "responds to []" do
+      assert_respond_to subject, :[]
+    end
+
+    it "responds to services" do
+      assert_respond_to subject, :services
+    end
+  end
+end

data/tests/aws/requests/sts/assume_role_with_saml_tests.rb

@@ -0,0 +1,18 @@
+Shindo.tests('AWS::STS | assume role with SAML', ['aws']) do
+
+	@policy = {"Statement" => [{"Effect" => "Allow", "Action" => "*", "Resource" => "*"}]}
+
+	@response_format = {
+		'SessionToken' => String,
+		'SecretAccessKey' => String,
+		'Expiration' => String,
+		'AccessKeyId' => String,
+		'Arn' => String,
+		'RequestId' => String
+	}
+
+	tests("#assume_role_with_saml('role_arn', 'principal_arn', 'saml_assertion', #{@policy.inspect}, 900)").formats(@response_format) do
+		pending if Fog.mocking?
+		Fog::AWS[:sts].assume_role_with_saml("role_arn","principal_arn","saml_assertion", @policy, 900).body
+	end
+end

data/tests/compute/helper.rb

@@ -19,29 +19,6 @@ def compute_providers
       },
       :mocked => false
     },
-    :ecloud => {
-      :server_attributes => {
-        :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, :organization_uri].each do |k|
-          key = "ecloud_#{k}".to_sym
-          if Fog.credentials[key]
-            hash[k]= Fog.credentials[key]
-          end
-        end
-      end,
-      :mocked => true,
-    },
     :cloudstack => {
       :provider_attributes => {
         :cloudstack_host => 'http://host.foo'

data/tests/compute/models/flavors_tests.rb

@@ -1,6 +1,6 @@
 for provider, config in compute_providers
 
-  next if [:glesys, :ibm, :ecloud].include?(provider)
+  next if [:glesys, :ibm].include?(provider)
 
   Shindo.tests("Fog::Compute[:#{provider}] | flavors", [provider.to_s]) do
 

data/tests/compute/models/server_tests.rb

@@ -1,7 +1,4 @@
 for provider, config in compute_providers
-
-  next if [:ecloud].include?(provider)
-
   Shindo.tests("Fog::Compute[:#{provider}] | server", [provider.to_s]) do
 
     provider_attributes = config[:provider_attributes] || {}

data/tests/compute/models/servers_tests.rb

@@ -1,7 +1,4 @@
 for provider, config in compute_providers
-
-  next if [:ecloud].include?(provider)
-
   Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s]) do
 
     provider_attributes = config[:provider_attributes] || {}

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

@@ -37,7 +37,8 @@ Shindo.tests('Fog::Compute[:fogdocker] | server model', ['fogdocker']) do
                      :privileged,
                      :tty,
                      :exposed_ports,
-                     :volumes
+                     :volumes,
+                     :environment_variables
       ]
       tests("The server model should respond to") do
         attributes.each do |attribute|

data/tests/helpers/mock_helper.rb

@@ -13,9 +13,6 @@ if Fog.mock?
     :aws_secret_access_key            => 'aws_secret_access_key',
     :ia_access_key_id                 => 'aws_access_key_id',
     :ia_secret_access_key             => 'aws_secret_access_key',
-    :atmos_storage_token              => 'atmos_token',
-    :atmos_storage_secret             => 'atmos_secret',
-    :atmos_storage_endpoint           => 'http://atmos.is.cool:1000/test1.0',
     :bluebox_api_key                  => 'bluebox_api_key',
     :bluebox_customer_id              => 'bluebox_customer_id',
     :brightbox_client_id              => 'brightbox_client_id',
@@ -34,9 +31,6 @@ if Fog.mock?
     :dnsimple_password                => 'dnsimple_password',
     :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',
     :dnsmadeeasy_secret_key           => 'dnsmadeeasy_secret_key',
-    :ecloud_username                  => 'ecloud_username',
-    :ecloud_password                  => 'ecloud_password',
-    :ecloud_versions_uri              => 'http://ecloud.versions.uri',
     :glesys_username                  => 'glesys_username',
     :glesys_api_key                   => 'glesys_api_key',
     :go_grid_api_key                  => 'go_grid_api_key',

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

@@ -10,16 +10,22 @@ class OpenStack
   end
 end
 
+def compute
+  Fog::Compute[:openstack]
+end
+
 def get_flavor_ref
-  compute = Fog::Compute[:openstack]
   ENV['OPENSTACK_FLAVOR_REF'] || compute.list_flavors.body['flavors'].first['id']
 end
 
 def get_image_ref
-  compute = Fog::Compute[:openstack]
   ENV['OPENSTACK_IMAGE_REF'] || compute.list_images.body['images'].first['id']
 end
 
+def get_volume_ref
+  ENV['OPENSTACK_VOLUME_REF'] || compute.list_volumes.body['volumes'].first['id']
+end
+
 def get_flavor_ref_resize
   # by default we simply add one to the default flavor ref
   ENV['OPENSTACK_FLAVOR_REF_RESIZE'] || (get_flavor_ref.to_i + 1).to_s
@@ -31,6 +37,5 @@ def set_password_enabled
 end
 
 def get_security_group_ref
-  compute = Fog::Compute[:openstack]
   ENV['OPENSTACK_SECURITY_GROUP_REF'] || compute.list_security_groups.body['security_groups'].first['name']
 end

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

@@ -1,24 +1,25 @@
 Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
 
-  @detailed_server_format = {
-    'id'         => String,
-    'addresses'  => Hash,
-    'flavor'     => Hash,
-    'hostId'     => String,
-    'image'      => Hash,
-    'metadata'   => Hash,
-    'name'       => String,
-    'progress'   => Integer,
-    'status'     => String,
-    'accessIPv4' => Fog::Nullable::String,
-    'accessIPv6' => Fog::Nullable::String,
-    'links'      => Array,
-    'created'    => String,
-    'updated'    => String,
-    'user_id'    => String,
+  @base_server_format = {
+    'id'           => String,
+    'addresses'    => Hash,
+    'flavor'       => Hash,
+    'hostId'       => String,
+    'metadata'     => Hash,
+    'name'         => String,
+    'progress'     => Integer,
+    'status'       => String,
+    'accessIPv4'   => Fog::Nullable::String,
+    'accessIPv6'   => Fog::Nullable::String,
+    'links'        => Array,
+    'created'      => String,
+    'updated'      => String,
+    'user_id'      => String,
     'config_drive' => String,
   }
 
+  @server_from_image_format = @base_server_format.merge('image' => Hash)
+
   @create_format = {
     'adminPass'       => String,
     'id'              => String,
@@ -51,6 +52,60 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
     @flavor_id = get_flavor_ref
     @security_group_name = get_security_group_ref
 
+    #CREATE_SERVER_WITH_BLOCK_DEVICE_MAPPING
+    tests('#create_server("test", nil , #{@flavor_id}) with a block_device_mapping').formats(@create_format, false) do
+      @volume1_id = compute.create_volume('test', 'this is a test volume', 1).body["volume"]["id"]
+      volume_data = {
+        :delete_on_termination => true,
+        :device_name           => "vda",
+        :volume_id             => @volume1_id,
+        :volume_size           => 1,
+      }
+      data = compute.create_server("test", nil, @flavor_id, "block_device_mapping" => volume_data).body['server']
+      @server_id = data['id']
+      data
+    end
+
+    tests("#get_server_details(#{@server_id})").formats(@base_server_format, false) do
+      compute.get_server_details(@server_id).body['server']
+    end
+
+    tests("#block_device_mapping").succeeds do
+      compute.servers.get(@server_id).volumes.first.id == @volume1_id
+    end
+
+    #CREATE_SERVER_WITH_BLOCK_DEVICE_MAPPING_V2
+    tests('#create_server("test", nil , #{@flavor_id}) with multiple block_device_mapping_v2').formats(@create_format, false) do
+      @volume2_id = compute.create_volume('test', 'this is a test volume', 1).body["volume"]["id"]
+      volume_data = [{
+        :boot_index            => 0,
+        :uuid                  => @volume1_id,
+        :device_name           => "vda",
+        :source_type           => "volume",
+        :destination_type      => "volume",
+        :delete_on_termination => true,
+      }, {
+        :boot_index            => 1,
+        :uuid                  => @volume2_id,
+        :device_name           => "vdb",
+        :source_type           => "volume",
+        :destination_type      => "volume",
+        :delete_on_termination => true,
+      }]
+      data = compute.create_server("test", nil, @flavor_id, "block_device_mapping_v2" => volume_data).body['server']
+      @server_id = data['id']
+      data
+    end
+
+    tests("#get_server_details(#{@server_id})").formats(@base_server_format, false) do
+      compute.get_server_details(@server_id).body['server']
+    end
+
+    tests("#block_device_mapping_v2").succeeds do
+      compute.servers.get(@server_id).volumes.collect(&:id).sort == [@volume1_id, @volume2_id].sort
+    end
+
+    #CREATE_SINGLE_FROM_IMAGE
     tests('#create_server("test", #{@image_id} , 19)').formats(@create_format, false) do
       data = Fog::Compute[:openstack].create_server("test", @image_id, @flavor_id).body['server']
       @server_id = data['id']
@@ -59,12 +114,11 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
 
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? }
 
-    #CREATE
-    tests("#get_server_details(#{@server_id})").formats(@detailed_server_format, false) do
+    tests("#get_server_details(#{@server_id})").formats(@server_from_image_format, false) do
       Fog::Compute[:openstack].get_server_details(@server_id).body['server']
     end
 
-    #MULTI_CREATE
+    #MULTI_CREATE_FROM_IMAGE
     tests('#create_server("test", #{@image_id} , 19, {"min_count" => 2, "return_reservation_id" => "True"})').formats(@reservation_format, false) do
       data = Fog::Compute[:openstack].create_server("test", @image_id, @flavor_id, {"min_count" => 2, "return_reservation_id" => "True"}).body
       @reservation_id = data['reservation_id']
@@ -96,7 +150,7 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
     end
 
     #DETAILS
-    tests('#list_servers_detail').formats({'servers' => [@detailed_server_format]}, false) do
+    tests('#list_servers_detail').formats({'servers' => [@server_from_image_format]}, false) do
       Fog::Compute[:openstack].list_servers_detail.body
     end
 
@@ -133,7 +187,7 @@ Shindo.tests('Fog::Compute[:openstack] | server requests', ['openstack']) do
     Fog::Compute[:openstack].images.get(@snapshot_id).wait_for { ready? }
 
     #REBUILD
-    tests("#rebuild_server(#{@server_id}, #{@snapshot_id}, 'fog')").formats({'server' => @detailed_server_format}, false) do
+    tests("#rebuild_server(#{@server_id}, #{@snapshot_id}, 'fog')").formats({'server' => @server_from_image_format}, false) do
       Fog::Compute[:openstack].rebuild_server(@server_id, @snapshot_id, 'fog', 'newpass', {"foo" => "bar"}).body
     end
     Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } if not Fog.mocking?