cloudkeeper-one 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbc48a405520c660028cc35656d0dd47ff17ac45
-  data.tar.gz: c422f0474a07032eedecff64b8348c6c2f2570bf
+SHA256:
+  metadata.gz: 8b8142e76a372832f41e114c4c8857a6d3a053850a26513bc6aed57b05a50307
+  data.tar.gz: 613d777b20247367cf1bd708f7cf2360875596387b6ab871ed947aa781c9c141
 SHA512:
-  metadata.gz: d2be7e38e80e4a22e5b90768ed1c26dbf4d13e3708b995a8cc037496c68a39dd3678bf1b0aaf891e75372900016dcb55a111154deab09ad05b4a731207b8e98b
-  data.tar.gz: a77fbd53adc364eaeb7a136fce354a5b2c0d2a6596ac1e131def6ec53cf237afd842e44caa5f2c117b17d460914d66d247d7fdbf0a65d3ced4911e800d40b2dc
+  metadata.gz: b2850302011a4dce74a674f6fa6c680c8e1d183949f244cbd1ca94ef96e08c1f0f3a0ba03277eddde4b2553037bcd9753e4182d704ebfbe81a92f5e72b3278a7
+  data.tar.gz: b3286b1caf923a0c92547900399d950c4bf67d76a9fc5e3b54c6e7f91fdad5b9133271c2d402502e574b52dac7527702f49251b9b9a880afc1981749d65d5462

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/.rubocop.yml

@@ -11,12 +11,22 @@ Metrics/LineLength:
   Exclude:
     - 'lib/cloudkeeper/one/appliance_actions/list.rb'
 
+Metrics/LineLength:
+  Max: 140
+  Include:
+    - 'lib/cloudkeeper/one/core_connector.rb'
+
 Style/Documentation:
   Enabled: false
 
 Metrics/MethodLength:
   Max: 15
 
+Metrics/MethodLength:
+  Max: 20
+  Include:
+    - 'lib/cloudkeeper/one/appliance_actions/list.rb'
+
 Metrics/AbcSize:
   Max: 20
   Exclude:

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 ARG branch=master
 ARG version
@@ -10,7 +10,7 @@ ENV applDir="${spoolDir}/appliances" \
     logDir="/var/log/${username}"
 
 LABEL application=${name} \
-      description="A tool for synchronizing appliances between cloudkeeper and OpenNebula" \
+      description="A tool for synchronizing appliances between Cloudkeeper and OpenNebula" \
       maintainer="kimle@cesnet.cz" \
       version=${version} \
       branch=${branch}

data/README.md

@@ -1,14 +1,21 @@
-# cloudkeeper-one
-OpenNebula backend for [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper)
+<h1 align="center">
+  <img src="https://i.imgur.com/95iUPzX.png" alt="Logo Cloudkeeper-ONE" title="Logo Cloudkeeper-ONE" width="256"/>
+  <p>Cloudkeeper-ONE</p>
+</h1>
 
-[![Travis](https://img.shields.io/travis/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square)](http://travis-ci.org/the-cloudkeeper-project/cloudkeeper-one)
-[![Gemnasium](https://img.shields.io/gemnasium/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square)](https://gemnasium.com/the-cloudkeeper-project/cloudkeeper-one)
-[![Gem](https://img.shields.io/gem/v/cloudkeeper-one.svg?style=flat-square)](https://rubygems.org/gems/cloudkeeper-one)
-[![Code Climate](https://img.shields.io/codeclimate/github/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square)](https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper-one)
-[![DockerHub](https://img.shields.io/badge/docker-ready-blue.svg?style=flat-square)](https://hub.docker.com/r/cloudkeeper/cloudkeeper-one/)
+<p align="center">
+  <a href="http://travis-ci.org/the-cloudkeeper-project/cloudkeeper-one"><img src="https://img.shields.io/travis/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square" alt="Travis"></a>
+  <a href="https://depfu.com/repos/the-cloudkeeper-project/cloudkeeper-one"><img src="https://img.shields.io/depfu/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square" alt="Depfu"></a>
+  <a href="https://rubygems.org/gems/cloudkeeper-one"><img src="https://img.shields.io/gem/v/cloudkeeper-one.svg?style=flat-square" alt="Gem"></a>
+  <a href="https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper-one"><img src="https://img.shields.io/codeclimate/maintainability/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square" alt="Code Climate"></a>
+  <a href="https://hub.docker.com/r/cloudkeeper/cloudkeeper-one/"><img src="https://img.shields.io/badge/docker-ready-blue.svg?style=flat-square" alt="DockerHub"></a>
+  <a href="https://zenodo.org/record/1134571"><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%2F1134571&style=flat-square" alt="DOI"></a>
+</p>
 
-## What does cloudkeeper-one do?
-cloudkeeper-one is able to manage [OpenNebula](https://opennebula.org/) cloud - upload, update and remove images and templates representing EGI AppDB appliances. cloudkeeper-one runs as a server listening for [gRPC](http://www.grpc.io/) communication usually from core [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) component.
+<h4 align="center">OpenNebula backend for <a href="https://github.com/the-cloudkeeper-project/cloudkeeper">Cloudkeeper</a></h4>
+
+## What does Cloudkeeper-ONE do?
+Cloudkeeper-ONE is able to manage [OpenNebula](https://opennebula.org/) CMF - upload, update and remove images and templates representing EGI AppDB appliances. Cloudkeeper-ONE runs as a server listening for [gRPC](http://www.grpc.io/) communication usually from core [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) component.
 
 ## Requirements
 * Ruby >= 2.2.0
@@ -40,8 +47,8 @@ bundle exec rake spec
 ```
 
 ## Configuration
-### Create a configuration file for cloudkeeper-one
-Configuration file can be read by cloudkeeper-one from these
+### Create a configuration file for Cloudkeeper-ONE
+Configuration file can be read by Cloudkeeper-ONE from these
 three locations:
 
 * `~/.cloudkeeper-one/cloudkeeper-one.yml`
@@ -52,43 +59,44 @@ The default configuration file can be found at the last location
 `PATH_TO_GEM_DIR/config/cloudkeeper-one.yml`.
 
 ## Usage
-cloudkeeper-one is run with executable `cloudkeeper-one`. For further assistance run `cloudkeeper-one help sync`:
+Cloudkeeper-ONE is run with executable `cloudkeeper-one`. For further assistance run `cloudkeeper-one help sync`:
 ```bash
 Usage:
-  cloudkeeper-one sync --appliances-permissions=APPLIANCES-PERMISSIONS --appliances-tmp-dir=APPLIANCES-TMP-DIR --identifier=IDENTIFIER --listen-address=LISTEN-ADDRESS --opennebula-api-call-timeout=OPENNEBULA-API-CALL-TIMEOUT --opennebula-datastores=one two three --opennebula-endpoint=OPENNEBULA-ENDPOINT --opennebula-secret=OPENNEBULA-SECRET
+  cloudkeeper-one sync --appliances-permissions=APPLIANCES-PERMISSIONS --appliances-tmp-dir=APPLIANCES-TMP-DIR --identifier=IDENTIFIER --listen-address=LISTEN-ADDRESS --opennebula-api-call-timeout=OPENNEBULA-API-CALL-TIMEOUT --opennebula-datastore=OPENNEBULA-DATASTORE
 
 Options:
-  --listen-address=LISTEN-ADDRESS                            # IP address gRPC server will listen on
-                                                             # Default: 127.0.0.1:50051
-  [--authentication], [--no-authentication]                  # Client <-> server authentication
-  [--certificate=CERTIFICATE]                                # Backend's host certificate
-                                                             # Default: /etc/grid-security/hostcert.pem
-  [--key=KEY]                                                # Backend's host key
-                                                             # Default: /etc/grid-security/hostkey.pem
-  --identifier=IDENTIFIER                                    # Instance identifier
-                                                             # Default: cloudkeeper-one
-  [--core-certificate=CORE-CERTIFICATE]                      # Core's certificate
-                                                             # Default: /etc/grid-security/corecert.pem
-  --appliances-tmp-dir=APPLIANCES-TMP-DIR                    # Directory where to temporarily store appliances
-                                                             # Default: /var/spool/cloudkeeper/appliances
-  [--appliances-template-dir=APPLIANCES-TEMPLATE-DIR]        # If set, templates within this directory are used to construct images and templates in OpenNebula
-  --appliances-permissions=APPLIANCES-PERMISSIONS            # UNIX-like permissions appliances will have within OpenNebula
-                                                             # Default: 640
-  --opennebula-secret=OPENNEBULA-SECRET                      # OpenNebula authentication secret
-                                                             # Default: oneadmin:opennebula
-  --opennebula-endpoint=OPENNEBULA-ENDPOINT                  # OpenNebula XML-RPC endpoint
-                                                             # Default: http://localhost:2633/RPC2
-  --opennebula-datastores=one two three                      # OpenNebula datastores images will be uploaded to
-                                                             # Default: ["default"]
-  [--opennebula-users=one two three]                         # Handle only images/templates of specified users
-  --opennebula-api-call-timeout=OPENNEBULA-API-CALL-TIMEOUT  # How long will cloudkeeper-one wait for image/template operations to finish in OpenNebula
-                                                             # Default: 3h
+  --listen-address=LISTEN-ADDRESS                                            # IP address gRPC server will listen on
+                                                                             # Default: 127.0.0.1:50051
+  [--authentication], [--no-authentication]                                  # Client <-> server authentication
+  [--certificate=CERTIFICATE]                                                # Backend's host certificate
+                                                                             # Default: /etc/grid-security/hostcert.pem
+  [--key=KEY]                                                                # Backend's host key
+                                                                             # Default: /etc/grid-security/hostkey.pem
+  --identifier=IDENTIFIER                                                    # Instance identifier
+                                                                             # Default: cloudkeeper-one
+  [--core-certificate=CORE-CERTIFICATE]                                      # Core's certificate
+                                                                             # Default: /etc/grid-security/corecert.pem
+  --appliances-tmp-dir=APPLIANCES-TMP-DIR                                    # Directory where to temporarily store appliances
+                                                                             # Default: /var/spool/cloudkeeper/appliances
+  [--appliances-template-dir=APPLIANCES-TEMPLATE-DIR]                        # If set, templates within this directory are used to construct images and templates in OpenNebula
+  --appliances-permissions=APPLIANCES-PERMISSIONS                            # UNIX-like permissions appliances will have within OpenNebula
+                                                                             # Default: 640
+  [--opennebula-secret=OPENNEBULA-SECRET]                                    # OpenNebula authentication secret
+                                                                             # Default: oneadmin:opennebula
+  [--opennebula-endpoint=OPENNEBULA-ENDPOINT]                                # OpenNebula XML-RPC endpoint
+                                                                             # Default: http://localhost:2633/RPC2
+  --opennebula-datastore=OPENNEBULA-DATASTORE                                # OpenNebula datastore images will be uploaded to
+                                                                             # Default: default
+  --opennebula-api-call-timeout=OPENNEBULA-API-CALL-TIMEOUT                  # How long will cloudkeeper-one wait for image/template operations to finish in OpenNebula
+                                                                             # Default: 3h
+  [--opennebula-allow-remote-source], [--no-opennebula-allow-remote-source]  # Allows OpenNebula to directly download remote image
+                                                                             # Default: true
   --logging-level=LOGGING-LEVEL
-                                                             # Default: ERROR
-                                                             # Possible values: DEBUG, INFO, WARN, ERROR, FATAL, UNKNOWN
-  [--logging-file=LOGGING-FILE]                              # File to write logs to
-                                                             # Default: /var/log/cloudkeeper/cloudkeeper-one.log
-  [--debug], [--no-debug]                                    # Runs cloudkeeper in debug mode
+                                                                             # Default: ERROR
+                                                                             # Possible values: DEBUG, INFO, WARN, ERROR, FATAL, UNKNOWN
+  [--logging-file=LOGGING-FILE]                                              # File to write logs to
+                                                                             # Default: /var/log/cloudkeeper/cloudkeeper-one.log
+  [--debug], [--no-debug]                                                    # Runs cloudkeeper in debug mode
 ```
 
 ## Contributing

data/{cloudkeeper-one.gemspec → cloudkeeper_one.gemspec}

@@ -30,16 +30,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.14'
-  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 'pry-byebug', '~> 3.4'
-  spec.add_development_dependency 'rake', '~> 11.2'
+  spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.5'
   spec.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
   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-one.yml

@@ -13,9 +13,7 @@ cloudkeeper-one:
   opennebula:
     secret: oneadmin:opennebula # If not specified, looking for secret in environment variable ONE_AUTH and file ~/.one/one_auth
     endpoint: http://localhost:2633/RPC2 # If not specified, looking for endpoint in environment variable ONE_XMLRPC and file ~/.one/one_endpoint
-    datastores: # Array of OpenNebula datastores images will be uploaded to
-      - default
-    users: # Handle only images/templates of specified users
+    datastore: default # OpenNebula datastore images will be uploaded to
     api-call-timeout: 3h # How long will cloudkeeper-one wait for image/template operations to finish in OpenNebula
     allow-remote-source: true # Allows OpenNebula to directly download remote image
   logging:

data/config/templates/template.erb

@@ -6,7 +6,7 @@ DESCRIPTION = "<%= "#{appliance.title} - #{appliance.description}" %>"
 DESCRIPTION = "<%= appliance.title %>"
 <% end %>
 
-MEMORY = "<%= appliance.ram != 0 ? appliance.ram : 1024 %>"
+MEMORY = "<%= appliance.ram != 0 ? (appliance.ram / (1024**2)) : 1024 %>"
 CPU = "<%= appliance.core != 0 ? appliance.core : 0.25 %>"
 VCPU = "<%= appliance.core != 0 ? appliance.core : 1 %>"
 

data/lib/cloudkeeper/one.rb

@@ -2,7 +2,6 @@ require 'active_support/all'
 require 'opennebula'
 require 'json'
 require 'base64'
-require 'tempfile'
 
 module Cloudkeeper
   module One

data/lib/cloudkeeper/one/appliance_actions/list.rb

@@ -23,8 +23,8 @@ module Cloudkeeper
           templates.uniq! { |template| template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_ID}"] }
 
           appliances = templates.map do |template|
-            check_image_for_template! template
-            populate_proto_appliance template
+            image = find_image_for_template template
+            populate_proto_appliance template, image
           end
 
           logger.debug "Appliances: #{appliances.map(&:identifier).inspect}"
@@ -33,12 +33,15 @@ module Cloudkeeper
 
         private
 
-        def check_image_for_template!(template)
+        def find_image_for_template(template)
+          image = image_handler.find_by_name template.name
           raise Cloudkeeper::One::Errors::Actions::ListingError, "Missing coresponding image for template #{template.id.inspect}" \
-            unless image_handler.find_by_name template.name
+            unless image
+
+          image
         end
 
-        def populate_proto_appliance(template)
+        def populate_proto_appliance(template, image)
           CloudkeeperGrpc::Appliance.new identifier: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_ID}"].to_s,
                                          description: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_DESCRIPTION}"].to_s,
                                          mpuri: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_MPURI}"].to_s,
@@ -50,10 +53,21 @@ module Cloudkeeper
                                          architecture: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_ARCHITECTURE}"].to_s,
                                          operating_system: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_OPERATING_SYSTEM}"].to_s,
                                          vo: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_VO}"].to_s,
-                                         image: nil,
+                                         image: populate_proto_image(image),
                                          expiration_date: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_EXPIRATION_DATE}"].to_i,
                                          image_list_identifier: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_IMAGE_LIST_ID}"].to_s,
-                                         attributes: JSON.parse(Base64.strict_decode64(template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_ATTRIBUTES}"]))
+                                         base_mpuri: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_BASE_MPURI}"].to_s,
+                                         appid: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_APPID}"].to_s,
+                                         digest: template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_DIGEST}"].to_s
+        end
+
+        def populate_proto_image(image)
+          CloudkeeperGrpc::Image.new mode: :LOCAL, location: '',
+                                     format: image["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::IMAGE_FORMAT}"].upcase.to_sym,
+                                     checksum: image["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::IMAGE_CHECKSUM}"].to_s,
+                                     size: image["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::IMAGE_SIZE}"].to_i,
+                                     uri: image["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::IMAGE_URI}"].to_s,
+                                     digest: image["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::IMAGE_DIGEST}"].to_s
         end
       end
     end

data/lib/cloudkeeper/one/appliance_actions/registration.rb

@@ -10,54 +10,47 @@ module Cloudkeeper
         def register_or_update_appliance(proto_appliance)
           raise Cloudkeeper::One::Errors::ArgumentError, 'appliance cannot be nil' unless proto_appliance
 
-          group = group_handler.find_by_name proto_appliance.vo
-          raise Cloudkeeper::One::Errors::Actions::RegistrationError, "Missing group with name #{proto_appliance.vo}" unless group
-
           discard_images :find_by_appliance_id, proto_appliance.identifier
 
-          datastores = datastore_handler.find_by_names Cloudkeeper::One::Settings[:'opennebula-datastores']
-          datastores.each do |datastore|
-            image = register_image proto_appliance, datastore, group
-            register_or_update_template proto_appliance, image, group
-          end
+          datastore = datastore_handler.find_by_name Cloudkeeper::One::Settings[:'opennebula-datastore']
+          image = register_image proto_appliance, datastore
+          register_or_update_template proto_appliance, image
         end
 
         private
 
-        def register_or_update_template(proto_appliance, image, group)
+        def register_or_update_template(proto_appliance, image)
           template = template_handler.find_by_name image.name
           if template
             update_template template, image, proto_appliance
             return
           end
 
-          register_template proto_appliance, image.id, image.name, group
+          register_template proto_appliance, image.id, image.name
         end
 
-        def register_image(proto_appliance, datastore, group)
+        def register_image(proto_appliance, datastore)
           raise Cloudkeeper::One::Errors::ArgumentError, 'appliance and image cannot be nil' \
             unless proto_appliance && proto_appliance.image
 
-          logger.debug "Registering image for appliance #{proto_appliance.identifier}, datastore #{datastore.name.inspect} and " \
-                       "group #{group.name.inspect}"
+          logger.debug "Registering image for appliance #{proto_appliance.identifier} and datastore #{datastore.name.inspect}"
 
           proto_image = prepare_image proto_appliance
           name = "#{proto_appliance.identifier}@#{datastore.name}"
           template = prepare_template 'image.erb', appliance: proto_appliance, image: proto_image, name: name
-          image_handler.register template, datastore, group
+          image_handler.register template, datastore
         end
 
-        def register_template(proto_appliance, image_id, name, group)
+        def register_template(proto_appliance, image_id, name)
           raise Cloudkeeper::One::Errors::ArgumentError, 'appliance cannot be nil' \
             unless proto_appliance
 
-          logger.debug "Registering template for appliance #{proto_appliance.identifier}, image #{image_id.inspect} and " \
-                       "group #{group.name.inspect}"
+          logger.debug "Registering template for appliance #{proto_appliance.identifier} and image #{image_id.inspect}"
 
           proto_image = proto_appliance.image
           template = prepare_template 'template.erb', appliance: proto_appliance, image: proto_image,
                                                       name: name, image_id: image_id
-          template_handler.register template, group
+          template_handler.register template
         end
 
         def prepare_image(proto_appliance)

data/lib/cloudkeeper/one/appliance_actions/update.rb

@@ -4,7 +4,7 @@ module Cloudkeeper
       module Update
         include Utils::TemplatePreparation
 
-        def update_appliance_metadata(proto_appliance)
+        def update_metadata(proto_appliance)
           raise Cloudkeeper::One::Errors::ArgumentError, 'appliance cannot be nil' unless proto_appliance
 
           templates = template_handler.find_by_appliance_id proto_appliance.identifier
@@ -12,6 +12,7 @@ module Cloudkeeper
             image = image_handler.find_by_name template.name
             raise Cloudkeeper::One::Errors::Actions::UpdateError, "Missing coresponding image for template #{template.id.inspect}"\
               unless image
+
             update_image image, proto_appliance
             update_template template, image, proto_appliance
           end
@@ -25,7 +26,7 @@ module Cloudkeeper
 
         def update_template(template, image, proto_appliance)
           logger.debug "Updating template metadata for appliance #{proto_appliance.identifier.inspect}"
-          template_template = prepare_template 'template.erb', appliance: proto_appliance, name: template.name, image_id: image.id
+          template_template = prepare_template 'template.erb', appliance: proto_appliance, image: proto_appliance.image, name: template.name, image_id: image.id
           template_handler.update template, template_template
         end
       end

data/lib/cloudkeeper/one/appliance_actions/utils/template_preparation.rb

@@ -1,3 +1,4 @@
+require 'stringio'
 require 'erb'
 require 'tilt/erb'
 
@@ -21,13 +22,13 @@ module Cloudkeeper
           end
 
           def render_templates(templates, data)
-            Tempfile.open 'cloudkeeper-template' do |tmp|
-              templates.each { |template| tmp.write(File.read(template)) }
-              tmp.flush
-
-              template = Tilt::ERBTemplate.new tmp
-              template.render Object.new, data
+            template = Tilt::ERBTemplate.new do
+              io = StringIO.new
+              templates.each { |file| io.write(File.read(file)) }
+              io.string
             end
+
+            template.render Object.new, data
           end
         end
       end

data/lib/cloudkeeper/one/appliance_actions/utils/templates/attributes.erb

@@ -12,5 +12,14 @@
 <%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_VO %> = "<%= appliance.vo %>"
 <%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_EXPIRATION_DATE %> = "<%= appliance.expiration_date %>"
 <%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_IMAGE_LIST_ID %> = "<%= appliance.image_list_identifier %>"
+<%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_BASE_MPURI %> = "<%= appliance.base_mpuri %>"
+<%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_APPID %> = "<%= appliance.appid %>"
+<%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_DIGEST %> = "<%= appliance.digest %>"
 
-<%= Cloudkeeper::One::Opennebula::Tags::APPLIANCE_ATTRIBUTES %> = "<%= Base64.strict_encode64 appliance.attributes.to_h.to_json %>"
+<% if image %>
+<%= Cloudkeeper::One::Opennebula::Tags::IMAGE_URI %> = "<%= image.uri %>"
+<%= Cloudkeeper::One::Opennebula::Tags::IMAGE_CHECKSUM %> = "<%= image.checksum %>"
+<%= Cloudkeeper::One::Opennebula::Tags::IMAGE_SIZE %> = "<%= image.size %>"
+<%= Cloudkeeper::One::Opennebula::Tags::IMAGE_FORMAT %> = "<%= image.format %>"
+<%= Cloudkeeper::One::Opennebula::Tags::IMAGE_DIGEST %> = "<%= image.digest %>"
+<% end %>

data/lib/cloudkeeper/one/cli.rb

@@ -68,25 +68,20 @@ module Cloudkeeper
                     type: :string,
                     desc: 'UNIX-like permissions appliances will have within OpenNebula'
       method_option :'opennebula-secret',
-                    required: true,
+                    required: false,
                     default: Cloudkeeper::One::Settings['opennebula']['secret'],
                     type: :string,
                     desc: 'OpenNebula authentication secret'
       method_option :'opennebula-endpoint',
-                    required: true,
+                    required: false,
                     default: Cloudkeeper::One::Settings['opennebula']['endpoint'],
                     type: :string,
                     desc: 'OpenNebula XML-RPC endpoint'
-      method_option :'opennebula-datastores',
+      method_option :'opennebula-datastore',
                     required: true,
-                    default: Cloudkeeper::One::Settings['opennebula']['datastores'],
-                    type: :array,
-                    desc: 'OpenNebula datastores images will be uploaded to'
-      method_option :'opennebula-users',
-                    required: false,
-                    default: Cloudkeeper::One::Settings['opennebula']['users'],
-                    type: :array,
-                    desc: 'Handle only images/templates of specified users'
+                    default: Cloudkeeper::One::Settings['opennebula']['datastore'],
+                    type: :string,
+                    desc: 'OpenNebula datastore images will be uploaded to'
       method_option :'opennebula-api-call-timeout',
                     required: true,
                     default: Cloudkeeper::One::Settings['opennebula']['api-call-timeout'],
@@ -106,6 +101,7 @@ module Cloudkeeper
         grpc_server.run_till_terminated
       rescue SignalException => ex
         raise ex unless SIGNALS.include? ex.signo
+
         grpc_server.stop
       rescue Cloudkeeper::One::Errors::InvalidConfigurationError => ex
         abort ex.message

data/lib/cloudkeeper/one/core_connector.rb

@@ -1,24 +1,24 @@
 module Cloudkeeper
   module One
     class CoreConnector < CloudkeeperGrpc::Communicator::Service
-      attr_reader :image_handler, :template_handler, :datastore_handler, :group_handler
+      attr_reader :image_handler, :template_handler, :datastore_handler
 
       include Cloudkeeper::One::ApplianceActions::Registration
       include Cloudkeeper::One::ApplianceActions::Discard
       include Cloudkeeper::One::ApplianceActions::Update
       include Cloudkeeper::One::ApplianceActions::List
 
-      ERRORS = Hash.new(CloudkeeperGrpc::Constants::STATUS_ERROR).update(
-        Cloudkeeper::One::Errors::Actions::ListingError => CloudkeeperGrpc::Constants::STATUS_ERROR_APPLIANCE_NOT_FOUND,
-        Cloudkeeper::One::Errors::Actions::UpdateError => CloudkeeperGrpc::Constants::STATUS_ERROR_APPLIANCE_NOT_FOUND,
-        Cloudkeeper::One::Errors::NetworkConnectionError => CloudkeeperGrpc::Constants::STATUS_ERROR_APPLIANCE_TRANSFER,
-        Cloudkeeper::One::Errors::Opennebula::AuthenticationError => CloudkeeperGrpc::Constants::STATUS_ERROR_AUTHENTICATION,
-        Cloudkeeper::One::Errors::Opennebula::UserNotAuthorizedError => CloudkeeperGrpc::Constants::STATUS_ERROR_USER_NOT_AUTHORIZED,
-        Cloudkeeper::One::Errors::Opennebula::ResourceNotFoundError => CloudkeeperGrpc::Constants::STATUS_ERROR_RESOURCE_NOT_FOUND,
-        Cloudkeeper::One::Errors::Actions::RegistrationError => CloudkeeperGrpc::Constants::STATUS_ERROR_RESOURCE_NOT_FOUND,
-        Cloudkeeper::One::Errors::Opennebula::ResourceRetrievalError => CloudkeeperGrpc::Constants::STATUS_ERROR_RESOURCE_RETRIEVAL,
-        Cloudkeeper::One::Errors::Opennebula::ResourceStateError => CloudkeeperGrpc::Constants::STATUS_ERROR_RESOURCE_STATE,
-        Cloudkeeper::One::Errors::Opennebula::ApiCallTimeoutError => CloudkeeperGrpc::Constants::STATUS_ERROR_RESOURCE_STATE
+      STATUS_CODES = Hash.new(CloudkeeperGrpc::Constants::STATUS_CODE_UNKNOWN).update(
+        Cloudkeeper::One::Errors::Actions::ListingError => CloudkeeperGrpc::Constants::STATUS_CODE_APPLIANCE_NOT_FOUND,
+        Cloudkeeper::One::Errors::Actions::UpdateError => CloudkeeperGrpc::Constants::STATUS_CODE_APPLIANCE_NOT_FOUND,
+        Cloudkeeper::One::Errors::NetworkConnectionError => CloudkeeperGrpc::Constants::STATUS_CODE_FAILED_APPLIANCE_TRANSFER,
+        Cloudkeeper::One::Errors::Opennebula::AuthenticationError => CloudkeeperGrpc::Constants::STATUS_CODE_UNAUTHENTICATED,
+        Cloudkeeper::One::Errors::Opennebula::UserNotAuthorizedError => CloudkeeperGrpc::Constants::STATUS_CODE_PERMISSION_DENIED,
+        Cloudkeeper::One::Errors::Opennebula::ResourceNotFoundError => CloudkeeperGrpc::Constants::STATUS_CODE_RESOURCE_NOT_FOUND,
+        Cloudkeeper::One::Errors::Actions::RegistrationError => CloudkeeperGrpc::Constants::STATUS_CODE_RESOURCE_NOT_FOUND,
+        Cloudkeeper::One::Errors::Opennebula::ResourceRetrievalError => CloudkeeperGrpc::Constants::STATUS_CODE_FAILED_RESOURCE_RETRIEVAL,
+        Cloudkeeper::One::Errors::Opennebula::ResourceStateError => CloudkeeperGrpc::Constants::STATUS_CODE_INVALID_RESOURCE_STATE,
+        Cloudkeeper::One::Errors::Opennebula::ApiCallTimeoutError => CloudkeeperGrpc::Constants::STATUS_CODE_INVALID_RESOURCE_STATE
       ).freeze
 
       def initialize
@@ -27,78 +27,70 @@ module Cloudkeeper
         @image_handler = Cloudkeeper::One::Opennebula::ImageHandler.new
         @template_handler = Cloudkeeper::One::Opennebula::TemplateHandler.new
         @datastore_handler = Cloudkeeper::One::Opennebula::DatastoreHandler.new
-        @group_handler = Cloudkeeper::One::Opennebula::GroupHandler.new
       end
 
-      def pre_action(_empty, call)
+      def pre_action(_empty, _call)
         logger.debug 'Running \'pre-action\'...'
-        call_backend(call) { discard_expired }
+        Google::Protobuf::Empty.new
       end
 
-      def post_action(_empty, call)
+      def post_action(_empty, _call)
         logger.debug 'Running \'post-action\'...'
-        call.output_metadata['status'] = 'SUCCESS'
         Google::Protobuf::Empty.new
       end
 
-      def add_appliance(appliance, call)
+      def add_appliance(appliance, _call)
         logger.debug "Registering appliance #{appliance.identifier.inspect}"
-        call_backend(call) { register_or_update_appliance appliance }
+        call_backend { register_or_update_appliance appliance }
       end
 
-      def update_appliance(appliance, call)
+      def update_appliance(appliance, _call)
         logger.debug "Updating appliance #{appliance.identifier.inspect}"
-        call_backend(call) { appliance.image ? register_or_update_appliance(appliance) : update_appliance_metadata(appliance) }
+        call_backend { register_or_update_appliance appliance }
+      end
+
+      def update_appliance_metadata(appliance, _call)
+        logger.debug "Updating appliance metadata of #{appliance.identifier.inspect}"
+        call_backend { update_metadata appliance }
       end
 
-      def remove_appliance(appliance, call)
+      def remove_appliance(appliance, _call)
         logger.debug "Removing appliance #{appliance.identifier.inspect}"
-        call_backend(call) { discard_appliance appliance.identifier }
+        call_backend { discard_appliance appliance.identifier }
       end
 
-      def remove_image_list(image_list_identifier, call)
+      def remove_image_list(image_list_identifier, _call)
         logger.debug "Removing appliances from image list #{image_list_identifier.image_list_identifier.inspect}"
-        call_backend(call) { discard_image_list image_list_identifier.image_list_identifier }
+        call_backend { discard_image_list image_list_identifier.image_list_identifier }
       end
 
-      def image_lists(_empty, call)
+      def image_lists(_empty, _call)
         logger.debug 'Retrieving image lists registered in OpenNebula'
-        call_backend(call, default_return_value: [], use_return_value: true) { list_image_lists.each }
+        call_backend(use_return_value: true) { list_image_lists.each }
       end
 
-      def appliances(image_list_identifier, call)
+      def appliances(image_list_identifier, _call)
         logger.debug "Retrieving appliances from image list #{image_list_identifier.image_list_identifier.inspect} " \
                      'registered in OpenNebula'
-        call_backend(call, default_return_value: [], use_return_value: true) do
-          list_appliances(image_list_identifier.image_list_identifier).each
-        end
+        call_backend(use_return_value: true) { list_appliances(image_list_identifier.image_list_identifier).each }
+      end
+
+      def remove_expired_appliances(_empty, _call)
+        logger.debug 'Removing expired appliances'
+
+        call_backend { discard_expired }
       end
 
       private
 
-      def call_backend(call, default_return_value: Google::Protobuf::Empty.new, use_return_value: false)
+      def call_backend(use_return_value: false)
         raise Cloudkeeper::One::Errors::ArgumentError, 'Error handler was called without a block!' unless block_given?
 
-        return_value = handle_errors(call) { yield }
-        finalize_return_value(return_value, default_return_value, use_return_value)
-      end
-
-      def handle_errors(call)
         return_value = yield
-        call.output_metadata[CloudkeeperGrpc::Constants::KEY_STATUS] = CloudkeeperGrpc::Constants::STATUS_SUCCESS
-
-        return_value
+        use_return_value ? return_value : Google::Protobuf::Empty.new
       rescue Cloudkeeper::One::Errors::StandardError => ex
         logger.error "#{ex.class.inspect}: #{ex.message}"
-        call.output_metadata[CloudkeeperGrpc::Constants::KEY_STATUS] = ERRORS[ex.class]
-        call.output_metadata[CloudkeeperGrpc::Constants::KEY_MESSAGE] = ex.message
-
-        return_value
-      end
-
-      def finalize_return_value(return_value, default_return_value, use_return_value)
-        return return_value if return_value && use_return_value
-        default_return_value
+        raise GRPC::BadStatus.new(STATUS_CODES[ex.class], ex.message)
       end
     end
   end

data/lib/cloudkeeper/one/opennebula/appliance_handler.rb

@@ -50,24 +50,10 @@ module Cloudkeeper
           end
         end
 
-        def chgrp(element, group)
-          raise Cloudkeeper::One::Errors::ArgumentError, 'element cannot be nil' unless element
-
-          handle_opennebula_error { element.info! }
-          return if group.id == element.gid
-
-          handle_opennebula_error do
-            element.chown(LEAVE_ID_AS_IS, group.id)
-            element.info!
-          end
-        end
-
         private
 
         def find_all_by(attributes)
           xpaths = attributes.clone
-          xpaths['UNAME'] = Cloudkeeper::One::Settings[:'opennebula-users'] \
-            if Cloudkeeper::One::Settings[:'opennebula-users'] && !Cloudkeeper::One::Settings[:'opennebula-users'].empty?
 
           find_all xpaths
         end

data/lib/cloudkeeper/one/opennebula/datastore_handler.rb

@@ -6,10 +6,6 @@ module Cloudkeeper
           super
           @pool = OpenNebula::DatastorePool.new client
         end
-
-        def find_by_names(names)
-          names.map { |name| find_by_name name }.compact
-        end
       end
     end
   end

data/lib/cloudkeeper/one/opennebula/image_handler.rb

@@ -18,8 +18,6 @@ module Cloudkeeper
 
         def expired
           xpaths = { "TEMPLATE/#{Tags::EXPIRED}" => 'yes' }
-          xpaths['UNAME'] = Cloudkeeper::One::Settings[:'opennebula-users'] \
-            if Cloudkeeper::One::Settings[:'opennebula-users'] && !Cloudkeeper::One::Settings[:'opennebula-users'].empty?
 
           find_all xpaths
         end
@@ -76,7 +74,7 @@ module Cloudkeeper
           handle_opennebula_error { image.update(expiration_attribute, true) }
         end
 
-        def register(image_template, datastore, group)
+        def register(image_template, datastore)
           image_alloc = OpenNebula::Image.build_xml
           image = OpenNebula::Image.new(image_alloc, client)
 
@@ -93,7 +91,6 @@ module Cloudkeeper
           end
 
           chmod image, Cloudkeeper::One::Settings[:'appliances-permissions']
-          chgrp image, group
 
           image
         end

data/lib/cloudkeeper/one/opennebula/tags.rb

@@ -22,12 +22,15 @@ module Cloudkeeper
         APPLIANCE_VO = "#{APPLIANCE}_VO".freeze
         APPLIANCE_EXPIRATION_DATE = "#{APPLIANCE}_EXPIRATION_DATE".freeze
         APPLIANCE_IMAGE_LIST_ID = "#{APPLIANCE}_IMAGE_LIST_ID".freeze
-        APPLIANCE_ATTRIBUTES = "#{APPLIANCE}_ATTRIBUTES".freeze
+        APPLIANCE_BASE_MPURI = "#{APPLIANCE}_BASE_MPURI".freeze
+        APPLIANCE_APPID = "#{APPLIANCE}_APPID".freeze
+        APPLIANCE_DIGEST = "#{APPLIANCE}_DIGEST".freeze
 
         IMAGE_URI = "#{IMAGE}_URI".freeze
         IMAGE_CHECKSUM = "#{IMAGE}_CHECKSUM".freeze
         IMAGE_SIZE = "#{IMAGE}_SIZE".freeze
         IMAGE_FORMAT = "#{IMAGE}_FORMAT".freeze
+        IMAGE_DIGEST = "#{IMAGE}_DIGEST".freeze
       end
     end
   end

data/lib/cloudkeeper/one/opennebula/template_handler.rb

@@ -7,14 +7,13 @@ module Cloudkeeper
           @pool = OpenNebula::TemplatePool.new client
         end
 
-        def register(template_template, group)
+        def register(template_template)
           template_alloc = OpenNebula::Template.build_xml
           template = OpenNebula::Template.new(template_alloc, client)
 
           handle_opennebula_error { template.allocate template_template }
 
           chmod template, Cloudkeeper::One::Settings[:'appliances-permissions']
-          chgrp template, group
 
           template
         end

data/lib/cloudkeeper/one/version.rb

@@ -1,5 +1,5 @@
 module Cloudkeeper
   module One
-    VERSION = '1.3.1'.freeze
+    VERSION = '2.0.0'.freeze
   end
 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-one
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,22 +28,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
@@ -78,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   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
@@ -323,7 +317,7 @@ files:
 - README.md
 - Rakefile
 - bin/cloudkeeper-one
-- cloudkeeper-one.gemspec
+- cloudkeeper_one.gemspec
 - config/cloudkeeper-one.yml
 - config/templates/image.erb
 - config/templates/template.erb
@@ -364,7 +358,6 @@ files:
 - lib/cloudkeeper/one/opennebula.rb
 - lib/cloudkeeper/one/opennebula/appliance_handler.rb
 - lib/cloudkeeper/one/opennebula/datastore_handler.rb
-- lib/cloudkeeper/one/opennebula/group_handler.rb
 - lib/cloudkeeper/one/opennebula/handler.rb
 - lib/cloudkeeper/one/opennebula/helper.rb
 - lib/cloudkeeper/one/opennebula/image_handler.rb
@@ -380,14 +373,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-one
 licenses:
 - Apache License, Version 2.0
@@ -408,7 +401,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: OpenNebula backend for cloudkeeper

data/lib/cloudkeeper/one/opennebula/group_handler.rb

@@ -1,12 +0,0 @@
-module Cloudkeeper
-  module One
-    module Opennebula
-      class GroupHandler < Handler
-        def initialize
-          super
-          @pool = OpenNebula::GroupPool.new client
-        end
-      end
-    end
-  end
-end

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