fog 1.1.2 → 1.2.0

data/tests/glesys/requests/compute/ip_tests.rb

@@ -9,7 +9,7 @@ Shindo.tests('Fog::Compute[:glesys] | ip requests', ['glesys']) do
       pending if Fog.mocking?
       Fog::Compute[:glesys].ip_list_own.body['response']
     end
-    
+
     tests("#ip_list_free(:datacenter => 'Falkenberg, :platform => 'Xen', :ipversion => 4)"
     ).formats(Glesys::Compute::Formats::Ips::IPLIST_ALL) do
       pending if Fog.mocking?
@@ -18,10 +18,10 @@ Shindo.tests('Fog::Compute[:glesys] | ip requests', ['glesys']) do
         :platform   => "Xen",
         :ipversion  => 4
       )
-      @free_ip = ips.body['response']['iplist'].first
+      @free_ip = ips.body['response']['iplist']['ipaddresses'].first
       ips.body['response']
     end
-    
+
     tests("#ip_take(:datacenter => 'Falkenberg', :platform => 'Xen', :ipversion => 4, :ipaddress => #{@free_ip})"
     ).formats(Glesys::Compute::Formats::Ips::IPLIST_CATCH_RELEASE) do
       pending if Fog.mocking?

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

@@ -3,10 +3,14 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     @serverid = nil
     @hostname = "fog-#{Time.now.to_i}"
 
-    @create = ":hostname => #@hostname, :rootpw => 'pw#{Time.now.to_i}', "+
-    ":datacenter => 'Falkenberg', :platform => 'Xen', :template => 'Debian-6 x64', "+
+    @create = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
+    ":datacenter => 'Falkenberg', :platform => 'Xen', :templatename => 'Debian-6 x64', "+
     ":disksize => '10', :memorysize => '512', :cpucores => '1', :transfer => '500'"
 
+    @create_vz = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
+    ":datacenter => 'Stockholm', :platform => 'OpenVZ', :templatename => 'Debian 6.0 64-bit', "+
+    ":disksize => '10', :memorysize => '256', :cpucores => '2', :transfer => '500'"
+
   tests('success') do
 
     tests("#list_servers()").formats(Glesys::Compute::Formats::Servers::LIST) do
@@ -17,15 +21,15 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     tests("#create(#{@create})").formats(Glesys::Compute::Formats::Servers::CREATE) do
       pending if Fog.mocking?
       vm =  Fog::Compute[:glesys].create(
-              :hostname   => @hostname,
-              :rootpw     => "pw#{Time.now.to_i}",
-              :datacenter => "Falkenberg",
-              :platform   => "Xen",
-              :template   => "Debian-6 x64",
-              :disksize   => "10",
-              :memorysize => "512",
-              :cpucores   => "1",
-              :transfer   => "500"
+              :hostname     => @hostname,
+              :rootpassword => "pw#{Time.now.to_i}",
+              :datacenter   => "Falkenberg",
+              :platform     => "Xen",
+              :templatename => "Debian-6 x64",
+              :disksize     => "10",
+              :memorysize   => "512",
+              :cpucores     => "1",
+              :transfer     => "500"
             )
 
       @serverid = vm.body['response']['server']['serverid']
@@ -58,7 +62,7 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
       s.wait_for { s.state == 'stopped' }
     end
 
-    tests("#start(:serverid => #{@serverid})").formats(Glesys::Compute::Formats::Servers::START) do
+    tests("#start(:serverid => #{@serverid})").formats(Glesys::Compute::Formats::Servers::DETAILS) do
       pending if Fog.mocking?
       Fog::Compute[:glesys].start(:serverid => @serverid).body['response']
     end
@@ -73,6 +77,40 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
       Fog::Compute[:glesys].destroy(:serverid => @serverid).body['response']
     end
 
+    # Test of OpenVZ
+    tests("#create(#{@create_vz})").formats(Glesys::Compute::Formats::Servers::CREATE) do
+      pending if Fog.mocking?
+      vm =  Fog::Compute[:glesys].create(
+              :hostname     => @hostname,
+              :rootpassword => "pw#{Time.now.to_i}",
+              :datacenter   => "Stockholm",
+              :platform     => "OpenVZ",
+              :templatename => "Debian 6.0 64-bit",
+              :disksize     => "10",
+              :memorysize   => "256",
+              :cpucores     => "2",
+              :transfer     => "500"
+            )
+
+      @serverid = vm.body['response']['server']['serverid']
+      vm.body['response']
+    end
+
+    tests("#server_details(#{@serverid})").formats(Glesys::Compute::Formats::Servers::DETAILS) do
+      pending if Fog.mocking?
+      Fog::Compute[:glesys].server_details(@serverid).body['response']
+    end
+
+    unless Fog.mocking?
+      Fog::Compute[:glesys].servers.get(@serverid).wait_for { ready? }
+    end
+
+    tests("#destroy(:serverid => #{@serverid})").formats(Glesys::Compute::Formats::Servers::DESTROY) do
+      pending if Fog.mocking?
+      Fog::Compute[:glesys].destroy(:serverid => @serverid).body['response']
+    end
+
+
   end
 
   tests('failure') do

data/tests/helper.rb

@@ -12,7 +12,7 @@ def array_differences(array_a, array_b)
 end
 
 # check to see which credentials are available and add others to the skipped tags list
-all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'linode', 'local', 'ninefold', 'newservers', 'openstack', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'zerigo']
+all_providers = ['aws', 'bluebox', 'brightbox', 'dnsimple', 'dnsmadeeasy', 'dynect', 'ecloud', 'glesys', 'gogrid', 'google', 'joyent', 'linode', 'local', 'ninefold', 'baremetalcloud', 'openstack', 'ovirt', 'rackspace', 'slicehost', 'stormondemand', 'voxel', 'vsphere', 'zerigo']
 available_providers = Fog.available_providers.map {|provider| provider.downcase}
 for provider in (all_providers - available_providers)
   Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")

data/tests/helpers/formats_helper.rb

@@ -14,7 +14,7 @@ module Fog
   end
 end
 [FalseClass, TrueClass].each {|klass| klass.send(:include, Fog::Boolean)}
-[NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
+[FalseClass, TrueClass, NilClass, Fog::Boolean].each {|klass| klass.send(:include, Fog::Nullable::Boolean)}
 [NilClass, String].each {|klass| klass.send(:include, Fog::Nullable::String)}
 [NilClass, Time].each {|klass| klass.send(:include, Fog::Nullable::Time)}
 [Integer, NilClass].each {|klass| klass.send(:include, Fog::Nullable::Integer)}

data/tests/helpers/mock_helper.rb

@@ -30,10 +30,12 @@ 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',
+    :joyent_username                  => "joyentuser",
+    :joyent_password                  => "joyentpass",
     :linode_api_key                   => 'linode_api_key',
     :local_root                       => '~/.fog',
-    :new_servers_password             => 'new_servers_password',
-    :new_servers_username             => 'new_servers_username',
+    :bare_metal_cloud_password        => 'bare_metal_cloud_password',
+    :bare_metal_cloud_username        => 'bare_metal_cloud_username',
     :ninefold_compute_key             => 'ninefold_compute_key',
     :ninefold_compute_secret          => 'ninefold_compute_secret',
     :ninefold_storage_secret          => 'ninefold_storage_secret',
@@ -44,6 +46,9 @@ if Fog.mock?
     :openstack_username               => 'openstack_username',
     :openstack_tenant                 => 'openstack_tenant',
     :openstack_auth_url               => 'openstack_auth_url',
+    :ovirt_url                        => 'http://ovirt:8080/api',
+    :ovirt_username                   => 'admin@internal',
+    :ovirt_password                   => '123123',
     :rackspace_api_key                => 'rackspace_api_key',
     :rackspace_username               => 'rackspace_username',
     :slicehost_password               => 'slicehost_password',

data/tests/joyent/requests/compute/datasets_tests.rb

@@ -0,0 +1,49 @@
+Shindo.tests("Fog::Compute[:joyent] | dataset requests", ["joyent"]) do
+  @dataset_format = {
+    "description" => String,
+    "requirements" => {},
+    "name" => String,
+    "version" => String,
+    "os" => String,
+    "id" => String,
+    "urn" => String,
+    "default" => Fog::Boolean,
+    "type" => String,
+    "created" => Time,
+  }
+
+  if Fog.mock?
+    Fog::Compute[:joyent].data[:datasets] = {
+      "33904834-1f01-49d3-bed3-b642e158c375" => {
+        "id" => "33904834-1f01-49d3-bed3-b642e158c375",
+        "urn" => "sdc:sdc:zeus-simple-lb-200mbps:1.1.1",
+        "name" => "zeus-simple-lb-200mbps",
+        "os" => "smartos",
+        "type" => "smartmachine",
+        "description" => "Zeus Simple Load Balancer 200 Mbps SmartMachine",
+        "default" => false,
+        "requirements" => {},
+        "version" => "1.1.1",
+        "created" => Time.parse("2011-09-15T07:39:13+00:00")
+      },
+      "3fcf35d2-dd79-11e0-bdcd-b3c7ac8aeea6" => {
+        "id" => "3fcf35d2-dd79-11e0-bdcd-b3c7ac8aeea6",
+        "urn" => "sdc:sdc:mysql:1.4.1",
+        "name" => "mysql",
+        "os" => "smartos",
+        "type" => "smartmachine",
+        "description" => "MySQL SmartMachine",
+        "default" => false,
+        "requirements" => {},
+        "version" => "1.4.1",
+        "created" => Time.parse("2011-09-15T05:01:34+00:00")
+      }
+    }
+  end
+
+  tests("#list_datasets") do
+    formats(@dataset_format) do
+      Fog::Compute[:joyent].list_datasets.body.first
+    end
+  end
+end

data/tests/joyent/requests/compute/keys_tests.rb

@@ -0,0 +1,47 @@
+Shindo.tests("Fog::Compute[:joyent] | key requests", ['joyent']) do
+
+  @key_format = {
+    "name" => String,
+    "key" => String,
+    "created" => Time,
+    "updated" => Time
+  }
+
+  before do
+    #
+    # Clear out all the test keys on the account in prep for test
+    #
+    Fog::Compute[:joyent].list_keys.body.each do |key|
+      if key["name"] =~ /^fog-test/
+        Fog::Compute[:joyent].delete_key(key["name"])
+      end
+    end
+
+    @test_key_name = "fog-test-#{Time.now.utc.to_i}"
+
+    Fog::Compute[:joyent].create_key(
+      :name => @test_key_name,
+      :key => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWxSNYngOTeu0pYd+2tpfYGISuMfMUNGyAIh4yRprAbacVddRq4Nyr12vDklzaRTzgd9PgX/82JMb4RARbVTtUKXJXmaBLvg2epGM+ScanZIitzL53whJrlGx+7nT+TnRdkB1XG7uIf2EpTQBaKrT4iG0magCXh5bmOqCyWte2gV8fArMg5bZclUT1p2E7qEW0htaLOiMSyGkjBlxb6vYQCA/Pa8VWETHehIF46S942gCj0aaL81gTocfyTm5/F+AgvUAsjHzRVkB/Dlhwq7Q7sK+4iAhlKPYMflkKC8r+nF0/LL9S3lllLZvbkEWJfEqlMCAbgmjTpYlBzQEqf/eN"
+    )
+  end
+
+  tests("#list_keys").formats(@key_format) do
+    Fog::Compute[:joyent].list_keys.body.first
+  end
+
+  tests("#get_key").formats(@key_format) do
+    Fog::Compute[:joyent].get_key(@test_key_name).body
+  end
+
+  tests("#delete_key") do
+    returns(204 , "returns status code 204") do
+      Fog::Compute[:joyent].delete_key(@test_key_name).status
+    end
+
+    raises(Excon::Errors::NotFound, "when a key no longer exists") do
+      Fog::Compute[:joyent].delete_key(@test_key_name)
+      Fog::Compute[:joyent].delete_key(@test_key_name)
+    end
+  end
+
+end

data/tests/joyent/requests/compute/machines_tests.rb

@@ -0,0 +1,67 @@
+Shindo.tests("Fog::Compute[:joyent] | machine requests", ["joyent"]) do
+
+  @machine_format = {
+    "id" => String,
+    "name" => String,
+    "type" => String,
+    "state" => String,
+    "dataset" => String,
+    "memory" => Integer,
+    "disk" => Integer,
+    "ips" => Array,
+    "metadata" => Hash,
+    "created" => Time,
+    "updated" => Time
+  }
+
+  if Fog.mock?
+    @machines = Fog::Compute[:joyent].data[:machines] = {
+      "15080eca-3786-4bb8-a4d0-f43e1981cd72" => {
+        "id" => "15080eca-3786-4bb8-a4d0-f43e1981cd72",
+        "name" => "getting-started",
+        "type" => "smartmachine",
+        "state" => "running",
+        "dataset" => "sdc:sdc:smartos:1.3.15",
+        "memory" => 256,
+        "disk" => 5120,
+        "ips" => ["10.88.88.50"],
+        "metadata" => {},
+        "created" => Time.parse("2011-06-03T00:02:31+00:00"),
+        "updated" => Time.parse("2011-06-03T00:02:31+00:00")
+      }
+    }
+  end
+
+  @provider = Fog::Compute[:joyent]
+
+
+  #
+  # https://us-west-1.api.joyentcloud.com/docs#ListMachines
+  #
+  tests("#list_machines") do
+    if Fog.mock?
+      returns(@machines.length, "correct number of machines") do
+        @provider.list_machines.body.length
+      end
+    end
+
+    returns(Array, "returns an Array of machines") do
+      @provider.list_machines.body.class
+    end
+
+    formats([@machine_format]) do
+      @provider.list_machines.body
+    end
+  end
+
+  # https://us-west-1.api.joyentcloud.com/docs#GetMachine
+  tests("#get_machine") do
+    machines = @provider.list_machines.body
+    unless machines.empty?
+      formats(@machine_format) do
+        id = machines.first["id"]
+        @provider.get_machine(id).body
+      end
+    end
+  end
+end

data/tests/joyent/requests/compute/packages_tests.rb

@@ -0,0 +1,68 @@
+Shindo.tests("Fog::Compute[:joyent] | package requests", ["joyent"]) do
+  @package_format = {
+    'name' => String,
+    'vcpus' => Integer,
+    'memory' => Integer,
+    'disk' => Integer,
+    'swap' => Integer,
+    'default' => Fog::Boolean
+  }
+
+  if Fog.mock?
+    @data = Fog::Compute[:joyent].data
+
+    @data[:packages] = {
+      "regular_128" => {
+        "name" => "regular_128",
+        "memory" => 128,
+        "disk" => 5120,
+        "vcpus" => 1,
+        "swap" => 256,
+        "default" => true
+      },
+      "regular_256" => {
+        "name" => "regular_256",
+        "memory" => 256,
+        "disk" => 5120,
+        "vcpus" => 1,
+        "swap" => 512,
+        "default" => false
+      },
+      "regular_512" => {
+        "name" => "regular_512",
+        "memory" => 512,
+        "disk" => 10240,
+        "vcpus" => 1,
+        "swap" => 1024,
+        "default" => false
+      }
+    }
+  end
+
+  tests("#list_packages") do
+    formats([@package_format]) do
+      Fog::Compute[:joyent].list_packages.body
+    end
+  end
+
+  if Fog.mock?
+    tests("#list_packages") do
+      actual = @data[:packages].values.length
+      returns(actual, "has correct number of packages") do
+        Fog::Compute[:joyent].list_packages.body.length
+      end
+    end
+  end
+
+  tests("#get_package") do
+    pkgid = if Fog.mock?
+      @data[:packages].keys.first
+    else
+      Fog::Compute[:joyent].list_packages.body.first["name"]
+    end
+
+    formats(@package_format) do
+      Fog::Compute[:joyent].get_package(pkgid).body
+    end
+  end
+end

data/tests/ovirt/compute_tests.rb

@@ -0,0 +1,24 @@
+Shindo.tests('Fog::Compute[:ovirt]', ['ovirt']) do
+
+  compute = Fog::Compute[:ovirt]
+
+  tests("Compute attributes") do
+    %w{ ovirt_attrs }.each do |attr|
+      test("it should respond to #{attr}") { compute.respond_to? attr }
+    end
+  end
+
+  tests("Compute collections") do
+    %w{ servers templates clusters interfaces }.each do |collection|
+      test("it should respond to #{collection}") { compute.respond_to? collection }
+    end
+  end
+
+  tests("Compute requests") do
+    %w{ add_interface create_vm datacenters destroy_interface destroy_vm get_cluster get_template
+        get_virtual_machine list_clusters list_networks list_template_interfaces list_templates
+        list_virtual_machines list_vm_interfaces storage_domains update_interface update_vm vm_action  }.each do |collection|
+      test("it should respond to #{collection}") { compute.respond_to? collection }
+    end
+  end
+end

data/tests/ovirt/models/compute/cluster_tests.rb

@@ -0,0 +1,31 @@
+Shindo.tests('Fog::Compute[:ovirt] | cluster model', ['ovirt']) do
+
+  clusters = Fog::Compute[:ovirt].clusters
+  cluster = clusters.last
+
+  tests('The cluster model should') do
+    tests('have the action') do
+      test('reload') { cluster.respond_to? 'reload' }
+      %w{ networks }.each do |action|
+        test(action) { cluster.respond_to? action }
+      end
+    end
+    tests('have attributes') do
+      model_attribute_hash = cluster.attributes
+      attributes = [ :id,
+        :name]
+      tests("The cluster model should respond to") do
+        attributes.each do |attribute|
+          test("#{attribute}") { cluster.respond_to? attribute }
+        end
+      end
+      tests("The attributes hash should have key") do
+        attributes.each do |attribute|
+          test("#{attribute}") { model_attribute_hash.has_key? attribute }
+        end
+      end
+    end
+    test('be a kind of Fog::Compute::Ovirt::Cluster') { cluster.kind_of? Fog::Compute::Ovirt::Cluster }
+  end
+
+end