visor-image 0.0.3 → 0.0.4

data/lib/image/meta.rb

@@ -5,32 +5,27 @@ require 'json'
 module Visor
   module Image
 
-    # The API for the VISoR Meta Server. This class supports all image metadata manipulation operations.
+    # The API for the VISOR Meta System (VMS) server. This class supports all image metadata manipulation operations.
     #
-    # This is the entry-point for the VISoR Image Server to communicate with the VISoR Meta Server,
-    # here are processed and logged all the calls to the meta server coming from it.
+    # This is the API used by the VISOR Image System (VIS) to communicate with the VMS in order to accomplish
+    # metadata retrieving and registering operations.
     #
     class Meta
       include Visor::Common::Exception
 
-      DEFAULT_HOST = '0.0.0.0'
-      DEFAULT_PORT = 4567
+      attr_reader :host, :port
 
-      attr_reader :host, :port, :ssl
-
-      # Initializes a new new VISoR Meta Image.
+      # Initializes a new new VMS interface.
       #
-      # @option opts [String] :host (DEFAULT_HOST) The host address where VISoR meta server resides.
-      # @option opts [String] :port (DEFAULT_PORT) The host port where VISoR meta server resides.
-      # @option opts [String] :ssl (false) If the connection should be made through HTTPS (SSL).
+      # @option opts [String] :host The host address where VMS server resides.
+      # @option opts [String] :port The host port where VMS server listens.
       #
       def initialize(opts = {})
-        @host = opts[:host] || DEFAULT_HOST
-        @port = opts[:port] || DEFAULT_PORT
-        @ssl  = opts[:ssl] || false
+        @host = opts[:host]
+        @port = opts[:port]
       end
 
-      # Retrieves brief metadata of all public images.
+      # Retrieves all public and user’s private images brief metadata.
       # Options for filtering the returned results can be passed in.
       #
       # @option query [String] :<attribute_name> The image attribute value to filter returned results.
@@ -38,27 +33,18 @@ module Visor
       # @option query [String] :sort ("_id") The image attribute to sort returned results.
       # @option query [String] :dir ("asc") The direction to sort results ("asc"/"desc").
       #
-      # @return [Array] All public images brief metadata.
-      #   Just {Visor::Meta::Backends::Base::BRIEF BRIEF} fields are returned.
+      # @return [Array] All images brief metadata.
+      #   Just {Visor::Meta::Backends::Base::BRIEF BRIEF} attributes are returned.
       #
-      # @raise [NotFound] If there are no public images registered on the server.
+      # @raise [NotFound] If there are no images registered on VMS.
       #
       def get_images(query = {}, owner=nil)
-        http    = request.get path: '/images', query: query.merge({access: 'public'}), head: get_headers
-        pub = return_response(http)
-        priv = []
-        if owner
-          http = request.get path: '/images', query: query.merge({access: 'private', owner: owner}), head: get_headers
-          begin
-            priv = return_response(http)
-          rescue => e
-            nil
-          end
-        end
-        pub + priv
+        query.merge!(owner: owner) if owner
+        http = request.get path: '/images', query: query, head: get_headers
+        return_response(http)
       end
 
-      # Retrieves detailed metadata of all public images.
+      # Retrieves all public and user’s private images detailed metadata.
       #
       # Filtering and querying works the same as with {#get_images}. The only difference is the number
       # of disclosed attributes.
@@ -71,59 +57,50 @@ module Visor
       # @return [Array] All public images detailed metadata.
       #   The {Visor::Meta::Backends::Base::DETAIL_EXC DETAIL_EXC} fields are excluded from results.
       #
-      # @raise [NotFound] If there are no public images registered on the server.
+      # @raise [NotFound] If there are no images registered on the server.
       #
       def get_images_detail(query = {}, owner=nil)
+        query.merge!(owner: owner) if owner
         http = request.get path: '/images/detail', query: query, head: get_headers
-        pub = return_response(http)
-        priv = []
-        if owner
-          http = request.get path: '/images/detail', query: query.merge({access: 'private', owner: owner}), head: get_headers
-          begin
-            priv = return_response(http)
-          rescue => e
-            nil
-          end
-        end
-        pub + priv
+        return_response(http)
       end
 
-      # Retrieves detailed image metadata of the image with the given id.
+      # Retrieves detailed metadata of the image with the given id.
       #
       # @param id [String] The wanted image's _id.
       #
-      # @return [Hash] The requested image metadata.
+      # @return [Hash] The requested image detailed metadata.
       #
-      # @raise [NotFound] If image not found.
+      # @raise [NotFound] If image metadata was not found.
       #
       def get_image(id)
         http = request.get path: "/images/#{id}", head: get_headers
         return_response(http)
       end
 
-      # Register a new image on the server with the given metadata and returns its metadata.
+      # Register a new image metadata on VMS and return it.
       #
       # @param meta [Hash] The image metadata.
       #
-      # @return [Hash] The already inserted image metadata.
+      # @return [Hash] The already inserted detailed image metadata.
       #
-      # @raise [Invalid] If image meta validation fails.
+      # @raise [Invalid] If image metadata validation fails.
       #
-      def post_image(meta)
+      def post_image(meta, address)
         body = prepare_body(meta)
-        http = request.post path: '/images', body: body, head: post_headers
+        http = request.post path: '/images', body: body, head: post_headers(address)
         return_response(http)
       end
 
-      # Updates an image record with the given metadata and returns its metadata.
+      # Updates an image metadata with the given metadata and returns it.
       #
       # @param id [String] The image's _id which will be updated.
       # @param meta [Hash] The image metadata.
       #
-      # @return [Hash] The already updated image metadata.
+      # @return [Hash] The already updated detailed image metadata.
       #
       # @raise [Invalid] If image meta validation fails.
-      # @raise [NotFound] If required image was not found.
+      # @raise [NotFound] If the target image metadata was not found.
       #
       def put_image(id, meta)
         body = prepare_body(meta)
@@ -135,9 +112,9 @@ module Visor
       #
       # @param id [String] The image's _id which will be deleted.
       #
-      # @return [Hash] The already deleted image metadata. This is useful for recover on accidental delete.
+      # @return [Hash] The already deleted detailed image metadata. This is useful for recovery on accidental delete.
       #
-      # @raise [NotFound] If required image was not found.
+      # @raise [NotFound] If the target image metadata was not found.
       #
       def delete_image(id)
         http = request.delete path: "/images/#{id}", head: delete_headers
@@ -160,7 +137,7 @@ module Visor
 
       # Process requests by preparing its headers, launch them and assert or raise their response.
       #
-      # @param request [EventMachine::HttpRequest] The request which will be launched.
+      # @param http [EventMachine::HttpRequest] The request which will be launched.
       #
       # @return [String, Hash] If an error is raised, then it parses and returns its message,
       #   otherwise it properly parse and return the response body.
@@ -171,30 +148,36 @@ module Visor
       def return_response(http)
         body   = http.response
         status = http.response_header.status.to_i
-        parsed = JSON.parse(body, symbolize_names: true)
 
         case status
+        when 0 then
+          raise InternalError, "VISOR Meta System server not found. Is it running?"
         when 404 then
-          raise NotFound, parsed[:message]
+          raise NotFound, parse(body)
         when 400 then
-          raise Invalid, parsed[:message]
+          raise Invalid, parse(body)
         when 500 then
-          raise InternalError, parsed[:message]
+          raise InternalError, parse(body)
         else
-          parsed[:image] || parsed[:images]
+          parse(body)
         end
       end
 
+      def parse(body)
+        parsed = JSON.parse(body, symbolize_names: true)
+        parsed[:image] || parsed[:images] || parsed[:message]
+      end
+
       # Generate a new HTTP or HTTPS connection based on initialization parameters.
       #
       # @return [EventMachine::HttpRequest] A HTTP or HTTPS (not done yet) connection ready to use.
       #
       def request
-        if @ssl
+        #if @ssl
           #TODO: ssl connection
-        else
+        #else
           EventMachine::HttpRequest.new("http://#{@host}:#{@port}")
-        end
+        #end
       end
 
       # Fill common header keys before each request. This sets the 'User-Agent' and 'Accept'
@@ -202,18 +185,23 @@ module Visor
       # for POST and PUT requests.
       #
       def get_headers
-        {'User-Agent' => 'VISoR Image Server',
+        {'User-Agent' => 'VISOR Image System',
          'Accept'     => 'application/json'}
       end
 
-      def post_headers
-        {'User-Agent'   => 'VISoR Image Server',
+      def put_headers
+        {'User-Agent'   => "VISOR Image System",
+         'Accept'       => 'application/json',
+         'content-type' => 'application/json'}
+      end
+
+      def post_headers(address)
+        {'User-Agent'   => "VISOR Image System - #{address}",
          'Accept'       => 'application/json',
          'content-type' => 'application/json'}
       end
 
       alias :delete_headers :get_headers
-      alias :put_headers :post_headers
     end
   end
 end

data/lib/image/routes/delete_all_images.rb

@@ -28,6 +28,8 @@ module Visor
         exit_error(403, e.message)
       rescue NotFound => e
         exit_error(404, e.message)
+      rescue InternalError => e
+        exit_error(503, e.message)
       end
 
       def exit_error(code, message)

data/lib/image/routes/delete_image.rb

@@ -41,6 +41,8 @@ module Visor
         exit_error(403, e.message)
       rescue NotFound => e
         exit_error(404, e.message)
+      rescue InternalError => e
+        exit_error(503, e.message)
       else
         [200, {}, {image: meta}]
       end

data/lib/image/routes/get_image.rb

@@ -38,6 +38,8 @@ module Visor
           return exit_error(403, e.message)
         rescue NotFound => e
           return exit_error(404, e.message)
+        rescue InternalError => e
+          exit_error(503, e.message)
         end
 
         custom  = {'Content-Type' => 'application/octet-stream', 'X-Stream' => 'Goliath'}

data/lib/image/routes/get_images.rb

@@ -30,11 +30,14 @@ module Visor
       def response(env)
         access_key = authorize(env, vas)
         meta = vms.get_images(params, access_key)
+        env.params.delete('format')
         [200, {}, {images: meta}]
       rescue Forbidden => e
         exit_error(403, e.message)
       rescue NotFound => e
         exit_error(404, e.message)
+      rescue InternalError => e
+        exit_error(503, e.message)
       end
 
       # Produce an HTTP response with an error code and message.

data/lib/image/routes/get_images_detail.rb

@@ -30,11 +30,14 @@ module Visor
       def response(env)
         access_key = authorize(env, vas)
         meta = vms.get_images_detail(params, access_key)
+        env.params.delete('format')
         [200, {}, {images: meta}]
       rescue Forbidden => e
         exit_error(403, e.message)
       rescue NotFound => e
         exit_error(404, e.message)
+      rescue InternalError => e
+        exit_error(503, e.message)
       end
 
       # Produce an HTTP response with an error code and message.

data/lib/image/routes/head_image.rb

@@ -32,6 +32,8 @@ module Visor
         exit_error(403, e.message)
       rescue NotFound => e
         exit_error(404, e.message)
+      rescue InternalError => e
+        exit_error(503, e.message)
       end
 
       # Produce an HTTP response with an error code and message.

data/lib/image/routes/post_image.rb

@@ -74,7 +74,7 @@ module Visor
         rescue InternalError => e
           body.close if body
           body.unlink if body
-          return exit_error(500, e.message)
+          return exit_error(503, e.message)
         end
 
         # if has body(image file), upload file and update meta or raise on error
@@ -86,6 +86,8 @@ module Visor
           return exit_error(404, e.message, true)
         rescue Duplicated => e
           return exit_error(409, e.message, true)
+        rescue InternalError => e
+          return exit_error(503, e.message, true)
         ensure
           body.close
           body.unlink
@@ -127,7 +129,7 @@ module Visor
       # @return [Hash] The already inserted image metadata.
       #
       def insert_meta(meta)
-        image     = vms.post_image(meta)
+        image     = vms.post_image(meta, address)
         env['id'] = image[:_id]
 
         if image[:location]

data/lib/image/routes/put_image.rb

@@ -82,7 +82,7 @@ module Visor
         rescue InternalError => e
           body.close if body
           body.unlink if body
-          return exit_error(500, e.message)
+          return exit_error(503, e.message)
         end unless meta.empty?
 
         # if has body(image file), upload file and update meta or raise on error
@@ -96,6 +96,8 @@ module Visor
           return exit_error(409, e.message)
         rescue Duplicated => e
           return exit_error(409, e.message, true)
+        rescue InternalError => e
+          return exit_error(503, e.message, true)
         ensure
           body.close
           body.unlink

data/lib/image/server.rb

@@ -5,33 +5,35 @@ require 'json'
 module Visor
   module Image
 
-    # The VISoR Image Server. This supports all image metadata manipulation
-    # operations, dispatched to the VISoR Meta Server and the image files storage operations.
+    # The VISOR Image System (VIS) server. This server is the VISOR front-end and supports all image metadata manipulation
+    # operations (dispatched to the VISOR Meta System) and the image files management too.
     #
-    # *The Server API is a RESTful web service for image meta as follows:*
+    # **The Server is a RESTful Web service with the following API:**
     #
-    #   HEAD    /images/<id>    - Returns metadata about the image with the given id
-    #   GET     /images         - Returns a set of brief metadata about all public images
-    #   GET     /images/detail  - Returns a set of detailed metadata about all public images
-    #   GET     /images/<id>    - Returns image data and metadata for the image with the given id
-    #   POST    /images         - Stores a new image data and metadata and returns the registered metadata
-    #   PUT     /images/<id>    - Update image metadata and/or data for the image with the given id
-    #   DELETE  /images/<id>    - Delete the metadata and data of the image with the given id
+    #   HEAD    /images/<id>    - Return detailed metadata of a given image.
+    #   GET     /images         - Return brief metadata of all public and user’s private images.
+    #   GET     /images/detail  - Return detailed metadata of all public and user’s private images.
+    #   GET     /images/<id>    - Return the metadata and file of a given image.
+    #   POST    /images         - Add new metadata and optionally upload a file.
+    #   PUT     /images/<id>    - Update the metadata and/or file of a given image.
+    #   DELETE  /images/<id>    - Remove the metadata and file of a given image.
     #
-    # The Image is multi-format, most properly it supports response encoding in JSON and XML formats.
+    # The VIS API is multi-format, most properly it supports response encoding in JSON and XML formats.
     # It will auto negotiate and encode the response metadata and error messages in the proper format,
     # based on the request *Accept* header, being it 'application/json' or 'application/xml'.
     # If no Accept header is provided, Image will encode and render it as JSON by default.
     #
-    # This server routes all metadata operations to the {Visor::Meta::Server Visor Meta Server}.
+    # This server routes all metadata operations to the {Visor::Meta::Server Visor Meta System server}.
     #
     # The server will interact with the multiple supported backend store to manage the image files.
     #
-    # *Currently we support the following store backend and operations:*
+    # **Currently we support the following store backend and operations:**
     #
     #   Amazon Simple Storage (s3)  - GET, POST, PUT, DELETE
+    #   Lunacloud Storage (lcs)     - GET, POST, PUT, DELETE
     #   Nimbus Cumulus (cumulus)    - GET, POST, PUT, DELETE
     #   Eucalyptus Walrus (walrus)  - GET, POST, PUT, DELETE
+    #   Hadoop HDFS (hdfs)          - GET, POST, PUT, DELETE
     #   Local Filesystem (file)     - GET, POST, PUT, DELETE
     #   Remote HTTP (http)          - GET
     #
@@ -57,26 +59,34 @@ module Visor
       #
       # The image metadata is promptly passed as a set of HTTP headers, as the following example:
       #
-      #   x-image-meta-_id:           <id>
-      #   x-image-meta-uri:           <uri>
-      #   x-image-meta-name:          <name>
-      #   x-image-meta-architecture:  <architecture>
-      #   x-image-meta-access:        <access>
-      #   x-image-meta-status:        <status>
-      #   x-image-meta-created_at:    <timestamp>
+      #   x-image-meta-_id: <id>
+      #   x-image-meta-uri: <uri>
+      #   x-image-meta-name: <name>
+      #   x-image-meta-architecture: <architecture>
+      #   x-image-meta-access: <access>
+      #   x-image-meta-status: <status>
+      #   x-image-meta-size: <size>
+      #   x-image-meta-format: <format>
+      #   x-image-meta-store: <store>
+      #   x-image-meta-location: <location>
+      #   x-image-meta-created_at: <timestamp>
+      #   x-image-meta-updated_at: <timestamp>
+      #   x-image-meta-checksum: <checksum>
+      #   x-image-meta-owner: <owner>
       #
-      # @note Undefined attributes are ignored and not included into response's header. Also
-      #   any raised error will be passed through HTTP headers as expected.
+      # @note Undefined attributes are ignored and not included into response's header.
+      #   Any raised error will be passed through HTTP headers too.
       #
       # @param [String] id The wanted image _id.
       #
       # @example Retrieve the image metadata with id '19b39ed6-6c43-41cc-8d59-d1a1ed24ac9d':
       #   'HEAD /images/19b39ed6-6c43-41cc-8d59-d1a1ed24ac9d'
       #
-      # @return [HTTP Headers] The image data file.
+      # @return [HTTP Headers] The image metadata.
       #
-      # @raise [HTTP Error 404] If image not found.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 403] If user authentication has failed.
+      # @raise [HTTP Error 404] If image metadata was not found.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       head '/images/:id', HeadImage
 
@@ -84,20 +94,18 @@ module Visor
       # @method get_all_brief
       # @overload get '/images'
       #
-      # Get brief information about all public images, see {Visor::Image::GetImages}.
+      # Get brief metadata of all public and user’s private images, see {Visor::Image::GetImages}.
       #
       #   { "images":
       #     [
       #       {
       #         "_id":<_id>,
-      #         "uri":<uri>,
       #         "name":<name>,
       #         "architecture":<architecture>,
-      #         "type":<type>,
+      #         "access":<access>
       #         "format":<format>,
-      #         "store":<type>,
       #         "size":<size>,
-      #         "created_at":<timestamp>
+      #         "store":<store>
       #       },
       #       ...
       #     ]
@@ -110,19 +118,20 @@ module Visor
       # @param [String] sort ("_id") The image attribute to sort results.
       # @param [String] dir ("asc") The sorting order ("asc"/"desc").
       #
-      # @example Retrieve all public images brief metadata:
+      # @example Retrieve all images brief metadata:
       #   'GET /images'
       #
-      # @example Retrieve all public `x86_64` images brief metadata:
+      # @example Retrieve all `x86_64` images brief metadata:
       #   'GET /images?architecture=x86_64'
       #
-      # @example Retrieve all public `.iso` images brief metadata, descending sorted by `size`:
+      # @example Retrieve all `.iso` images brief metadata, descending sorted by `size`:
       #   'GET /images?format=iso&sort=size&dir=desc'
       #
-      # @return [JSON, XML] The public images brief metadata.
+      # @return [JSON, XML] Images brief metadata.
       #
-      # @raise [HTTP Error 404] If there is no public images.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 403] If user authentication has failed.
+      # @raise [HTTP Error 404] If no images were found.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       get '/images', GetImages
 
@@ -130,7 +139,7 @@ module Visor
       # @method get_all_detail
       # @overload get '/images/detail'
       #
-      # Get detailed information about all public images, see {Visor::Image::GetImagesDetail}.
+      # Get detailed metadata of all public and user’s private images, see {Visor::Image::GetImagesDetail}.
       #
       #   { "images":
       #     [
@@ -147,8 +156,8 @@ module Visor
       #         "store":<store>,
       #         "created_at":<timestamp>
       #         "updated_at":<timestamp>,
-      #         "kernel":<associated kernel>,
-      #         "ramdisk":<associated ramdisk>,
+      #         "checksum":<checksum>,
+      #         "owner":<owner>,
       #       },
       #       ...
       #     ]
@@ -161,15 +170,16 @@ module Visor
       # @param [String] sort ("_id") The image attribute to sort results.
       # @param [String] dir ("asc") The sorting order ("asc"/"desc").
       #
-      # @example Retrieve all public images detailed metadata:
+      # @example Retrieve all images detailed metadata:
       #   'GET /images/detail'
       #
-      # @note Querying and ordering results are made as with #get_all_detail
+      # @note Querying and results sorting is made as with #get_all_brief
       #
-      # @return [JSON, XML] The public images detailed metadata.
+      # @return [JSON, XML] Images detailed metadata.
       #
-      # @raise [HTTP Error 404] If there is no public images.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 403] If user authentication has failed.
+      # @raise [HTTP Error 404] If no images were found.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       get '/images/detail', GetImagesDetail
 
@@ -177,21 +187,28 @@ module Visor
       # @method get_image
       # @overload get '/images/:id'
       #
-      # Get image data and detailed metadata for the given id, see {Visor::Image::GetImage}.
+      # Get detailed metadata and file for the image with given id, see {Visor::Image::GetImage}.
       #
-      # The image data file is streamed as response's body. The server will return a 200 status code,
+      # The image data file is streamed through the response body. The server will return a 200 status code,
       # with a special HTTP header, indicating that the response body will be streamed in chunks
       # and connection shouldn't be closed until the transfer is complete.
       #
       # Also, the image metadata is promptly passed as a set of HTTP headers, as the following example:
       #
-      #   x-image-meta-_id:           <id>
-      #   x-image-meta-uri:           <uri>
-      #   x-image-meta-name:          <name>
-      #   x-image-meta-architecture:  <architecture>
-      #   x-image-meta-access:        <access>
-      #   x-image-meta-status:        <status>
-      #   x-image-meta-created_at:    <timestamp>
+      #   x-image-meta-_id: <id>
+      #   x-image-meta-uri: <uri>
+      #   x-image-meta-name: <name>
+      #   x-image-meta-architecture: <architecture>
+      #   x-image-meta-access: <access>
+      #   x-image-meta-status: <status>
+      #   x-image-meta-size: <size>
+      #   x-image-meta-format: <format>
+      #   x-image-meta-store: <store>
+      #   x-image-meta-location: <location>
+      #   x-image-meta-created_at: <timestamp>
+      #   x-image-meta-updated_at: <timestamp>
+      #   x-image-meta-checksum: <checksum>
+      #   x-image-meta-owner: <owner>
       #
       # @note Undefined attributes are ignored and not included into response's header.
       #
@@ -200,11 +217,13 @@ module Visor
       # @example Retrieve the image with id '19b39ed6-6c43-41cc-8d59-d1a1ed24ac9d':
       #   'GET /images/19b39ed6-6c43-41cc-8d59-d1a1ed24ac9d'
       #
-      # @return [HTTP Headers] The image data file.
-      # @return [HTTP Body] The image data file.
+      # @return [HTTP Headers] The image metadata.
+      # @return [HTTP Body] The image file.
       #
-      # @raise [HTTP Error 404] If image not found.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 403] If user authentication has failed.
+      # @raise [HTTP Error 404] If the image metadata was not found.
+      # @raise [HTTP Error 404] If the image file was not found.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       get '/images/:id', GetImage
 
@@ -222,8 +241,8 @@ module Visor
       #
       # If wanted, the image data file should be streamed through the request body.
       # The server will receive that data in chunks, buffering them to a properly secured temporary
-      # file, avoiding buffering all the data into memory. Server will then handle the upload of that
-      # data to the definitive store location, cleaning then the generated temporary file.
+      # file, avoiding buffering all the data into memory. The server will then handle the upload of that
+      # file to the definitive store location, cleaning then the generated temporary file.
       #
       # Alternatively, a *x-image-meta-location* header can be passed, if the file is already stored in some
       # provided location. If this header is present, no body content can be passed in the request.
@@ -234,9 +253,10 @@ module Visor
       # @raise [HTTP Error 400] If the location header is present no file content can be provided.
       # @raise [HTTP Error 400] If trying to post an image file to a HTTP backend.
       # @raise [HTTP Error 400] If provided store is an unsupported store backend.
-      # @raise [HTTP Error 404] If no image data is found at the provided location.
+      # @raise [HTTP Error 403] If user authentication has failed.
+      # @raise [HTTP Error 404] If no image file is found at the provided location.
       # @raise [HTTP Error 409] If the provided image file already exists in the backend store.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       post '/images', PostImage
 
@@ -269,10 +289,11 @@ module Visor
       # @raise [HTTP Error 400] If the location header is present no file content can be provided.
       # @raise [HTTP Error 400] If trying to post an image file to a HTTP backend.
       # @raise [HTTP Error 400] If provided store is an unsupported store backend.
+      # @raise [HTTP Error 403] If user authentication has failed.
       # @raise [HTTP Error 404] If no image data is found at the provided location.
       # @raise [HTTP Error 409] If trying to assign image file to a locked or uploading image.
       # @raise [HTTP Error 409] If the provided image file already exists in the backend store.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       put '/images/:id', PutImage
 
@@ -280,7 +301,7 @@ module Visor
       # @method delete
       # @overload delete '/images/:id'
       #
-      # Delete the metadata and data of the image with the given id, see {Visor::Image::DeleteImage}.
+      # Delete the metadata and file of the image with the given id, see {Visor::Image::DeleteImage}.
       #
       # @param [String] id The image _id to delete.
       #
@@ -289,9 +310,10 @@ module Visor
       #
       # @return [JSON, XML] The already deleted image detailed metadata.
       #
-      # @raise [HTTP Error 404] If image meta or data not found.
+      # @raise [HTTP Error 403] If user authentication has failed.
       # @raise [HTTP Error 403] If user does not have permission to manipulate the image file.
-      # @raise [HTTP Error 500] On internal server error.
+      # @raise [HTTP Error 404] If image metadata was not found.
+      # @raise [HTTP Error 503] If VIS or VAS servers were not found.
       #
       delete '/images/:id', DeleteImage