nifty 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5591b23e043bc9d838800912365f1bcd58b048fa
-  data.tar.gz: 9d0e05448b444852afd7270c9bfdf951338afab9
+  metadata.gz: 5cdc153b695c7aff6d7f455493d363fff9e25b86
+  data.tar.gz: 391b28158089f86dadd7d65afd043f5ccd688401
 SHA512:
-  metadata.gz: 26b0ccf1af50d091ce7d7145c747fd7df1b3f9a8eeb63402dfbd71ed244775e11bb083c40e91c194d58e58275b3065e4bf255bb44931be3e853543419f4c1d7d
-  data.tar.gz: 59641bfa248ac314da3ec51bb226a6fb81daee88a8f6ba491dfe525c1d43462af10c1901a94443884f5e798f1237c32779f079f7de05ee49b3c843ba93c3e573
+  metadata.gz: 7975505c83737b902cb1c1aba634c842e19c96fa2c3eb998c7a2807ec3160ed2e90a0fc844db911ac7828f5331ff7af7490d3cda6393d9b49c09c555260fd776
+  data.tar.gz: ea370f4d5d5d872423eb84a111601e7614d3724ba4aa26f34c03244b93349b4c2f79fed015d171271535d8714c8cf67519ece310dc6a70d2c71f1414f9a650d2

data/README.md

@@ -64,11 +64,11 @@ NIFTY is run with executable `nifty`. For further assistance run `nifty help`:
 $ nifty help
 
 Commands:
-  nifty backends                                                                             # Lists all available backends with their description
-  nifty help [COMMAND]                                                                       # Describe available commands or one specific command
-  nifty opennebula --expiration-interval=EXPIRATION-INTERVAL -d, --datastores=one two three  # Runs NIFTY with backend opennebula
-  nifty opennebula-transfer-methods                                                          # Lists all available transfer methods with their description for opennebula backend
-  nifty version                                                                              # Prints NIFTY's version
+  nifty backends                                                                                                                                           # Lists all available backends with their description
+  nifty help [COMMAND]                                                                                                                                     # Describe available commands or one specific command
+  nifty opennebula --api-call-timeout=API-CALL-TIMEOUT --expiration-interval=EXPIRATION-INTERVAL --permissions=PERMISSIONS -d, --datastores=one two three  # Runs NIFTY with backend opennebula
+  nifty opennebula-transfer-methods                                                                                                                        # Lists all available transfer methods with their description for "...
+  nifty version                                                                                                                                            # Prints NIFTY's version
 
 Options:
   -a, --appliance-dir=APPLIANCE-DIR                  # Directory from where appliance descriptors will be loaded
@@ -85,12 +85,13 @@ OpenNebula is currently the only supported backend for NIFTY. NIFTY can upload a
 $ nifty help opennebula
 
 Usage:
-  nifty opennebula --expiration-interval=EXPIRATION-INTERVAL -d, --datastores=one two three
+  nifty opennebula --api-call-timeout=API-CALL-TIMEOUT --expiration-interval=EXPIRATION-INTERVAL --permissions=PERMISSIONS -d, --datastores=one two three
 
 Options:
       [--secret=SECRET]                                  # Pair of username and password in form of 'username:password' for accessing OpenNebula
       [--endpoint=ENDPOINT]                              # OpenNebula's XML RPC endpoint
       --expiration-interval=EXPIRATION-INTERVAL          # How long should expired images be kept in OpenNebula befor removal, 0 means don't remove
+      --api-call-timeout=API-CALL-TIMEOUT                # How long will NIFTY wait for image/template operations to finish in OpenNebula
   -d, --datastores=one two three                         # Names of OpenNebula datastores images will be uploaded to
       [--template-dir=TEMPLATE-DIR]                      # If set, templates within this directory are used to construct images and templates in OpenNebula
       [--description-naming], [--no-description-naming]  # If true, uses identifier and version from appliance description as template/image name instead of generated uuids
@@ -100,7 +101,6 @@ Options:
   -a, --appliance-dir=APPLIANCE-DIR                      # Directory from where appliance descriptors will be loaded
   -m, --transfer-method=TRANSFER-METHOD                  # Transfer method for image upload
   -t, [--transfer-destination=TRANSFER-DESTINATION]      # Image upload destination
-  -b, --backend=BACKEND                                  # Backend for registering images
       --logging-level=LOGGING-LEVEL
       [--logging-file=LOGGING-FILE]                      # File to write log to
       [--debug], [--no-debug]                            # Runs nifty in debug mode

data/config/nifty.yml

@@ -9,6 +9,7 @@ production:
     datastores: # Array of names of OpenNebula datastores images will be uploaded to. Has to contain at least one datastore if opennebula backend is selected
       - default
     expiration-interval: 2w # How long should expired images be kept in OpenNebula before removal, 0 means don't remove
+    api-call-timeout: 3h # How long will NIFTY wait for image/template operations to finish in OpenNebula
     template-dir: # If set, templates within this directory are used to construct images and templates in OpenNebula
     description-naming: false # If true, uses identifier and version from appliance description as template/image name instead of generated uuids
     disk-expiration: true # Will expire old disks before the new one is registered

data/lib/nifty/backends/opennebula.rb

@@ -30,6 +30,11 @@ class Nifty::Backends::Opennebula < Nifty::Backend
           :type => :string,
           :desc => 'How long should expired images be kept in OpenNebula befor removal, 0 means don\'t remove'
         },
+        :"api-call-timeout" => {
+          :required => true,
+          :type => :string,
+          :desc => 'How long will NIFTY wait for image/template operations to finish in OpenNebula'
+        },
         :datastores => {
           :required => true,
           :type => :array,
@@ -63,6 +68,7 @@ class Nifty::Backends::Opennebula < Nifty::Backend
 
     # @see Nifty::Backend#pre
     def pre(parameters)
+      Nifty::Backends::Utils::Opennebula::Handler.api_call_timeout = ChronicDuration.parse(parameters[:'api-call-timeout'], keep_zero: true)
       expiration_check(parameters)
     end
 
@@ -89,7 +95,7 @@ class Nifty::Backends::Opennebula < Nifty::Backend
     # @option parameters [String] secret OpenNebula's secret
     # @option parameters [String] endpoint OpenNebula's endpoint
     def expiration_check(parameters)
-      interval = ChronicDuration.parse(parameters[:"expiration-interval"])
+      interval = ChronicDuration.parse(parameters[:'expiration-interval'])
       return unless interval
 
       client = Nifty::Backends::Utils::Opennebula::Helper.client(parameters[:secret], parameters[:endpoint])

data/lib/nifty/backends/utils/opennebula/handler.rb

@@ -7,11 +7,13 @@
 class Nifty::Backends::Utils::Opennebula::Handler
   attr_reader :client
   attr_accessor :pool
+  cattr_accessor :api_call_timeout
 
   ONEADMIN_ID = 0
   LEAVE_AS_IS = -1
   ATTRIBUTE_APPLIANCE_ID = 'NIFTY_APPLIANCE_ID'
   OWNER_OCTET = '600'
+  API_POLLING_WAIT = 10
 
   # Constructor
   #

data/lib/nifty/backends/utils/opennebula/image_handler.rb

@@ -75,9 +75,9 @@ class Nifty::Backends::Utils::Opennebula::ImageHandler < Nifty::Backends::Utils:
     logger.debug("Deleting image with id #{id.inspect}")
     Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.delete }
 
-    Timeout::timeout(Nifty::API_CALL_TIMEOUT) do
+    Timeout::timeout(Nifty::Backends::Utils::Opennebula::Handler.api_call_timeout) do
       while(image_exist?(id))
-        sleep(Nifty::API_POLLING_WAIT)
+        sleep(Nifty::Backends::Utils::Opennebula::Handler::API_POLLING_WAIT)
       end
     end
   rescue Timeout::Error
@@ -105,9 +105,9 @@ class Nifty::Backends::Utils::Opennebula::ImageHandler < Nifty::Backends::Utils:
     Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.disable }
 
     Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.info! }
-    Timeout::timeout(Nifty::API_CALL_TIMEOUT) do
+    Timeout::timeout(Nifty::Backends::Utils::Opennebula::Handler.api_call_timeout) do
       until(image.state_str == IMAGE_STATE_DISABLED)
-        sleep(Nifty::API_POLLING_WAIT)
+        sleep(Nifty::Backends::Utils::Opennebula::Handler::API_POLLING_WAIT)
         Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.info! }
       end
     end
@@ -171,11 +171,11 @@ class Nifty::Backends::Utils::Opennebula::ImageHandler < Nifty::Backends::Utils:
     Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.allocate(template, datastore.id) }
 
     begin
-      Timeout::timeout(Nifty::API_CALL_TIMEOUT) do
+      Timeout::timeout(Nifty::Backends::Utils::Opennebula::Handler.api_call_timeout) do
         Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.info! }
 
         until(image.state_str == IMAGE_STATE_READY)
-          sleep(Nifty::API_POLLING_WAIT)
+          sleep(Nifty::Backends::Utils::Opennebula::Handler::API_POLLING_WAIT)
           Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { image.info! }
         end
       end

data/lib/nifty/backends/utils/opennebula/template_handler.rb

@@ -47,9 +47,9 @@ class Nifty::Backends::Utils::Opennebula::TemplateHandler < Nifty::Backends::Uti
     logger.debug("Deleting template with id #{id.inspect}")
     Nifty::Backends::Utils::Opennebula::Helper.handle_opennebula_error { template.delete }
 
-    Timeout::timeout(Nifty::API_CALL_TIMEOUT) do
+    Timeout::timeout(Nifty::Backends::Utils::Opennebula::Handler.api_call_timeout) do
       while(template_exist?(id))
-        sleep(Nifty::API_POLLING_WAIT)
+        sleep(Nifty::Backends::Utils::Opennebula::Handler::API_POLLING_WAIT)
       end
     end
   rescue Timeout::Error

data/lib/nifty/version.rb

@@ -1,3 +1,3 @@
 module Nifty
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/lib/nifty.rb

@@ -2,8 +2,6 @@
 module Nifty
   GEM_DIR = File.realdirpath(File.join(File.dirname(__FILE__), '..'))
   APPLIANCE_SCHEMA = File.join(GEM_DIR, 'schema', 'appliance.json')
-  API_CALL_TIMEOUT = 60
-  API_POLLING_WAIT = 5
 end
 
 require 'active_support/all'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nifty
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler