RubyGems - deltacloud-core - Versions diffs - 0.0.6 → 0.0.7 - Mend

deltacloud-core 0.0.6 → 0.0.7

Files changed (32) hide show

data/deltacloud.rb +2 -0
data/lib/deltacloud/base_driver/base_driver.rb +30 -0
data/lib/deltacloud/base_driver/features.rb +7 -0
data/lib/deltacloud/base_driver/mock_driver.rb +18 -0
data/lib/deltacloud/drivers/azure/azure_driver.rb +127 -0
data/lib/deltacloud/drivers/ec2/ec2_driver.rb +128 -4
data/lib/deltacloud/drivers/gogrid/gogrid_driver.rb +5 -2
data/lib/deltacloud/drivers/mock/mock_driver.rb +10 -16
data/lib/deltacloud/drivers/opennebula/opennebula_driver.rb +1 -1
data/lib/deltacloud/drivers/rackspace/rackspace_driver.rb +110 -11
data/lib/deltacloud/drivers/rhevm/rhevm_driver.rb +7 -4
data/lib/deltacloud/helpers/application_helper.rb +8 -1
data/lib/deltacloud/helpers/blob_stream.rb +51 -0
data/lib/deltacloud/models/blob.rb +26 -0
data/lib/deltacloud/models/bucket.rb +24 -0
data/lib/drivers.rb +1 -0
data/lib/sinatra/respond_to.rb +147 -181
data/lib/sinatra/respond_to_old.rb +253 -0
data/server.rb +104 -22
data/tests/instance_states_test.rb +1 -2
data/tests/instances_test.rb +12 -9
data/tests/url_for_test.rb +1 -1
data/views/blobs/show.html.haml +20 -0
data/views/blobs/show.xml.haml +7 -0
data/views/buckets/index.html.haml +33 -0
data/views/buckets/index.xml.haml +10 -0
data/views/buckets/new.html.haml +13 -0
data/views/buckets/show.html.haml +19 -0
data/views/buckets/show.xml.haml +8 -0
data/views/instance_states/show.html.haml +1 -1
data/views/instance_states/{show.gv.erb → show.png.erb} +0 -0
metadata +61 -33

data/lib/sinatra/respond_to_old.rb ADDED

@@ -0,0 +1,253 @@
+require 'sinatra/base'
+require 'sinatra/accept_media_types'
+# Accept header parsing was looked at but deemed
+# too much of an irregularity to deal with.  Problems with the header
+# differences from IE, Firefox, Safari, and every other UA causes
+# problems with the expected output.  The general expected behavior
+# would be serve html when no extension provided, but most UAs say
+# they will accept application/xml with out a quality indicator, meaning
+# you'd get the xml block served insead.  Just plain retarded, use the
+# extension and you'll never be suprised.
+module Sinatra
+  module RespondTo
+    class UnhandledFormat < Sinatra::NotFound; end
+    class MissingTemplate < Sinatra::NotFound
+      def code; 500 end
+    end
+    TEXT_MIME_TYPES = [:txt, :html, :js, :json, :xml, :rss, :atom, :css, :asm, :c, :cc, :conf,
+                       :csv, :cxx, :diff, :dtd, :f, :f77, :f90, :for, :gemspec, :h, :hh, :htm,
+                       :log, :mathml, :mml, :p, :pas, :pl, :pm, :py, :rake, :rb, :rdf, :rtf, :ru,
+                       :s, :sgm, :sgml, :sh, :svg, :svgz, :text, :wsdl, :xhtml, :xsl, :xslt, :yaml,
+                       :yml, :ics, :png]
+    def self.registered(app)
+      app.helpers RespondTo::Helpers
+      app.set :default_charset, 'utf-8'
+      app.set :default_content, :html
+      app.set :assume_xhr_is_js, true
+    #deltacloud: removed the code that tried to 'guess' content based on extension
+    #as this broke blobstore api (stripping blob names). Use ?format if present, otherwise
+    #use http accept, otherwise set to default
+      app.before do
+        if (params[:format])
+          @mime_types = [Helpers::mime_type(params[:format])]
+          format params[:format]
+        elsif env['HTTP_ACCEPT'].nil? || env['HTTP_ACCEPT'].empty?
+          ext = options.default_content
+        end
+      end
+     app.configure :development do |dev|
+        dev.error UnhandledFormat do
+          content_type :html, :charset => 'utf-8'
+          (<<-HTML).gsub(/^ {10}/, '')
+          <!DOCTYPE html>
+          <html>
+          <head>
+            <style type="text/css">
+            body { text-align:center;font-family:helvetica,arial;font-size:22px;
+              color:#888;margin:20px}
+            #c {margin:0 auto;width:500px;text-align:left}
+            </style>
+          </head>
+          <body>
+            <h2>Sinatra doesn't know this ditty.</h2>
+            <img src='/__sinatra__/404.png'>
+            <div id="c">
+              Try this:
+              <pre>#{request.request_method.downcase} '#{request.path_info}' do\n  respond_to do |wants|\n    wants.#{format} { "Hello World" }\n  end\nend</pre>
+            </div>
+          </body>
+          </html>
+          HTML
+        end
+        dev.error MissingTemplate do
+          content_type :html, :charset => 'utf-8'
+          response.status = request.env['sinatra.error'].code
+          engine = request.env['sinatra.error'].message.split('.').last
+          engine = 'haml' unless ['haml', 'builder', 'erb'].include? engine
+          path = File.basename(request.path_info)
+          path = "root" if path.nil? || path.empty?
+          format = engine == 'builder' ? 'xml' : 'html'
+          layout = case engine
+                   when 'haml' then "!!!\n%html\n  %body= yield"
+                   when 'erb' then "<html>\n  <body>\n    <%= yield %>\n  </body>\n</html>"
+                   when 'builder' then ::Sinatra::VERSION =~ /^1.0/ ? "xml << yield" : "builder do |xml|\n  xml << yield\nend"
+                   end
+          layout = "<small>app.#{format}.#{engine}</small>\n<pre>#{escape_html(layout)}</pre>"
+          (<<-HTML).gsub(/^ {10}/, '')
+          <!DOCTYPE html>
+          <html>
+          <head>
+            <style type="text/css">
+            body { text-align:center;font-family:helvetica,arial;font-size:22px;
+              color:#888;margin:20px}
+            #c {margin:0 auto;width:500px;text-align:left;}
+            small {float:right;clear:both;}
+            pre {clear:both;}
+            </style>
+          </head>
+          <body>
+            <h2>Sinatra can't find #{request.env['sinatra.error'].message}</h2>
+            <img src='/__sinatra__/500.png'>
+            <div id="c">
+              Try this:<br />
+              #{layout}
+              <small>#{path}.#{format}.#{engine}</small>
+              <pre>Hello World!</pre>
+              <small>application.rb</small>
+              <pre>#{request.request_method.downcase} '#{request.path_info}' do\n  respond_to do |wants|\n    wants.#{engine == 'builder' ? 'xml' : 'html'} { #{engine} :#{path}#{",\n#{' '*32}layout => :app" if layout} }\n  end\nend</pre>
+            </div>
+          </body>
+          </html>
+          HTML
+        end
+      end
+      app.class_eval do
+        private
+          def accept_list
+            @mime_types || Rack::AcceptMediaTypes.new(env['HTTP_ACCEPT'] || '')
+          end
+          # Changes in 1.0 Sinatra reuse render for layout so we store
+          # the original value to tell us if this is an automatic attempt
+          # to do a layout call.  If it is, it might fail with Errno::ENOENT
+          # and we want to pass that back to sinatra since it isn't a MissingTemplate
+          # error
+          def render_with_format(*args, &block)
+            assumed_layout = args[1] == :layout
+            args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
+            render_without_format *args, &block
+          rescue Errno::ENOENT => e
+            raise MissingTemplate, "#{args[1]}.#{args[0]}" unless assumed_layout
+            raise e
+          end
+          alias_method :render_without_format, :render
+          alias_method :render, :render_with_format
+          if ::Sinatra::VERSION =~ /^0\.9/
+            def lookup_layout_with_format(*args)
+              args[1] = "#{args[1]}.#{format}".to_sym if args[1].is_a?(::Symbol)
+              lookup_layout_without_format *args
+            end
+            alias_method :lookup_layout_without_format, :lookup_layout
+            alias_method :lookup_layout, :lookup_layout_with_format
+          end
+      end
+    end
+    module Helpers
+      # Patch the content_type function to remember the set type
+      # This helps cut down on time in the format helper so it
+      # doesn't have to do a reverse lookup on the header
+      def self.included(klass)
+        klass.class_eval do
+          def content_type_with_save(*args)
+            content_type_without_save *args
+            @_format = args.first.to_sym
+            response['Content-Type']
+          end
+          alias_method :content_type_without_save, :content_type
+          alias_method :content_type, :content_type_with_save
+        end if ::Sinatra::VERSION =~ /^1.0/
+      end
+      def self.mime_type(sym)
+        ::Sinatra::Base.respond_to?(:mime_type) && ::Sinatra::Base.mime_type(sym) || ::Sinatra::Base.media_type(sym)
+      end
+      def format(val=nil)
+        unless val.nil?
+          mime_type = ::Sinatra::RespondTo::Helpers.mime_type(val)
+          fail "Unknown media type #{val}\nTry registering the extension with a mime type" if mime_type.nil?
+          @_format = val.to_sym
+          response['Content-Type'].sub!(/^[^;]+/, mime_type)
+          charset options.default_charset if Sinatra::RespondTo::TEXT_MIME_TYPES.include?(format) and format!=:png
+        end
+        @_format
+      end
+      # This is mostly just a helper so request.path_info isn't changed when
+      # serving files from the public directory
+      def static_file?(path)
+        public_dir = File.expand_path(options.public)
+        path = File.expand_path(File.join(public_dir, unescape(path)))
+        path[0, public_dir.length] == public_dir && File.file?(path)
+      end
+      def charset(val=nil)
+        fail "Content-Type must be set in order to specify a charset" if response['Content-Type'].nil?
+        if response['Content-Type'] =~ /charset=[^;]+/
+          response['Content-Type'].sub!(/charset=[^;]+/, (val == '' && '') || "charset=#{val}")
+        else
+          response['Content-Type'] += ";charset=#{val}"
+        end unless val.nil?
+        response['Content-Type'][/charset=([^;]+)/, 1]
+      end
+      def respond_to(&block)
+        wants = Format.new
+        yield wants
+        fmt, type, handler = match_accept_type(accept_list, wants)
+        raise UnhandledFormat if fmt.nil?
+        format fmt
+        handler.nil? ? nil : handler.call
+      end
+      def match_accept_type(mime_types, format)
+        selected = []
+        accepted_types = mime_types.map {|type| Regexp.escape(type).gsub(/\\\*/,'.*') }
+        # Fix for Chrome based browsers which returns XML when 'xhtml' is requested.
+        if env['HTTP_USER_AGENT'] =~ /Chrome/ and accepted_types.size>1
+          accepted_types[0], accepted_types[1] = accepted_types[1], accepted_types[0]
+          if accepted_types[0].eql?('application/xhtml\\+xml')
+            accepted_types[0] = 'text/html'
+          end
+        end
+        accepted_types.each do |at|
+          format.each do |fmt, ht, handler|
+            (selected = [fmt, ht, handler]) and break if ht.match(at)
+          end
+          break unless selected.empty?
+        end
+        selected
+      end
+      # NOTE Array instead of hash because order matters (wildcard type
+      # matches first handler)
+      class Format < Array #:nodoc:
+        def method_missing(format, *args, &handler)
+          mt = Sinatra::RespondTo::Helpers.mime_type(format)
+          if mt.nil?
+            Sinatra::Base.send(:fail, "Unknown media type for respond_to: #{format}\nTry registering the extension with a mime type")
+          end
+          self << [format.to_s, mt, handler]
+        end
+      end
+    end
+  end
+end
+Rack::Mime::MIME_TYPES.merge!({ ".gv" => "text/plain" })
+Sinatra::Application.register Sinatra::RespondTo

data/server.rb CHANGED

@@ -9,6 +9,7 @@ require 'sinatra/lazy_auth'
 require 'erb'
 require 'haml'
 require 'open3'
+require 'lib/deltacloud/helpers/blob_stream'
 configure do
   set :raise_errors => false
@@ -37,6 +38,8 @@ error Deltacloud::BackendError do
   report_error(500, "backend_error")
 end
+Sinatra::Application.register Sinatra::RespondTo
 # Redirect to /api
 get '/' do redirect url_for('/api'); end
@@ -74,7 +77,8 @@ END
   operation :index do
     description <<END
-    Operation will list all available realms. For specific architecture use "architecture" parameter.
+    Operation will list all available realms. Realms can be filtered using
+    the "architecture" parameter.
 END
     param :id,            :string
     param :architecture,  :string,  :optional,  [ 'i386', 'x86_64' ]
@@ -98,9 +102,9 @@ END
   operation :index do
     description <<END
-    The instances collection will return a set of all images
-    available to the current use. You can filter images using
-    "owner_id" and "architecture" parameter
+    The images collection will return a set of all images
+    available to the current use. Images can be filtered using the
+    "owner_id" and "architecture" parameters.
 END
     param :id,            :string
     param :architecture,  :string,  :optional
@@ -138,7 +142,10 @@ collection :instance_states do
         format.png do
           # Trick respond_to into looking up the right template for the
           # graphviz file
-          format(:gv); gv = erb :"instance_states/show"; format(:png)
+          format_backup = format
+          format(:gv)
+          gv = erb(:"instance_states/show")
+          format(format_backup)
           png =  ''
           cmd = 'dot -Kdot -Gpad="0.2,0.2" -Gsize="5.0,8.0" -Gdpi="180" -Tpng'
           Open3.popen3( cmd ) do |stdin, stdout, stderr|
@@ -146,6 +153,7 @@ collection :instance_states do
             stdin.close()
             png = stdout.read
           end
+          content_type 'image/png'
           png
         end
       end
@@ -170,7 +178,7 @@ collection :instances do
 END
   operation :index do
-    description "List all instances"
+    description "List all instances."
     param :id,            :string,  :optional
     param :state,         :string,  :optional
     control { filter_all(:instances) }
@@ -183,7 +191,7 @@ END
   end
   operation :create do
-    description "Create a new instance"
+    description "Create a new instance."
     param :image_id,     :string, :required
     param :realm_id,     :string, :optional
     param :hwp_id,       :string, :optional
@@ -206,25 +214,25 @@ END
   end
   operation :reboot, :method => :post, :member => true do
-    description "Reboot running instance"
+    description "Reboot a running instance."
     param :id,           :string, :required
     control { instance_action(:reboot) }
   end
   operation :start, :method => :post, :member => true do
-    description "Start an instance"
+    description "Start an instance."
     param :id,           :string, :required
     control { instance_action(:start) }
   end
   operation :stop, :method => :post, :member => true do
-    description "Stop running instance"
+    description "Stop a running instance."
     param :id,           :string, :required
     control { instance_action(:stop) }
   end
   operation :destroy do
-    description "Destroy instance"
+    description "Destroy an instance."
     param :id,           :string, :required
     control { instance_action(:destroy) }
   end
@@ -239,7 +247,7 @@ collection :hardware_profiles do
 END
   operation :index do
-    description "List of available hardware profiles"
+    description "List of available hardware profiles."
     param :id,          :string
     param :architecture,  :string,  :optional,  [ 'i386', 'x86_64' ]
     control do
@@ -253,7 +261,7 @@ END
   end
   operation :show do
-    description "Show specific hardware profile"
+    description "Show specific hardware profile."
     param :id,          :string,    :required
     control do
       @profile =  driver.hardware_profile(credentials, params[:id])
@@ -275,13 +283,13 @@ collection :storage_snapshots do
   description "Storage snapshots description here"
   operation :index do
-    description "Listing of storage snapshots"
+    description "List of storage snapshots."
     param :id,            :string
     control { filter_all(:storage_snapshots) }
   end
   operation :show do
-    description "Show storage snapshot"
+    description "Show storage snapshot."
     param :id,          :string,    :required
     control { show(:storage_snapshot) }
   end
@@ -291,13 +299,13 @@ collection :storage_volumes do
   description "Storage volumes description here"
   operation :index do
-    description "Listing of storage volumes"
+    description "List of storage volumes."
     param :id,            :string
     control { filter_all(:storage_volumes) }
   end
   operation :show do
-    description "Show storage volume"
+    description "Show storage volume."
     param :id,          :string,    :required
     control { show(:storage_volume) }
   end
@@ -310,23 +318,23 @@ get '/api/keys/new' do
 end
 collection :keys do
-  description "Instance authentication credentials"
+  description "Instance authentication credentials."
   operation :index do
-    description "List all available credentials which could be used for instance authentication"
+    description "List all available credentials which could be used for instance authentication."
     control do
       filter_all :keys
     end
   end
   operation :show do
-    description "Show details about given instance credential"
+    description "Show details about given instance credential."
     param :id,  :string,  :required
     control { show :key }
   end
   operation :create do
-    description "Create a new instance credential if backend supports this"
+    description "Create a new instance credential if backend supports this."
     param :name,  :string,  :required
     control do
       unless driver.respond_to?(:create_key)
@@ -342,7 +350,7 @@ collection :keys do
   end
   operation :destroy do
-    description "Destroy given instance credential if backend supports this"
+    description "Destroy given instance credential if backend supports this."
     param :id,  :string,  :required
     control do
       unless driver.respond_to?(:destroy_key)
@@ -355,3 +363,77 @@ collection :keys do
   end
 end
+get '/api/buckets/:bucket/:blob' do
+  @blob = driver.blob(credentials, { :id => params[:blob], 'bucket' => params[:bucket]})
+  if @blob
+    respond_to do |format|
+      format.html { haml :"blobs/show" }
+      format.xml { haml :"blobs/show" }
+      format.json { convert_to_json(blobs, @blob) }
+      end
+  else
+      report_error(404, 'not_found')
+  end
+end
+get '/api/buckets/new' do
+  respond_to do |format|
+    format.html { haml :"buckets/new" }
+  end
+end
+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
+  BlobStream.call(env, credentials, params)
+end
+collection :buckets do
+  description "Cloud Storage buckets - aka buckets|directories|folders"
+  operation :index do
+    description "List buckets associated with this account"
+    param :id,        :string
+    param :name,      :string
+    param :size,      :string
+    control { filter_all(:buckets) }
+  end
+  operation :show do
+    description "Show bucket"
+    param :id,        :string
+    control { show(:bucket) }
+  end
+  operation :create do
+    description "Create a new bucket (POST /api/buckets)"
+    param :name,      :string,    :required
+    control do
+      @bucket = driver.create_bucket(credentials, params[:name], params)
+      respond_to do |format|
+        format.xml do
+          response.status = 201  # Created
+          response['Location'] = bucket_url(@bucket.id)
+          haml :"buckets/show"
+        end
+        format.html do
+          redirect bucket_url(@bucket.id) if @bucket and @bucket.id
+          redirect buckets_url
+        end
+      end
+    end
+  end
+  operation :destroy do
+    description "Delete a bucket by name - bucket must be empty"
+    param :id,    :string,    :required
+    control do
+      driver.delete_bucket(credentials, params[:id], params)
+      redirect(buckets_url)
+    end
+  end
+end