deltacloud-core 0.1.2 → 0.3.0

data/views/drivers/index.xml.haml

@@ -0,0 +1,7 @@
+%drivers
+  - @drivers.each do |id, details|
+    %driver{ :href => driver_url(id), :id => id }
+      %name<
+        =details[:name]
+      - driver_provider(details).keys.each do |prov|
+        %provider{ :id => prov }

data/views/drivers/show.html.haml

@@ -0,0 +1,20 @@
+%h1
+  Details for driver #{@name}
+
+%dl
+  %di
+    %dt ID
+    %dd= @name
+  %di
+    %dt Name
+    %dd= @driver[:name]
+  %di
+    %dt Provider
+    %dd
+      - providers = driver_provider(@driver).keys.collect { |k| k.to_s }.sort
+      - if providers.empty?
+        None
+      - else
+        %ol
+          - providers.each do |k|
+            %li= k

data/views/drivers/show.xml.haml

@@ -0,0 +1,7 @@
+%driver{ :href => driver_url(@name), :id => @name }
+  %name<
+    = @driver[:name]
+  - driver_provider(@driver).each do |prov, details|
+    %provider{ :id => prov }
+      - details.each do |kind, url|
+        %entrypoint{ :kind => kind }<=cdata(url)

data/views/error.html.haml

@@ -0,0 +1,31 @@
+!!!
+!!! XML
+
+%html
+  %head
+    = stylesheet_link_tag '/stylesheets/compiled/screen.css', :media => 'screen, projection'
+    = stylesheet_link_tag '/stylesheets/compiled/print.css', :media => 'print'
+    /[if lt IE 8]
+      = stylesheet_link_tag '/stylesheets/compiled/ie.css', :media => 'screen, projection'
+    = stylesheet_link_tag '/stylesheets/compiled/application.css', :media => 'screen, projection'
+    %script{:type => "text/javascript", :src => "/javascripts/jquery-1.4.2.min.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/application.js" }
+  %body
+    #wrapper
+      #header
+        = link_to image_tag( "/images/logo-wide.png" ), root_url
+      = bread_crumb
+      #content{:class => :error}
+        = yield
+      #footer
+        #formats
+          Format:
+          =link_to_format(:xml)
+          |
+          =link_to_format(:json)
+        #driver_info
+          Driver: #{driver_symbol} | API version: #{settings.version}
+        #copyright
+          Copyright 2009-2011
+          %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
+          and individual contributors.

data/views/errors/auth_exception.xml.haml

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

data/views/errors/backend_capability_failure.xml.haml

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

data/views/errors/backend_error.html.haml

@@ -6,6 +6,9 @@
   %di
     %dt Request URL
     %dd= request.env['REQUEST_URI']
+  %di
+    %dt Parameters
+    %dd= params.inspect
   %di
     %dt Code
     %dd= @error.code

data/views/errors/backend_error.xml.haml

@@ -4,5 +4,5 @@
     %code= @error.code
     %cause= @error.cause
     - if @error.details
-      %details #{@error.details}
-  %message #{@error.message}
+      %details< #{cdata @error.details.join("\n")}
+  %message< #{cdata @error.message}

data/views/errors/validation_failure.xml.haml

@@ -1,7 +1,8 @@
 %error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
   %parameter #{@error.name}
-  %message #{@error.message}
+  %message< #{cdata @error.message}
   - unless @error.param.options.empty?
     %valid_options
       - @error.param.options.each do |v|
-        %value #{v}
+        %value< #{cdata v}
+

data/views/images/index.html.haml

@@ -1,5 +1,4 @@
-%h1
-  Images
+%h1 Images
 
 %table.display
   %thead
@@ -10,8 +9,6 @@
         Name
       %th
         Owner
-      %th
-        Architecture
       %th
         Description
   %tbody
@@ -23,8 +20,6 @@
           = image.name
         %td
           = link_to image.owner_id, images_url
-        %td
-          = image.architecture
         %td
           = image.description
 

data/views/images/index.xml.haml

@@ -9,4 +9,6 @@
               - haml_concat image.send(attribute)
           - else
             - haml_concat image.send(attribute)
+      %actions
+        %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{image.id}"}
 

data/views/images/new.html.haml

@@ -0,0 +1,14 @@
+%h1 Create image from #{@instance.id}
+
+%form{ :action => images_url, :method => :post, :class => :new_instance }
+  %input{ :name => :instance_id, :type => :hidden, :value => @instance.id }/
+  %p
+    %label
+      Name:
+    %input{ :name => :name, :size => 30, :type => :text }/
+  %p
+    %label
+      Description:
+    %textarea{ :name => :description, :cols => 70, :rows => 20}
+  %p
+    %input{ :type => :submit, :value => 'Create' }

data/views/images/show.xml.haml

@@ -3,3 +3,5 @@
   - @image.attributes.select{ |attr| attr!=:id }.each do |attribute|
     - haml_tag(attribute, :<) do
       - haml_concat @image.send(attribute)
+  %actions
+    %link{ :rel => 'create_instance', :method => :post, :href => "#{instances_url};image_id=#{@image.id}"}

data/views/instances/index.html.haml

@@ -7,24 +7,26 @@
       %th Owner
       %th Name
       %th Image
-      %th Realm
+      %th Profile
       %th State
       %th Actions
   %tbody
     - @instances.each do |instance|
       %tr
         %td
-          = link_to instance.id, instance_url( instance.id )
+          = link_to truncate_words(instance.id), instance_url( instance.id )
         %td
-          = link_to instance.owner_id, images_url
+          = link_to instance.owner_id, "#{instances_url}?owner_id=#{instance.owner_id}"
         %td
           = instance.name
         %td
-          = link_to instance.image_id, image_url( instance.image_id )
+          = link_to truncate_words(instance.image_id), image_url( instance.image_id )
         %td
-          = instance.realm_id ? link_to(instance.realm_id, realm_url( instance.realm_id )) : 'default'
+          = instance.hardware_profile ? link_to(instance.hardware_profile, hardware_profile_url( instance.instance_profile.id )) : 'default'
         %td
-          = instance.state
+          = image_for_state(instance.state)
         %td
           -instance.actions.each do |action|
             =link_to_action action, self.send(:"#{action}_instance_url", instance.id), instance_action_method(action)
+          - if driver.respond_to?(:run_on_instance) and instance.state=="RUNNING"
+            =link_to_action "Run command", url_for("/api/instances/#{instance.id}/run"), :get

data/views/instances/index.xml.haml

@@ -13,6 +13,10 @@
       %actions
         - instance.actions.compact.each do |action|
           %link{:rel => action, :href => self.send("#{action}_instance_url", instance.id), :method => instance_action_method(action)}
+        - if driver.respond_to?(:run_on_instance)
+          %link{:rel => 'run', :method => :post, :href => run_instance_url(instance.id)}
+        - if instance.can_create_image?
+          %link{:rel => 'create_image', :method => :post, :href => "#{create_image_url};instance_id=#{instance.id}"}
       %public_addresses
         - instance.public_addresses.each do |address|
           %address  #{address}

data/views/instances/new.html.haml

@@ -1,27 +1,40 @@
-%h1 New Instance
+%h1 Launch new Instance
 
+%h3{:class => "description"}= @image.description
 %h2= @image.id
-%h3= @image.description
 
-%form{ :action => instances_url, :method => :post }
+%form{ :action => instances_url, :method => :post, :class => :new_instance }
   %input{ :name => :image_id, :type => :hidden, :value => @instance.image_id }/
   %p
     %label
-      Instance Name:
-      %input{ :name => 'name', :size => 30 }/
+      Name:
+    %input{ :name => 'name', :size => 30, :type => :text }/
+  -if driver_has_feature?(:instance_count)
+    %p
+      %label
+        Number of instances:
+      %input{ :type => :text, :value => "1", :name => :instance_count }
+  -if driver_has_feature?(:sandboxing)
+    %p
+      %label
+        Sandbox?:
+      %input{ :type => :checkbox, :value => "1", :name => :sandbox }
   -if driver_has_feature?(:register_to_load_balancer)
     %p
       %label
-        Assign to load balancer:
-        %select{:name => 'load_balancer_id'}
-          %option{:value => ""}
-          - @load_balancers.each do |load_balancer|
-            %option{:value => load_balancer.id} #{load_balancer.id}
+        Load balancer to assign:
+      %select{:name => 'load_balancer_id'}
+        %option
+        - @load_balancers.each do |load_balancer|
+          %option{:value => load_balancer.id} #{load_balancer.id}
   -if driver_has_feature?(:authentication_key)
     %p
       %label
         Instance Keyname:
-        %input{:name => 'keyname', :size => 30 }
+      %select{:name => 'keyname'}
+        %option
+        - @keys.each do |key|
+          %option{ :value => key.id } #{key.id}
   - if !@hardware_profiles.empty?
     %h3 What size machine?
     - for hwp in @hardware_profiles
@@ -60,4 +73,20 @@
           %br/
           %span.radio-group-details
             = "#{realm.name}, #{realm.limit}"
+  - if driver_has_feature?(:user_files, :instances)
+    %h2 User-supplied files
+    %table
+      %thead
+        %tr
+          %th
+          %th Path
+          %th Content (must be base64 encoded)
+      %tbody
+        - 1.upto(5) do |i|
+          %tr
+            %td #{i.ordinalize} File:
+            %td
+              %input{ :name => "path#{i}", :size => 20 }
+            %td
+              %input{ :name => "content#{i}", :size => 50 }
   %input{ :type => :submit, :name => "commit", :value => "create" }/

data/views/instances/run.html.haml

@@ -0,0 +1,9 @@
+%h1 Run command on instance #{params[:id]}
+
+%p
+  %label Command:
+  %em #{@output.ssh.command}
+%p
+  %strong Command output
+%pre
+  =@output.body

data/views/instances/run.xml.haml

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

data/views/instances/run_command.html.haml

@@ -0,0 +1,16 @@
+%h1
+  Run command on 
+  = @instance.id
+
+%form{ :action => run_instance_url(@instance.id), :method => :post }
+  %p
+    %label{ :for => :cmd } Desired command:
+    %input{ :name => :cmd, :value => "", :type => :text}
+  %p
+    %label{ :for => :private_key } Private key:
+  %p
+    %small Leave private key blank if using password authentication method
+  %p
+    %textarea{ :name => :private_key, :cols => 65, :rows => 20 }
+  %p
+    %input{ :type => :submit, :value => "Execute" }

data/views/instances/show.html.haml

@@ -36,8 +36,22 @@
     %dt Private Addresses
     %dd
       = @instance.private_addresses.collect { |address| "<div>#{address}</div>" }.join
+  - if @instance.password
+    %di
+      %dt Username
+      %dd
+        = @instance.username
+    %di
+      %dt Password
+      %dd
+        = @instance.password
   %di
     %dt
     %dd
       -@instance.actions.each do |action|
         =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
+    %dt
+    %dd
+      - if @instance.can_create_image?
+        =link_to_action 'Create Image', url_for("/api/images/new?instance_id=#{@instance.id}"), :get
+

data/views/instances/show.xml.haml

@@ -21,16 +21,24 @@
     %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)}
+      - 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.instance_variables.include?("@launch_time")
     %launch_time<
       =@instance.launch_time
   - if @instance.public_addresses
-    %public_addresses
+    %public_addresses<
       - @instance.public_addresses.each do |address|
-        %address<
-          =address
+        - if address.class.eql?(Hash) and address[:address]!=""
+          %address{ :port => address[:port], :type => address[:type], :mac => address[:mac] }<
+            =address[:address]
+        - elsif address.class.eql?(String)
+          %address<
+            =address
   - if @instance.private_addresses
-    %private_addresses
+    %private_addresses<
       - @instance.private_addresses.each do |address|
         %address<
           =address

data/views/layout.html.haml

@@ -18,9 +18,14 @@
       #content
         = yield
       #footer
+        #formats
+          Format:
+          =link_to_format(:xml)
+          |
+          =link_to_format(:json)
         #driver_info
           Driver: #{driver_symbol} | API version: #{settings.version}
         #copyright
-          Copyright 2009, 2010
-          %a{:href => 'http://redhat.com'} Red Hat
+          Copyright 2009-2011
+          %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
           and individual contributors.

data/views/load_balancers/index.html.haml

@@ -17,7 +17,7 @@
         %td
           = balancer.public_addresses.first
         %td
-          = link_to balancer.realms.first.id, realm_url( balancer.realms.first.id )
+          =link_to balancer.realms.first.id, realm_url( balancer.realms.first.id )
         %td
           - balancer.listeners.each do |listener|
             ="#{listener.protocol}[#{listener.load_balancer_port}]<br/>"

data/views/load_balancers/new.html.haml

@@ -28,11 +28,11 @@
   %p
     %label
       Load balancer port:
-    %input{ :name => "listener_lbr_port", :size => 30}
+    %input{ :name => "listener_balancer_port", :size => 30}
   %p
     %label
       Instances port:
-    %input{ :name => "listener_inst_port", :size => 30}
+    %input{ :name => "listener_instance_port", :size => 30}
   %p
     %input{ :type => :submit, :name => "commit", :value => "create" }/
 

data/views/load_balancers/show.html.haml

@@ -25,7 +25,7 @@
       - @load_balancer.instances.each do |inst|
         %dd
           =inst.id
-          =link_to_action, 'Delete', unregister_load_balancer_url(@load_balancer.id, :instance_id => inst.id), :post
+          =link_to_action 'Delete', unregister_load_balancer_url(@load_balancer.id, :instance_id => inst.id), :post
 
 %form{:action => url_for("/api/load_balancers/#{@load_balancer.id}/register"), :method => :post}
   %p

data/views/storage_snapshots/index.html.haml

@@ -7,6 +7,7 @@
       %th Volume
       %th Created
       %th State
+      %th Actions
   %tbody
     - @storage_snapshots.each do |snapshot|
       %tr
@@ -18,3 +19,5 @@
           = snapshot.created
         %td
           = snapshot.state
+        %td
+          = link_to_action "Delete", destroy_storage_snapshot_url(snapshot.id), :delete