You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2011/11/29 16:33:26 UTC
svn commit: r1207924 - in /deltacloud/trunk/server/lib/cimi/model:
machine.rb machine_configuration.rb machine_image.rb
Author: mfojtik
Date: Tue Nov 29 15:33:25 2011
New Revision: 1207924
URL: http://svn.apache.org/viewvc?rev=1207924&view=rev
Log:
CIMI: Renamed _self variable to context
Modified:
deltacloud/trunk/server/lib/cimi/model/machine.rb
deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb
deltacloud/trunk/server/lib/cimi/model/machine_image.rb
Modified: deltacloud/trunk/server/lib/cimi/model/machine.rb
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/cimi/model/machine.rb?rev=1207924&r1=1207923&r2=1207924&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/cimi/model/machine.rb (original)
+++ deltacloud/trunk/server/lib/cimi/model/machine.rb Tue Nov 29 15:33:25 2011
@@ -56,37 +56,37 @@ class CIMI::Model::Machine < CIMI::Model
scalar :rel, :href
end
- def self.find(id, _self)
+ def self.find(id, context)
instances = []
if id == :all
- instances = _self.driver.instances(_self.credentials)
- instances.map { |instance| from_instance(instance, _self) }.compact
+ instances = context.driver.instances(context.credentials)
+ instances.map { |instance| from_instance(instance, context) }.compact
else
- instance = _self.driver.instance(_self.credentials, :id => id)
+ instance = context.driver.instance(context.credentials, :id => id)
raise CIMI::Model::NotFound unless instance
- from_instance(instance, _self)
+ from_instance(instance, context)
end
end
- def self.create_from_json(body, _self)
+ def self.create_from_json(body, context)
json = JSON.parse(body)
hardware_profile_id = xml['MachineTemplate']['MachineConfig']["href"].split('/').last
image_id = xml['MachineTemplate']['MachineImage']["href"].split('/').last
- instance = _self.create_instance(_self.credentials, image_id, { :hwp_id => hardware_profile_id })
- from_instance(instance, _self)
+ instance = context.create_instance(context.credentials, image_id, { :hwp_id => hardware_profile_id })
+ from_instance(instance, context)
end
- def self.create_from_xml(body, _self)
+ def self.create_from_xml(body, context)
xml = XmlSimple.xml_in(body)
hardware_profile_id = xml['MachineTemplate'][0]['MachineConfig'][0]["href"].split('/').last
image_id = xml['MachineTemplate'][0]['MachineImage'][0]["href"].split('/').last
- instance = _self.driver.create_instance(_self.credentials, image_id, { :hwp_id => hardware_profile_id })
- from_instance(instance, _self)
+ instance = context.driver.create_instance(context.credentials, image_id, { :hwp_id => hardware_profile_id })
+ from_instance(instance, context)
end
- def perform(action, _self, &block)
+ def perform(action, context, &block)
begin
- if _self.driver.send(:"#{action.name}_instance", _self.credentials, self.name)
+ if context.driver.send(:"#{action.name}_instance", context.credentials, self.name)
block.callback :success
else
raise "Operation failed to execute on given Machine"
@@ -96,23 +96,23 @@ class CIMI::Model::Machine < CIMI::Model
end
end
- def self.delete!(id, _self)
- _self.driver.destroy_instance(_self.credentials, id)
+ def self.delete!(id, context)
+ context.driver.destroy_instance(context.credentials, id)
end
private
- def self.from_instance(instance, _self)
+ def self.from_instance(instance, context)
self.new(
:name => instance.id,
:description => instance.name,
- :uri => _self.machine_url(instance.id),
+ :uri => context.machine_url(instance.id),
:state => convert_instance_state(instance.state),
- :cpu => convert_instance_cpu(instance.instance_profile, _self),
- :memory => convert_instance_memory(instance.instance_profile, _self),
- :disks => convert_instance_storage(instance.instance_profile, _self),
+ :cpu => convert_instance_cpu(instance.instance_profile, context),
+ :memory => convert_instance_memory(instance.instance_profile, context),
+ :disks => convert_instance_storage(instance.instance_profile, context),
:network_interfaces => convert_instance_addresses(instance),
- :operations => convert_instance_actions(instance, _self)
+ :operations => convert_instance_actions(instance, context)
)
end
@@ -123,17 +123,17 @@ class CIMI::Model::Machine < CIMI::Model
('RUNNING' == state) ? 'STARTED' : state
end
- def self.convert_instance_cpu(profile, _self)
+ def self.convert_instance_cpu(profile, context)
cpu_override = profile.overrides.find { |p, v| p == :cpu }
if cpu_override.nil?
- MachineConfiguration.find(profile.id, _self).cpu
+ MachineConfiguration.find(profile.id, context).cpu
else
cpu_override[1]
end
end
- def self.convert_instance_memory(profile, _self)
- machine_conf = MachineConfiguration.find(profile.name, _self)
+ def self.convert_instance_memory(profile, context)
+ machine_conf = MachineConfiguration.find(profile.name, context)
memory_override = profile.overrides.find { |p, v| p == :memory }
{
:quantity => memory_override.nil? ? machine_conf.memory[:quantity] : memory_override[1],
@@ -141,8 +141,8 @@ class CIMI::Model::Machine < CIMI::Model
}
end
- def self.convert_instance_storage(profile, _self)
- machine_conf = MachineConfiguration.find(profile.name, _self)
+ def self.convert_instance_storage(profile, context)
+ machine_conf = MachineConfiguration.find(profile.name, context)
storage_override = profile.overrides.find { |p, v| p == :storage }
[
{ :capacity => {
@@ -166,11 +166,11 @@ class CIMI::Model::Machine < CIMI::Model
end
end
- def self.convert_instance_actions(instance, _self)
+ def self.convert_instance_actions(instance, context)
instance.actions.collect do |action|
action = :delete if action == :destroy # In CIMI destroy operation become delete
action = :restart if action == :reboot # In CIMI reboot operation become restart
- { :href => _self.send(:"#{action}_machine_url", instance.id), :rel => "http://www.dmtf.org/cimi/action/#{action}" }
+ { :href => context.send(:"#{action}_machine_url", instance.id), :rel => "http://www.dmtf.org/cimi/action/#{action}" }
end
end
Modified: deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb?rev=1207924&r1=1207923&r2=1207924&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb (original)
+++ deltacloud/trunk/server/lib/cimi/model/machine_configuration.rb Tue Nov 29 15:33:25 2011
@@ -35,20 +35,20 @@ class CIMI::Model::MachineConfiguration
scalar :rel, :href
end
- def self.find(id, _self)
+ def self.find(id, context)
profiles = []
if id == :all
- profiles = _self.driver.hardware_profiles(_self.credentials)
- profiles.map { |profile| from_hardware_profile(profile, _self) }.compact
+ profiles = context.driver.hardware_profiles(context.credentials)
+ profiles.map { |profile| from_hardware_profile(profile, context) }.compact
else
- profile = _self.driver.hardware_profile(_self.credentials, id)
- from_hardware_profile(profile, _self)
+ profile = context.driver.hardware_profile(context.credentials, id)
+ from_hardware_profile(profile, context)
end
end
private
- def self.from_hardware_profile(profile, _self)
+ def self.from_hardware_profile(profile, context)
# We accept just profiles with all properties set
return unless profile.memory or profile.cpu or profile.storage
machine_hash = {
@@ -59,7 +59,7 @@ class CIMI::Model::MachineConfiguration
:created => Time.now.to_s, # FIXME: DC hardware_profile has no mention about created_at
:memory => { :quantity => profile.memory.value, :units => profile.memory.unit },
:disks => [ { :capacity => { :quantity => profile.storage.value, :units => profile.storage.unit } } ],
- :uri => _self.machine_configuration_url(profile.name)
+ :uri => context.machine_configuration_url(profile.name)
}
self.new(machine_hash)
end
Modified: deltacloud/trunk/server/lib/cimi/model/machine_image.rb
URL: http://svn.apache.org/viewvc/deltacloud/trunk/server/lib/cimi/model/machine_image.rb?rev=1207924&r1=1207923&r2=1207924&view=diff
==============================================================================
--- deltacloud/trunk/server/lib/cimi/model/machine_image.rb (original)
+++ deltacloud/trunk/server/lib/cimi/model/machine_image.rb Tue Nov 29 15:33:25 2011
@@ -22,23 +22,23 @@ class CIMI::Model::MachineImage < CIMI::
scalar :rel, :href
end
- def self.find(id, _self)
+ def self.find(id, context)
images = []
if id == :all
- images = _self.driver.images(_self.credentials)
- images.map { |image| from_image(image, _self) }
+ images = context.driver.images(context.credentials)
+ images.map { |image| from_image(image, context) }
else
- image = _self.driver.image(_self.credentials, :id => id)
- from_image(image, _self)
+ image = context.driver.image(context.credentials, :id => id)
+ from_image(image, context)
end
end
- def self.from_image(image, _self)
+ def self.from_image(image, context)
self.new(
:name => image.id,
- :uri => _self.machine_image_url(image.id),
+ :uri => context.machine_image_url(image.id),
:description => image.description,
- :image_location => { :href => "#{_self.driver.name}://#{image.id}" } # FIXME
+ :image_location => { :href => "#{context.driver.name}://#{image.id}" } # FIXME
)
end