fog 1.1.0 → 1.2.0

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

@@ -4,179 +4,224 @@ class Glesys
       module Servers
 
         LIST = {
-          'arguments' => [],
-          'servers' => [{
-            'serverid' => String,
-            'hostname' => String
-          }],
-          'status' => {
-            'code' => String,
-            'text' => String
-          }
-        }
-
-        CREATE = {
-          'arguments' => {
-            "rootpw"        => String, 
-            "disksize"      => String, 
-            "memorysize"    => String, 
-            "datacenter"    => String, 
-            "cpucores"      => String,
-            "transfer"      => String,
-            "template"      => String,
-            "description"   => String,
-            "hostname"      => String,
-            "platform"      => String
+          'debug' => {
+            'input' => []
           },
-          'server' => {
+          'servers' => [{
             'serverid' => String,
             'hostname' => String,
-            'iplist' => [{
-              'cost' => String,
-              'version' => String,
-              'ip' => String
-            }]
-          },
-          'status' => {
-            'code' => String,
-            'text' => String
-          }
-        }
-
-        DESTROY = {
-          'arguments' => {
-            'serverid' => String,
-            'keepip'   => String,
-          },
+            'datacenter' => String,
+            'platform' => String
+          }],
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
         DETAILS = {
-          'arguments' =>  {
-            'serverid'  =>  String
-          }, 
+          'debug' => {
+            'input' =>  {
+              'serverid'  =>  Fog::Nullable::String
+            }
+          },
           'server' => {
             'managedhosting'  => String,
             'cost'            => {
               'amount'      =>  Float,
-              'timeperiod'  => String, 
+              'timeperiod'  => String,
               'currency'    => String
-            }, 
-            'datacenter'  => String, 
-            'memory'      => String,
-            'cpucores'    => String, 
-            'transfer'    => String, 
-            'template'    => String, 
-            'iplist'      =>  [{
-              'cost'    => String, 
-              'version' => String, 
-              'ip'      => String
+            },
+            'serverid'      => String,
+            'datacenter'    => String,
+            'memorysize'    => Integer,
+            'cpucores'      => Integer,
+            'transfer'      => Integer,
+            'templatename'  => String,
+            'iplist'        =>  [{
+              'cost'      => Integer,
+              'version'   => Fog::Nullable::Integer,
+              'ipaddress' => Fog::Nullable::String,
+              'currency'  => String
             }], 
             'description' => String,
-            'hostname'    => String, 
-            'disk'        => String, 
-            'platform'    => String
-          }, 
+            'hostname'    => String,
+            'disksize'    => Integer,
+            'platform'    => String,
+            'state'       => Fog::Nullable::String
+          },
           'status' => {
-            'code' => String, 
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
+        STOP = DETAILS.merge(
+          'debug' => {
+            'input' =>  {
+              'serverid'  => Fog::Nullable::String,
+              'type'      => String
+            }
+          }
+        )
+
+        CREATE = DETAILS.merge(
+          'debug' => {
+            'input' =>  {
+              'serverid'      => Fog::Nullable::String,
+              'hostname'      => String,
+              'rootpassword'  => String,
+              'datacenter'    => String,
+              'platform'      => String,
+              'templatename'  => String,
+              'disksize'      => String,
+              'memorysize'    => String,
+              'cpucores'      => String,
+              'transfer'      => String,
+              'description'   => String
+            }
+          }
+        )
+
         STATUS = {
-          'arguments' => {
-            'serverid' => String
-          }, 
+          'debug' => {
+            'input' => {
+              'serverid' => String
+            }
+          },
           'server' => {
-            'memory'    => String, 
-            'bandwidth' => {
-              'last30days'  => Integer, 
-              'today'       => Integer,
-              'max'         => String
-            }, 
-            'cpu'     => String, 
-            'disk'    => String, 
-            'state'   => String
-          }, 
-          'status' => { 
-            'code' => String,
-            'text' => String
-          }
-       }
-        
-        START = {
-          'arguments' => {
-            'serverid' => String
+            'memory'    => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'transfer'  => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'disk'      => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'state'     => String,
+            'transfer'  => {
+              'usage' => Fog::Nullable::Integer,
+              'max'   => Fog::Nullable::Integer,
+              'unit'  => Fog::Nullable::String
+            },
+            'cpu'       => [],
+            'uptime'    => {
+              'current' => Fog::Nullable::Integer,
+              'unit'    => String
+            }
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
-        }
+       }
 
-        STOP = {
-          'arguments' => {
-            'serverid'  => String,
-            'type'      => String
+        DESTROY = {
+          'debug' => {
+            'input' => {
+              'serverid' => String,
+              'keepip'   => String
+            }
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
       end
       module Ips
-    
+
         IPLIST = {
-          'arguments' => [],
+          'debug' => {
+            'input' => []
+          },
           'iplist' => [{
-            'price' => {
-              'amount' => String,
-              'timeperiod' => String,
-              'currency' => String
+            'cost' => {
+              'amount'      => Integer,
+              'timeperiod'  => String,
+              'currency'    => String
             },
-            'datacenter' => String,
-            'serverid' => Fog::Nullable::String,
-            'platform' => String,
-            'ip'       => String,
-            'version'  => String,
+            'netmask'     => Fog::Nullable::String,
+            'broadcast'   => Fog::Nullable::String,
+            'gateway'     => Fog::Nullable::String,
+            'nameservers' => [],
+            'datacenter'  => String,
+            'serverid'    => Fog::Nullable::String,
+            'platform'    => String,
+            'ipaddress'   => String,
+            'ipversion'   => Integer,
+            'ptr'         => String,
+            'reserved'    => String
           }],
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
-    
+
         IPLIST_ALL = {
-          'arguments' => {
+          'debug' => {
+            'input' => {
+              'datacenter'  => String,
+              'ipversion'   => String,
+              'platform'    => String
+            }
+          },
+          'iplist' => {
+            'ipversion'   => Integer,
             'datacenter'  => String,
-            'ipversion'   => String,
-            'platform'    => String
+            'platform'    => String,
+            "ipaddresses" => []
           },
-          'iplist' => [],
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           },
-          'ipinfo' => {
-            'datacenter' => String,
-            'ipversion'  => Integer,
-            'platform'   => String
-          }
         }
 
         IPLIST_CATCH_RELEASE = {
-          'arguments' => {
-            'ipaddress' => String, 
-            'ipversion'=> String,
-          }, 
+          'debug' => {
+            'input' => {
+              'ipaddress' => String,
+            }
+          },
+          'details' => {
+            'cost' => {
+              'amount'      => Integer,
+              'timeperiod'  => String,
+              'currency'    => String
+            },
+            'ipaddress'   => String,
+            'netmask'     => String,
+            'broadcast'   => String,
+            'gateway'     => String,
+            'nameservers' => [],
+            'datacenter'  => String,
+            'serverid'    => Fog::Nullable::String,
+            'platform'    => String,
+            'ipaddress'   => String,
+            'ipversion'   => Integer,
+            'ptr'         => String,
+            'reserved'    => String
+          },
           'status' => {
-            'code' => String, 
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 
@@ -184,26 +229,29 @@ class Glesys
       module Templates
 
         LIST = {
-          'arguments' => [],
-          'templates' =>  { 
+          'debug' => {
+            'input' => []
+          },
+          'templates' =>  {
             'Xen' => [{
-              'name'          => String,
-              'os'            => String, 
-              'min_mem_size'  => String, 
-              'min_disk_size' => String, 
-              'platform'      => String
+              'name'              => String,
+              'operatingsystem'   => String,
+              'minimummemorysize' => Integer,
+              'minimumdisksize'   => Integer,
+              'platform'          => String
             }],
             'OpenVZ' => [{
-              'name'          => String,
-              'os'            => String, 
-              'min_mem_size'  => String, 
-              'min_disk_size' => String, 
-              'platform'      => String
+              'name'              => String,
+              'operatingsystem'   => String,
+              'minimummemorysize' => Integer,
+              'minimumdisksize'   => Integer,
+              'platform'          => String
             }]
           },
           'status' => {
-            'code' => String,
-            'text' => String
+            'timestamp' => String,
+            'code'      => Integer,
+            'text'      => String
           }
         }
 

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

@@ -9,8 +9,8 @@ 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(:datcenter => 'Falkenberg, :platform => 'Xen', :ipversion => 4)"
+
+    tests("#ip_list_free(:datacenter => 'Falkenberg, :platform => 'Xen', :ipversion => 4)"
     ).formats(Glesys::Compute::Formats::Ips::IPLIST_ALL) do
       pending if Fog.mocking?
       ips = Fog::Compute[:glesys].ip_list_free(
@@ -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

@@ -1,12 +1,16 @@
 Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
-    
+
     @serverid = nil
-    @hostname = "fog.#{Time.now.to_i}"
+    @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,17 +21,17 @@ 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']
       vm.body['response']
     end
@@ -35,7 +39,7 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     unless Fog.mocking?
       Fog::Compute[:glesys].servers.get(@serverid).wait_for { ready? }
     end
-  
+
     tests("#server_details(#{@serverid})").formats(Glesys::Compute::Formats::Servers::DETAILS) do
       pending if Fog.mocking?
       Fog::Compute[:glesys].server_details(@serverid).body['response']
@@ -55,10 +59,10 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
     unless Fog.mocking?
       pending if Fog.mocking?
       s = Fog::Compute[:glesys].servers.get(@serverid)
-      s.wait_for { s.state == 'stopped' }  
+      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

@@ -15,6 +15,8 @@ if Fog.mock?
     :bluebox_customer_id              => 'bluebox_customer_id',
     :brightbox_client_id              => 'brightbox_client_id',
     :brightbox_secret                 => 'brightbox_secret',
+    :clodo_api_key                    => 'clodo_api_key',
+    :clodo_username                   => 'clodo_username',
     :dnsimple_email                   => 'dnsimple_email',
     :dnsimple_password                => 'dnsimple_password',
     :dnsmadeeasy_api_key              => 'dnsmadeeasy_api_key',
@@ -28,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',
@@ -42,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