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

[ninefold|compute] Updates reference to service

This commit is contained in:
Paul Thornthwaite 2012-12-22 23:24:54 +00:00
parent fbc5c52194
commit 6aefe10ccc
8 changed files with 27 additions and 27 deletions

View file

@ -35,19 +35,19 @@ module Fog
def destroy def destroy
requires :identity requires :identity
self.jobid = extract_job_id(connection.disassociate_ip_address(:id => identity)) self.jobid = extract_job_id(service.disassociate_ip_address(:id => identity))
true true
end end
def enable_static_nat(server) def enable_static_nat(server)
server.kind_of?(Integer) ? serverid = server : serverid = server.identity server.kind_of?(Integer) ? serverid = server : serverid = server.identity
res = connection.enable_static_nat(:virtualmachineid => serverid, :ipaddressid => identity) res = service.enable_static_nat(:virtualmachineid => serverid, :ipaddressid => identity)
reload reload
to_boolean(res['success']) to_boolean(res['success'])
end end
def disable_static_nat() def disable_static_nat()
self.jobid = extract_job_id(connection.disable_static_nat(:ipaddressid => identity)) self.jobid = extract_job_id(service.disable_static_nat(:ipaddressid => identity))
true true
end end
@ -59,7 +59,7 @@ module Fog
end end
def ready? def ready?
if jobid && connection.query_async_job_result(:jobid => jobid)['jobstatus'] == 0 if jobid && service.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
false false
else # No running job, we are ready. Refresh data. else # No running job, we are ready. Refresh data.
reload reload
@ -77,7 +77,7 @@ module Fog
:account => account, :account => account,
:domainid => domainid :domainid => domainid
}.delete_if {|k,v| v.nil? || v == "" } }.delete_if {|k,v| v.nil? || v == "" }
data = connection.associate_ip_address(options) data = service.associate_ip_address(options)
merge_attributes(data) merge_attributes(data)
true true
end end

View file

@ -10,13 +10,13 @@ module Fog
model Fog::Compute::Ninefold::Address model Fog::Compute::Ninefold::Address
def all def all
data = connection.list_public_ip_addresses data = service.list_public_ip_addresses
load(data) load(data)
end end
def get(identifier) def get(identifier)
return nil if identifier.nil? || identifier == "" return nil if identifier.nil? || identifier == ""
data = connection.list_public_ip_addresses(:id => identifier) data = service.list_public_ip_addresses(:id => identifier)
if data.empty? if data.empty?
nil nil
else else

View file

@ -10,12 +10,12 @@ module Fog
model Fog::Compute::Ninefold::Flavor model Fog::Compute::Ninefold::Flavor
def all def all
data = connection.list_service_offerings data = service.list_service_offerings
load(data) load(data)
end end
def get(identifier) def get(identifier)
data = connection.list_service_offerings(:id => identifier) data = service.list_service_offerings(:id => identifier)
if data.empty? if data.empty?
nil nil
else else

View file

@ -10,12 +10,12 @@ module Fog
model Fog::Compute::Ninefold::Image model Fog::Compute::Ninefold::Image
def all(offering = 'executable') def all(offering = 'executable')
data = connection.list_templates(:templatefilter => offering) data = service.list_templates(:templatefilter => offering)
load(data) load(data)
end end
def get(identifier, offering = 'executable') def get(identifier, offering = 'executable')
data = connection.list_templates(:templatefilter => offering, :id => identifier) data = service.list_templates(:templatefilter => offering, :id => identifier)
if data.empty? if data.empty?
nil nil
else else

View file

@ -25,12 +25,12 @@ module Fog
def destroy def destroy
requires :identity requires :identity
self.jobid = extract_job_id(connection.delete_ip_forwarding_rule(:id => identity)) self.jobid = extract_job_id(service.delete_ip_forwarding_rule(:id => identity))
true true
end end
def ready? def ready?
if jobid && connection.query_async_job_result(:jobid => jobid)['jobstatus'] == 0 if jobid && service.query_async_job_result(:jobid => jobid)['jobstatus'] == 0
false false
else # No running job, we are ready. Refresh data. else # No running job, we are ready. Refresh data.
reload reload
@ -58,7 +58,7 @@ module Fog
:startport => startport, :startport => startport,
:endport => endport :endport => endport
}.delete_if {|k,v| v.nil? || v == "" } }.delete_if {|k,v| v.nil? || v == "" }
data = connection.create_ip_forwarding_rule(options) data = service.create_ip_forwarding_rule(options)
merge_attributes(data) merge_attributes(data)
true true
end end

View file

@ -10,13 +10,13 @@ module Fog
model Fog::Compute::Ninefold::IpForwardingRule model Fog::Compute::Ninefold::IpForwardingRule
def all def all
data = connection.list_ip_forwarding_rules data = service.list_ip_forwarding_rules
load(data) load(data)
end end
def get(identifier) def get(identifier)
return nil if identifier.nil? || identifier == "" return nil if identifier.nil? || identifier == ""
data = connection.list_ip_forwarding_rules(:id => identifier) data = service.list_ip_forwarding_rules(:id => identifier)
if data.empty? if data.empty?
nil nil
else else

View file

@ -82,43 +82,43 @@ module Fog
def reboot def reboot
requires :identity requires :identity
self.jobid = extract_job_id(connection.reboot_virtual_machine(:id => identity)) self.jobid = extract_job_id(service.reboot_virtual_machine(:id => identity))
puts "jobid: " + jobid.to_s puts "jobid: " + jobid.to_s
true true
end end
def start def start
requires :identity requires :identity
self.jobid = extract_job_id(connection.start_virtual_machine(:id => identity)) self.jobid = extract_job_id(service.start_virtual_machine(:id => identity))
true true
end end
def stop def stop
requires :identity requires :identity
self.jobid = extract_job_id(connection.stop_virtual_machine(:id => identity)) self.jobid = extract_job_id(service.stop_virtual_machine(:id => identity))
true true
end end
def destroy def destroy
requires :identity requires :identity
self.jobid = extract_job_id(connection.destroy_virtual_machine(:id => identity)) self.jobid = extract_job_id(service.destroy_virtual_machine(:id => identity))
true true
end end
def flavor def flavor
requires :flavor_id requires :flavor_id
connection.flavors.get(flavor_id) service.flavors.get(flavor_id)
end end
def image def image
requires :image_id requires :image_id
connection.images.get(image_id) service.images.get(image_id)
end end
def ready? def ready?
if jobid if jobid
# we do this by polling the last job id status. # we do this by polling the last job id status.
res = connection.query_async_job_result(:jobid => jobid) res = service.query_async_job_result(:jobid => jobid)
if res['jobstatus'] == 0 if res['jobstatus'] == 0
false false
else else
@ -138,7 +138,7 @@ module Fog
unless networkids unless networkids
# No network specified, use first in this zone. # No network specified, use first in this zone.
networks = connection.list_networks(:zoneid => zoneid) networks = service.list_networks(:zoneid => zoneid)
if networks.empty? if networks.empty?
raise "No networks. Please create one, or specify a network ID" raise "No networks. Please create one, or specify a network ID"
else else
@ -164,7 +164,7 @@ module Fog
:size => size, :size => size,
:userdata => userdata :userdata => userdata
}.delete_if {|k,v| v.nil? || v == "" } }.delete_if {|k,v| v.nil? || v == "" }
data = connection.deploy_virtual_machine(options) data = service.deploy_virtual_machine(options)
merge_attributes(data) merge_attributes(data)
true true
end end

View file

@ -10,13 +10,13 @@ module Fog
model Fog::Compute::Ninefold::Server model Fog::Compute::Ninefold::Server
def all def all
data = connection.list_virtual_machines data = service.list_virtual_machines
load(data) load(data)
end end
def get(identifier) def get(identifier)
return nil if identifier.nil? || identifier == "" return nil if identifier.nil? || identifier == ""
data = connection.list_virtual_machines(:id => identifier) data = service.list_virtual_machines(:id => identifier)
if data.empty? if data.empty?
nil nil
else else