You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2011/11/16 21:34:32 UTC
[PATCH core 3/4] CIMI: Fixed wrong properties types in MachineImage and MachineConfiguration models
From: Michal Fojtik <mf...@redhat.com>
---
server/lib/cimi/model/machine_configuration.rb | 15 ++++++++++++---
server/lib/cimi/model/machine_image.rb | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/server/lib/cimi/model/machine_configuration.rb b/server/lib/cimi/model/machine_configuration.rb
index 221236c..ea78217 100644
--- a/server/lib/cimi/model/machine_configuration.rb
+++ b/server/lib/cimi/model/machine_configuration.rb
@@ -15,11 +15,20 @@
class CIMI::Model::MachineConfiguration < CIMI::Model::Base
- scalar :memory
+ struct :memory do
+ scalar :quantity
+ scalar :units
+ end
+
text :cpu
- array :disk do
- scalar :capacity
+ array :disks do
+ struct :capacity do
+ scalar :format
+ scalar :quantity
+ scalar :attachment_point
+ scalar :units
+ end
end
array :operations do
diff --git a/server/lib/cimi/model/machine_image.rb b/server/lib/cimi/model/machine_image.rb
index a23638f..18d91d4 100644
--- a/server/lib/cimi/model/machine_image.rb
+++ b/server/lib/cimi/model/machine_image.rb
@@ -15,7 +15,7 @@
class CIMI::Model::MachineImage < CIMI::Model::Base
- scalar :image_location
+ href :image_location
text :image_data
array :operations do
--
1.7.7.3
Re: [PATCH core 3/4] CIMI: Fixed wrong properties types in MachineImage
and MachineConfiguration models
Posted by "marios@redhat.com" <ma...@redhat.com>.
minor issue with nesting of MachineConfiguration attributes, otherwise, ACK:
On 16/11/11 22:34, mfojtik@redhat.com wrote:
> From: Michal Fojtik <mf...@redhat.com>
>
> class CIMI::Model::MachineConfiguration < CIMI::Model::Base
>
> - array :disk do
> - scalar :capacity
> + array :disks do
> + struct :capacity do
> + scalar :format
> + scalar :quantity
> + scalar :attachment_point
> + scalar :units
> + end
> end
should be:
array :disks do
struct :capacity do
scalar :quantity
scalar :units
end
scalar :format
scalar :attachment_point
end
i.e. :quantity and :units are nested attributes of :capacity but :format
and :attachment_point are direct attributes of each :disk
>
> array :operations do
> diff --git a/server/lib/cimi/model/machine_image.rb b/server/lib/cimi/model/machine_image.rb
> index a23638f..18d91d4 100644
> --- a/server/lib/cimi/model/machine_image.rb
> +++ b/server/lib/cimi/model/machine_image.rb
> @@ -15,7 +15,7 @@
>
> class CIMI::Model::MachineImage < CIMI::Model::Base
>
> - scalar :image_location
> + href :image_location
> text :image_data
>
> array :operations do