cloudkeeper 1.7.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52cab17c0a8e141cd0f549626d82eafce0f55474
-  data.tar.gz: d7f9b5015ac01d524761aa2079adfd82ece86be7
+SHA256:
+  metadata.gz: e3e03cb31bad0ef3603a895b10422f1d62cc8abdcb495e4dd53833f51d6b6ebe
+  data.tar.gz: a317e14a4eaff09c65138778f9cd6b87e1e096b6bbcca4d23e6b088694d20be3
 SHA512:
-  metadata.gz: e79c7b17353a91db63ed7a1d09fca50e7323c49af4664a80a4ace22d08160291f00542ae9ee269f4f3dbdb1025a69ad79469dad6594fd122f0b40309440d1a38
-  data.tar.gz: 2b100d07bee607244b9facbce8549f0cad3649ba350b98e56c456ad15116150ebe3a6093eac91d7cbd2b8c3925817cbcdbf9b1ae3372180bab4d00039281f99c
+  metadata.gz: 90e5a73a5c8885cd26fe7b84cd1ead6bba25966dea3221e100ec366fff5a0b1a24ca91aebea5bd00acad59689fec7ec8efa9c7a91fcf9ba2bea086b611841210
+  data.tar.gz: ad0235434275038c0038fe0999c8de8e8c37376419b25fe88635b4cdaabd4882ac6c11becc77ded3d2429cdd627428809eb465249f5a6b4f142f51df5c5a4cab

data/.circleci/config.yml

@@ -1,9 +1,6 @@
 version: 2
 jobs:
-  build:
-    branches:
-      ignore:
-        - /.*/
+  build_upload:
     docker:
       - image: docker:stable
     working_directory: /root/working_directory
@@ -29,8 +26,13 @@ jobs:
             docker tag $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:$TAG $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:latest
             docker push $DOCKERHUB_ORGANIZATION/$CIRCLE_PROJECT_REPONAME:latest
           fi
-deployment:
-  fake_deploy_for_cci2:
-    tag: /v.*/
-    commands:
-      - echo "make tags run in 2.0"
+workflows:
+  version: 2
+  release-docker-images:
+    jobs:
+      - build_upload:
+          filters:
+            tags:
+              only: /v.*/
+            branches:
+              ignore: /.*/

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ARG branch=master
 ARG version
@@ -23,7 +23,7 @@ SHELL ["/bin/bash", "-c"]
 # update + dependencies
 RUN apt-get update && \
     apt-get --assume-yes upgrade && \
-    apt-get --assume-yes install ruby qemu-utils curl nginx file
+    apt-get --assume-yes install ruby qemu-utils curl nginx file gnupg
 
 # EGI trust anchors
 RUN set -o pipefail && \

data/README.md

@@ -1,15 +1,21 @@
-# cloudkeeper
-cloudkeeper is an AppDB <-> cloud synchronization utility
+<h1 align="center">
+  <img src="https://i.imgur.com/dObI6KR.png" alt="Logo Cloudkeeper" title="Logo Cloudkeeper" width="256"/>
+  <p>Cloudkeeper</p>
+</h1>
 
-[![Travis](https://img.shields.io/travis/the-cloudkeeper-project/cloudkeeper.svg?style=flat-square)](http://travis-ci.org/the-cloudkeeper-project/cloudkeeper)
-[![Gemnasium](https://img.shields.io/gemnasium/the-cloudkeeper-project/cloudkeeper.svg?style=flat-square)](https://gemnasium.com/the-cloudkeeper-project/cloudkeeper)
-[![Gem](https://img.shields.io/gem/v/cloudkeeper.svg?style=flat-square)](https://rubygems.org/gems/cloudkeeper)
-[![Code Climate](https://img.shields.io/codeclimate/maintainability/the-cloudkeeper-project/cloudkeeper.svg?style=flat-square)](https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper)
-[![DockerHub](https://img.shields.io/badge/docker-ready-blue.svg?style=flat-square)](https://hub.docker.com/r/cloudkeeper/cloudkeeper/)
-[![DOI](https://img.shields.io/badge/dynamic/json.svg?label=DOI&colorB=0D7EBE&prefix=&suffix=&query=$.doi&uri=https%3A%2F%2Fzenodo.org%2Fapi%2Frecords%2F891886&style=flat-square)](https://zenodo.org/record/891886)
+<p align="center">
+  <a href="http://travis-ci.org/the-cloudkeeper-project/cloudkeeper"><img src="https://img.shields.io/travis/the-cloudkeeper-project/cloudkeeper.svg?style=flat-square" alt="Travis"></a>
+  <a href="https://depfu.com/repos/the-cloudkeeper-project/cloudkeeper"><img src="https://img.shields.io/depfu/the-cloudkeeper-project/cloudkeeper.svg?style=flat-square" alt="Depfu"></a>
+  <a href="https://rubygems.org/gems/cloudkeeper"><img src="https://img.shields.io/gem/v/cloudkeeper.svg?style=flat-square" alt="Gem"></a>
+  <a href="https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper"><img src="https://img.shields.io/codeclimate/maintainability/the-cloudkeeper-project/cloudkeeper.svg?style=flat-square" alt="Code Climate"></a>
+  <a href="https://hub.docker.com/r/cloudkeeper/cloudkeeper/"><img src="https://img.shields.io/badge/docker-ready-blue.svg?style=flat-square" alt="DockerHub"></a>
+  <a href="https://zenodo.org/record/891885"><img src="https://img.shields.io/badge/dynamic/json.svg?label=DOI&colorB=0D7EBE&prefix=&suffix=&query=$.doi&uri=https%3A%2F%2Fzenodo.org%2Fapi%2Frecords%2F891885&style=flat-square" alt="DOI"></a>
+</p>
 
-## What does cloudkeeper do?
-cloudkeeper is able to read image lists provided by EGI AppDB, parse their content and decide what cloud appliances should be added, updated or removed from managed cloud. During the addition and update cloudkeeper is able to download an appliance's image and convert it to the format supported by the managed cloud.
+<h4 align="center">EGI AppDB <-> CMF synchronization utility</h4>
+
+## What does Cloudkeeper do?
+Cloudkeeper is able to read image lists provided by EGI AppDB, parse their content and decide what cloud appliances should be added, updated or removed from managed cloud. During the addition and update Cloudkeeper is able to download an appliance's image and convert it to the format supported by the managed cloud.
 
 Currently supported image formats are:
 * QCOW2
@@ -17,12 +23,13 @@ Currently supported image formats are:
 * VMDK
 * OVA
 
-## How does cloudkeeper work?
-cloudkeeper communicates with cloud specific components via [gRPC](http://www.grpc.io/) communication framework to manage individual clouds.
+## How does Cloudkeeper work?
+Cloudkeeper communicates with cloud specific components via [gRPC](http://www.grpc.io/) communication framework to manage individual clouds.
 
 Currently supported clouds:
-* [OpenNebula](https://opennebula.org/) - component [cloudkeeper-one](https://github.com/the-cloudkeeper-project/cloudkeeper-one)
-* [OpenStack](https://www.openstack.org/) - component [cloudkeeper-os](https://github.com/the-cloudkeeper-project/cloudkeeper-os) (under development)
+* [OpenNebula](https://opennebula.org/) - component [Cloudkeeper-ONE](https://github.com/the-cloudkeeper-project/cloudkeeper-one)
+* [OpenStack](https://www.openstack.org/) - component [Cloudkeeper-OS](https://github.com/the-cloudkeeper-project/cloudkeeper-os)
+* [Amazon Web Services](https://aws.amazon.com/) - component [Cloudkeeper-AWS](https://github.com/the-cloudkeeper-project/cloudkeeper-aws)
 
 ## Requirements
 * Ruby >= 2.2.0
@@ -55,8 +62,8 @@ bundle exec rake spec
 ```
 
 ## Configuration
-### Create a configuration file for cloudkeeper
-Configuration file can be read by cloudkeeper from these
+### Create a configuration file for Cloudkeeper
+Configuration file can be read by Cloudkeeper from these
 three locations:
 
 * `~/.cloudkeeper/cloudkeeper.yml`
@@ -67,16 +74,17 @@ The default configuration file can be found at the last location
 `PATH_TO_GEM_DIR/config/cloudkeeper.yml`.
 
 ## Usage
-cloudkeeper is run with executable `cloudkeeper`. For further assistance run `cloudkeeper help sync`:
+Cloudkeeper is run with executable `cloudkeeper`. For further assistance run `cloudkeeper help sync`:
 ```bash
 $ cloudkeeper help sync
 
 Usage:
-  cloudkeeper sync --backend-endpoint=BACKEND-ENDPOINT --external-tools-execution-timeout=N --formats=one two three --image-dir=IMAGE-DIR --image-lists=one two three --qemu-img-binary=QEMU-IMG-BINARY
+  cloudkeeper sync --backend-endpoint=BACKEND-ENDPOINT --external-tools-execution-timeout=N --formats=one two three --image-dir=IMAGE-DIR --image-list=IMAGE-LIST --qemu-img-binary=QEMU-IMG-BINARY
 
 Options:
-  [--image-lists=one two three]                      # List of image lists to sync against
-  [--image-lists-file=IMAGE-LISTS-FILE]              # File containing list of image lists to sync against
+  --image-list=IMAGE-LIST                            # Image list to sync against
+  [--verify-image-list], [--no-verify-image-list]    # Verify SMIME signature on image list
+                                                     # Default: true
   [--ca-dir=CA-DIR]                                  # CA directory
                                                      # Default: /etc/grid-security/certificates/
   [--authentication], [--no-authentication]          # Client <-> server authentication
@@ -93,6 +101,8 @@ Options:
   --external-tools-execution-timeout=N               # Timeout for execution of external tools in seconds
                                                      # Default: 600
   [--remote-mode], [--no-remote-mode]                # Remote mode starts HTTP server (NGINX) and serves images to backend via HTTP
+  [--nginx-runtime-dir=NGINX-RUNTIME-DIR]            # Runtime directory for NGINX
+                                                     # Default: /var/run/cloudkeeper/
   [--nginx-error-log-file=NGINX-ERROR-LOG-FILE]      # NGINX error log file
                                                      # Default: /var/log/cloudkeeper/nginx-error.log
   [--nginx-access-log-file=NGINX-ACCESS-LOG-FILE]    # NGINX access log file

data/cloudkeeper.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'diffy', '~> 3.1'
-  spec.add_development_dependency 'grpc-tools', '>= 1.1', '<= 1.2.5'
+  spec.add_development_dependency 'grpc-tools', '~> 1.14'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.5'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.48'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.15'
   spec.add_development_dependency 'simplecov', '~> 0.12'
-  spec.add_development_dependency 'vcr', '~> 3.0'
+  spec.add_development_dependency 'vcr', '~> 4.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
 
   spec.add_runtime_dependency 'activesupport', '>= 4.0', '< 6.0'

data/config/cloudkeeper.yml

@@ -1,6 +1,6 @@
 cloudkeeper:
-  image-lists: # List of image lists to sync against
-  image-lists-file: # File containing list of image lists to sync against
+  image-list: # Image list to sync against
+  verify-image-list: true # Verify SMIME signature on image list
   ca-dir: /etc/grid-security/certificates/ # CA directory
   authentication: false # core (client) <-> backend (server) authentication (certificate, key and backend-certificate options)
   certificate: /etc/grid-security/hostcert.pem # Core's host certificate

data/lib/cloudkeeper/backend_connector.rb

@@ -2,21 +2,22 @@ module Cloudkeeper
   class BackendConnector
     include Cloudkeeper::Entities::Conversions
 
-    attr_reader :grpc_client, :nginx
+    attr_reader :grpc_client, :nginx, :errors
 
     def initialize
       @grpc_client = CloudkeeperGrpc::Communicator::Stub.new(Cloudkeeper::Settings[:'backend-endpoint'], credentials)
       @nginx = Cloudkeeper::Nginx::HttpServer.new
+      @errors = false
     end
 
     def pre_action
       logger.debug "'pre_action' gRPC method call"
-      handle_errors grpc_client.pre_action(Google::Protobuf::Empty.new, return_op: true), raise_exception: true
+      handle_errors(exception: true) { grpc_client.pre_action(Google::Protobuf::Empty.new) }
     end
 
     def post_action
       logger.debug "'post_action' gRPC method call"
-      handle_errors grpc_client.post_action(Google::Protobuf::Empty.new, return_op: true)
+      handle_errors { grpc_client.post_action(Google::Protobuf::Empty.new) }
     end
 
     def add_appliance(appliance)
@@ -29,6 +30,12 @@ module Cloudkeeper
       manage_appliance appliance, :update_appliance
     end
 
+    def update_appliance_metadata(appliance)
+      logger.debug "'update_appliance_metadata' gRPC method call (appliance.identifier: #{appliance.identifier})"
+      appliance.image = nil
+      manage_appliance appliance, :update_appliance_metadata
+    end
+
     def remove_appliance(appliance)
       logger.debug "'remove_appliance' gRPC method call (appliance.identifier: #{appliance.identifier})"
       appliance.image = nil
@@ -37,35 +44,35 @@ module Cloudkeeper
 
     def remove_image_list(image_list_identifier)
       logger.debug "'remove_image_list' gRPC method call (image_list_identifier: #{image_list_identifier})"
-      handle_errors grpc_client.remove_image_list(
-        CloudkeeperGrpc::ImageListIdentifier.new(image_list_identifier: image_list_identifier),
-        return_op: true
-      )
+      handle_errors do
+        grpc_client.remove_image_list(CloudkeeperGrpc::ImageListIdentifier.new(image_list_identifier: image_list_identifier))
+      end
     end
 
     def image_lists
       logger.debug "'image_lists' gRPC method call"
-      handle_errors(grpc_client.image_lists(Google::Protobuf::Empty.new, return_op: true)) do |response|
-        response.map(&:image_list_identifier)
-      end
+      response = handle_errors(exception: true) { grpc_client.image_lists(Google::Protobuf::Empty.new) }
+      response.map(&:image_list_identifier)
     end
 
     def appliances(image_list_identifier)
       logger.debug "'appliances' gRPC method call"
-      handle_errors(
-        grpc_client.appliances(
-          CloudkeeperGrpc::ImageListIdentifier.new(image_list_identifier: image_list_identifier),
-          return_op: true
-        ), raise_exception: true
-      ) do |response|
-        response.inject({}) do |acc, elem|
-          image = convert_image_proto(elem.image)
-          appliance = convert_appliance_proto elem, image
-          acc.merge appliance.identifier => appliance
-        end
+      response = handle_errors(exception: true) do
+        grpc_client.appliances(CloudkeeperGrpc::ImageListIdentifier.new(image_list_identifier: image_list_identifier))
+      end
+
+      response.inject({}) do |acc, elem|
+        image = convert_image_proto(elem.image)
+        appliance = convert_appliance_proto elem, image
+        acc.merge appliance.identifier => appliance
       end
     end
 
+    def remove_expired_appliances
+      logger.debug "'remove_expired_appliances' gRPC method call"
+      handle_errors { grpc_client.remove_expired_appliances(Google::Protobuf::Empty.new) }
+    end
+
     private
 
     def credentials
@@ -78,20 +85,18 @@ module Cloudkeeper
       )
     end
 
-    def handle_errors(operation, raise_exception: false)
-      return_value = operation.execute
-      return_value = yield(return_value) if block_given?
-      check_status operation.trailing_metadata, raise_exception: raise_exception
+    def handle_errors(exception: false, default: Google::Protobuf::Empty.new)
+      raise Cloudkeeper::Errors::ArgumentError, 'Backend connector error-wrapper was called without a block!' unless block_given?
 
-      return_value
-    end
-
-    def check_status(metadata, raise_exception: false)
-      return if metadata[CloudkeeperGrpc::Constants::KEY_STATUS] == CloudkeeperGrpc::Constants::STATUS_SUCCESS
-
-      message = "#{metadata[CloudkeeperGrpc::Constants::KEY_STATUS]}: #{metadata[CloudkeeperGrpc::Constants::KEY_MESSAGE]}"
+      yield
+    rescue GRPC::BadStatus => ex
+      errors = CloudkeeperGrpc::Constants.constants.reduce({}) { |acc, el| acc.merge(CloudkeeperGrpc::Constants.const_get(el) => el) }
+      message = "#{errors[ex.code]}: #{ex.details}"
       logger.error "Backend error: #{message}"
-      raise Cloudkeeper::Errors::BackendError, message if raise_exception
+      @errors = true
+      raise Cloudkeeper::Errors::BackendError, message if exception
+
+      default
     end
 
     def set_remote_data(image_proto, access_data)
@@ -114,7 +119,7 @@ module Cloudkeeper
         set_remote_data image_proto, nginx.access_data
       end
 
-      handle_errors grpc_client.send(call, convert_appliance(appliance, image_proto), return_op: true)
+      handle_errors { grpc_client.send(call, convert_appliance(appliance, image_proto)) }
 
       nginx.stop if Cloudkeeper::Settings[:'remote-mode'] && image
     rescue Cloudkeeper::Errors::NginxError, Cloudkeeper::Errors::Image::Format::NoRequiredFormatAvailableError => ex

data/lib/cloudkeeper/cli.rb

@@ -3,6 +3,8 @@ require 'yell'
 
 module Cloudkeeper
   class CLI < Thor
+    BACKEND_ERROR_CODE = 12
+
     class_option :'logging-level',
                  required: true,
                  default: Cloudkeeper::Settings['logging']['level'],
@@ -22,14 +24,15 @@ module Cloudkeeper
                  type: :boolean,
                  desc: 'Runs cloudkeeper in debug mode'
 
-    method_option :'image-lists',
-                  default: Cloudkeeper::Settings['image-lists'],
-                  type: :array,
-                  desc: 'List of image lists to sync against'
-    method_option :'image-lists-file',
-                  default: Cloudkeeper::Settings['image-lists-file'],
+    method_option :'image-list',
+                  required: true,
+                  default: Cloudkeeper::Settings['image-list'],
                   type: :string,
-                  desc: 'File containing list of image lists to sync against'
+                  desc: 'Image list to sync against'
+    method_option :'verify-image-list',
+                  default: Cloudkeeper::Settings['verify-image-list'],
+                  type: :boolean,
+                  desc: 'Verify SMIME signature on image list'
     method_option :'ca-dir',
                   required: false,
                   default: Cloudkeeper::Settings['ca-dir'],
@@ -129,7 +132,7 @@ module Cloudkeeper
       initialize_sync options
       File.open(Cloudkeeper::Settings[:'lock-file'], File::RDWR | File::CREAT, 0o644) do |file|
         lock = file.flock(File::LOCK_EX | File::LOCK_NB)
-        Cloudkeeper::Managers::ApplianceManager.new.synchronize_appliances if lock
+        run_sync if lock
         abort 'cloudkeeper instance is already running, quitting' unless lock
       end
     rescue Cloudkeeper::Errors::InvalidConfigurationError => ex
@@ -148,6 +151,18 @@ module Cloudkeeper
 
     private
 
+    def run_sync
+      appliance_manager = Cloudkeeper::Managers::ApplianceManager.new
+      appliance_manager.synchronize_appliances
+
+      exit_with_message BACKEND_ERROR_CODE if appliance_manager.errors[:backend_errors]
+    end
+
+    def exit_with_message(code)
+      warn 'Some errors occured during the run. See logs for more info.'
+      exit code
+    end
+
     def initialize_sync(options)
       initialize_configuration options
       validate_configuration!
@@ -171,7 +186,6 @@ module Cloudkeeper
       validate_configuration_group! %i[remote-mode nginx-proxy-ip-address],
                                     %i[nginx-proxy-port],
                                     'NGINX proxy configuration missing'
-      validate_contradictory_options! %i[image-lists image-lists-file], one_required: true
     end
 
     def validate_configuration_group!(flags, required_options, error_message)
@@ -180,16 +194,6 @@ module Cloudkeeper
       raise Cloudkeeper::Errors::InvalidConfigurationError, error_message unless all_options_available(required_options)
     end
 
-    def validate_contradictory_options!(flags, options)
-      filled = flags.select { |flag| Cloudkeeper::Settings[flag] }
-      if filled.count > 1
-        raise Cloudkeeper::Errors::InvalidConfigurationError, "Following options cannot be used together: #{filled.join(', ')}"
-      end
-
-      return unless options[:one_required]
-      raise Cloudkeeper::Errors::InvalidConfigurationError, "One of the options #{flags.join(', ')} required" if filled.empty?
-    end
-
     def all_options_available(required_options)
       required_options.reduce(true) { |acc, elem| Cloudkeeper::Settings[elem] && acc }
     end

data/lib/cloudkeeper/entities/appliance.rb

@@ -1,13 +1,19 @@
+require 'digest'
+require 'json'
+
 module Cloudkeeper
   module Entities
     class Appliance
-      attr_accessor :identifier, :description, :mpuri, :title, :group, :ram, :core, :version, :architecture
-      attr_accessor :operating_system, :image, :attributes, :vo, :expiration_date, :image_list_identifier
+      IMAGE_LIST_APPLIANCE_ATTRIBUTES = %i[dc:identifier ad:mpuri dc:date:expires dc:title dc:description
+                                           ad:group hv:ram_minimum hv:core_minimum hv:version sl:arch
+                                           ad:base_mpuri ad:appid sl:os sl:osname sl:osversion].freeze
 
-      REJECTED_ATTRIBUTES = %i[vo image_list_identifier].freeze
+      attr_accessor :identifier, :description, :mpuri, :title, :group, :ram, :core, :version, :architecture
+      attr_accessor :operating_system, :image, :vo, :expiration_date, :image_list_identifier, :base_mpuri, :appid, :digest
 
       def initialize(identifier, mpuri, vo, expiration_date, image_list_identifier, title = '', description = '', group = '',
-                     ram = 1024, core = 1, version = '', architecture = '', operating_system = '', image = nil, attributes = {})
+                     ram = 1024, core = 1, version = '', architecture = '', base_mpuri = '', appid = '', digest = '',
+                     operating_system = '', image = nil)
         if identifier.blank? || \
            mpuri.blank? || \
            vo.blank? || \
@@ -28,10 +34,12 @@ module Cloudkeeper
         @architecture = architecture
         @operating_system = operating_system
         @image = image
-        @attributes = attributes
         @vo = vo
         @expiration_date = expiration_date
         @image_list_identifier = image_list_identifier
+        @base_mpuri = base_mpuri
+        @appid = appid
+        @digest = digest
       end
 
       def expired?
@@ -52,7 +60,7 @@ module Cloudkeeper
 
           appliance = construct_appliance(appliance_hash)
           construct_os_name!(appliance, appliance_hash)
-          populate_attributes!(appliance, appliance_hash)
+          compute_digest!(appliance, appliance_hash)
 
           appliance
         rescue Cloudkeeper::Errors::ArgumentError => ex
@@ -72,7 +80,9 @@ module Cloudkeeper
                         appliance_hash[:'hv:ram_minimum'],
                         appliance_hash[:'hv:core_minimum'],
                         appliance_hash[:'hv:version'],
-                        appliance_hash[:'sl:arch']
+                        appliance_hash[:'sl:arch'],
+                        appliance_hash[:'ad:base_mpuri'],
+                        appliance_hash[:'ad:appid']
         end
 
         def construct_os_name!(appliance, appliance_hash)
@@ -81,9 +91,9 @@ module Cloudkeeper
           appliance.operating_system = "#{appliance.operating_system} #{appliance_hash[:'sl:osversion']}".strip
         end
 
-        def populate_attributes!(appliance, appliance_hash)
-          appliance_hash.reject! { |k, _v| REJECTED_ATTRIBUTES.include? k }
-          appliance.attributes = appliance_hash.map { |k, v| [k.to_s, v.to_s] }.to_h
+        def compute_digest!(appliance, appliance_hash)
+          digest_hash = appliance_hash.select { |key| IMAGE_LIST_APPLIANCE_ATTRIBUTES.include? key }
+          appliance.digest = Digest::SHA512.hexdigest(digest_hash.to_json)
         end
       end
     end

data/lib/cloudkeeper/entities/conversions.rb

@@ -7,7 +7,7 @@ module Cloudkeeper
         image_file = acceptable_image_file image
 
         CloudkeeperGrpc::Image.new mode: :LOCAL, location: image_file.file, format: image_file.format.upcase,
-                                   checksum: image_file.checksum, size: image_file.size.to_i, uri: image.uri
+                                   checksum: image_file.checksum, size: image_file.size.to_i, uri: image.uri, digest: image.digest
       end
 
       def convert_appliance(appliance, image_proto)
@@ -16,22 +16,22 @@ module Cloudkeeper
                                        ram: appliance.ram.to_i, core: appliance.core.to_i, version: appliance.version.to_s,
                                        architecture: appliance.architecture.to_s, operating_system: appliance.operating_system.to_s,
                                        vo: appliance.vo.to_s, image: image_proto, expiration_date: appliance.expiration_date.to_i,
-                                       image_list_identifier: appliance.image_list_identifier.to_s, attributes: appliance.attributes
+                                       image_list_identifier: appliance.image_list_identifier.to_s, appid: appliance.appid.to_s,
+                                       base_mpuri: appliance.base_mpuri.to_s, digest: appliance.digest.to_s
       end
 
       def convert_image_proto(image_proto)
-        return nil unless image_proto
-
-        Cloudkeeper::Entities::Image.new image_proto.uri, image_proto.checksum, image_proto.size
+        Cloudkeeper::Entities::Image.new image_proto.uri, image_proto.checksum, image_proto.size, image_proto.digest
       end
 
       def convert_appliance_proto(appliance_proto, image)
         Cloudkeeper::Entities::Appliance.new appliance_proto.identifier, appliance_proto.mpuri, appliance_proto.vo,
-                                             Time.at(appliance_proto.expiration_date).to_datetime,
+                                             Time.at(appliance_proto.expiration_date).to_time,
                                              appliance_proto.image_list_identifier, appliance_proto.title,
                                              appliance_proto.description, appliance_proto.group, appliance_proto.ram,
                                              appliance_proto.core, appliance_proto.version, appliance_proto.architecture,
-                                             appliance_proto.operating_system, image, appliance_proto.attributes.to_h
+                                             appliance_proto.base_mpuri, appliance_proto.appid, appliance_proto.digest,
+                                             appliance_proto.operating_system, image
       end
 
       def acceptable_image_file(image)

data/lib/cloudkeeper/entities/convertables/convertable.rb

@@ -25,6 +25,7 @@ module Cloudkeeper
           result = method.to_s.match(format_regex)
           if result && result[:format]
             return self if format.to_sym == result[:format].to_sym
+
             return convert result[:format]
           end
 

data/lib/cloudkeeper/entities/image.rb

@@ -1,14 +1,20 @@
+require 'digest'
+require 'json'
+
 module Cloudkeeper
   module Entities
     class Image
-      attr_accessor :image_files, :size, :uri, :checksum
+      IMAGE_LIST_IMAGE_ATTRIBUTES = %i[hv:uri sl:checksum:sha512 hv:size hv:version].freeze
+
+      attr_accessor :image_files, :size, :uri, :checksum, :digest
 
-      def initialize(uri, checksum, size = 0, image_files = [])
+      def initialize(uri, checksum, size = 0, digest = '', image_files = [])
         raise Cloudkeeper::Errors::ArgumentError, 'uri and checksum cannot be nil nor empty' if uri.blank? || checksum.blank?
 
         @uri = uri
         @checksum = checksum
         @size = size
+        @digest = digest
         @image_files = image_files
       end
 
@@ -30,7 +36,10 @@ module Cloudkeeper
         raise Cloudkeeper::Errors::Parsing::InvalidImageHashError, 'invalid image hash' if image_hash.blank?
 
         image_hash.deep_symbolize_keys!
-        Image.new image_hash[:'hv:uri'], image_hash[:'sl:checksum:sha512'], image_hash[:'hv:size']
+        image_hash.keep_if { |key| IMAGE_LIST_IMAGE_ATTRIBUTES.include? key }
+
+        Image.new image_hash[:'hv:uri'], image_hash[:'sl:checksum:sha512'], image_hash[:'hv:size'],
+                  Digest::SHA512.hexdigest(image_hash.to_json)
       rescue Cloudkeeper::Errors::ArgumentError => ex
         raise Cloudkeeper::Errors::Parsing::InvalidImageHashError, ex, "image hash #{image_hash.inspect} " \
                                                                        "doesn't contain all the necessary data"

data/lib/cloudkeeper/entities/image_file.rb

@@ -1,11 +1,11 @@
 module Cloudkeeper
   module Entities
     class ImageFile
-      attr_accessor :file, :format, :checksum, :size, :original
+      attr_accessor :file, :format, :checksum, :size
 
       include Cloudkeeper::Entities::Convertables::Convertable
 
-      def initialize(file, format, checksum, size, original = false)
+      def initialize(file, format, checksum, size)
         raise Cloudkeeper::Errors::ArgumentError, 'file, format, checksum and size cannot be nil nor empty'\
           if file.blank? || format.blank? || checksum.blank? || size.blank?
 
@@ -13,7 +13,6 @@ module Cloudkeeper
         @format = format
         @checksum = checksum
         @size = size
-        @original = original
 
         format_const_symbol = format.to_s.classify.to_sym
         extend(Cloudkeeper::Entities::Convertables.const_get(format_const_symbol)) \

data/lib/cloudkeeper/entities/image_formats/ova.rb

@@ -2,8 +2,8 @@ module Cloudkeeper
   module Entities
     module ImageFormats
       module Ova
-        OVF_REGEX = /^.+\.ovf$/i
-        VMDK_REGEX = /^.+\.vmdk$/i
+        OVF_REGEX = /^.+\.ovf$/i.freeze
+        VMDK_REGEX = /^.+\.vmdk$/i.freeze
         ARCHIVE_MAX_FILES = 100
 
         def ova?(archive)

data/lib/cloudkeeper/errors/image.rb

@@ -3,6 +3,7 @@ module Cloudkeeper
     module Image
       autoload :Format, 'cloudkeeper/errors/image/format'
       autoload :DownloadError, 'cloudkeeper/errors/image/download_error'
+      autoload :ChecksumError, 'cloudkeeper/errors/image/checksum_error'
       autoload :ConversionError, 'cloudkeeper/errors/image/conversion_error'
     end
   end

data/lib/cloudkeeper/errors/image/checksum_error.rb

@@ -0,0 +1,7 @@
+module Cloudkeeper
+  module Errors
+    module Image
+      class ChecksumError < StandardError; end
+    end
+  end
+end

data/lib/cloudkeeper/errors/image_list.rb

@@ -1,6 +1,7 @@
 module Cloudkeeper
   module Errors
     module ImageList
+      autoload :ImageListError, 'cloudkeeper/errors/image_list/image_list_error'
       autoload :VerificationError, 'cloudkeeper/errors/image_list/verification_error'
       autoload :RetrievalError, 'cloudkeeper/errors/image_list/retrieval_error'
       autoload :DownloadError, 'cloudkeeper/errors/image_list/download_error'

data/lib/cloudkeeper/errors/image_list/image_list_error.rb

@@ -0,0 +1,7 @@
+module Cloudkeeper
+  module Errors
+    module ImageList
+      class ImageListError < StandardError; end
+    end
+  end
+end

data/lib/cloudkeeper/managers/appliance_manager.rb

@@ -15,60 +15,79 @@ module Cloudkeeper
         logger.debug 'Running appliance synchronization...'
         backend_connector.pre_action
 
-        backend_image_lists = backend_connector.image_lists
-        image_list_manager.download_image_lists
-
-        sync_expired_image_lists
-        sync_new_image_lists(backend_image_lists)
-        sync_old_image_lists(backend_image_lists)
+        synchronize
 
         backend_connector.post_action
-      rescue Cloudkeeper::Errors::BackendError => ex
+      rescue Cloudkeeper::Errors::BackendError, Cloudkeeper::Errors::ImageList::ImageListError => ex
         abort ex.message
       end
 
+      def errors
+        { backend_errors: backend_connector.errors }
+      end
+
       private
 
-      def sync_expired_image_lists
-        logger.debug 'Removing appliances from expired image lists...'
-        image_list_manager.image_lists.each_value do |image_list|
-          backend_connector.remove_image_list image_list if image_list.expired?
+      def synchronize
+        backend_connector.remove_expired_appliances
+
+        image_list_manager.download_image_list
+
+        image_list = image_list_manager.image_list
+        if backend_connector.image_lists.include? image_list.identifier
+          sync_old_image_list image_list
+        else
+          sync_new_image_list image_list
         end
       end
 
-      def sync_new_image_lists(backend_image_lists)
-        logger.debug 'Registering appliances from new image lists...'
-        add_list = image_list_manager.image_lists.keys - backend_image_lists
-        logger.debug "Image lists to register: #{add_list.inspect}"
-        add_list.each do |image_list_identifier|
-          image_list_manager.image_lists[image_list_identifier].appliances.each_value do |appliance|
-            if appliance.expired?
-              log_expired appliance, 'Skipping expired appliance'
-              next
-            end
+      def sync_new_image_list(image_list)
+        logger.debug "Registering appliances from new image list #{image_list.identifier.inspect}"
+
+        if image_list.expired?
+          log_expired image_list, 'Not registering expired image list'
+          return
+        end
+
+        add_new_appliances image_list
+      end
 
-            add_appliance appliance
+      def add_new_appliances(image_list)
+        image_list.appliances.each_value do |appliance|
+          if appliance.expired?
+            log_expired appliance, 'Skipping expired appliance'
+            next
           end
+
+          add_appliance appliance
         end
       end
 
-      def sync_old_image_lists(backend_image_lists)
-        logger.debug 'Synchronizing registered appliances...'
-        sync_list = image_list_manager.image_lists.keys & backend_image_lists
-        logger.debug "Image lists to synchronize: #{sync_list.inspect}"
-        sync_list.each { |image_list_identifier| sync_image_list image_list_identifier }
+      def sync_old_image_list(image_list)
+        logger.debug "Synchronizing registered appliances from image list #{image_list.identifier.inspect}"
+
+        if image_list.expired?
+          remove_expired_image_list image_list
+          return
+        end
+
+        sync_image_list image_list
       end
 
-      def sync_image_list(image_list_identifier)
-        logger.debug "Synchronizing appliances for image list with id #{image_list_identifier.inspect}"
-        backend_appliances = backend_connector.appliances image_list_identifier
-        image_list_appliances = image_list_manager.image_lists[image_list_identifier].appliances
+      def sync_image_list(image_list)
+        backend_appliances = backend_connector.appliances image_list.identifier
+        image_list_appliances = image_list.appliances
 
         remove_appliances backend_appliances, image_list_appliances
         add_appliances backend_appliances, image_list_appliances
         update_appliances backend_appliances, image_list_appliances
       end
 
+      def remove_expired_image_list(image_list)
+        logger.debug "Removing expired image list #{image_list.identifier.inspect}"
+        backend_connector.remove_image_list image_list.identifier
+      end
+
       def remove_appliances(backend_appliances, image_list_appliances)
         logger.debug 'Removing previously registered appliances...'
         remove_list = backend_appliances.keys - image_list_appliances.keys
@@ -105,12 +124,22 @@ module Cloudkeeper
             next
           end
 
-          image_update = update_image?(image_list_appliance, backend_appliance)
-          image_list_appliance.image = nil unless image_update
-          update_appliance image_list_appliance if image_update || update_metadata?(image_list_appliance, backend_appliance)
+          method = :update_appliance_metadata if update_metadata?(image_list_appliance, backend_appliance)
+          method = :update_appliance if update_image?(image_list_appliance, backend_appliance)
+
+          send method, image_list_appliance if method
         end
       end
 
+      def update_appliance(appliance)
+        modify_appliance :update_appliance, appliance
+      end
+
+      def update_appliance_metadata(appliance)
+        appliance.image = nil
+        modify_appliance :update_appliance_metadata, appliance
+      end
+
       def add_appliance(appliance)
         modify_appliance :add_appliance, appliance
       end

data/lib/cloudkeeper/managers/image_list_manager.rb

@@ -6,39 +6,29 @@ require 'json'
 module Cloudkeeper
   module Managers
     class ImageListManager
-      attr_reader :image_lists, :openssl_store
+      attr_reader :image_list, :openssl_store
 
       def initialize
-        @image_lists = {}
-
         @openssl_store = OpenSSL::X509::Store.new
         @openssl_store.add_path Cloudkeeper::Settings[:'ca-dir'] if Cloudkeeper::Settings[:'ca-dir']
       end
 
-      def download_image_lists
+      def download_image_list
         logger.debug 'Downloading fresh image lists...'
-        Dir.mktmpdir('cloudkeeper') do |dir|
-          urls = Cloudkeeper::Settings[:'image-lists'] || File.read(Cloudkeeper::Settings[:'image-lists-file']).split("\n")
-          retrieve_image_lists urls, dir
-        end
+        url = Cloudkeeper::Settings[:'image-list']
+        Dir.mktmpdir('cloudkeeper') { |dir| retrieve_image_list url, dir }
+      rescue Cloudkeeper::Errors::ImageList::DownloadError, Cloudkeeper::Errors::ImageList::VerificationError,
+             Cloudkeeper::Errors::Parsing::ParsingError, OpenSSL::PKCS7::PKCS7Error, JSON::ParserError => ex
+        raise Cloudkeeper::Errors::ImageList::ImageListError, "Image list #{url.inspect} couldn't be downloaded\n#{ex.message}"
       end
 
       private
 
-      def retrieve_image_lists(urls, dir)
-        urls.each do |url|
-          begin
-            image_list = convert_image_list(load_image_list(download_image_list(url, dir)))
-            image_lists[image_list.identifier] = image_list
-          rescue Cloudkeeper::Errors::ImageList::DownloadError, Cloudkeeper::Errors::ImageList::VerificationError,
-                 Cloudkeeper::Errors::Parsing::ParsingError => ex
-            logger.warn "Image list #{url} couldn't be downloaded\n#{ex.message}"
-            next
-          end
-        end
+      def retrieve_image_list(url, dir)
+        @image_list = convert_image_list(load_image_list(download_image_list_file(url, dir)))
       end
 
-      def download_image_list(url, dir)
+      def download_image_list_file(url, dir)
         logger.debug "Downloading image list from #{url.inspect}"
         Cloudkeeper::Utils::URL.check!(url)
         uri = URI.parse url
@@ -74,10 +64,15 @@ module Cloudkeeper
       end
 
       def load_image_list(file)
-        pkcs7 = OpenSSL::PKCS7.read_smime(File.read(file))
-        verify_image_list!(pkcs7, file)
+        content = File.read(file)
+        pkcs7 = OpenSSL::PKCS7.read_smime(content)
+        verify_image_list!(pkcs7, file) if Cloudkeeper::Settings[:'verify-image-lists']
 
         JSON.parse pkcs7.data
+      rescue OpenSSL::PKCS7::PKCS7Error => ex
+        raise ex if Cloudkeeper::Settings[:'verify-image-lists']
+
+        JSON.parse content
       end
 
       def verify_image_list!(pkcs7, file)

data/lib/cloudkeeper/managers/image_manager.rb

@@ -1,4 +1,5 @@
 require 'net/https'
+require 'digest'
 
 module Cloudkeeper
   module Managers
@@ -46,21 +47,28 @@ module Cloudkeeper
           raise Cloudkeeper::Errors::Image::Format::NoFormatRecognizedError, "No image format recognized for file #{file.inspect}"
         end
 
-        def download_image(url)
+        def secure_download_image(url, checksum)
           logger.debug "Downloading image from #{url.inspect}"
           Cloudkeeper::Utils::URL.check!(url)
 
           uri = URI.parse url
           filename = generate_filename(uri)
           retrieve_image(uri, filename)
+          check_image_checksum!(filename, checksum)
 
           Cloudkeeper::Entities::ImageFile.new filename, format(filename), Cloudkeeper::Utils::Checksum.compute(filename),
-                                               File.size(filename), true
+                                               File.size(filename)
         rescue Cloudkeeper::Errors::InvalidURLError, Cloudkeeper::Errors::Image::Format::RecognitionError,
                Cloudkeeper::Errors::ArgumentError, Cloudkeeper::Errors::NetworkConnectionError, ::IOError => ex
           raise Cloudkeeper::Errors::Image::DownloadError, "Image #{url.inspect} download error: #{ex.message}"
         end
 
+        def check_image_checksum!(filename, checksum)
+          computed = Digest::SHA512.file(filename).hexdigest
+          raise Cloudkeeper::Errors::Image::ChecksumError, "Checksum mismatch, expecting #{checksum.inspect} got #{computed.inspect}" \
+            unless checksum == computed
+        end
+
         def retrieve_image(uri, filename)
           Net::HTTP.start(uri.host, uri.port, connection_options(uri)) do |http|
             request = Net::HTTP::Get.new(uri)

data/lib/cloudkeeper/utils/appliance.rb

@@ -1,10 +1,8 @@
 module Cloudkeeper
   module Utils
     module Appliance
-      IMAGE_UPDATE_ATTRIBUTES = ['hv:version', 'sl:checksum:sha512', 'hv:size'].freeze
-
-      def log_expired(appliance, message)
-        logger.info "#{message} #{appliance.identifier.inspect}"
+      def log_expired(expirable, message)
+        logger.info "#{message} #{expirable.identifier.inspect}"
       end
 
       def clean_image_files(appliance)
@@ -21,22 +19,15 @@ module Cloudkeeper
       end
 
       def update_image?(image_list_appliance, backend_appliance)
-        image_list_attributes = image_list_appliance.attributes
-        backend_attributes = backend_appliance.attributes
-
-        IMAGE_UPDATE_ATTRIBUTES.reduce(false) { |red, elem| red || (image_list_attributes[elem] != backend_attributes[elem]) }
+        image_list_appliance.image.digest != backend_appliance.image.digest
       end
 
       def update_metadata?(image_list_appliance, backend_appliance)
-        image_list_appliance.attributes != backend_appliance.attributes
-      end
-
-      def update_appliance(appliance)
-        modify_appliance :update_appliance, appliance
+        image_list_appliance.digest != backend_appliance.digest
       end
 
       def prepare_image!(appliance)
-        image_file = Cloudkeeper::Managers::ImageManager.download_image(appliance.image.uri)
+        image_file = Cloudkeeper::Managers::ImageManager.secure_download_image(appliance.image.uri, appliance.image.checksum)
         appliance.image.add_image_file image_file
         return if acceptable_formats.include? image_file.format
 
@@ -47,7 +38,7 @@ module Cloudkeeper
         format = acceptable_formats.find { |acceptable_format| image_file.respond_to? "to_#{acceptable_format}".to_sym }
         unless format
           raise Cloudkeeper::Errors::Image::Format::NoRequiredFormatAvailableError,
-                "image #{image.inspect} cannot be converted to any acceptable format"
+                "image #{image_file.inspect} cannot be converted to any acceptable format"
         end
 
         appliance.image.add_image_file image_file.send("to_#{format}".to_sym)

data/lib/cloudkeeper/utils/filename.rb

@@ -3,7 +3,7 @@ require 'zaru'
 module Cloudkeeper
   module Utils
     class Filename
-      WHITESPACES_REGEXP = /\s+/
+      WHITESPACES_REGEXP = /\s+/.freeze
 
       def self.sanitize(name)
         Zaru.sanitize!(name).gsub(WHITESPACES_REGEXP, '_')

data/lib/cloudkeeper/utils/url.rb

@@ -1,7 +1,7 @@
 module Cloudkeeper
   module Utils
     class URL
-      URL_REGEXP = /\A#{URI.regexp(%w[http https])}\z/
+      URL_REGEXP = /\A#{URI.regexp(%w[http https])}\z/.freeze
 
       def self.check!(url)
         raise Cloudkeeper::Errors::InvalidURLError, "#{url.inspect} is not a valid URL" unless url =~ URL_REGEXP

data/lib/cloudkeeper/version.rb

@@ -1,3 +1,3 @@
 module Cloudkeeper
-  VERSION = '1.7.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/cloudkeeper_grpc.rb

@@ -1,3 +1,5 @@
+require 'active_support/all'
+
 module CloudkeeperGrpc
   require 'cloudkeeper_grpc/cloudkeeper_pb'
   require 'cloudkeeper_grpc/cloudkeeper_services_pb'

data/lib/cloudkeeper_grpc/.gitmodules

@@ -1,6 +1,6 @@
 [submodule "protos"]
 	path = protos
 	url = https://github.com/the-cloudkeeper-project/cloudkeeper-proto.git
-[submodule "metadata"]
-	path = metadata
-	url = https://github.com/the-cloudkeeper-project/cloudkeeper-metadata.git
+[submodule "status-codes"]
+	path = status-codes
+	url = https://github.com/the-cloudkeeper-project/cloudkeeper-status-codes.git

data/lib/cloudkeeper_grpc/README.md

@@ -1,3 +1,9 @@
 ## cloudkeeper gRPC generated classes for Ruby
 
 This repository contains Ruby classes generated for gRPC communication within the [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) project.
+
+### Important!
+Code expects `String` class to contain method `underscore` which can be find within [Active Support](https://guides.rubyonrails.org/active_support_core_extensions.html) gem. At least extensions for `String` class must be required:
+```ruby
+require 'active_support/core_ext/string'
+```

data/lib/cloudkeeper_grpc/cloudkeeper_pb.rb

@@ -19,8 +19,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :vo, :string, 11
     optional :expiration_date, :int64, 12
     optional :image_list_identifier, :string, 13
-    optional :image, :message, 14, "cloudkeeper_grpc.Image"
-    map :attributes, :string, :string, 15
+    optional :base_mpuri, :string, 14
+    optional :appid, :string, 15
+    optional :digest, :string, 16
+    optional :image, :message, 17, "cloudkeeper_grpc.Image"
   end
   add_message "cloudkeeper_grpc.Image" do
     optional :mode, :enum, 1, "cloudkeeper_grpc.Image.Mode"
@@ -31,6 +33,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     optional :size, :int64, 6
     optional :username, :string, 7
     optional :password, :string, 8
+    optional :digest, :string, 9
   end
   add_enum "cloudkeeper_grpc.Image.Mode" do
     value :LOCAL, 0

data/lib/cloudkeeper_grpc/cloudkeeper_services_pb.rb

@@ -18,10 +18,12 @@ module CloudkeeperGrpc
       rpc :PostAction, Google::Protobuf::Empty, Google::Protobuf::Empty
       rpc :AddAppliance, Appliance, Google::Protobuf::Empty
       rpc :UpdateAppliance, Appliance, Google::Protobuf::Empty
+      rpc :UpdateApplianceMetadata, Appliance, Google::Protobuf::Empty
       rpc :RemoveAppliance, Appliance, Google::Protobuf::Empty
       rpc :RemoveImageList, ImageListIdentifier, Google::Protobuf::Empty
       rpc :ImageLists, Google::Protobuf::Empty, stream(ImageListIdentifier)
       rpc :Appliances, ImageListIdentifier, stream(Appliance)
+      rpc :RemoveExpiredAppliances, Google::Protobuf::Empty, Google::Protobuf::Empty
     end
 
     Stub = Service.rpc_stub_class

data/lib/cloudkeeper_grpc/constants.rb

@@ -2,11 +2,9 @@ require 'yaml'
 
 module CloudkeeperGrpc
   class Constants
-    metadata = YAML.load_file(File.join(File.dirname(__FILE__), 'metadata', 'metadata.yml'))
-    metadata['keys'].each do |key|
-      upcase_key = key.upcase
-      const_set("KEY_#{upcase_key}", key)
-      metadata[key].each { |value| const_set("#{upcase_key}_#{value.upcase}", value)} if metadata.has_key? key
+    status_codes = YAML.load_file(File.join(File.dirname(__FILE__), 'status-codes', 'status-codes.yml'))
+    status_codes.each do |key, value|
+      const_set("STATUS_CODE_#{key.underscore.upcase}", value)
     end
   end
 end

data/lib/cloudkeeper_grpc/protos/cloudkeeper.proto

@@ -18,8 +18,10 @@ message Appliance {
   string vo = 11;
   int64 expiration_date = 12;
   string image_list_identifier = 13;
-  Image image = 14;
-  map<string, string> attributes = 15;
+  string base_mpuri = 14;
+  string appid = 15;
+  string digest = 16;
+  Image image = 17;
 }
 
 message Image {
@@ -41,6 +43,7 @@ message Image {
   int64 size = 6;
   string username = 7;
   string password = 8;
+  string digest = 9;
 }
 
 message ImageListIdentifier {
@@ -52,8 +55,10 @@ service Communicator {
   rpc PostAction(google.protobuf.Empty) returns (google.protobuf.Empty) {}
   rpc AddAppliance(Appliance) returns (google.protobuf.Empty) {}
   rpc UpdateAppliance(Appliance) returns (google.protobuf.Empty) {}
+  rpc UpdateApplianceMetadata(Appliance) returns (google.protobuf.Empty) {}
   rpc RemoveAppliance(Appliance) returns (google.protobuf.Empty) {}
   rpc RemoveImageList(ImageListIdentifier) returns (google.protobuf.Empty) {}
   rpc ImageLists(google.protobuf.Empty) returns (stream ImageListIdentifier) {}
   rpc Appliances(ImageListIdentifier) returns (stream Appliance) {}
+  rpc RemoveExpiredAppliances(google.protobuf.Empty) returns (google.protobuf.Empty) {}
 }

data/lib/cloudkeeper_grpc/{metadata → status-codes}/LICENSE.txt

@@ -1,14 +1,10 @@
-The work represented by this source file was partially or entirely
-funded by the EGI-Engage project co-funded by the European Union (EU)
-Horizon 2020 program under Grant number 654142.
-
-Copyright (c) 2017 CESNET
+Copyright 2018 Michal Kimle
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

data/lib/cloudkeeper_grpc/status-codes/README.md

@@ -0,0 +1,3 @@
+## cloudkeeper status-codes file
+
+This repository contains status codes for error handling of gRPC communication within [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) project.

data/lib/cloudkeeper_grpc/status-codes/status-codes.yml

@@ -0,0 +1,12 @@
+---
+# Compatible with GRPC status codes
+Ok: 0
+Unknown: 2
+PermissionDenied: 7
+Unauthenticated: 16
+# Custom status codes
+ApplianceNotFound: 101
+FailedApplianceTransfer: 102
+ResourceNotFound: 103
+FailedResourceRetrieval: 104
+InvalidResourceState: 105

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,22 +42,16 @@ dependencies:
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +359,7 @@ files:
 - lib/cloudkeeper/errors/convertables.rb
 - lib/cloudkeeper/errors/convertables/convertability_error.rb
 - lib/cloudkeeper/errors/image.rb
+- lib/cloudkeeper/errors/image/checksum_error.rb
 - lib/cloudkeeper/errors/image/conversion_error.rb
 - lib/cloudkeeper/errors/image/download_error.rb
 - lib/cloudkeeper/errors/image/format.rb
@@ -376,6 +371,7 @@ files:
 - lib/cloudkeeper/errors/image/format/recognition_error.rb
 - lib/cloudkeeper/errors/image_list.rb
 - lib/cloudkeeper/errors/image_list/download_error.rb
+- lib/cloudkeeper/errors/image_list/image_list_error.rb
 - lib/cloudkeeper/errors/image_list/retrieval_error.rb
 - lib/cloudkeeper/errors/image_list/verification_error.rb
 - lib/cloudkeeper/errors/invalid_configuration_error.rb
@@ -415,14 +411,14 @@ files:
 - lib/cloudkeeper_grpc/cloudkeeper_pb.rb
 - lib/cloudkeeper_grpc/cloudkeeper_services_pb.rb
 - lib/cloudkeeper_grpc/constants.rb
-- lib/cloudkeeper_grpc/metadata/CODE_OF_CONDUCT.md
-- lib/cloudkeeper_grpc/metadata/LICENSE.txt
-- lib/cloudkeeper_grpc/metadata/README.md
-- lib/cloudkeeper_grpc/metadata/metadata.yml
 - lib/cloudkeeper_grpc/protos/CODE_OF_CONDUCT.md
 - lib/cloudkeeper_grpc/protos/LICENSE.txt
 - lib/cloudkeeper_grpc/protos/README.md
 - lib/cloudkeeper_grpc/protos/cloudkeeper.proto
+- lib/cloudkeeper_grpc/status-codes/CODE_OF_CONDUCT.md
+- lib/cloudkeeper_grpc/status-codes/LICENSE.txt
+- lib/cloudkeeper_grpc/status-codes/README.md
+- lib/cloudkeeper_grpc/status-codes/status-codes.yml
 homepage: https://github.com/the-cloudkeeper-project/cloudkeeper
 licenses:
 - Apache License, Version 2.0
@@ -443,7 +439,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Synchronize cloud appliances between AppDB and cloud platforms

data/lib/cloudkeeper_grpc/metadata/README.md

@@ -1,3 +0,0 @@
-## cloudkeeper metadata file
-
-This repository contains potential metadata transfered during the gRPC communication within [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) project.

data/lib/cloudkeeper_grpc/metadata/metadata.yml

@@ -1,13 +0,0 @@
-keys:
-  - status
-  - message
-status:
-  - SUCCESS
-  - ERROR
-  - ERROR_APPLIANCE_NOT_FOUND
-  - ERROR_APPLIANCE_TRANSFER
-  - ERROR_AUTHENTICATION
-  - ERROR_USER_NOT_AUTHORIZED
-  - ERROR_RESOURCE_NOT_FOUND
-  - ERROR_RESOURCE_RETRIEVAL
-  - ERROR_RESOURCE_STATE