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

[compute|ninefold] small consistency fixes for server

Browse source
This commit is contained in:
geemus 2011-07-22 15:38:48 -05:00
parent c0ca2cd5dc
commit 3e8a2f3177
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/fog/compute/models/ninefold/server.rb
View file

@ -5,6 +5,9 @@ module Fog
class Ninefold
class Server < Fog::Model
extend Fog::Deprecation
deprecate :serviceofferingid, :flavor_id
deprecate :templateid, :image_id
identity :id
@ -13,10 +16,11 @@ module Fog
attribute :cpuspeed
attribute :cpuused
attribute :created, :type => :time
attribute :created, :type => :time
attribute :displayname
attribute :domain
attribute :domainid
attribute :flavor_id, :aliases => :serviceofferingid
attribute :forvirtualnetwork
attribute :group
attribute :groupid
@ -25,6 +29,7 @@ module Fog
attribute :hostid
attribute :hostname
attribute :hypervisor
attribute :image_id, :aliases => :templateid
#attribute :ipaddress
attribute :isodisplaytext
attribute :isoid
@ -35,20 +40,18 @@ module Fog
attribute :name
attribute :networkkbsread
attribute :networkkbswrite
attribute :nic
attribute :password
attribute :passwordenabled
attribute :rootdeviceid
attribute :rootdevicetype
attribute :serviceofferingid
attribute :securitygroup
attribute :serviceofferingname
attribute :state
attribute :templatedisplaytext
attribute :templateid
attribute :templatename
attribute :zoneid
attribute :zonename
attribute :nic
attribute :securitygroup
# used for creation only.
attribute :networkids
@ -66,7 +69,7 @@ module Fog
def initialize(attributes={})
merge_attributes({
:serviceofferingid => 105 # '1CPU, 384MB, 80GB HDD'
:flavor_id => 105 # '1CPU, 384MB, 80GB HDD'
})
super
end
@ -102,13 +105,13 @@ module Fog
end
def flavor
requires :serviceofferingid
connection.flavors.get(serviceofferingid)
requires :flavor_id
connection.flavors.get(flavor_id)
end
def image
requires :templateid
connection.images.get(templateid)
requires :image_id
connection.images.get(image_id)
end
def ready?
@ -130,9 +133,7 @@ module Fog
def save
raise "Operation not supported" if self.identity
requires :serviceofferingid
requires :templateid
requires :zoneid
requires :flavor_id, :image_id, :zoneid
unless networkids
# No network specified, use first in this zone.
@ -146,8 +147,8 @@ module Fog
end
options = {
:serviceofferingid => serviceofferingid,
:templateid => templateid,
:serviceofferingid => flavor_id,
:templateid => image_id,
:name => name,
:zoneid => zoneid,
:networkids => networkids,