deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@redhat.com
Subject [PATCH core 1/5] Core: Added rake task for running 'api' tests (rake test:api)
Date Tue, 15 May 2012 12:50:02 GMT
From: Michal Fojtik <mfojtik@redhat.com>


Signed-off-by: Michal fojtik <mfojtik@redhat.com>
---
 server/views/instances/show.xml.haml |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/views/instances/show.xml.haml b/server/views/instances/show.xml.haml
index a0ae4b2..24c10b5 100644
--- a/server/views/instances/show.xml.haml
+++ b/server/views/instances/show.xml.haml
@@ -41,11 +41,12 @@
     %firewalls<
       - @instance.firewalls.each do |firewall|
         %firewall{:href => firewall_url(firewall), :id => firewall }
-  %storage_volumes<
-    - @instance.storage_volumes.each do |volume|
-      %storage_volume{:href=> storage_volume_url(volume.keys.first), :id => volume.keys.first,
:device => volume.values.first}
-  - if driver.class.has_feature?(:instances, :authentication_key) or driver.class.has_feature?(:instances,
:authentication_password)
-    %authentication{ :type => auth_feature_name }
+  - if @instance.storage_volumes
+    %storage_volumes<
+      - @instance.storage_volumes.each do |volume|
+        %storage_volume{:href=> storage_volume_url(volume.keys.first), :id => volume.keys.first,
:device => volume.values.first}
+  - if driver.class.has_feature?(:keys, :authentication_key) or driver.class.has_feature?(:keys,
:authentication_password)
+    %authentication{ :type => driver_auth_feature_name }
       - if @instance.authn_feature_failed?
         %error  #{@instance.authn_error}
       - else
-- 
1.7.10.1


Mime
View raw message