kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #3470 from Artmann/glesys-Xen-is-deprecated-use-vmware-instead

Browse source 
[GleSYS] Xen is deprecated use VMware instead
This commit is contained in:
Paulo Henrique Lopes Ribeiro 2015-03-04 10:41:58 -03:00
commit 61840773b4
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/glesys/models/compute/server.rb
View file

@ -58,9 +58,9 @@ module Fog
options = {
:datacenter => datacenter || "Falkenberg",
:platform => platform || "Xen",
:platform => platform || "OpenVz",
:hostname => hostname,
:templatename => templatename || "Debian-6 x64",
:templatename => templatename || "Debian 7.0 64-bit",
:disksize => disksize || "10",
:memorysize => memorysize || "512",
:cpucores => cpucores || "1",

3
tests/glesys/requests/compute/helper.rb
View file

@ -28,7 +28,6 @@ class Glesys
'server' => {
'managedhosting' => String,
'cost' => {
'amount' => Float,
'timeperiod' => String,
'currency' => String
},
@ -115,7 +114,7 @@ class Glesys
'unit' => Fog::Nullable::String
},
'cpu' => {
'usage' => Fog::Nullable::Integer,
'usage' => Fog::Nullable::Float,
'max' => Fog::Nullable::Integer,
'unit' => Fog::Nullable::String
},

11
tests/glesys/requests/compute/server_tests.rb
View file

@ -4,11 +4,11 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
@hostname = "fog-#{Time.now.to_i}"
@create = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
":datacenter => 'Falkenberg', :platform => 'Xen', :templatename => 'Debian-6 x64', "+
":datacenter => 'Falkenberg', :platform => 'VMware', :templatename => 'Debian 7.0 64-bit', "+
":disksize => '10', :memorysize => '512', :cpucores => '1', :transfer => '500', :bandwidth => '10'"
@create_vz = ":hostname => #@hostname, :rootpassword => 'pw#{Time.now.to_i}', "+
":datacenter => 'Stockholm', :platform => 'OpenVZ', :templatename => 'Debian 6.0 64-bit', "+
":datacenter => 'Stockholm', :platform => 'OpenVZ', :templatename => 'Debian 7.0 64-bit', "+
":disksize => '10', :memorysize => '256', :cpucores => '2', :transfer => '500', :bandwidth => '10'"
tests('success') do
@ -22,10 +22,11 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
pending if Fog.mocking?
vm = Fog::Compute[:glesys].create(
:hostname => @hostname,
:description => "Fog test server",
:rootpassword => "pw#{Time.now.to_i}",
:datacenter => "Falkenberg",
:platform => "Xen",
:templatename => "Debian-6 x64",
:platform => "VMware",
:templatename => "Debian 7.0 64-bit",
:disksize => "10",
:memorysize => "512",
:cpucores => "1",
@ -86,7 +87,7 @@ Shindo.tests('Fog::Compute[:glesys] | server requests', ['glesys']) do
:rootpassword => "pw#{Time.now.to_i}",
:datacenter => "Stockholm",
:platform => "OpenVZ",
:templatename => "Debian 6.0 64-bit",
:templatename => "Debian 7.0 64-bit",
:disksize => "10",
:memorysize => "256",
:cpucores => "2",