cloudkeeper-one 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e196faafd597eb04749900d0018efa45acd9e3be
-  data.tar.gz: 88db4d7e7caa6ad5acf67aab4ccb6496b49bbee9
+  metadata.gz: df65ccc84ad1470254b4357721efc6fddcc4850a
+  data.tar.gz: bdce17f386d3d7b22c741a6a5c09064f458e70db
 SHA512:
-  metadata.gz: 80b3135b1e03af1077dd9b096bfa9ced5939311451fb8905dc7c9ef87ce591404a2e7dc9cf02013e9e792e07d4937fee9c8b056ccb198048ddd5afac8afa31fa
-  data.tar.gz: 1272ad092a1608fe0d8f549f4c98661acb22aced948d3b2e514ddfb498310719973b3e8b46d00716d74b38085eaaac39eb99ea3cf603a7bcc415c1092f7ffca7
+  metadata.gz: 47ac56b1226cb92cee84530f2e866e9d36e85d2becc89b92f17e626780a1ed2f7dfac1e3f30db0ff4e8649b70d1dac4079a174020567a22f2e42750a55f3249e
+  data.tar.gz: ba6c9b0390209e8b013f9120c2244597655f46fe19fa0a5d9c0f17f548b31b2033d38fd132ea677504a4d11ccdda18b86ed5a45ba38417335a7efb5262d785a7

data/cloudkeeper-one.gemspec

@@ -42,11 +42,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3.4'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
-  spec.add_development_dependency 'grpc-tools', '~> 1.0'
+  spec.add_development_dependency 'grpc-tools', '>= 1.1', '<= 1.2.5'
 
   spec.add_runtime_dependency 'thor', '~> 0.19'
   spec.add_runtime_dependency 'yell', '~> 2.0'
-  spec.add_runtime_dependency 'grpc', '~> 1.0'
+  spec.add_runtime_dependency 'grpc', '>= 1.1', '<= 1.2.5'
   spec.add_runtime_dependency 'settingslogic', '~> 2.0'
   spec.add_runtime_dependency 'activesupport', '>= 4.0', '< 6.0'
   spec.add_runtime_dependency 'tilt', '~> 2.0'

data/lib/cloudkeeper/one/appliance_actions/{removal.rb → discard.rb}

@@ -1,31 +1,31 @@
 module Cloudkeeper
   module One
     module ApplianceActions
-      module Removal
-        def remove_appliance(appliance_id)
+      module Discard
+        def discard_appliance(appliance_id)
           logger.debug "Removing templates for appliance #{appliance_id.inspect}"
-          remove_templates :find_by_appliance_id, appliance_id
+          discard_templates :find_by_appliance_id, appliance_id
           logger.debug "Removing images for appliance #{appliance_id.inspect}"
-          remove_images :find_by_appliance_id, appliance_id
+          discard_images :find_by_appliance_id, appliance_id
         end
 
-        def remove_image_list(image_list_id)
+        def discard_image_list(image_list_id)
           logger.debug "Removing templates for image list #{image_list_id.inspect}"
-          remove_templates :find_by_image_list_id, image_list_id
+          discard_templates :find_by_image_list_id, image_list_id
           logger.debug "Removing images for image list #{image_list_id.inspect}"
-          remove_images :find_by_image_list_id, image_list_id
+          discard_images :find_by_image_list_id, image_list_id
         end
 
-        def remove_expired
+        def discard_expired
           logger.debug 'Removing expired images...'
           handle_iteration(image_handler.expired) { |item| image_handler.delete item }
         end
 
-        def remove_templates(method, value)
+        def discard_templates(method, value)
           handle_iteration(template_handler.send(method, value)) { |item| template_handler.delete item }
         end
 
-        def remove_images(method, value)
+        def discard_images(method, value)
           handle_iteration(image_handler.send(method, value)) do |item|
             image_handler.expire item
             image_handler.delete item

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

@@ -22,10 +22,13 @@ module Cloudkeeper
           templates = template_handler.find_by_image_list_id image_list_id
           templates.uniq! { |template| template["TEMPLATE/#{Cloudkeeper::One::Opennebula::Tags::APPLIANCE_ID}"] }
 
-          templates.map do |template|
+          appliances = templates.map do |template|
             image = find_image_for_template template
             populate_proto_appliance template, image
           end
+
+          logger.debug "Appliances: #{appliances.map(&:identifier).inspect}"
+          appliances
         end
 
         private

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

@@ -5,7 +5,7 @@ module Cloudkeeper
         include Utils::ImageDownload
         include Utils::TemplatePreparation
         include Cloudkeeper::One::ApplianceActions::Update
-        include Cloudkeeper::One::ApplianceActions::Removal
+        include Cloudkeeper::One::ApplianceActions::Discard
 
         def register_or_update_appliance(proto_appliance)
           raise Cloudkeeper::One::Errors::ArgumentError, 'appliance cannot be nil' unless proto_appliance
@@ -13,7 +13,7 @@ module Cloudkeeper
           group = group_handler.find_by_name proto_appliance.vo
           raise Cloudkeeper::One::Errors::Actions::RegistrationError, "Missing group with name #{proto_appliance.vo}" unless group
 
-          remove_images :find_by_appliance_id, proto_appliance.identifier
+          discard_images :find_by_appliance_id, proto_appliance.identifier
 
           datastores = datastore_handler.find_by_names Cloudkeeper::One::Settings[:'opennebula-datastores']
           datastores.each do |datastore|

data/lib/cloudkeeper/one/appliance_actions.rb

@@ -2,7 +2,7 @@ module Cloudkeeper
   module One
     module ApplianceActions
       autoload :Registration, 'cloudkeeper/one/appliance_actions/registration'
-      autoload :Removal, 'cloudkeeper/one/appliance_actions/removal'
+      autoload :Discard, 'cloudkeeper/one/appliance_actions/discard'
       autoload :Update, 'cloudkeeper/one/appliance_actions/update'
       autoload :List, 'cloudkeeper/one/appliance_actions/list'
       autoload :Utils, 'cloudkeeper/one/appliance_actions/utils'

data/lib/cloudkeeper/one/core_connector.rb

@@ -4,7 +4,7 @@ module Cloudkeeper
       attr_reader :image_handler, :template_handler, :datastore_handler, :group_handler
 
       include Cloudkeeper::One::ApplianceActions::Registration
-      include Cloudkeeper::One::ApplianceActions::Removal
+      include Cloudkeeper::One::ApplianceActions::Discard
       include Cloudkeeper::One::ApplianceActions::Update
       include Cloudkeeper::One::ApplianceActions::List
 
@@ -32,7 +32,7 @@ module Cloudkeeper
 
       def pre_action(_empty, call)
         logger.debug 'Running \'pre-action\'...'
-        call_backend(call) { remove_expired }
+        call_backend(call) { discard_expired }
       end
 
       def post_action(_empty, call)
@@ -53,12 +53,12 @@ module Cloudkeeper
 
       def remove_appliance(appliance, call)
         logger.debug "Removing appliance #{appliance.identifier.inspect}"
-        call_backend(call) { remove_appliance appliance }
+        call_backend(call) { discard_appliance appliance.identifier }
       end
 
       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) { remove_image_list image_list_identifier.image_list_identifier }
+        call_backend(call) { discard_image_list image_list_identifier.image_list_identifier }
       end
 
       def image_lists(_empty, call)

data/lib/cloudkeeper/one/version.rb

@@ -1,5 +1,5 @@
 module Cloudkeeper
   module One
-    VERSION = '1.2.2'.freeze
+    VERSION = '1.2.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper-one
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,16 +168,22 @@ dependencies:
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +216,22 @@ dependencies:
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
@@ -324,9 +336,9 @@ files:
 - examples/etc/init.d/cloudkeeper-one
 - lib/cloudkeeper/one.rb
 - lib/cloudkeeper/one/appliance_actions.rb
+- lib/cloudkeeper/one/appliance_actions/discard.rb
 - lib/cloudkeeper/one/appliance_actions/list.rb
 - lib/cloudkeeper/one/appliance_actions/registration.rb
-- lib/cloudkeeper/one/appliance_actions/removal.rb
 - lib/cloudkeeper/one/appliance_actions/update.rb
 - lib/cloudkeeper/one/appliance_actions/utils.rb
 - lib/cloudkeeper/one/appliance_actions/utils/image_download.rb