bbrowning-deltacloud-core 0.0.1.1 → 0.0.3.1

data/tests/instances_test.rb

@@ -1,136 +1,219 @@
-require 'tests/deltacloud_test'
+require 'tests/common'
 
-class InstancesTest < Test::Unit::TestCase
+module DeltacloudUnitTest
+  class InstancesTest < Test::Unit::TestCase
+    include Rack::Test::Methods
 
-  def initialize(*args)
-    @collection = 'instances'
-    @operations = [:index, :show]
-    @options = [:id, :architecture, :memory, :storage]
-    @params = {}
-    self.temp_inst_id = 'inst2'
-    super(*args)
-  end
-
-  attr_accessor :temp_inst_id
-
-  def test_if_instances_are_not_empty
-    get '/api/instances.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_not_equal 0, doc.xpath('/instances/instance').size
-  end
+    def app
+      Sinatra::Application
+    end
 
-  [:id, :name, :owner_id, :image, :realm, :state, :actions, :'public-addresses', :'private-addresses'].each do |option|
-    method_name = :"test_if_instances_index_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/instances.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      instance = doc.xpath('/instances/instance[1]').first
-      assert_not_nil instance.xpath(option.to_s).first
+    def test_it_require_authentication
+      require_authentication?('/api/instances').should == true
     end
-  end
 
-  [:id, :name, :owner_id, :image, :realm, :state, :actions, :'public-addresses', :'private-addresses'].each do |option|
-    method_name = :"test_if_instance_show_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/instances/inst1.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      instance = doc.xpath('/instance').first
-      assert_not_nil instance.xpath(option.to_s).first
+    def test_it_returns_instances
+      do_xml_request '/api/instances', {}, true
+      (last_xml_response/'instances/instance').map.size.should > 0
     end
-  end
 
-  def test_instances_filtering_by_id
-    get '/api/instances.xml', { :id => 'inst1'}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 1, doc.xpath('/instances/instance').size
-    assert_equal 'inst1', doc.xpath('/instances/instance/id').first.text
-  end
+    def test_it_has_correct_attributes_set
+      do_xml_request '/api/images', {}, true
+      (last_xml_response/'images/image').each do |image|
+        image.attributes.keys.sort.should == [ 'href', 'id' ]
+      end
+    end
 
-  def test_instances_filtering_by_state
-    get '/api/instances.xml', { :state => 'RUNNING'}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    doc.xpath('/instances/instance').each do |instance|
-      assert_equal 'RUNNING', instance.xpath('state').first.text
+    def test_it_has_unique_ids
+      do_xml_request '/api/instances', {}, true
+      ids = []
+      (last_xml_response/'instances/instance').each do |image|
+        ids << image['id'].to_s
+      end
+      ids.sort.should == ids.sort.uniq
     end
-  end
 
-  def test_instances_filtering_by_unknown_state
-    get '/api/instances.xml', { :state => '_TEST_UNKNOWN_STATE'}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 0, doc.xpath('/instances/instance').size
-  end
+    def test_inst1_has_correct_attributes
+      do_xml_request '/api/instances', {}, true
+      instance = (last_xml_response/'instances/instance[@id="inst1"]')
+      test_instance_attributes(instance)
+    end
 
-  def test_001_create_instance
-    @params = {
-      :name     => '_test-instance',
-      :image_id => 'img1'
-    }
+    def test_it_returns_valid_realm
+      do_xml_request '/api/instances/inst1', {}, true
+      instance = (last_xml_response/'instance')
+      test_instance_attributes(instance)
+    end
 
-    post '/api/instances.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
+    def test_it_responses_to_json
+      do_request '/api/instances', {}, true, { :format => :json }
+      JSON::parse(last_response.body).class.should == Hash
+      JSON::parse(last_response.body)['instances'].class.should == Array
 
-    self.temp_inst_id = doc.xpath('/instance/id').text
+      do_request '/api/instances/inst1', {}, true, { :format => :json }
+      last_response.status.should == 200
+      JSON::parse(last_response.body).class.should == Hash
+      JSON::parse(last_response.body)['instance'].class.should == Hash
+    end
 
-    assert_equal @params[:name], doc.xpath('/instance/name').first.text
-    image_href = doc.xpath('/instance/image').first[:href].to_s
-    image_id = image_href.gsub(/.*\/(\w+)$/, '\1')
-    assert_equal @params[:image_id], image_id
-  end
+    def test_it_responses_to_html
+      do_request '/api/instances', {}, true, { :format => :html }
+      last_response.status.should == 200
+      Nokogiri::HTML(last_response.body).search('html').first.name.should == 'html'
 
-  def test_create_instance_with_hwp_id
+      do_request '/api/instances/inst1', {}, true, { :format => :html }
+      last_response.status.should == 200
+      Nokogiri::HTML(last_response.body).search('html').first.name.should == 'html'
+    end
 
-    @params = {
-      :name     => '_test-instance',
-      :image_id => 'img1',
-      :hwp_id => 'm1-xlarge'
-    }
+    def test_it_create_a_new_instance_using_image_id
+      params = {
+        :image_id => 'img1'
+      }
+      post '/api/instances', params, authenticate(:format => :xml)
+      last_response.status.should == 302
+      last_response.headers['Location'].should_not == nil
+      do_xml_request last_response.headers['Location'], {}, true
+      (last_xml_response/'instance/name').should_not == nil
+      add_created_instance (last_xml_response/'instance').first['id']
+      test_instance_attributes(last_xml_response/'instance')
+    end
 
-    post '/api/instances.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    hwp_href = doc.xpath('/instance/hardware_profile').first[:href].to_s
-    hwp_id = hwp_href.gsub(/.*\/([\w\-]+)$/, '\1')
-    assert_equal @params[:hwp_id], hwp_id
-  end
+    def test_it_create_a_new_instance_using_image_id_and_name
+      params = {
+        :image_id => 'img1',
+        :name => "unit_test_instance1"
+      }
+      post '/api/instances', params, authenticate(:format => :xml)
+      last_response.status.should == 302
+      last_response.headers['Location'].should_not == nil
+      do_xml_request last_response.headers['Location'], {}, true
+      (last_xml_response/'instance/name').text.should == 'unit_test_instance1'
+      add_created_instance (last_xml_response/'instance').first['id']
+      test_instance_attributes(last_xml_response/'instance')
+    end
 
-  def test_create_instance_with_realm_id
+    def test_it_create_a_new_instance_using_image_id_and_name_and_hwp
+      params = {
+        :image_id => 'img1',
+        :name => "unit_test_instance1",
+        :hwp_id => "m1-xlarge"
+      }
+      post '/api/instances', params, authenticate(:format => :xml)
+      last_response.status.should == 302
+      last_response.headers['Location'].should_not == nil
+      do_xml_request last_response.headers['Location'], {}, true
+      (last_xml_response/'instance/name').text.should == 'unit_test_instance1'
+      (last_xml_response/'instance/hardware_profile').first['id'].should == 'm1-xlarge'
+      add_created_instance (last_xml_response/'instance').first['id']
+      test_instance_attributes(last_xml_response/'instance')
+    end
 
-    @params = {
-      :name     => '_test-instance',
-      :image_id => 'img1',
-      :realm_id => 'us'
-    }
+    def test_it_z0_stop_and_start_instance
+      $created_instances.each do |instance_id|
+        do_xml_request "/api/instances/#{instance_id}", {}, true
+        stop_url = (last_xml_response/'actions/link[@rel="stop"]').first['href']
+        stop_url.should_not == nil
+        post create_url(stop_url), {}, authenticate(:format => :xml)
+        last_response.status.should == 200
+        instance = Nokogiri::XML(last_response.body)
+        test_instance_attributes(instance)
+        (instance/'state').text.should == 'STOPPED'
+        do_xml_request "/api/instances/#{instance_id}", {}, true
+        start_url = (last_xml_response/'actions/link[@rel="start"]').first['href']
+        start_url.should_not == nil
+        post create_url(start_url), {}, authenticate(:format => :xml)
+        last_response.status.should == 200
+        instance = Nokogiri::XML(last_response.body)
+        test_instance_attributes(instance)
+        (instance/'state').text.should == 'RUNNING'
+      end
+    end
 
-    post '/api/instances.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    realm_href = doc.xpath('/instance/realm').first[:href].to_s
-    realm_id = realm_href.gsub(/.*\/([\w\-]+)$/, '\1')
-    assert_equal @params[:realm_id], realm_id
-  end
+    def test_z0_reboot_instance
+      $created_instances.each do |instance_id|
+        do_xml_request "/api/instances/#{instance_id}", {}, true
+        reboot_url = (last_xml_response/'actions/link[@rel="reboot"]').first['href']
+        reboot_url.should_not == nil
+        post create_url(reboot_url), {}, authenticate(:format => :xml)
+        last_response.status.should == 200
+        instance = Nokogiri::XML(last_response.body)
+        test_instance_attributes(instance)
+        (instance/'state').text.should == 'RUNNING'
+      end
+    end
 
-  def test_002_stop_instance
-    post '/api/instances/'+self.temp_inst_id+'/stop.xml', rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 'STOPPED', doc.xpath('/instance/state').first.text
-  end
+    def test_z1_stop_created_instances
+      $created_instances.each do |instance_id|
+        do_xml_request "/api/instances/#{instance_id}", {}, true
+        stop_url = (last_xml_response/'actions/link[@rel="stop"]').first['href']
+        stop_url.should_not == nil
+        post create_url(stop_url), {}, authenticate(:format => :xml)
+        last_response.status.should == 200
+        instance = Nokogiri::XML(last_response.body)
+        test_instance_attributes(instance)
+        (instance/'state').text.should == 'STOPPED'
+      end
+    end
 
-  def test_003_start_instance
-    post '/api/instances/'+self.temp_inst_id+'/start.xml', rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 'RUNNING', doc.xpath('/instance/state').first.text
-  end
+    def test_z2_destroy_created_instances
+      $created_instances.each do |instance_id|
+        do_xml_request "/api/instances/#{instance_id}", {}, true
+        destroy_url = (last_xml_response/'actions/link[@rel="destroy"]').first['href']
+        destroy_url.should_not == nil
+        delete create_url(destroy_url), {}, authenticate(:format => :xml)
+        last_response.status.should == 302
+        do_xml_request last_response.headers['Location'], {}, true
+        (last_xml_response/'instances').should_not == nil
+        do_xml_request "/api/instances/#{instance_id}", {}, true
+        last_response.status.should == 404
+      end
+    end
 
-  def test_004_reboot_instance
-    post '/api/instances/'+self.temp_inst_id+'/reboot.xml', rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 'RUNNING', doc.xpath('/instance/state').first.text
-  end
+    private
+
+    def test_instance_attributes(instance)
+      (instance/'name').should_not == nil
+      (instance/'owner_id').should_not == nil
+      ['RUNNING', 'STOPPED'].include?((instance/'state').text).should == true
+
+      (instance/'public_addreses').should_not == nil
+      (instance/'public_addresses/address').map.size.should > 0
+      (instance/'public_addresses/address').first.text.should_not == ""
+
+      (instance/'private_addresses').should_not == nil
+      (instance/'private_addresses/address').map.size.should > 0
+      (instance/'private_addresses/address').first.text.should_not == ""
+
+      (instance/'actions/link').map.size.should > 0
+      (instance/'actions/link').each do |link|
+        link['href'].should_not == ""
+        link['rel'].should_not == ""
+        link['method'].should_not == ""
+        ['get', 'post', 'delete', 'put'].include?(link['method']).should == true
+      end
+
+      (instance/'image').size.should > 0
+      (instance/'image').first['href'].should_not == ""
+      (instance/'image').first['id'].should_not == ""
+      do_xml_request (instance/'image').first['href'], {}, true
+      (last_xml_response/'image').should_not == nil
+      (last_xml_response/'image').first['href'] == (instance/'image').first['href']
+
+      (instance/'realm').size.should > 0
+      (instance/'realm').first['href'].should_not == ""
+      (instance/'realm').first['id'].should_not == ""
+      do_xml_request (instance/'realm').first['href']
+      (last_xml_response/'realm').should_not == nil
+      (last_xml_response/'realm').first['href'] == (instance/'realm').first['href']
+
+      (instance/'hardware_profile').size.should > 0
+      (instance/'hardware_profile').first['href'].should_not == ""
+      (instance/'hardware_profile').first['id'].should_not == ""
+      do_xml_request (instance/'hardware_profile').first['href']
+      (last_xml_response/'hardware_profile').should_not == nil
+      (last_xml_response/'hardware_profile').first['href'] == (instance/'hardware_profile').first['href']
+    end
 
-  def test_005_destroy_instance
-    delete '/api/instances/'+self.temp_inst_id+'.xml', {}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert last_response.ok?
   end
-
-  include DeltacloudTest
-
 end

data/tests/realms_test.rb

@@ -1,56 +1,78 @@
-require 'tests/deltacloud_test'
+require 'tests/common'
 
-class RealmsTest < Test::Unit::TestCase
+module DeltacloudUnitTest
+  class RealmsTest < Test::Unit::TestCase
+    include Rack::Test::Methods
 
-  def initialize(*args)
-    @collection = 'realms'
-    @operations = [:index, :show]
-    @options = [:id, :name, :state]
-    @params = {}
-    super(*args)
-  end
+    def app
+      Sinatra::Application
+    end
 
-  def test_if_realms_are_not_empty
-    get '/api/realms.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_not_equal 0, doc.xpath('/realms/realm').size
-  end
+    def test_it_not_require_authentication
+      require_authentication?('/api/realms').should_not == true
+    end
 
-  [:id, :name, :state].each do |option|
-    method_name = :"test_if_realms_index_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/realms.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      realm = doc.xpath('/realms/realm[1]').first
-      assert_not_nil realm.xpath(option.to_s).first
+    def test_it_returns_realms
+      do_xml_request '/api/realms', {}, true
+      (last_xml_response/'realms/realm').map.size.should > 0
     end
-  end
 
-  [:id, :name, :state].each do |option|
-    method_name = :"test_if_realm_show_contain_#{option}"
-    send :define_method, method_name do
-      get '/api/realms/us.xml', @params, rack_headers
-      doc = Nokogiri::XML.parse(last_response.body)
-      realm = doc.xpath('/realm').first
-      assert_not_nil realm.xpath(option.to_s).first
+    def test_it_has_correct_attributes_set
+      do_xml_request '/api/realms', {}, true
+      (last_xml_response/'realms/realm').each do |realm|
+        realm.attributes.keys.sort.should == [ 'href', 'id' ]
+      end
     end
-  end
 
-  def test_realms_filtering_by_state
-    @params[:state] = 'AVAILABLE'
-    get '/api/realms.xml', @params, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 2, doc.xpath('/realms/realm').size
-    assert_equal @params[:state], doc.xpath('/realms/realm/state').first.text
-  end
+    def test_us_has_correct_attributes
+      do_xml_request '/api/realms', {}, true
+      realm = (last_xml_response/'realms/realm[@id="us"]')
+      test_realm_attributes(realm)
+    end
 
-  def test_realms_filtering_by_id
-    get '/api/realms.xml', { :id => 'us'}, rack_headers
-    doc = Nokogiri::XML.parse(last_response.body)
-    assert_equal 1, doc.xpath('/realms/realm').size
-    assert_equal 'us', doc.xpath('/realms/realm/id').first.text
-  end
+    def test_it_returns_valid_realm
+      do_xml_request '/api/realms/us', {}, true
+      realm = (last_xml_response/'realm')
+      test_realm_attributes(realm)
+    end
 
-  include DeltacloudTest
+    def test_it_has_unique_ids
+      do_xml_request '/api/realms', {}, true
+      ids = []
+      (last_xml_response/'realms/realm').each do |realm|
+        ids << realm['id'].to_s
+      end
+      ids.sort.should == ids.sort.uniq
+    end
 
+    def test_it_responses_to_json
+      do_request '/api/realms', {}, false, { :format => :json }
+      JSON::parse(last_response.body).class.should == Hash
+      JSON::parse(last_response.body)['realms'].class.should == Array
+
+      do_request '/api/realms/us', {}, false, { :format => :json }
+      last_response.status.should == 200
+      JSON::parse(last_response.body).class.should == Hash
+      JSON::parse(last_response.body)['realm'].class.should == Hash
+    end
+
+    def test_it_responses_to_html
+      do_request '/api/realms', {}, false, { :format => :html }
+      last_response.status.should == 200
+      Nokogiri::HTML(last_response.body).search('html').first.name.should == 'html'
+
+      do_request '/api/realms/us', {}, false, { :format => :html }
+      last_response.status.should == 200
+      Nokogiri::HTML(last_response.body).search('html').first.name.should == 'html'
+    end
+
+    private
+
+    def test_realm_attributes(realm)
+      (realm/'name').should_not == nil
+      (realm/'limit').should_not == nil
+      ['AVAILABLE'].include?((realm/'state').text).should == true
+    end
+
+  end
 end

data/views/errors/not_found.html.haml

@@ -0,0 +1,6 @@
+%h1 Not Found
+
+%dl
+  %di
+    %dt Request URL
+    %dd= request.env['REQUEST_URI']

data/views/errors/not_found.xml.haml

@@ -0,0 +1,2 @@
+%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %message Not Found

data/views/hardware_profiles/index.xml.haml

@@ -1,4 +1,4 @@
 !!! XML
-%hardware-profiles
+%hardware_profiles
   - @profiles.each do |prof|
     = haml :'hardware_profiles/show', :locals => { :@profile => prof, :partial => true }

data/views/hardware_profiles/show.xml.haml

@@ -1,7 +1,8 @@
 - unless defined?(partial)
   !!! XML
-%hardware-profile{ :href => hardware_profile_url(@profile.name) }
-  %id= @profile.name
+%hardware_profile{ :href => hardware_profile_url(@profile.name), :id => @profile.name }
+  %name<
+    =@profile.name
   - @profile.each_property do |prop|
     - attr = { :name => prop.name, :kind => prop.kind, :unit => prop.unit }
     - if prop.kind == :fixed

data/views/images/index.xml.haml

@@ -1,7 +1,8 @@
 !!! XML
 %images
   - @elements.each do |image|
-    %image{:href => image_url(image.id)}
-      - image.attributes.each do |attribute|
-        - haml_tag(attribute, :<) do
+    %image{:href => image_url(image.id), :id => image.id}
+      - image.attributes.select{ |attr| attr!=:id }.each do |attribute|
+        - haml_tag("#{attribute}".tr('-', '_'), :<) do
           - haml_concat image.send(attribute)
+

data/views/images/show.xml.haml

@@ -1,5 +1,5 @@
 !!! XML
-%image{:href => image_url(@image.id)}
-  - @image.attributes.each do |attribute|
+%image{:href => image_url(@image.id), :id => @image.id}
+  - @image.attributes.select{ |attr| attr!=:id }.each do |attribute|
     - haml_tag(attribute, :<) do
       - haml_concat @image.send(attribute)

data/views/instances/index.xml.haml

@@ -1,23 +1,21 @@
 !!! XML
 %instances
   - @elements.each do |instance|
-    %instance{:href => instance_url(instance.id)}
-      %id #{instance.id}
+    %instance{:href => instance_url(instance.id), :id => instance.id}
       %name #{instance.name}
       %owner_id #{instance.owner_id}
-      %image{:href => image_url(instance.image_id)}
-      %realm{:href => realm_url(instance.realm_id)}
+      %image{:href => image_url(instance.image_id), :id => instance.image_id }
+      %realm{:href => realm_url(instance.realm_id), :id => instance.realm_id }
       %state #{instance.state}
-      - haml_tag :"hardware-profile", { :href => hardware_profile_url(instance.instance_profile.id)} do
-        %id #{instance.instance_profile.id}
+      - haml_tag :"hardware_profile", { :id => instance.instance_profile.id, :href => hardware_profile_url(instance.instance_profile.id)} do
         - instance.instance_profile.overrides.each do |p, v|
           %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
       %actions
         - instance.actions.compact.each do |action|
           %link{:rel => action, :href => self.send("#{action}_instance_url", instance.id), :method => instance_action_method(action)}
-      %public-addresses
+      %public_addresses
         - instance.public_addresses.each do |address|
           %address  #{address}
-      %private-addresses
+      %private_addresses
         - instance.private_addresses.each do |address|
           %address  #{address}

data/views/instances/show.xml.haml

@@ -1,28 +1,27 @@
 !!! XML
-%instance{:href => instance_url(@instance.id)}
-  %id<
-    =@instance.id
+%instance{:href => instance_url(@instance.id), :id => @instance.id}
   %name<
     =@instance.name
   %owner_id<
     =@instance.owner_id
-  %image{:href => image_url(@instance.image_id)}
-  %realm{:href => realm_url(@instance.realm_id)}
+  %image{:href => image_url(@instance.image_id), :id => @instance.image_id }
+  %realm{:href => realm_url(@instance.realm_id), :id => @instance.realm_id }
   %state<
     =@instance.state
-  - haml_tag :"hardware-profile", {:href => hardware_profile_url(@instance.instance_profile.id)} do
-    %id<
-      =@instance.instance_profile.id
+  - haml_tag :"hardware_profile", {:id => @instance.instance_profile.id, :href => hardware_profile_url(@instance.instance_profile.id)} do
     - @instance.instance_profile.overrides.each do |p, v|
       %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
   %actions
     - @instance.actions.compact.each do |instance_action|
       %link{:rel => instance_action, :method => instance_action_method(instance_action), :href => self.send("#{instance_action}_instance_url", @instance.id)}
-  %public-addresses
+  - if @instance.instance_variables.include?("@launch_time")
+    %launch_time<
+      =@instance.launch_time
+  %public_addresses
     - @instance.public_addresses.each do |address|
       %address<
         =address
-  %private-addresses
+  %private_addresses
     - @instance.private_addresses.each do |address|
       %address<
         =address

data/views/realms/index.xml.haml

@@ -1,9 +1,7 @@
 !!!XML
 %realms
   - @elements.each do |realm|
-    %realm{:href => realm_url(realm.id)}
-      %id<
-        =realm.id
+    %realm{:href => realm_url(realm.id), :id => realm.id }
       %name<
         =realm.name
       %state<

data/views/realms/show.xml.haml

@@ -1,10 +1,9 @@
 !!!XML
-%realm{:href => realm_url(@realm.id)}
-  %id<
-    =@realm.id
+%realm{:href => realm_url(@realm.id), :id => @realm.id }
   %name<
     =@realm.name
   %state<
     =@realm.state
-  %limit<
-    =@realm.limit.eql?(:unlimited) ? '' : @realm.limit
+  - unless @realm.limit.eql?(:unlimited)
+    %limit<
+      =@realm.limit

data/views/storage_snapshots/index.xml.haml

@@ -1,11 +1,9 @@
 !!!XML
-%storage-snapshots
+%storage_snapshots
   - @elements.each do |snapshot|
-    %storage-snapshot{ :href => storage_snapshot_url(snapshot.id)}
-      %id<
-        =snapshot.id
+    %storage_snapshot{ :href => storage_snapshot_url(snapshot.id), :id => snapshot.id }
       %created<
         =snapshot.created
       %state<
         =snapshot.state
-      %storage-volume{ :href => storage_volume_url(snapshot.storage_volume_id)}
+      %storage_volume{ :href => storage_volume_url(snapshot.storage_volume_id), :id => snapshot.storage_volume_id }

data/views/storage_snapshots/show.xml.haml

@@ -1,9 +1,7 @@
 !!!XML
-%storage-snapshot{:href => storage_snapshot_url(@storage_snapshot.id)}
-  %id<
-    =@storage_snapshot.id
+%storage_snapshot{:href => storage_snapshot_url(@storage_snapshot.id), :id => @storage_snapshot.id }
   %created<
     =@storage_snapshot.created
   %state<
     =@storage_snapshot.state
-  %storage-volume{:href => storage_volume_url(@storage_snapshot.storage_volume_id)}
+  %storage_volume{:href => storage_volume_url(@storage_snapshot.storage_volume_id), :id => @storage_snapshot.storage_volume_id}