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/01/04 14:11:16 UTC
svn commit: r1055023 - in /incubator/deltacloud/trunk/server:
lib/deltacloud/models/storage_volume.rb
views/storage_volumes/show.html.haml views/storage_volumes/show.xml.haml
Author: mfojtik
Date: Tue Jan 4 13:11:16 2011
New Revision: 1055023
URL: http://svn.apache.org/viewvc?rev=1055023&view=rev
Log:
Added name and kind properties to Storage Volume model to match
RHEV-M model of Storage Domain
Modified:
incubator/deltacloud/trunk/server/lib/deltacloud/models/storage_volume.rb
incubator/deltacloud/trunk/server/views/storage_volumes/show.html.haml
incubator/deltacloud/trunk/server/views/storage_volumes/show.xml.haml
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/models/storage_volume.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/models/storage_volume.rb?rev=1055023&r1=1055022&r2=1055023&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/models/storage_volume.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/models/storage_volume.rb Tue Jan 4 13:11:16 2011
@@ -26,5 +26,7 @@ class StorageVolume < BaseModel
attr_accessor :device
attr_accessor :realm_id
attr_accessor :actions
+ attr_accessor :name
+ attr_accessor :kind
end
Modified: incubator/deltacloud/trunk/server/views/storage_volumes/show.html.haml
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/storage_volumes/show.html.haml?rev=1055023&r1=1055022&r2=1055023&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/views/storage_volumes/show.html.haml (original)
+++ incubator/deltacloud/trunk/server/views/storage_volumes/show.html.haml Tue Jan 4 13:11:16 2011
@@ -3,6 +3,10 @@
%dl
%di
+ %dt Name
+ %dd
+ = @storage_volume.name
+ %di
%dt Created
%dd
= @storage_volume.created
Modified: incubator/deltacloud/trunk/server/views/storage_volumes/show.xml.haml
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/storage_volumes/show.xml.haml?rev=1055023&r1=1055022&r2=1055023&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/views/storage_volumes/show.xml.haml (original)
+++ incubator/deltacloud/trunk/server/views/storage_volumes/show.xml.haml Tue Jan 4 13:11:16 2011
@@ -1,14 +1,20 @@
- unless defined?(partial)
!!!XML
%storage_volume{ :href => storage_volume_url(@storage_volume.id), :id => @storage_volume.id}
- %created<
- =@storage_volume.created
+ - if @storage_volume.created
+ %created<
+ =@storage_volume.created
%capacity{ :unit => "GB" }<
= @storage_volume.capacity
- %realm_id<
- = @storage_volume.realm_id
- %state<
- = @storage_volume.state
+ - if @storage_volume.kind
+ %kind
+ = @storage_volume.kind
+ - if @storage_volume.name
+ %name
+ = @storage_volume.name
+ - if @storage_volume.device
+ %device
+ = @storage_volume.device
- unless @storage_volume.instance_id.nil?
%mount
%instance{:href => @storage_volume.instance_id, :id => @storage_volume.instance_id}