opennebula-cli 5.13.80.pre → 5.13.85.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133ad6e159617025214647d52dbcb5d41f3093cf
-  data.tar.gz: 11cdb1ed429159108f9374034cf3fbe7a7866b8c
+  metadata.gz: 855c80b5cfbc91284d684d4ad8c16b16723280a4
+  data.tar.gz: 583fd805721234146baa37a38cfb231bda65d77d
 SHA512:
-  metadata.gz: b6450713483ad56c4eea014eb294043d0c83b6d29175c5c123a50e854bc5b08ffc9ecfe034dd19b7dc04655b6581152d047df29e475fdbd16bb812ee9b3701cf
-  data.tar.gz: 2633fb675faf36ec1c5d7bf20c57ecaf22f2af9404a5141a7310049108574f2e41b75f260936aa4e9109051ad600341605f350ccd2beeb9d5c61e2bb4e4a0657
+  metadata.gz: 0e13faf950b3041e3fe6957f9d007b9ed984cf6ecf201e6148b8ca203f18390dfc78cc01c2208881aef764809cc3ad8c073100c3b5498a44681677f46168e9b9
+  data.tar.gz: c42cb386febcc3f7a25bebddc11747bd8d7337f7e3cff466ad8d12fa8fd95e77e905ec307e18981d9bbcd0d605a97809b113819070184377d4d5a2ba06c8ce33

data/bin/onehost

@@ -171,8 +171,8 @@ CommandParser::CmdParser.new(ARGV) do
             [:file, nil], :options => CREAT_OPTIONS do
         if options[:im].nil? || options[:vm].nil?
             STDERR.puts 'Drivers are mandatory to create a host:'
-            STDERR.puts '\t -i information driver'
-            STDERR.puts '\t -v hypervisor driver'
+            STDERR.puts "\t -i information driver"
+            STDERR.puts "\t -v hypervisor driver"
             exit(-1)
         end
 

data/bin/oneimage

@@ -164,7 +164,7 @@ CommandParser::CmdParser.new(ARGV) do
             :options => CREATE_OPTIONS + OneImageHelper::TEMPLATE_OPTIONS do
         if options[:datastore].nil? && !options[:dry]
             STDERR.puts 'Datastore to save the image is mandatory: '
-            STDERR.puts '\t -d datastore_id'
+            STDERR.puts "\t -d datastore_id"
             exit(-1)
         end
 
@@ -484,7 +484,7 @@ CommandParser::CmdParser.new(ARGV) do
         # Check user options
         unless options[:datastore]
             STDERR.puts 'Datastore to save the image is mandatory: '
-            STDERR.puts '\t -d datastore_id'
+            STDERR.puts "\t -d datastore_id"
             exit(-1)
         end
 

data/bin/onemarketapp

@@ -177,7 +177,7 @@ CommandParser::CmdParser.new(ARGV) do
                         OneMarketPlaceAppHelper::TEMPLATE_OPTIONS do
         if options[:marketplace].nil?
             STDERR.puts 'Marketplace to save the app is mandatory: '
-            STDERR.puts '\t -m marketplace_id'
+            STDERR.puts "\t -m marketplace_id"
             exit(-1)
         end
 

data/lib/cli_helper.rb

@@ -357,14 +357,14 @@ module CLIHelper
         # @param options [Hash] Object with CLI user options
         # @param top     [Boolean]     True to not update columns again
         def show(data, options = {}, top = false)
+            update_columns(options) unless top
+
             if options[:list]
                 @cli_columns = options[:list].collect {|o| o.upcase.to_sym }
             else
                 @cli_columns = @default_columns
             end
 
-            update_columns(options) unless top
-
             if data.is_a? Hash
                 @data = data
 

data/lib/one_helper/onemarketapp_helper.rb

@@ -198,6 +198,9 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
             end
         end
 
+        # Turn import all into a boolean
+        import_all == 'yes' ? import_all = true : import_all = false
+
         main_market = options[:market]
 
         # Read marketplace where import the service template
@@ -232,7 +235,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         ids = []
 
         # Create roles apps
-        if import_all == 'yes'
+        if import_all
             rc  = create_apps(markets, import_all)
             ids = rc[1]
 
@@ -282,6 +285,9 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
             end
         end
 
+        # Turn import all into a boolean
+        import_all == 'yes' ? import_all = true : import_all = false
+
         main_market = options[:market]
 
         # Read marketplace where import the VM template
@@ -510,7 +516,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
 
     # Get roles information when importing a service template into marketplace
     #
-    # @param import_all [String]  yes to import VM templates too, no otherwise
+    # @param import_all [Boolean] true to import VM templates too
     # @param body       [Hash]    Sevice Template information
     # @param pool       [Array]   Marketplace pool
     # @param market     [Integer] Marketplace to import
@@ -525,7 +531,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
         markets = {}
         default_mp = pool.first['ID'].to_i
 
-        if import_all == 'yes'
+        if import_all
             # Read marketplace where import each different VM template
             # It can only be a private marketplace
             unless market
@@ -592,9 +598,9 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
 
     # Create applications in Marketplace
     #
-    # @param markets       [Hash]   Marketplaces and templates information
-    # @param import_all    [String] yes to import images too, no otherwise
-    # @param template_name [String] Virtual Machine Template app name
+    # @param markets       [Hash]    Marketplaces and templates information
+    # @param import_all    [Boolean] true to import images too
+    # @param template_name [String]  Virtual Machine Template app name
     #
     # @return [String] Error message in case of any
     def create_apps(markets, import_all, template_name = nil)

data/lib/one_helper/onezone_helper.rb

@@ -38,8 +38,6 @@ class Replicator
           :service => 'opennebula' },
         { :name    => 'monitord.conf',
           :service => 'opennebula' },
-        { :name    => 'econe.conf',
-          :service => 'opennebula-econe' },
         { :name    => 'oneflow-server.conf',
           :service => 'opennebula-flow' },
         { :name    => 'onegate-server.conf',
@@ -57,7 +55,6 @@ class Replicator
     FOLDERS = [
         { :name => 'sunstone-views', :service => 'opennebula-sunstone' },
         { :name => 'auth', :service => 'opennebula' },
-        { :name => 'ec2query_templates', :service => 'opennebula' },
         { :name => 'hm', :service => 'opennebula' },
         { :name => 'sunstone-views', :service => 'opennebula' },
         { :name => 'vmm_exec', :service => 'opennebula' }
@@ -99,8 +96,7 @@ class Replicator
         @opennebula_services = { 'opennebula'          => false,
                                  'opennebula-sunstone' => false,
                                  'opennebula-gate'     => false,
-                                 'opennebula-flow'     => false,
-                                 'opennebula-econe'    => false }
+                                 'opennebula-flow'     => false }
     end
 
     # Process files and folders

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.13.80.pre
+  version: 5.13.85.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.13.80.pre
+        version: 5.13.85.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.13.80.pre
+        version: 5.13.85.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement