You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by dk...@apache.org on 2013/07/15 09:00:17 UTC
[7/8] git commit: CIMI: added memory unit (KiB) and use consistent
naming between machine and machine_configuration
CIMI: added memory unit (KiB) and use consistent naming
between machine and machine_configuration
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/36186098
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/36186098
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/36186098
Branch: refs/heads/master
Commit: 3618609856e73fa933784dcc421e4eaeae974836
Parents: cbeeef3
Author: Dies Koper <di...@fast.au.fujitsu.com>
Authored: Mon Jul 15 12:02:09 2013 +1000
Committer: Dies Koper <di...@fast.au.fujitsu.com>
Committed: Mon Jul 15 12:02:24 2013 +1000
----------------------------------------------------------------------
clients/cimi/views/machine_configurations/show.haml | 4 ++--
clients/cimi/views/machines/show.haml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/36186098/clients/cimi/views/machine_configurations/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/machine_configurations/show.haml b/clients/cimi/views/machine_configurations/show.haml
index d5ac78a..94b696e 100644
--- a/clients/cimi/views/machine_configurations/show.haml
+++ b/clients/cimi/views/machine_configurations/show.haml
@@ -21,7 +21,7 @@
- row 'Name', @machine_configuration.name
- row 'Description', @machine_configuration.description
- row 'Created', @machine_configuration.created
- - row 'Num of CPUs', @machine_configuration.cpu
- - row 'Memory (RAM)', @machine_configuration.memory
+ - row 'CPU', @machine_configuration.cpu
+ - row 'Memory (RAM)', "#{@machine_configuration.memory} KiB"
- row 'Storage (disks)', @machine_configuration.disks.map { |d| [d.capacity, d.format].join(' ') }.join(',')
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/36186098/clients/cimi/views/machines/show.haml
----------------------------------------------------------------------
diff --git a/clients/cimi/views/machines/show.haml b/clients/cimi/views/machines/show.haml
index 7d36da0..a7ef075 100644
--- a/clients/cimi/views/machines/show.haml
+++ b/clients/cimi/views/machines/show.haml
@@ -38,7 +38,7 @@
-row 'Description',@machine.description
-row 'State',state_span_for(@machine.state)
-row 'CPU', boolean_span_for(@machine.cpu)
- -row 'RAM', @machine.memory
+ -row 'Memory (RAM)', "#{@machine.memory} KiB"
-row 'Meters', (@machine.meters.empty? ? "No meters" : ( @machine.meters.each{|meter| meters.id}))
-row 'Created', @machine.created
-row 'Disks', url("/cimi/machines/#{href_to_id @machine.id}/disks")