You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:15:51 UTC
svn commit: r961997 - in /incubator/deltacloud/trunk/framework:
app/controllers/ app/views/storage_snapshots/ app/views/storage_volumes/
lib/converters/ lib/drivers/
Author: lutter
Date: Thu Jul 8 23:15:50 2010
New Revision: 961997
URL: http://svn.apache.org/viewvc?rev=961997&view=rev
Log:
Include XML tag for nil attributes.
Remove _at suffix for dates.
Move links to tag content, instead of href attribute.
Modified:
incubator/deltacloud/trunk/framework/app/controllers/storage_snapshots_controller.rb
incubator/deltacloud/trunk/framework/app/controllers/storage_volumes_controller.rb
incubator/deltacloud/trunk/framework/app/views/storage_snapshots/index.html.erb
incubator/deltacloud/trunk/framework/app/views/storage_snapshots/show.html.erb
incubator/deltacloud/trunk/framework/app/views/storage_volumes/index.html.erb
incubator/deltacloud/trunk/framework/app/views/storage_volumes/show.html.erb
incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb
incubator/deltacloud/trunk/framework/lib/drivers/ec2.rb
Modified: incubator/deltacloud/trunk/framework/app/controllers/storage_snapshots_controller.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/controllers/storage_snapshots_controller.rb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/controllers/storage_snapshots_controller.rb (original)
+++ incubator/deltacloud/trunk/framework/app/controllers/storage_snapshots_controller.rb Thu Jul 8 23:15:50 2010
@@ -9,6 +9,10 @@ class StorageSnapshotsController < Appli
@snapshots = driver.snapshots( credentials )
respond_to do |format|
format.html
+ format.json
+ format.xml {
+ render :xml=>convert_to_xml( :storage_snapshot, @snapshots )
+ }
end
end
Modified: incubator/deltacloud/trunk/framework/app/controllers/storage_volumes_controller.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/controllers/storage_volumes_controller.rb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/controllers/storage_volumes_controller.rb (original)
+++ incubator/deltacloud/trunk/framework/app/controllers/storage_volumes_controller.rb Thu Jul 8 23:15:50 2010
@@ -10,6 +10,10 @@ class StorageVolumesController < Applica
puts @volumes.inspect
respond_to do |format|
format.html
+ format.json
+ format.xml {
+ render :xml=>convert_to_xml( :storage_volume, @volumes )
+ }
end
end
@@ -19,6 +23,7 @@ class StorageVolumesController < Applica
format.html
format.json
format.xml {
+ render :xml=>convert_to_xml( :storage_volume, @volume )
}
end
end
Modified: incubator/deltacloud/trunk/framework/app/views/storage_snapshots/index.html.erb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/views/storage_snapshots/index.html.erb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/views/storage_snapshots/index.html.erb (original)
+++ incubator/deltacloud/trunk/framework/app/views/storage_snapshots/index.html.erb Thu Jul 8 23:15:50 2010
@@ -6,12 +6,30 @@
<th>
ID
</th>
+ <th>
+ Volume
+ </th>
+ <th>
+ Created
+ </th>
+ <th>
+ State
+ </th>
</tr>
<% for snapshot in @snapshots %>
<tr>
<td>
<%= link_to snapshot[:id], storage_snapshot_url( snapshot[:id] ) %>
</td>
+ <td>
+ <%= link_to snapshot[:volume_id], storage_volume_url( snapshot[:volume_id] ) %>
+ </td>
+ <td>
+ <%= snapshot[:created] %>
+ </td>
+ <td>
+ <%= snapshot[:state] %>
+ </td>
</tr>
<% end %>
</table>
Modified: incubator/deltacloud/trunk/framework/app/views/storage_snapshots/show.html.erb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/views/storage_snapshots/show.html.erb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/views/storage_snapshots/show.html.erb (original)
+++ incubator/deltacloud/trunk/framework/app/views/storage_snapshots/show.html.erb Thu Jul 8 23:15:50 2010
@@ -4,18 +4,26 @@
<dl>
<di>
<dt>
- State
+ Volume
</dt>
<dd>
- <%= @snapshot[:state] %>
+ <%= @snapshot[:volume_id] %>
</dd>
</di>
<di>
<dt>
- Volume
+ Created
</dt>
<dd>
- <%= @snapshot[:volume_id] %>
+ <%= @snapshot[:created] %>
+ </dd>
+ </di>
+ <di>
+ <dt>
+ State
+ </dt>
+ <dd>
+ <%= @snapshot[:state] %>
</dd>
</di>
</dl>
Modified: incubator/deltacloud/trunk/framework/app/views/storage_volumes/index.html.erb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/views/storage_volumes/index.html.erb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/views/storage_volumes/index.html.erb (original)
+++ incubator/deltacloud/trunk/framework/app/views/storage_volumes/index.html.erb Thu Jul 8 23:15:50 2010
@@ -22,7 +22,7 @@
<%= link_to volume[:id], storage_volume_url( volume[:id] ) %>
</td>
<td>
- <%= volume[:created_at] %>
+ <%= volume[:created] %>
</td>
<td>
<%= volume[:capacity] %> GB
Modified: incubator/deltacloud/trunk/framework/app/views/storage_volumes/show.html.erb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/views/storage_volumes/show.html.erb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/views/storage_volumes/show.html.erb (original)
+++ incubator/deltacloud/trunk/framework/app/views/storage_volumes/show.html.erb Thu Jul 8 23:15:50 2010
@@ -7,7 +7,7 @@
Created
</dt>
<dd>
- <%= @volume[:created_at] %>
+ <%= @volume[:created] %>
</dd>
</di>
<di>
Modified: incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb Thu Jul 8 23:15:50 2010
@@ -2,7 +2,8 @@
module Converters
ALIASES = {
- :owner=>nil
+ :owner=>nil,
+ :volume=>:storage_volume,
}
def self.url_type(type)
@@ -40,16 +41,24 @@ module Converters
type = $1
builder.__send__( type.pluralize ) do
v.each do |each_id|
- builder.__send__( type, :href=>@link_builder.send( "#{type}_url", each_id ) )
+ builder.__send__( type, @link_builder.send( "#{type}_url", each_id ) )
end
end
elsif ( k.to_s =~/^(.*)_id$/ )
type = $1
url_type = Converters.url_type( $1 )
unless ( url_type.nil? )
- builder.__send__( type, :href=>@link_builder.send( "#{url_type}_url", v ) )
+ if ( v.nil? )
+ builder.__send__( type )
+ else
+ builder.__send__( type, @link_builder.send( "#{url_type}_url", v ) )
+ end
else
- builder.__send__( "#{type}_id", v )
+ if ( v.nil? )
+ builder.__send__( "#{type}_id" )
+ else
+ builder.__send__( "#{type}_id", v )
+ end
end
else
builder.__send__( Converters.tag_name( k ), v )
Modified: incubator/deltacloud/trunk/framework/lib/drivers/ec2.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/drivers/ec2.rb?rev=961997&r1=961996&r2=961997&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/drivers/ec2.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/drivers/ec2.rb Thu Jul 8 23:15:50 2010
@@ -168,7 +168,7 @@ module Drivers
def convert_volume(ec2_volume)
{
:id=>ec2_volume[:aws_id],
- :created_at=>ec2_volume[:aws_created_at],
+ :created=>ec2_volume[:aws_created_at],
:state=>ec2_volume[:aws_status].upcase,
:capacity=>ec2_volume[:aws_size],
:instance_id=>ec2_volume[:aws_instance_id],
@@ -181,6 +181,7 @@ module Drivers
:id=>ec2_snapshot[:aws_id],
:state=>ec2_snapshot[:aws_status].upcase,
:volume_id=>ec2_snapshot[:aws_volume_id],
+ :created=>ec2_snapshot[:aws_started_at],
}
end