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

[glesys|compute] Updates reference to service

Browse source
This commit is contained in:
Paul Thornthwaite 2012-12-22 23:27:08 +00:00
parent 59bed55aa0
commit 2135e583b5
6 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/fog/glesys/models/compute/ip.rb
View file

@ -15,12 +15,12 @@ module Fog
attribute :ip attribute :ip
def list_own def list_own
connection.list_own service.list_own
end end
def list_free def list_free
requires :version, :datacenter, :platform requires :version, :datacenter, :platform
connection.ip_list_free( service.ip_list_free(
:ipversion => version, :ipversion => version,
:platform => platform, :platform => platform,
:datacenter => datacenter :datacenter => datacenter
@ -29,7 +29,7 @@ module Fog
def details def details
requires :version, :ip requires :version, :ip
connection.ip_details( service.ip_details(
:ipversion => version, :ipversion => version,
:ipaddress => ip :ipaddress => ip
) )
@ -37,7 +37,7 @@ module Fog
def take def take
requires :version, :ip requires :version, :ip
connection.ip_take( service.ip_take(
:ipversion => version, :ipversion => version,
:ipaddress => ip :ipaddress => ip
) )
@ -45,7 +45,7 @@ module Fog
def release def release
requires :version, :ip requires :version, :ip
connection.ip_release( service.ip_release(
:ipversion => version, :ipversion => version,
:ipaddress => ip :ipaddress => ip
) )
@ -53,7 +53,7 @@ module Fog
def add def add
requires :serverid, :version, :ip requires :serverid, :version, :ip
connection.ip_add( service.ip_add(
:serverid => serverid, :serverid => serverid,
:ipversion => version, :ipversion => version,
:ipaddress => ip :ipaddress => ip
@ -62,7 +62,7 @@ module Fog
def remove def remove
requires :serverid, :version, :ip requires :serverid, :version, :ip
connection.ip_remove( service.ip_remove(
:serverid => serverid, :serverid => serverid,
:ipversion => version, :ipversion => version,
:ipaddress => ip :ipaddress => ip

14
lib/fog/glesys/models/compute/ips.rb
View file

@ -12,22 +12,22 @@ module Fog
attribute :serverid attribute :serverid
def all def all
data = connection.ip_list_own.body['response']['iplist'] data = service.ip_list_own.body['response']['iplist']
load(data) load(data)
end end
def get(identifier) def get(identifier)
return nil if identifier.nil? || identifier == "" return nil if identifier.nil? || identifier == ""
self.new( :serverid => identifier )
data = connection.ip_list_own(:serverid => identifier).body['response'] self.new( :serverid => identifier )
data = service.ip_list_own(:serverid => identifier).body['response']
if data['iplist'].empty? if data['iplist'].empty?
nil nil
else else
new(data['iplist'].first) new(data['iplist'].first)
end end
end end
def new(attributes = {}) def new(attributes = {})
super({ :serverid => serverid }.merge!(attributes)) super({ :serverid => serverid }.merge!(attributes))

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

@ -32,22 +32,22 @@ module Fog
def start def start
requires :identity requires :identity
connection.start(:serverid => identity) service.start(:serverid => identity)
end end
def stop def stop
requires :identity requires :identity
connection.stop(:serverid => identity) service.stop(:serverid => identity)
end end
def reboot def reboot
requires :identity requires :identity
connection.reboot(:serverid => identity) service.reboot(:serverid => identity)
end end
def destroy def destroy
requires :identity requires :identity
connection.destroy(:serverid => identity, :keepip => keepip) service.destroy(:serverid => identity, :keepip => keepip)
end end
def save def save
@ -64,8 +64,8 @@ module Fog
:cpucores => cpucores || "1", :cpucores => cpucores || "1",
:rootpassword => rootpassword, :rootpassword => rootpassword,
:transfer => transfer || "500", :transfer => transfer || "500",
} }
data = connection.create(options) data = service.create(options)
merge_attributes(data.body['response']['server']) merge_attributes(data.body['response']['server'])
data.status == 200 ? true : false data.status == 200 ? true : false
end end

8
lib/fog/glesys/models/compute/servers.rb
View file

@ -10,16 +10,16 @@ module Fog
model Fog::Compute::Glesys::Server model Fog::Compute::Glesys::Server
def all def all
data = connection.list_servers.body['response']['servers'] data = service.list_servers.body['response']['servers']
load(data) load(data)
end end
def get(identifier) def get(identifier)
return nil if identifier.nil? || identifier == "" return nil if identifier.nil? || identifier == ""
begin begin
details = connection.server_details(identifier).body['response'] details = service.server_details(identifier).body['response']
status = connection.server_status(identifier).body['response'] status = service.server_status(identifier).body['response']
if details.empty? || status.empty? if details.empty? || status.empty?
nil nil

2
lib/fog/glesys/models/compute/template.rb
View file

@ -16,7 +16,7 @@ module Fog
attribute :min_disk_size attribute :min_disk_size
def list def list
connection.template_list service.template_list
end end
end end

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

@ -10,8 +10,8 @@ module Fog
model Fog::Glesys::Compute::Template model Fog::Glesys::Compute::Template
def all def all
openvz = connection.template_list.body['response']['templates']['OpenVZ'] openvz = service.template_list.body['response']['templates']['OpenVZ']
xen = connection.template_list.body['response']['templates']['Xen'] xen = service.template_list.body['response']['templates']['Xen']
load(xen+openvz) load(xen+openvz)
end end