You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by ma...@redhat.com on 2012/03/07 12:27:40 UTC
[PATCH 1/2] Fix CIMI::MachineConfiguration - wasn't grabbing cpu/memory when the Deltacloud hardware_profile was using range
From: marios <ma...@redhat.com>
Signed-off-by: marios <ma...@redhat.com>
---
server/lib/cimi/model/machine_configuration.rb | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/server/lib/cimi/model/machine_configuration.rb b/server/lib/cimi/model/machine_configuration.rb
index feab4e8..07f5429 100644
--- a/server/lib/cimi/model/machine_configuration.rb
+++ b/server/lib/cimi/model/machine_configuration.rb
@@ -51,14 +51,17 @@ class CIMI::Model::MachineConfiguration < CIMI::Model::Base
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
+ memory = profile.memory.value || profile.memory.default
+ cpu = profile.cpu.value || profile.cpu.default
+ storage = profile.storage.value || profile.storage.default
machine_hash = {
:name => profile.name,
- :description => "Machine Configuration with #{profile.memory.value} #{profile.memory.unit} "+
- "of memory and #{profile.cpu.value} CPU",
- :cpu => profile.cpu.value,
+ :description => "Machine Configuration with #{memory} #{profile.memory.unit} "+
+ "of memory and #{cpu} CPU",
+ :cpu => cpu,
:created => Time.now.to_s, # FIXME: DC hardware_profile has no mention about created_at
- :memory => { :quantity => profile.memory.value || profile.memory.default, :units => profile.memory.unit },
- :disks => [ { :capacity => { :quantity => profile.storage.value || profile.storage.default, :units => profile.storage.unit } } ],
+ :memory => { :quantity => memory, :units => profile.memory.unit },
+ :disks => [ { :capacity => { :quantity => storage, :units => profile.storage.unit } } ],
:uri => context.machine_configuration_url(profile.name)
}
self.new(machine_hash)
--
1.7.6.5
Re: [PATCH 2/2] CIMI: fix issue with (mock driver) opaque hardware_profile conversion
Posted by Michal Fojtik <mf...@redhat.com>.
ACK.
Michal Fojtik
http://deltacloud.org
mfojtik@redhat.com
On Mar 7, 2012, at 12:27 PM, marios@redhat.com wrote:
> From: marios <ma...@redhat.com>
>
>
> Signed-off-by: marios <ma...@redhat.com>
> ---
> server/lib/cimi/model/machine.rb | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/server/lib/cimi/model/machine.rb b/server/lib/cimi/model/machine.rb
> index 88c9f73..2e31065 100644
> --- a/server/lib/cimi/model/machine.rb
> +++ b/server/lib/cimi/model/machine.rb
> @@ -136,15 +136,16 @@ class CIMI::Model::Machine < CIMI::Model::Base
> private
>
> def self.from_instance(instance, context)
> + cpu = memory = disks = (instance.instance_profile.id == "opaque")? "n/a" : nil
> self.new(
> :name => instance.id,
> :description => instance.name,
> :created => instance.launch_time,
> :uri => context.machine_url(instance.id),
> :state => convert_instance_state(instance.state),
> - :cpu => convert_instance_cpu(instance.instance_profile, context),
> - :memory => convert_instance_memory(instance.instance_profile, context),
> - :disks => convert_instance_storage(instance.instance_profile, context),
> + :cpu => cpu || convert_instance_cpu(instance.instance_profile, context),
> + :memory => memory || convert_instance_memory(instance.instance_profile, context),
> + :disks => disks || convert_instance_storage(instance.instance_profile, context),
> :network_interfaces => convert_instance_addresses(instance),
> :operations => convert_instance_actions(instance, context),
> :volumes=>convert_storage_volumes(instance, context),
> --
> 1.7.6.5
>
[PATCH 2/2] CIMI: fix issue with (mock driver) opaque hardware_profile conversion
Posted by ma...@redhat.com.
From: marios <ma...@redhat.com>
Signed-off-by: marios <ma...@redhat.com>
---
server/lib/cimi/model/machine.rb | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/lib/cimi/model/machine.rb b/server/lib/cimi/model/machine.rb
index 88c9f73..2e31065 100644
--- a/server/lib/cimi/model/machine.rb
+++ b/server/lib/cimi/model/machine.rb
@@ -136,15 +136,16 @@ class CIMI::Model::Machine < CIMI::Model::Base
private
def self.from_instance(instance, context)
+ cpu = memory = disks = (instance.instance_profile.id == "opaque")? "n/a" : nil
self.new(
:name => instance.id,
:description => instance.name,
:created => instance.launch_time,
:uri => context.machine_url(instance.id),
:state => convert_instance_state(instance.state),
- :cpu => convert_instance_cpu(instance.instance_profile, context),
- :memory => convert_instance_memory(instance.instance_profile, context),
- :disks => convert_instance_storage(instance.instance_profile, context),
+ :cpu => cpu || convert_instance_cpu(instance.instance_profile, context),
+ :memory => memory || convert_instance_memory(instance.instance_profile, context),
+ :disks => disks || convert_instance_storage(instance.instance_profile, context),
:network_interfaces => convert_instance_addresses(instance),
:operations => convert_instance_actions(instance, context),
:volumes=>convert_storage_volumes(instance, context),
--
1.7.6.5