deltacloud-core 0.5.0 → 1.0.0

data/views/addresses/associate.html.haml

@@ -2,7 +2,7 @@
 =subheader @address.id
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => associate_address_url(@address.id), :method => :post}
+  %form{ :action => "#{address_url(@address.id)}/associate", :method => :post}
     %div{ 'data-role' => :fieldcontain }
       %label{ :for => :name} Instance:
       %select{:name => 'instance_id'}

data/views/addresses/index.html.haml

@@ -1,5 +1,5 @@
 =header "Addresses" do
-  %a{ :href => "#", :onclick => "create_address('#{create_address_url}')", :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => "false", :method => :post} Create new address
+  %a{ :href => "#", :onclick => "create_address('#{addresses_url}')", :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => "false", :method => :post} Create new address
 =subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}

data/views/addresses/show.html.haml

@@ -13,9 +13,8 @@
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
         - if @address.associated?
-          =link_to @address.instance_id, instance_url(@address.instance_id)
-          =link_to_action 'Disassociate', disassociate_address_url(@address.id), :post
+          =link_to_action 'Disassociate', "#{address_url(@address.id)}/disassociate", :post
         - else
           - if driver.respond_to?(:associate_address)
-            =link_to_action 'Associate', associate_address_url(@address.id), :get
+            =link_to_action 'Associate',"#{address_url(@address.id)}/associate", :get
         =link_to_action "Destroy", destroy_address_url(@address.id), :delete

data/views/api/show.html.haml

@@ -3,18 +3,31 @@
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
-    - @collections.sort_by { |k| k.to_s }.each do |key|
-      %li= link_to key.to_s.gsub('_', ' ').titlecase, api_url_for(key), :'data-icon' => "arrow-r", :'data-ajax' => false
+    - Deltacloud.collections.each do |c|
+      - next unless c.operation(:index).has_capability?
+      %li
+        %a{ :href => api_url_for(c.collection_name),  :'data-icon' => "arrow-r"}=c.collection_name.to_s.gsub('_', ' ').titlecase
 
-- if @providers.size > 1
+
+- unless Deltacloud::Drivers.driver_config.nil?
+  %div{ :'data-role' => :footer, :'data-theme' => 'a'}
+    %form{ :action => settings.root_url, :method => :post, :'data-ajax' => 'false'}
+      %fieldset{ :'data-type' => "horizontal", :'data-role' => "controlgroup", :id => "providers" }
+        %select{:name => 'driver', :'data-inline' => 'true', :'data-native-menu' => 'false'}
+          %option{ :value => "#{driver_symbol.to_s}"} #{driver_symbol.to_s}
+          - Deltacloud::Drivers.driver_config.keys.each do |driver|
+            %option{ :value => driver } #{driver}
+        %button{ :type => :submit, :'data-inline' => "true"} Change Driver
+
+
+- unless driver.configured_providers.empty?
   %div{ :'data-role' => :footer, :'data-theme' => 'a'}
     %form{ :action => settings.root_url, :method => :post, :'data-ajax' => 'false'}
       - if @driver_name
-        %input{ :name => :driver, :type => :hidden, :value => @driver_name }/
-      %div{ :'data-role' => :footer, :'data-theme' => 'a' , :class => 'middle-dialog'}
-        %label{ :for => :provider, :class => 'ui-input-text'}
-        %select{:name => 'provider', :'data-native-menu' => "true" }
+        %input{ :name => :driver, :type => :hidden, :value => driver.name }/
+      %fieldset{ :'data-type' => "horizontal", :'data-role' => "controlgroup", :id => "providers" }
+        %select{:name => 'provider', :'data-inline' => 'true', :'data-native-menu' => 'false'}
           %option{ :value => 'default'} default
-          - @providers.each do |provider|
+          - driver.configured_providers.each do |provider|
             %option{ :value => provider } #{provider}
-        %button{ :type => :submit} Change Provider
+        %button{ :type => :submit, :'data-inline' => "true"} Change Provider

data/views/api/show.xml.haml

@@ -1,7 +1,8 @@
-%api{ :version => settings.version, :driver => driver_symbol }
-  - for entry_point in entry_points
-    %link{ :rel=>entry_point[0], :href=>entry_point[1] }
-      - for feature in driver.features(entry_point[0])
-        %feature{ :name=>feature.name }
-          - for name,value in feature.constraints
-            %constraint{ :name=>name, :value=>value }
+%api{ :version => settings.version, :driver => driver_symbol, :provider => Thread.current[:provider] || ENV['API_PROVIDER'] }
+  - Deltacloud.collections.each do |c|
+    - next unless c.operation(:index).has_capability?
+    %link{ :rel => c.collection_name, :href => self.send(:"#{c.collection_name}_url")}
+      - c.features.select { |f| driver.class.has_feature?(c.collection_name, f.name) }.each do |f|
+        %feature{ :name => f.name }
+          - driver.class.constraints(:collection => c.collection_name, :feature => f.name).each do |name, value|
+            %constraint{ :name => name }=value

data/views/blobs/show.xml.haml

@@ -1,11 +1,14 @@
 !!! XML
 %blob{:href => bucket_url(@blob.bucket) + '/' + @blob.id, :id => @blob.id}
+  %bucket=@blob.bucket
   - @blob.attributes.select{ |attr| (attr!=:id && attr!=:user_metadata) }.each do |attribute|
+    - next if attribute == :bucket
     - unless attribute == :content
       - haml_tag(attribute, :<) do
         - haml_concat @blob.send(attribute)
   %user_metadata
-    - @blob.user_metadata.each do |k, v|
-      %entry{:key => k}
-        #{cdata v}
-  %content{:href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content'}
+    - if @blob.user_metadata.respond_to? :each
+      - @blob.user_metadata.each do |k, v|
+        %entry{:key => k}
+          #{cdata v}
+  %content{:href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content', :rel => 'blob_content'}

data/views/buckets/new.html.haml

@@ -1,12 +1,12 @@
 =header "New bucket"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => buckets_url, :method => :post }
+  %form{ :action => buckets_url, :method => :post, :'data-ajax' => 'false' }
     %label
       Bucket Name:
       %input{ :name => 'name', :size => 250}/
       %br
-    -if driver_has_bucket_location_feature?
+    -if driver.class.has_feature?(:buckets, :bucket_location)
       %p
         %label
           Location: (optional)

data/views/cimi/errors/401.xml.haml

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

data/views/error.html.haml

@@ -2,11 +2,11 @@
 %html
   %head
     %title Deltacloud API #{settings.version}
-    = stylesheet_link_tag '/stylesheets/jquery.mobile-1.0rc1.min.css'
-    = stylesheet_link_tag '/stylesheets/new.css'
+    %link{ :charset => "utf-8", :href => "/stylesheets/jquery.mobile-1.0.1.min.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
+    %link{ :charset => "utf-8", :href => "/stylesheets/new.css", :media => "screen", :rel => "stylesheet", :type => "text/css"}
     %script{:type => "text/javascript", :src => "/javascripts/jquery.min.js" }
     %script{:type => "text/javascript", :src => "/javascripts/application.js" }
-    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0rc1.min.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/jquery.mobile-1.0.1.min.js" }
     :javascript
       $(document).ready(function() {
         $(document).bind("mobileinit", function(){

data/views/errors/400.html.haml

@@ -19,7 +19,7 @@
     %h3 Backtrace
     %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
       %li
-        %pre=@error.backtrace.join("\n")
+        %pre=(@error.backtrace.nil?) ? "n/a" : @error.backtrace.join("\n")
 
   %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
     %h3 Parameters

data/views/errors/400.xml.haml

@@ -1,4 +1,3 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
-  %parameter #{@error.name}
   %message< #{cdata @error.message}
-
+  %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }

data/views/errors/401.html.haml

@@ -2,7 +2,7 @@
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
     %li{ :'data-role' => 'list-divider'} Server message
     %li
-      %h3=[@error.class.name, @error.message].join(' - ')
+      %h3 Authentication Failure
     %li{ :'data-role' => 'list-divider'} Original request URI
     %li
       %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
@@ -15,11 +15,12 @@
       - else
         %em No details
 
-  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
-    %h3 Backtrace
-    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
-      %li
-        %pre=@error.backtrace.join("\n")
+  - if @error.class.method_defined? :backtrace
+    %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+      %h3 Backtrace
+      %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+        %li
+          %pre=@error.backtrace.join("\n")
 
   %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
     %h3 Parameters
@@ -38,4 +39,4 @@
       - request.env.each do |key, value|
         %li{ :'data-role' => 'list-divider'}=key
         %li
-          %span{:style => 'font-weight:normal;'}=value.inspect
+          %span{:style => 'font-weight:normal;'}=value.to_s

data/views/errors/401.xml.haml

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

data/views/errors/404.xml.haml

@@ -1,2 +1,3 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
   %message Resource not found

data/views/errors/500.xml.haml

@@ -1,10 +1,12 @@
+- unless defined?(partial)
+  !!! XML
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %kind backend_error
   %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
     %code=response.status
   %message< #{cdata @error.message}
-  - if @error.respond_to? :backtrace
-    %backtrace=cdata @error.backtrace.join("\n")
+  - if @error.respond_to?(:backtrace) and !@error.backtrace.nil?
+    %backtrace=cdata(@error.backtrace.join("\n"))
   - if params
     %request
       - params.each do |k, v|

data/views/{cimi/errors/403.html.haml → errors/501.html.haml}

@@ -15,12 +15,12 @@
       - else
         %em No details
 
-  - if @error.backtrace
+  - if @error.class.method_defined? :backtrace
     %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
       %h3 Backtrace
       %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
         %li
-          %pre=@error.backtrace.join("\n")
+          %pre=@error.backtrace.join("\n") unless @error.backtrace.nil?
 
   %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
     %h3 Parameters
@@ -28,6 +28,7 @@
       - if params.keys.empty?
         %li{ :'data-role' => 'list-divider'} No parameters
       - params.each do |key, value|
+        - next if value.inspect.to_s == '#'
         %li{ :'data-role' => 'list-divider'}=key
         %li
           %span{:style => 'font-weight:normal;'}=value.inspect
@@ -37,6 +38,7 @@
     %h3 Request details
     %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
       - request.env.each do |key, value|
+        - next if value.inspect.to_s == '#'
         %li{ :'data-role' => 'list-divider'}=key
         %li
           %span{:style => 'font-weight:normal;'}=value.inspect

data/views/errors/501.xml.haml

@@ -0,0 +1 @@
+= haml :'errors/500', :locals => { :@error => @error, :partial => true }

data/views/errors/502.xml.haml

@@ -1,7 +1 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
-  %kind backend_error
-  %backend{ :driver => driver_symbol }
-    %code= @error.code
-    - if @error.respond_to?(:details) && @error.details
-      %details< #{cdata @error.details.join("\n")}
-  %message< #{cdata @error.message}
+= haml :'errors/500', :locals => { :@error => @error, :partial => true }

data/views/errors/504.xml.haml

@@ -0,0 +1 @@
+= haml :'errors/500', :locals => { :@error => @error, :partial => true }

data/views/firewalls/new.html.haml

@@ -1,6 +1,6 @@
 %h1 New Firewall
 
-%form{:action => firewalls_url, :method => :post}
+%form{:action => firewalls_url, :method => :post, :'data-ajax' => 'false'}
   %label
     Firewall Name
     %input{:name => 'name', :size => 25}/
@@ -8,4 +8,4 @@
   %label
     Firewall Description
     %input{:name => 'description', :size => 100}/
-  %input{:type => :submit, :name => "commit", :value=>"create"}
+  %input{:type => :submit, :name => "commit", :value=>"create"}

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}
+  %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

@@ -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.name)}/#{rule.id}", :delete
+          =link_to_action "Delete", "#{firewall_url(@firewall.id)}/#{rule.id}", :delete

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 @profiles
+    - for profile in order_hardware_profiles(@hardware_profiles)
       %li{ :'data-theme' => 'c'}
         %a{ :href => hardware_profile_url(profile.name)}
           %img{ :class => 'ui-link-thumb', :src => '/images/profile.png'}
@@ -15,3 +15,5 @@
             = format_hardware_property profile.memory
             %strong Storage:
             = format_hardware_property profile.storage
+            %strong CPU:
+            = format_hardware_property profile.cpu

data/views/hardware_profiles/index.xml.haml

@@ -1,4 +1,4 @@
 !!! XML
 %hardware_profiles
-  - @profiles.each do |prof|
-    = haml :'hardware_profiles/show', :locals => { :@profile => prof, :partial => true }
+  - order_hardware_profiles(@hardware_profiles).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 @profile.name
+=subheader @hardware_profile.name
 
 %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'}=@profile.name
-    - @profile.each_property do |p|
+      %p{ :'data-role' => 'fieldcontain'}=@hardware_profile.name
+    - @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,9 +1,9 @@
 - unless defined?(partial)
   !!! XML
-%hardware_profile{ :href => hardware_profile_url(@profile.name), :id => @profile.name }
+%hardware_profile{ :href => hardware_profile_url(@hardware_profile.name), :id => @hardware_profile.name }
   %name<
-    =@profile.name
-  - @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/show.html.haml

@@ -20,6 +20,11 @@
     %li{ :'data-role' => 'list-divider'} Architecture
     %li
       %p{ :'data-role' => 'fieldcontain'}=@image.architecture
+    %li{ :'data-role' => 'list-divider'} Hardware Profiles
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        - @image.hardware_profiles.each do |hwp|
+          %a{ :href => api_url_for("hardware_profiles/#{hwp.name}"), :'data-role' => "button", :'data-ajax' => 'false'} #{hwp.name}
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }

data/views/images/show.xml.haml

@@ -1,8 +1,13 @@
 - unless defined?(partial)
   !!! XML
 %image{:href => image_url(@image.id), :id => @image.id}
-  - @image.attributes.select{ |attr| attr!=:id }.each do |attribute|
+  - @image.attributes.select{ |attr| ![:id, :hardware_profiles].include?(attr) }.each do |attribute|
     - haml_tag(attribute, :<) do
       - haml_concat @image.send(attribute)
+  - if @image.hardware_profiles
+    %hardware_profiles
+      - @image.hardware_profiles.each do |profile|
+        %hardware_profile{ :href => hardware_profile_url(profile.name), :id => profile.name, :rel => :hardware_profile }
   %actions
     %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{@image.id}"}
+    %link{ :rel => 'destroy_image', :method => :delete, :href => "#{destroy_image_url(@image.id)}" }

data/views/instance_states/show.html.haml

@@ -2,7 +2,7 @@
 =subheader "#{driver_symbol}@#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'd', :class => 'middle-dialog'}
-  = image_tag api_url_for('instance_states?format=png')
+  %img{ :src => api_url_for('instance_states?format=png') }
 
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-theme' => 'a'}
     - @machine.states.each do |state|

data/views/instances/index.html.haml

@@ -8,7 +8,7 @@
       %li
         %a{ :href => instance_url(instance.id), :'data-ajax' => 'false'}
           %img{ :class => 'ui-link-thumb', :src => '/images/machine.png'}
-          %h3=truncate_words(instance.id)
+          %h3=instance.id.to_s.truncate
           %p
             %strong=instance.name
           %p=[instance.owner_id, instance.image_id, instance.hardware_profile].join(', ')

data/views/instances/new.html.haml

@@ -18,56 +18,71 @@
             %input{ :name => prop.param, :size => 10, :value => "#{prop.default}" }= prop.unit
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => instances_url, :method => :post, :class => :new_instance, :'data-ajax' => 'false'}
+  %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 }/
 
-    - if driver_has_feature?(:user_name)
+    - if driver.class.has_feature?(:instances, :user_name)
       %div{ 'data-role' => :fieldcontain }
         %label{ :for => :name} Instance name:
         %input{ :type => :text, :id => :name, :name => :name, :value => '' }
 
-    %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
-      %h3 Additional parameters
+    - if additional_features_for?(:instances, [:user_name])
+      %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+        %h3 Additional parameters
 
-      - if driver_has_feature?(:user_data)
-        %div{ 'data-role' => :fieldcontain }
-          %label{ :for => :user_data} Base64 encoded user-data:
-          %textarea{ :id => :user_data, :name => :user_data, :value => '' }
-          %br/
-          %a{ :href => "", :onclick => 'encodeb64();', :'data-ajax' => 'false'} Encode data
+        - if driver.class.has_feature?(:instances, :user_data)
+          %div{ 'data-role' => :fieldcontain }
+            %label{ :for => :user_data} Base64 encoded user-data:
+            %textarea{ :id => :user_data, :name => :user_data, :value => '' }
+            %br/
+            %a{ :href => "", :onclick => 'encodeb64();', :'data-ajax' => 'false'} Encode data
 
-      - if driver_has_feature?(:instance_count)
-        %div{ 'data-role' => :fieldcontain }
-          %label{ :for => :instance_count} # of instances to be launched:
-          %input{ :type => :text, :id => :instance_count, :name => :instance_count, :value => '1' }
+        - if driver.class.has_feature?(:instances, :instance_count)
+          %div{ 'data-role' => :fieldcontain }
+            %label{ :for => :instance_count} # of instances to be launched:
+            %input{ :type => :text, :id => :instance_count, :name => :instance_count, :value => '1' }
 
-      - if driver_has_feature?(:authentication_key)
-        %div{ 'data-role' => :fieldcontain }
-          %label{ :for => :keyname, :class => 'ui-input-text'} Instance SSH key:
-          %select{:name => 'keyname', :'data-native-menu' => "true" }
-            %option{ :value => ''} None
-            - @keys.each do |key|
-              %option{ :value => key.id } #{key.id}
+        - if driver.class.has_feature?(:instances, :metrics)
+          %div{ 'data-role' => :fieldcontain }
+            %label{ :for => :metrics} Enable metrics for this instance
+            %input{ :type => :checkbox, :id => :metrics, :name => :metrics, :checked => 'false' }
 
-      - if driver_has_feature?(:register_to_load_balancer)
-        %div{ 'data-role' => :fieldcontain }
-          %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|
-              %option{:value => load_balancer.id} #{load_balancer.id}
+        - if driver.class.has_feature?(:instances, :authentication_key)
+          %div{ 'data-role' => :fieldcontain }
+            %label{ :for => :keyname, :class => 'ui-input-text'} Instance SSH key:
+            %select{:name => 'keyname', :'data-native-menu' => "true" }
+              %option{ :value => ''} None
+              - @keys.each do |key|
+                %option{ :value => key.id } #{key.id}
 
-      - if driver_has_feature?(: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}"}/
-                %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
+        - if driver.class.has_feature?(:instances, :register_to_load_balancer)
+          %div{ 'data-role' => :fieldcontain }
+            %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|
+                %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}"}/
+                  %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
+
+        - if driver.class.has_feature?(:instances, :user_files)
+          %div{ 'data-role' => :fieldcontain }
+            %h3 Make user data file(s) available in launched Instance
+            %h4 The path specified for each file below is where the data will be made available on the launched Instance.
+            - for i in 1..5
+              %h4 User file #{i}
+              %input{ :type => :text, :id => "path#{i}", :name => "path#{i}", :value => ""} Path #{i}
+              %input{ :type => "file", :name => "content#{i}", :size => 50 }
 
     - if !@hardware_profiles.empty?
       %div{ 'data-role' => :fieldcontain }