deltacloud-core 1.1.2 → 1.1.3

data/views/drivers/index.xml.haml

@@ -1,5 +1,5 @@
 %drivers
-  - @drivers.each do |id, details|
+  - drivers.each do |id, details|
     %driver{ :href => driver_url(id), :id => id }
       %name<
         =details[:name]

data/views/drivers/show.html.haml

@@ -1,23 +1,23 @@
-=header @name
+=header name
 =subheader "Deltacloud API #{settings.version}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Identifier
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@name
+      %p{ :'data-role' => 'fieldcontain'}=name
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@driver[:name]
+      %p{ :'data-role' => 'fieldcontain'}=driver[:name]
     %li{ :'data-role' => 'list-divider'} Provider
     %li
       %p{ :'data-role' => 'fieldcontain'}
-        - if @providers
-          - @providers.each do |p|
+        - if providers
+          - providers.each do |p|
             %h3= p.id
             %p= p.url
         - else
-          - providers = driver_provider(@driver).keys.collect { |k| k.to_s }.sort
+          - providers = driver_provider(driver).keys.collect { |k| k.to_s }.sort
           - if providers.empty?
             None
           - else

data/views/drivers/show.xml.haml

@@ -1,12 +1,12 @@
-%driver{ :href => driver_url(@name), :id => @name }
+%driver{ :href => driver_url(name), :id => name }
   %name<
-    = @driver[:name]
-  - if @providers.nil?
-    - driver_provider(@driver).each do |prov, details|
+    = driver[:name]
+  - if providers.nil?
+    - driver_provider(driver).each do |prov, details|
       %provider{ :id => prov }
         - details.each do |kind, url|
           %entrypoint{ :kind => kind }<=cdata(url)
   - else
-    - @providers.each do |p|
+    - providers.each do |p|
       %provider{ :id => p.id }
         %entrypoint{ :kind => p.name }<=p.url

data/views/error.html.haml

@@ -17,8 +17,8 @@
   %body
     %div{ 'data-role' => :page, :'data-theme' => 'e', :class => :error }
       =header "#{response.status} - #{translate_error_code(response.status)[:message]}"
-      - if @error
-        =subheader @error.message
+      - if err
+        =subheader err.message
       - elsif response.status.to_s =~ /4(\d{2})/
         =subheader request.env['REQUEST_URI']
       = yield

data/views/errors/backend_capability_failure.xml.haml

@@ -1,5 +1,5 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
-  %capability #{@error.capability}
-  %message< #{cdata @error.message}
+%err{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %capability #{err.capability}
+  %message< #{cdata err.message}
 
 

data/views/errors/common.html.haml

@@ -2,28 +2,28 @@
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
     %li{ :'data-role' => 'list-divider'} Server message
     %li
-      %h3= h [@error.class.name, @error.message].join(' - ')
+      %h3= h [err.class.name, err.message].join(' - ')
     %li{ :'data-role' => 'list-divider'} Original request URI
     %li
       %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
         %span=request.env['REQUEST_URI']
         %span{ :class => 'ui-li-count'} Retry
-    %li{ :'data-role' => 'list-divider'} Error details
+    %li{ :'data-role' => 'list-divider'} err details
     %li
-      - if @error.class.method_defined? :details
-        %p= h @error.details
+      - if err.class.method_defined? :details
+        %p= h err.details
       - else
         %em No details
     %li{ :'data-role' => 'list-divider'} Backtrace
     %li
-      %pre= bt @error.backtrace
+      %pre= bt err.backtrace
 
-  - if @error.backtrace
+  - if err.backtrace
     %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
       %h3 Backtrace
       %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
         %li
-          %pre= h @error.backtrace.join("\n")
+          %pre= h err.backtrace.join("\n")
 
   %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
     %h3 Parameters

data/views/errors/common.xml.haml

@@ -4,13 +4,13 @@
   %backend{ :driver => driver_symbol, :provider => current_provider }
   %code=response.status
   %message<
-    - if @error.respond_to? :message
-      =cdata @error.message
+    - if err.respond_to? :message
+      =cdata err.message
     - else
-      =translate_error_code(response.status)
-  - if @error.respond_to? :backtrace
+      =translate_err_code(response.status)
+  - if err.respond_to? :backtrace
     %backtrace
-      =cdata @error.backtrace.nil? ? '' : @error.backtrace.join("\n")
+      =cdata err.backtrace.nil? ? '' : err.backtrace.join("\n")
     %request
       - if params
         -params.each do |name, value|

data/views/firewalls/index.html.haml

@@ -5,7 +5,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @firewalls.each do |firewall|
+    - elements.each do |firewall|
       %li
         %a{ :href => firewall_url(firewall.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/firewall.png'}

data/views/firewalls/index.xml.haml

@@ -1,6 +1,6 @@
 !!! XML
 %firewalls
-  - @firewalls.each do |firewall|
+  - elements.each do |firewall|
     %firewall{:href => firewall_url(firewall.id), :id => firewall.id}
       %actions
         %link{ :rel => :destroy, :href => destroy_firewall_url(firewall.id), :method => :delete, :id => firewall.id}

data/views/firewalls/new_rule.html.haml

@@ -1,7 +1,7 @@
 =header "New firewall rule"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog', :id => "new_rule_form"}
-  %form{ :action => "#{firewall_url(@firewall_name)}/rules", :method => :post,  :'data-ajax' => 'false'}
+  %form{ :action => "#{firewall_url(firewall_name)}/rules", :method => :post,  :'data-ajax' => 'false'}
     %div{ 'data-role' => :fieldcontain }
       %label{ :for => :name} Protocol:
       %input{ :type => :text, :id => :protocol, :name => :protocol, :value => '', :size => 10 }

data/views/firewalls/show.html.haml

@@ -1,27 +1,27 @@
 =header "Firewall"
-=subheader @firewall.id
+=subheader firewall.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Identifier
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@firewall.id
+      %p{ :'data-role' => 'fieldcontain'}=firewall.id
     %li{ :'data-role' => 'list-divider'} Description
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@firewall.description
+      %p{ :'data-role' => 'fieldcontain'}=firewall.description
     %li{ :'data-role' => 'list-divider'} Owner
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@firewall.owner_id
+      %p{ :'data-role' => 'fieldcontain'}=firewall.owner_id
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        =link_to_action "Destroy", destroy_firewall_url(@firewall.id), :delete
+        =link_to_action "Destroy", destroy_firewall_url(firewall.id), :delete
 
 =header "Rules", :back => 'false' do
-  %a{ :href => url_for("firewalls/#{@firewall.id}/new_rule"), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => 'false'} Add new rule
+  %a{ :href => url_for("firewalls/#{firewall.id}/new_rule"), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => 'false'} Add new rule
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
-  - @firewall.rules.each do |rule|
+  - firewall.rules.each do |rule|
     %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
       %li{ :'data-role' => 'list-divider'}
         %strong=rule.id
@@ -39,4 +39,4 @@
       %li{ :'data-role' => 'list-divider'} Actions
       %li
         %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-          =link_to_action "Delete", "#{firewall_url(@firewall.id)}/#{rule.id}", :delete
+          =link_to_action "Delete", "#{firewall_url(firewall.id)}/#{rule.id}", :delete

data/views/firewalls/show.xml.haml

@@ -1,20 +1,20 @@
 !!! XML
-%firewall{:href => firewall_url(@firewall.id), :id => @firewall.id}
+%firewall{:href => firewall_url(firewall.id), :id => firewall.id}
   %actions
-    %link{ :rel => :destroy, :href => destroy_firewall_url(@firewall.id), :method => :delete}
-    %link{ :rel => :update, :href => "#{firewall_url(@firewall_name)}/rules", :method => :post}
-  - @firewall.attributes.select{ |attr| attr != :id && attr!= :rules}.each do |attribute|
+    %link{ :rel => :destroy, :href => destroy_firewall_url(firewall.id), :method => :delete}
+    %link{ :rel => :update, :href => "#{firewall_url(firewall.id)}/rules", :method => :post}
+  - firewall.attributes.select{ |attr| attr != :id && attr!= :rules}.each do |attribute|
     - haml_tag("#{attribute}".tr('-', '_'), :<) do
       - if [:name, :description].include?(attribute)
         =cdata do
-          - haml_concat @firewall.send(attribute)
+          - haml_concat firewall.send(attribute)
       - else
-        - haml_concat @firewall.send(attribute)
+        - haml_concat firewall.send(attribute)
   %rules
-    - @firewall.rules.each do |rule|
-      %rule{:href => firewall_url(@firewall.id) + '/' + rule.id, :id => rule.id}
+    - firewall.rules.each do |rule|
+      %rule{:href => firewall_url(firewall.id) + '/' + rule.id, :id => rule.id}
         %actions
-          %link{ :rel => :destroy, :href => "#{firewall_url(@firewall.name)}/#{rule.id}", :method => :delete}
+          %link{ :rel => :destroy, :href => "#{firewall_url(firewall.name)}/#{rule.id}", :method => :delete}
         - rule.attributes.select{|attr| attr != :sources && attr != :id}.each do |rule_attrib|
           - haml_tag("#{rule_attrib}".tr('-', '_'), :<) do
             - haml_concat rule.send(rule_attrib)

data/views/hardware_profiles/index.html.haml

@@ -3,7 +3,7 @@
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview, :'data-inset' => :true }
-    - for profile in order_hardware_profiles(@hardware_profiles)
+    - for profile in order_hardware_profiles(elements)
       %li{ :'data-theme' => 'c'}
         %a{ :href => hardware_profile_url(profile.id)}
           %img{ :class => 'ui-link-thumb', :src => '/images/profile.png'}

data/views/hardware_profiles/index.xml.haml

@@ -1,4 +1,4 @@
 !!! XML
 %hardware_profiles
-  - order_hardware_profiles(@hardware_profiles).each do |prof|
-    = haml :'hardware_profiles/show', :locals => { :@hardware_profile => prof, :partial => true }
+  - order_hardware_profiles(elements).each do |prof|
+    = haml :'hardware_profiles/show', :locals => { :hardware_profile => prof, :partial => true }

data/views/hardware_profiles/show.html.haml

@@ -1,12 +1,12 @@
 =header "Hardware profiles"
-=subheader @hardware_profile.name || @hardware_profile.id
+=subheader hardware_profile.name || hardware_profile.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@hardware_profile.name || @hardware_profile.id
-    - @hardware_profile.each_property do |p|
+      %p{ :'data-role' => 'fieldcontain'}=hardware_profile.name || hardware_profile.id
+    - hardware_profile.each_property do |p|
       %li{ :'data-role' => 'list-divider'} #{p.name.to_s.titlecase}
       %li
         %p{ :'data-role' => 'fieldcontain'}

data/views/hardware_profiles/show.xml.haml

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

data/views/images/index.html.haml

@@ -4,7 +4,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @images.each do |image|
+    - elements.each do |image|
       %li
         %a{ :href => image_url(image.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/image.png'}

data/views/images/index.xml.haml

@@ -1,5 +1,5 @@
 - unless defined?(partial)
   !!! XML
 %images
-  - @elements.each do |c|
-    = haml :'images/show', :locals => { :@image => c, :partial => true }
+  - elements.each do |c|
+    = haml :'images/show', :locals => { :image => c, :partial => true }

data/views/images/new.html.haml

@@ -1,9 +1,9 @@
 =header "Create new image"
-=subheader "#{@instance.id}"
+=subheader "#{instance.id}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
   %form{ :action => images_url, :method => :post}
-    %input{ :type => :hidden, :name => :instance_id, :value => @instance.id}
+    %input{ :type => :hidden, :name => :instance_id, :value => instance.id}
     %div{ 'data-role' => :fieldcontain }
       %label{ :for => :name} Name:
       %input{ :type => :text, :id => :name, :name => :name, :value => '' }

data/views/images/show.html.haml

@@ -1,40 +1,40 @@
 =header "Image"
-=subheader @image.id
+=subheader image.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@image.name
+      %p{ :'data-role' => 'fieldcontain'}=image.name
     %li{ :'data-role' => 'list-divider'} Description
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@image.description
+      %p{ :'data-role' => 'fieldcontain'}=image.description
     %li{ :'data-role' => 'list-divider'} Owner
     %li
       %p{ :'data-role' => 'fieldcontain'}
-        %a{ :href => images_url + "?owner_id=#{@image.owner_id}"}
-          =@image.owner_id
+        %a{ :href => images_url + "?owner_id=#{image.owner_id}"}
+          =image.owner_id
     %li{ :'data-role' => 'list-divider'} State
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@image.state
-    - if @image.creation_time
+      %p{ :'data-role' => 'fieldcontain'}=image.state
+    - if image.creation_time
       %li{ :'data-role' => 'list-divider'} Creation Time
       %li
-        %p{ :'data-role' => 'fieldcontain'}=@image.creation_time
+        %p{ :'data-role' => 'fieldcontain'}=image.creation_time
     %li{ :'data-role' => 'list-divider'} Root Device Type
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@image.root_type
+      %p{ :'data-role' => 'fieldcontain'}=image.root_type
     %li{ :'data-role' => 'list-divider'} Architecture
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@image.architecture
-    - if @image.hardware_profiles
+      %p{ :'data-role' => 'fieldcontain'}=image.architecture
+    - if image.hardware_profiles
       %li{ :'data-role' => 'list-divider'} Compatible Hardware Profiles
       %li
         %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-          - @image.hardware_profiles.each do |hwp|
+          - image.hardware_profiles.each do |hwp|
             %a{ :href => url_for("hardware_profiles/#{hwp.id}"), :'data-role' => "button", :'data-ajax' => 'false'} #{hwp.name}
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => url_for("instances/new?image_id=#{@image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch...
-        = link_to_action 'Destroy', destroy_image_url(@image.id), :delete
+        %a{ :href => url_for("instances/new?image_id=#{image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch...
+        = link_to_action 'Destroy', destroy_image_url(image.id), :delete

data/views/images/show.xml.haml

@@ -1,20 +1,20 @@
 - unless defined?(partial)
   !!! XML
-%image{:href => image_url(@image.id), :id => @image.id}
-  %name=@image.name
-  %description=@image.description
-  %owner_id=@image.owner_id
-  %architecture=@image.architecture
-  - if @image.state
-    %state=@image.state
-  - if @image.creation_time
-    %creation_time=@image.creation_time
-  - if @image.hardware_profiles
+%image{:href => image_url(image.id), :id => image.id}
+  %name=image.name
+  %description=image.description
+  %owner_id=image.owner_id
+  %architecture=image.architecture
+  - if image.state
+    %state=image.state
+  - if image.creation_time
+    %creation_time=image.creation_time
+  - if image.hardware_profiles
     %hardware_profiles
-      - @image.hardware_profiles.each do |profile|
+      - image.hardware_profiles.each do |profile|
         %hardware_profile{ :href => hardware_profile_url(profile.id), :id => profile.id, :rel => :hardware_profile }
-  %root_type=@image.root_type
+  %root_type=image.root_type
   %actions
-    %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{@image.id}"}
+    %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{image.id}"}
     - if driver.respond_to? :destroy_image
-      %link{ :rel => 'destroy_image', :method => :delete, :href => "#{destroy_image_url(@image.id)}" }
+      %link{ :rel => 'destroy_image', :method => :delete, :href => "#{destroy_image_url(image.id)}" }

data/views/instance_states/show.html.haml

@@ -5,7 +5,7 @@
   %img{ :src => url_for('instance_states?format=png') }
 
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-theme' => 'a'}
-    - @machine.states.each do |state|
+    - machine.states.each do |state|
       %li{ :'data-role' => 'list-divider', :'class' => 'ui-bar-a', :'data-theme' => 'a'}=state
       - if state.transitions.empty?
         %li{ :'data-role' => 'list-divider'} Action

data/views/instance_states/show.png.erb

@@ -1,6 +1,6 @@
 digraph instance_states {
   rankdir=LR;
-  <% for state in @machine.states do %>
+  <% for state in machine.states do %>
     <%= state %>
       [
         label="<%= state.to_s.titlecase %>",
@@ -23,7 +23,7 @@ digraph instance_states {
       ]
   <% end %>
 
-  <% for state in @machine.states do %>
+  <% for state in machine.states do %>
     <% for transition in state.transitions do %>
       <%= state %> -> <%= transition.destination %>
         [

data/views/instance_states/show.xml.haml

@@ -1,5 +1,5 @@
 %states
-  - for state in @machine.states
+  - for state in machine.states
     %state{ :name=>state }
       - for transition in state.transitions
         - if ( transition.automatically? )

data/views/instances/index.html.haml

@@ -4,7 +4,7 @@
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     %li{ :'data-role' => 'list-divider'}=driver_symbol
-    - @elements.each do |instance|
+    - elements.each do |instance|
       %li
         %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/machine.png'}