deltacloud-core 0.1.2 → 0.3.0

data/public/stylesheets/compiled/screen.css

@@ -6,7 +6,7 @@ html, body {
   font-weight: inherit;
   font-style: inherit;
   font-size: 100%;
-  font-family: inherit;
+  font-family : "Helvetica Neue","Liberation Sans",Arial,sans-serif;
   vertical-align: baseline; }
 
 /* line 12, ../../../../../../../.gem/ruby/1.8/gems/compass-0.8.17/frameworks/blueprint/stylesheets/blueprint/modules/_reset.sass */

data/server.rb

@@ -1,5 +1,3 @@
-# Copyright (C) 2009, 2010  Red Hat, Inc.
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.  The
@@ -28,11 +26,19 @@ require 'haml'
 require 'open3'
 require 'lib/deltacloud/helpers/blob_stream'
 require 'sinatra/rack_driver_select'
+require 'sinatra/rack_runtime'
+require 'sinatra/rack_etag'
+require 'sinatra/rack_matrix_params'
 
-set :version, '0.1.0'
+set :version, '0.3.0'
 
+include Deltacloud::Drivers
+set :drivers, Proc.new { driver_config }
 
-use RackDriverSelect
+use Rack::ETag
+use Rack::Runtime
+use Rack::MatrixParams
+use Rack::DriverSelect
 
 configure do
   set :raise_errors => false
@@ -58,29 +64,29 @@ end
 error Deltacloud::BackendCapability::Failure do
   report_error(405, "backend_capability_failure")
 end
+
 error Deltacloud::AuthException do
-  report_error(403, "auth_exception")
+  report_error(401, "auth_exception")
 end
 
 error Deltacloud::BackendError do
   report_error(500, "backend_error")
 end
 
+error Sinatra::Rabbit::UnsupportedCollectionException do
+  report_error(404, "not_found")
+end
+
 Sinatra::Application.register Sinatra::RespondTo
 
 # Redirect to /api
-get '/' do redirect url_for('/api'); end
-
-get '/api/drivers\/?' do
-  respond_to do |format|
-    format.xml { haml :"api/drivers" }
-  end
-end
+get '/' do redirect url_for('/api'), 301; end
 
 get '/api\/?' do
   if params[:force_auth]
     return [401, 'Authentication failed'] unless driver.valid_credentials?(credentials)
   end
+  @collections = [:drivers] + driver.supported_collections
   respond_to do |format|
     format.xml { haml :"api/show" }
     format.json do
@@ -97,6 +103,41 @@ end
 
 # Rabbit DSL
 
+collection :drivers do
+  global!
+
+  description <<EOS
+List all the drivers supported by this server.
+EOS
+
+  operation :index do
+    description "List all drivers"
+    control do
+      @drivers = settings.drivers
+      respond_to do |format|
+        format.xml { haml :"drivers/index" }
+        format.json { @drivers.to_json }
+        format.html { haml :"drivers/index" }
+      end
+    end
+  end
+
+  operation :show do
+    description "Show details for a driver"
+    param :id,      :string
+    control do
+      @name = params[:id].to_sym
+      @driver = settings.drivers[@name]
+      return [404, "Driver #{@name} not found"] unless @driver
+      respond_to do |format|
+        format.xml { haml :"drivers/show" }
+        format.json { @driver.to_json }
+        format.html { haml :"drivers/show" }
+      end
+    end
+  end
+end
+
 collection :realms do
   description <<END
   Within a cloud provider a realm represents a boundary containing resources.
@@ -129,6 +170,13 @@ END
 
 end
 
+get "/api/images/new" do
+  @instance = Instance.new( :id => params[:instance_id] )
+  respond_to do |format|
+    format.html { haml :"images/new" }
+  end
+end
+
 collection :images do
   description <<END
   An image is a platonic form of a machine. Images are not directly executable,
@@ -154,6 +202,28 @@ END
     control { show(:image) }
   end
 
+  operation :create do
+    description 'Create image from instance'
+    with_capability :create_image
+    param :instance_id,	 :string, :required
+    param :name,	 :string, :optional
+    param :description,	 :string, :optional
+    control do 
+      @image = driver.create_image(credentials, { 
+	:id => params[:instance_id],
+        :name => params[:name],
+	:description => params[:description]
+      })
+      respond_to do |format|
+        format.xml do
+          response.status = 201 # Created
+          haml :"images/show"
+        end
+        format.html { haml :"images/show" }
+      end
+    end
+  end
+
 end
 
 collection :instance_states do
@@ -203,6 +273,7 @@ get "/api/instances/new" do
   @image   = driver.image( credentials, :id => params[:image_id] )
   @hardware_profiles = driver.hardware_profiles(credentials, :architecture => @image.architecture )
   @realms = driver.realms(credentials)
+  @keys = driver.keys(credentials) if driver_has_feature?(:authentication_key)
   if driver_has_feature?(:register_to_load_balancer)
     @load_balancers = driver.load_balancers(credentials)
   end
@@ -211,6 +282,13 @@ get "/api/instances/new" do
   end
 end
 
+get '/api/instances/:id/run' do
+  @instance = driver.instance(credentials, :id => params[:id])
+  respond_to do |format|
+    format.html { haml :"instances/run_command" }
+  end
+end
+
 get '/api/load_balancers/new' do
   @realms = driver.realms(credentials)
   @instances = driver.instances(credentials) if driver_has_feature?(:register_instance, :load_balancers)
@@ -246,7 +324,10 @@ collection :load_balancers do
     control do
       @load_balancer = driver.create_load_balancer(credentials, params)
       respond_to do |format|
-        format.xml { haml :"load_balancers/show" }
+        format.xml do
+          response.status = 201  # Created
+          haml :"load_balancers/show"
+        end
         format.html { haml :"load_balancers/show" }
       end
     end
@@ -277,7 +358,11 @@ collection :load_balancers do
     param :id,  :string,  :required
     control do
       driver.destroy_load_balancer(credentials, params[:id])
-      redirect(load_balancers_url)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(load_balancers_url) }
+      end
     end
   end
 
@@ -312,17 +397,15 @@ END
     param :realm_id,     :string, :optional
     param :hwp_id,       :string, :optional
     control do
-      @image = driver.image(credentials, :id => params[:image_id])
-      instance = driver.create_instance(credentials, @image.id, params)
+      @instance = driver.create_instance(credentials, params[:image_id], params)
       respond_to do |format|
         format.xml do
           response.status = 201  # Created
-          response['Location'] = instance_url(instance.id)
-          @instance = instance
+          response['Location'] = instance_url(@instance.id)
           haml :"instances/show"
         end
         format.html do
-          redirect instance_url(instance.id) if instance and instance.id
+          redirect instance_url(@instance.id) if @instance and @instance.id
           redirect instances_url
         end
       end
@@ -356,6 +439,26 @@ END
     param :id,           :string, :required
     control { instance_action(:destroy) }
   end
+
+  operation :run, :method => :post, :member => true do
+    description <<END
+  Run command on instance. Either password or private key must be send
+  in order to execute command. Authetication method should be advertised
+  in instance.
+END
+    with_capability :run_on_instance
+    param :id,          :string,  :required
+    param :cmd,         :string,  :required, "Shell command to run on instance"
+    param :private_key, :string,  :optional, "Private key in PEM format for authentication"
+    param :password,    :string,  :optional, "Password used for authentication"
+    control do
+      @output = driver.run_on_instance(credentials, params)
+      respond_to do |format|
+        format.xml { haml :"instances/run" }
+        format.html { haml :"instances/run" }
+      end
+    end
+  end
 end
 
 collection :hardware_profiles do
@@ -401,6 +504,12 @@ END
 
 end
 
+get '/api/storage_snapshots/new' do
+  respond_to do |format|
+    format.html { haml :"storage_snapshots/new" }
+  end
+end
+
 collection :storage_snapshots do
   description "Storage snapshots description here"
 
@@ -417,6 +526,44 @@ collection :storage_snapshots do
     param :id,          :string,    :required
     control { show(:storage_snapshot) }
   end
+
+  operation :create do
+    description "Create a new snapshot from volume"
+    with_capability :create_storage_snapshot
+    param :volume_id, :string,  :required
+    control do
+      response.status = 201  # Created
+      @storage_snapshot = driver.create_storage_snapshot(credentials, params)
+      show(:storage_snapshot)
+    end
+  end
+
+  operation :destroy do
+    description "Delete storage snapshot"
+    with_capability :destroy_storage_snapshot
+    param :id,  :string,  :required
+    control do
+      driver.destroy_storage_snapshot(credentials, params)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(storage_snapshots_url) }
+      end
+    end
+  end
+end
+
+get '/api/storage_volumes/new' do
+  respond_to do |format|
+    format.html { haml :"storage_volumes/new" }
+  end
+end
+
+get '/api/storage_volumes/attach' do
+  respond_to do |format|
+    @instances = driver.instances(credentials)
+    format.html { haml :"storage_volumes/attach" }
+  end
 end
 
 collection :storage_volumes do
@@ -435,6 +582,63 @@ collection :storage_volumes do
     param :id,          :string,    :required
     control { show(:storage_volume) }
   end
+
+  operation :create do
+    description "Create a new storage volume"
+    with_capability :create_storage_volume
+    param :snapshot_id, :string,  :optional
+    param :capacity,    :string,  :optional
+    param :realm_id,    :string,  :optional
+    control do
+      @storage_volume = driver.create_storage_volume(credentials, params)
+      respond_to do |format|
+        format.html { haml :"storage_volumes/show" }
+        format.xml do
+          response.status = 201  # Created
+          haml :"storage_volumes/show"
+        end
+      end
+    end
+  end
+
+  operation :attach, :method => :post, :member => true do
+    description "Attach storage volume to instance"
+    with_capability :attach_storage_volume
+    param :id,         :string,  :required
+    param :instance_id,:string,  :required
+    param :device,     :string,  :required
+    control do
+      driver.attach_storage_volume(credentials, params)
+      redirect(storage_volume_url(params[:id]))
+    end
+  end
+
+  operation :detach, :method => :post, :member => true do
+    description "Detach storage volume to instance"
+    with_capability :detach_storage_volume
+    param :id,         :string,  :required
+    control do
+      volume = driver.storage_volume(credentials, :id => params[:id])
+      driver.detach_storage_volume(credentials, :id => volume.id, :instance_id => volume.instance_id,
+                                   :device => volume.device)
+      redirect(storage_volume_url(params[:id]))
+    end
+  end
+
+  operation :destroy do
+    description "Destroy storage volume"
+    with_capability :destroy_storage_volume
+    param :id,          :string,  :optional
+    control do
+      driver.destroy_storage_volume(credentials, params)
+      respond_to do |format|
+        format.xml { return 204 }
+        format.json { return 204 }
+        format.html { return redirect(storage_volumes_url) }
+      end
+    end
+  end
+
 end
 
 get '/api/keys/new' do
@@ -469,7 +673,10 @@ collection :keys do
       @key = driver.create_key(credentials, { :key_name => params[:name] })
       respond_to do |format|
         format.html { haml :"keys/show" }
-        format.xml { haml :"keys/show", :ugly => true }
+        format.xml do
+          response.status = 201  # Created
+          haml :"keys/show", :ugly => true
+        end
       end
     end
   end
@@ -479,8 +686,12 @@ collection :keys do
     with_capability :destroy_key
     param :id,  :string,  :required
     control do
-      driver.destroy_key(credentials, { :key_name => params[:id]})
-      redirect(keys_url)
+      driver.destroy_key(credentials, { :id => params[:id]})
+      respond_to do |format|
+        format.xml { 204 }
+        format.json { 204 }
+        format.html { redirect(keys_url) }
+      end
     end
   end
 
@@ -499,7 +710,21 @@ post '/api/buckets/:bucket' do
   bucket_id = params[:bucket]
   blob_id = params['blob_id']
   blob_data = params['blob_data']
-  @blob = driver.create_blob(credentials, bucket_id, blob_id, blob_data )
+  user_meta = {}
+#first try get blob_metadata from params (i.e., passed by http form post, e.g. browser)
+  max = params[:meta_params]
+  if(max)
+    (1..max.to_i).each do |i|
+      key = params[:"meta_name#{i}"]
+      key = "HTTP_X_Deltacloud_Blobmeta_#{key}"
+      value = params[:"meta_value#{i}"]
+      user_meta[key] = value
+    end #max.each do
+  else #can try to get blob_metadata from http headers
+    meta_array = request.env.select{|k,v| k.match(/^HTTP[-_]X[-_]Deltacloud[-_]Blobmeta[-_]/i)}
+    meta_array.inject({}){ |result, array| user_meta[array.first.upcase] = array.last}
+  end #end if
+  @blob = driver.create_blob(credentials, bucket_id, blob_id, blob_data, user_meta)
   respond_to do |format|
     format.html { haml :"blobs/show"}
     format.xml { haml :"blobs/show" }
@@ -511,7 +736,38 @@ delete '/api/buckets/:bucket/:blob' do
   bucket_id = params[:bucket]
   blob_id = params[:blob]
   driver.delete_blob(credentials, bucket_id, blob_id)
-  redirect(bucket_url(bucket_id))
+  respond_to do |format|
+    format.xml {  204 }
+    format.json {  204 }
+    format.html { bucket_url(bucket_id) }
+  end
+end
+
+#get blob metadata
+head '/api/buckets/:bucket/:blob' do
+  @blob_id = params[:blob]
+  @blob_metadata = driver.blob_metadata(credentials, {:id => params[:blob], 'bucket' => params[:bucket]})
+  if @blob_metadata
+      @blob_metadata.each do |k,v|
+        headers["X-Deltacloud-Blobmeta-#{k}"] = v
+      end
+   else
+    report_error(404, 'not_found')
+  end
+end
+
+#update blob metadata
+post '/api/buckets/:bucket/:blob' do
+  meta_hash = {}
+  request.env.inject({}){|current, (k,v)| meta_hash[k] = v if k.match(/^HTTP[-_]X[-_]Deltacloud[-_]Blobmeta[-_]/i)}
+  success = driver.update_blob_metadata(credentials, {'bucket'=>params[:bucket], :id =>params[:blob], 'meta_hash' => meta_hash})
+  if(success)
+    meta_hash.each do |k,v|
+      headers["X-Deltacloud-Blobmeta-#{k}"] = v
+    end
+  else
+    report_error(404, 'not_found') #FIXME is this the right error code?
+  end
 end
 
 #Get a particular blob's particulars (not actual blob data)
@@ -531,10 +787,14 @@ end
 #get the content of a particular blob
 get '/api/buckets/:bucket/:blob/content' do
   @blob = driver.blob(credentials, { :id => params[:blob], 'bucket' => params[:bucket]})
-  params['content_length'] = @blob.content_length
-  params['content_type'] = @blob.content_type
-  params['content_disposition'] = "attachment; filename=#{@blob.id}"
-  BlobStream.call(env, credentials, params)
+  if @blob
+    params['content_length'] = @blob.content_length
+    params['content_type'] = @blob.content_type
+    params['content_disposition'] = "attachment; filename=#{@blob.id}"
+    BlobStream.call(env, credentials, params)
+  else
+    report_error(404, 'not_found')
+  end
 end
 
 #Get html form for creating a new bucket
@@ -589,7 +849,11 @@ collection :buckets do
     param :id,    :string,    :required
     control do
       driver.delete_bucket(credentials, params[:id], params)
-      redirect(buckets_url)
+      respond_to do |format|
+        format.xml { 204 }
+        format.json {  204 }
+        format.html {  redirect(buckets_url) }
+      end
     end
   end