deltacloud-core 1.1.2 → 1.1.3

data/views/instances/index.xml.haml

@@ -1,4 +1,4 @@
 !!! XML
 %instances
-  - @elements.each do |c|
-    = haml :'instances/show', :locals => { :@instance => c, :partial => true }
+  - elements.each do |c|
+    = haml :'instances/show', :locals => { :instance => c, :partial => true }

data/views/instances/new.html.haml

@@ -1,8 +1,8 @@
 =header "Launch new instance"
-=subheader "#{@image.id}"
+=subheader "#{image.id}"
 
 .hidden_content
-  - @image.hardware_profiles.each do |profile|
+  - hardware_profiles.each do |profile|
     %div{ :'data-role' => :fieldcontain, :id => "hwp_properties_#{profile.name}", :class => 'property_block'}
       - profile.properties.reject { |prop| prop.fixed? }.each do |prop|
         %label{ :for => "#{prop.param}_#{profile.name}", :class => 'ui-input-text' }=prop.name
@@ -19,7 +19,7 @@
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
   %form{ :action => instances_url, :method => :post, :class => :new_instance, :enctype => 'multipart/form-data', :'data-ajax' => 'false'}
-    %input{ :name => :image_id, :type => :hidden, :value => @instance.image_id }/
+    %input{ :name => :image_id, :type => :hidden, :value => instance.image_id }/
 
     - if driver.class.has_feature?(:instances, :user_name)
       %div{ 'data-role' => :fieldcontain }
@@ -37,6 +37,14 @@
             %br/
             %a{ :href => "", :onclick => 'encodeb64();', :'data-ajax' => 'false'} Encode data
 
+        - if driver.class.has_feature?(:instances, :first_boot_dev)
+          %fieldset{ :'data-role' => 'controlgroup', 'data-iconpos' => 'right'}
+            %legend First boot device:
+            %input{ :name => 'first_boot_dev', :id => :first_boot_dev_hd, :value => 'hd', :checked => 'checked', :type => 'radio'}
+            %label{ :for => :first_boot_dev_hd} Hard Disk
+            %input{ :name  => 'first_boot_dev', :id => :first_boot_dev_network, :value => 'network', :type => "radio"}
+            %label{ :for => :first_boot_dev_network} Network
+
         - if driver.class.has_feature?(:instances, :instance_count)
           %div{ 'data-role' => :fieldcontain }
             %label{ :for => :instance_count} # of instances to be launched:
@@ -52,7 +60,7 @@
             %label{ :for => :keyname, :class => 'ui-input-text'} Instance SSH key:
             %select{:name => 'keyname', :'data-native-menu' => "true" }
               %option{ :value => ''} None
-              - @keys.each do |key|
+              - keys.each do |key|
                 %option{ :value => key.id } #{key.id}
 
         - if driver.class.has_feature?(:instances, :register_to_load_balancer)
@@ -60,20 +68,20 @@
             %label{ :for => :load_balancer_id, :class => 'ui-input-text'} Register to loadbalancer:
             %select{:name => 'load_balancer_id', :'data-native-menu' => "true" }
               %option{ :value => ''} None
-              - @load_balancers.each do |load_balancer|
+              - load_balancers.each do |load_balancer|
                 %option{:value => load_balancer.id} #{load_balancer.id}
 
         - if driver.class.has_feature?(:instances, :firewalls)
           %div{ 'data-role' => :fieldcontain }
             %fieldset{ :'data-role' => 'controlgroup'}
               %legend Register to firewall:
-              - @firewalls.each_index do |i|
-                - if @firewalls[i].name == 'default'
-                  %input{:type => :checkbox, :value => @firewalls[i].name, :name => "firewalls#{i}", :checked => :true, :id => "firewalls#{i}"}/
+              - firewalls.each_index do |i|
+                - if firewalls[i].name == 'default'
+                  %input{:type => :checkbox, :value => firewalls[i].name, :name => "firewalls#{i}", :checked => :true, :id => "firewalls#{i}"}/
                   %label{:for => "firewalls#{i}"} Default
                 - else
-                  %input{:type => :checkbox, :value => @firewalls[i].name, :name => "firewalls#{i}", :id => "firewalls#{i}"}/
-                  %label{:for => "firewalls#{i}"}=@firewalls[i].name
+                  %input{:type => :checkbox, :value => firewalls[i].name, :name => "firewalls#{i}", :id => "firewalls#{i}"}/
+                  %label{:for => "firewalls#{i}"}=firewalls[i].name
 
         - if driver.class.has_feature?(:instances, :user_files)
           %div{ 'data-role' => :fieldcontain }
@@ -84,21 +92,21 @@
               %input{ :type => :text, :id => "path#{i}", :name => "path#{i}", :value => ""} Path #{i}
               %input{ :type => "file", :name => "content#{i}", :size => 50 }
 
-    - if !@hardware_profiles.empty?
+    - if !hardware_profiles.empty?
       %div{ 'data-role' => :fieldcontain }
         %h3 Instance profile
         %fieldset{ :'data-role' => :fieldcontain}
-          - @hardware_profiles.each do |profile|
+          - hardware_profiles.each do |profile|
             %input{ :type => :radio, :name => 'hwp_id', :value => profile.id, :id => profile.name, :'data-theme' => 'b'}/
             %label{ :for => profile.name, :onclick => "expandHWP('#{profile.name}');"}="#{profile.name} - #{profile.memory} MB"
             %div{ :'data-role' => :fieldcontain, :id => "property_container_#{profile.name}", :class => 'hwp_properties'}
 
-    - if !@realms.empty?
+    - if !realms.empty?
       %div{ 'data-role' => :fieldcontain }
         %h3 Where do you want it?
         %fieldset{ :'data-role' => :fieldcontain}
           %legend
-          - @realms.each do |realm|
+          - realms.each do |realm|
             %div{ :'data-role' => :fieldcontain}
               %label{ :for => realm.id }= "#{realm.name}, #{realm.limit}"
               %input{ :type => :radio, :name => 'realm_id', :value => realm.id, :id => realm.id, :'data-theme' => 'b' }/

data/views/instances/run.html.haml

@@ -2,8 +2,8 @@
 
 %p
   %label Command:
-  %em #{@output.ssh.command}
+  %em #{output.ssh.command}
 %p
   %strong Command output
 %pre
-  =@output.body
+  =output.body

data/views/instances/run.xml.haml

@@ -1,7 +1,7 @@
 %instance{:id => params[:id], :href=> instance_url(params[:id])}
   %public_address
-    =@output.ssh.network.ip
+    =output.ssh.network.ip
   %command
-    =@output.ssh.command
+    =output.ssh.command
   %output<
-    =@output.body
+    =output.body

data/views/instances/run_command.html.haml

@@ -1,15 +1,15 @@
-=header "Run command on #{@instance.name}"
-=subheader "#{@instance.id}"
+=header "Run command on #{instance.name}"
+=subheader "#{instance.id}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => url_for('/instances/%s/run' % @instance.id), :method => :post }
+  %form{ :action => url_for('/instances/%s/run' % instance.id), :method => :post }
     %p
       %label{ :for => :cmd } Desired command:
       %input{ :name => :cmd, :value => "", :type => :text}
     %p
       %fieldset{ :'data-role' => :fieldcontain}
         %legend Target instance IP address:
-        - (@instance.public_addresses | @instance.private_addresses).each_with_index do |ip, idx|
+        - (instance.public_addresses | instance.private_addresses).each_with_index do |ip, idx|
           %label{ :for => ip.address }= "#{ip.address}"
           %input{ :name => :ip, :value => ip.address, :id => ip.address, :type => :radio, :'data-theme' => 'b', :checked => idx == 0 || nil}/
     %p

data/views/instances/show.html.haml

@@ -1,67 +1,67 @@
 =header "Instance"
-=subheader @instance.id
+=subheader instance.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'}=@instance.name
+      %p{ :'data-role' => 'fieldcontain'}=instance.name
     %li{ :'data-role' => 'list-divider'} Owner
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.owner_id
+      %p{ :'data-role' => 'fieldcontain'}=instance.owner_id
     %li{ :'data-role' => 'list-divider'} State
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.state
+      %p{ :'data-role' => 'fieldcontain'}=instance.state
     %li{ :'data-role' => 'list-divider'} Launch Time
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.launch_time
+      %p{ :'data-role' => 'fieldcontain'}=instance.launch_time
     %li{ :'data-role' => 'list-divider'} Image
     %li
-      %a{ :href => image_url(@instance.image_id), :'data-ajax' => 'false' }=@instance.image_id
+      %a{ :href => image_url(instance.image_id), :'data-ajax' => 'false' }=instance.image_id
     %li{ :'data-role' => 'list-divider'} Hardware Profile
     %li
-      - prof = @instance.instance_profile
+      - prof = instance.instance_profile
       %a{ :href => hardware_profile_url(prof.name), :'data-ajax' => 'false'}
         =[prof.name, format_instance_profile(prof)].compact.join(', ')
     %li{ :'data-role' => 'list-divider'} Realm
     %li
-      - if @instance.realm_id
-        %a{ :href => realm_url(@instance.realm_id), :'data-ajax' => 'false' }=@instance.realm_id
+      - if instance.realm_id
+        %a{ :href => realm_url(instance.realm_id), :'data-ajax' => 'false' }=instance.realm_id
       - else
         default
     %li{ :'data-role' => 'list-divider'} Public addresses
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.public_addresses.join(',')
+      %p{ :'data-role' => 'fieldcontain'}=instance.public_addresses.join(',')
     %li{ :'data-role' => 'list-divider'} Private addresses
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@instance.private_addresses.join(',')
-    - if @instance.password or @instance.keyname
+      %p{ :'data-role' => 'fieldcontain'}=instance.private_addresses.join(',')
+    - if instance.password or instance.keyname
       %li{ :'data-role' => 'list-divider'} Authentication
-    - if @instance.password
+    - if instance.password
       %li{ :'data-role' => 'list-divider'} Username
-      %li=@instance.username
+      %li=instance.username
       %li{ :'data-role' => 'list-divider'} Password
-      %li=@instance.password
-    - if @instance.keyname
+      %li=instance.password
+    - if instance.keyname
       %li{ :'data-role' => 'list-divider'} SSH key name
       %li
-        %a{ :href => key_url(@instance.keyname), :'data-ajax' => 'false'}=@instance.keyname
-    - if @instance.firewalls
+        %a{ :href => key_url(instance.keyname), :'data-ajax' => 'false'}=instance.keyname
+    - if instance.firewalls
       %li{ :'data-role' => 'list-divider'} Firewalls
-      - @instance.firewalls.each do |firewall|
+      - instance.firewalls.each do |firewall|
         %li
           %a{ :href => firewall_url(firewall), :'data-ajax' => 'false'}=firewall
-    - if @instance.storage_volumes
+    - if instance.storage_volumes
       %li{ :'data-role' => 'list-divider'} Attached Storage Volumes
-      -@instance.storage_volumes.each do |vol|
+      -instance.storage_volumes.each do |vol|
         %li
           %a{ :href => storage_volume_url("#{vol.keys.first}"), :'data-ajax' => 'false'}=["#{vol.keys.first}", "#{vol.values.first}"].compact.reject{ |e| e.empty? }.join(' <---> ')
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        - @instance.actions.each do |action|
-          =link_to_action action.to_s.capitalize, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
-        - if @instance.state=="RUNNING" and driver.respond_to?(:run_on_instance)
-          =link_to_action 'Run command...', url_for('instances/%s/run' % @instance.id), :get
-        - if @instance.can_create_image?
-          =link_to_action 'Create image...', url_for("images/new?instance_id=#{@instance.id}"), :get
+        - instance.actions.each do |action|
+          =link_to_action action.to_s.capitalize, self.send(:"#{action}_instance_url", instance.id), instance_action_method(action)
+        - if instance.state=="RUNNING" and driver.respond_to?(:run_on_instance)
+          =link_to_action 'Run command...', url_for('instances/%s/run' % instance.id), :get
+        - if instance.can_create_image?
+          =link_to_action 'Create image...', url_for("images/new?instance_id=#{instance.id}"), :get

data/views/instances/show.xml.haml

@@ -1,60 +1,60 @@
 - unless defined?(partial)
   !!! XML
-%instance{:href => instance_url(@instance.id), :id => @instance.id}
-  - if @instance.name
+%instance{:href => instance_url(instance.id), :id => instance.id}
+  - if instance.name
     %name<
-      =@instance.name
-  - if @instance.owner_id
+      =instance.name
+  - if instance.owner_id
     %owner_id<
-      =@instance.owner_id
-  - if @instance.image_id
-    %image{:href => image_url(@instance.image_id), :id => @instance.image_id }
-  - if @instance.realm_id
-    %realm{:href => realm_url(@instance.realm_id), :id => @instance.realm_id }
-  - if @instance.state
+      =instance.owner_id
+  - if instance.image_id
+    %image{:href => image_url(instance.image_id), :id => instance.image_id }
+  - if instance.realm_id
+    %realm{:href => realm_url(instance.realm_id), :id => instance.realm_id }
+  - if instance.state
     %state<
-      =@instance.state
-  - if @instance.instance_profile
-    - 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|
+      =instance.state
+  - if instance.instance_profile
+    - 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)}
-  - if @instance.actions
+  - if instance.actions
     %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)}
+      - 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)}
       - if driver.respond_to?(:run_on_instance)
-        %link{:rel => 'run', :method => :post, :href => "#{run_instance_url(@instance.id)};id=#{@instance.id}"}
-      - if @instance.can_create_image?
-        %link{:rel => 'create_image', :method => :post, :href => "#{create_image_url};instance_id=#{@instance.id}"}
-  - if @instance.launch_time
+        %link{:rel => 'run', :method => :post, :href => "#{run_instance_url(instance.id)};id=#{instance.id}"}
+      - if instance.can_create_image?
+        %link{:rel => 'create_image', :method => :post, :href => "#{create_image_url};instance_id=#{instance.id}"}
+  - if instance.launch_time
     %launch_time<
-      =@instance.launch_time
-  - if @instance.public_addresses
+      =instance.launch_time
+  - if instance.public_addresses
     %public_addresses<
-      - @instance.public_addresses.each do |a|
+      - instance.public_addresses.each do |a|
         %address{ :type => a.address_type, :port => a.port }=a.address
-  - if @instance.private_addresses
+  - if instance.private_addresses
     %private_addresses<
-      - @instance.private_addresses.each do |a|
+      - instance.private_addresses.each do |a|
         %address{ :type => a.address_type, :port => a.port }=a.address
-  - if @instance.firewalls
+  - if instance.firewalls
     %firewalls<
-      - @instance.firewalls.each do |firewall|
+      - instance.firewalls.each do |firewall|
         %firewall{:href => firewall_url(firewall), :id => firewall }
-  - if @instance.storage_volumes
+  - if instance.storage_volumes
     %storage_volumes<
-      - @instance.storage_volumes.each do |volume|
+      - 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.authn_feature_failed?
-        %error  #{@instance.authn_error}
+      - if instance.authn_feature_failed?
+        %error  #{instance.authn_error}
       - else
-        - if @instance.password
+        - if instance.password
           %login
-            %username #{@instance.username}
-            %password=cdata(@instance.password)
-        - if @instance.keyname
+            %username #{instance.username}
+            %password=cdata(instance.password)
+        - if instance.keyname
           %login
-            %keyname #{@instance.keyname}
+            %keyname #{instance.keyname}
 

data/views/keys/index.html.haml

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

data/views/keys/index.xml.haml

@@ -1,4 +1,4 @@
 !!!XML
 %keys
-  - @elements.each do |c|
-    = haml :'keys/show', :locals => { :@key => c, :partial => true }
+  - elements.each do |c|
+    = haml :'keys/show', :locals => { :key => c, :partial => true }

data/views/keys/show.html.haml

@@ -1,31 +1,31 @@
 =header "Key"
-=subheader @key.id
+=subheader key.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'}=@key.id
+      %p{ :'data-role' => 'fieldcontain'}=key.id
     %li{ :'data-role' => 'list-divider'} Name
     %li
-      %p{ :'data-role' => 'fieldcontain'}=@key.name
-    - if @key.is_password?
+      %p{ :'data-role' => 'fieldcontain'}=key.name
+    - if key.is_password?
       %li{ :'data-role' => 'list-divider'} Username
       %li
-        %p{ :'data-role' => 'fieldcontain'}=@key.username
+        %p{ :'data-role' => 'fieldcontain'}=key.username
       %li{ :'data-role' => 'list-divider'} Password
       %li
-        %p{ :'data-role' => 'fieldcontain'}=@key.password
+        %p{ :'data-role' => 'fieldcontain'}=key.password
     - else
-      - if @key.fingerprint
+      - if key.fingerprint
         %li{ :'data-role' => 'list-divider'} Fingerprint
         %li
-          %p{ :'data-role' => 'fieldcontain'}=@key.fingerprint
+          %p{ :'data-role' => 'fieldcontain'}=key.fingerprint
       %li{ :'data-role' => 'list-divider'} PEM key
       %li
         %p{ :'data-role' => 'fieldcontain'}
-          %pre{:style=> 'width:600px;overflow:auto;'}=@key.pem_rsa_key
+          %pre{:style=> 'width:600px;overflow:auto;'}=key.pem_rsa_key
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        =link_to_action "Destroy", destroy_key_url(@key.id), :delete
+        =link_to_action "Destroy", destroy_key_url(key.id), :delete

data/views/keys/show.xml.haml

@@ -1,23 +1,23 @@
 - unless defined?(partial)
   !!! XML
-%key{ :href => key_url(@key.id), :id => @key.id, :type => "#{@key.credential_type}" }
-  %name=@key.name
+%key{ :href => key_url(key.id), :id => key.id, :type => "#{key.credential_type}" }
+  %name=key.name
   %actions
     - if driver.respond_to?(:destroy_key)
-      %link{ :rel => "destroy", :method => "delete", :href => destroy_key_url(@key.id)}
-  - if @key.is_key?
-    - if @key.fingerprint
+      %link{ :rel => "destroy", :method => "delete", :href => destroy_key_url(key.id)}
+  - if key.is_key?
+    - if key.fingerprint
       %fingerprint<
-        =@key.fingerprint
-    - unless @key.pem_rsa_key.nil?
+        =key.fingerprint
+    - unless key.pem_rsa_key.nil?
       %pem
-        ~render_cdata(@key.pem_rsa_key)
-  - if @key.is_password?
+        ~render_cdata(key.pem_rsa_key)
+  - if key.is_password?
     %username<
       =cdata do
-        =@key.username
+        =key.username
     %password<
       =cdata do
-        =@key.password
+        =key.password
   %state<
-    =@key.state
+    =key.state

data/views/load_balancers/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'}
-    - @elements.each do |balancer|
+    - elements.each do |balancer|
       %li
         %a{ :href => load_balancer_url(balancer.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/balancer.png'}

data/views/load_balancers/index.xml.haml

@@ -1,4 +1,4 @@
 !!!XML
 %load_balancers
-  - @elements.each do |c|
-    = haml :'load_balancers/show', :locals => { :@load_balancer => c, :partial => true }
+  - elements.each do |c|
+    = haml :'load_balancers/show', :locals => { :load_balancer => c, :partial => true }