mirror of
https://github.com/fog/fog.git
synced 2022-11-09 13:51:43 -05:00
bcfb571dea
Attributes were overwritten when requesting full information about a server. Essential the problem is that both the server details and the server status were requested from Glesys then merged together to create a Fog Glesys server model object. I moved some of the status attributes into a usage attribute on the server instead.
46 lines
1 KiB
Ruby
46 lines
1 KiB
Ruby
require 'fog/core/collection'
|
|
require 'fog/glesys/models/compute/server'
|
|
|
|
module Fog
|
|
module Compute
|
|
class Glesys
|
|
|
|
class Servers < Fog::Collection
|
|
|
|
model Fog::Compute::Glesys::Server
|
|
|
|
def all
|
|
data = service.list_servers.body['response']['servers']
|
|
load(data)
|
|
end
|
|
|
|
def get(identifier)
|
|
return nil if identifier.nil? || identifier == ""
|
|
|
|
begin
|
|
details = service.server_details(identifier).body['response']
|
|
status = service.server_status(identifier).body['response']
|
|
|
|
if details.empty? || status.empty?
|
|
nil
|
|
else
|
|
details['server']['usage'] = Hash.new
|
|
|
|
%w|cpu memory disk transfer|.each do |attr|
|
|
details['server']['usage'][attr] = status['server'].delete(attr)
|
|
end
|
|
|
|
details['server'].merge!(status['server'])
|
|
|
|
new(details['server'])
|
|
end
|
|
rescue
|
|
return nil
|
|
end
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
end
|
|
end
|