opennebula-cli 5.11.80.pre → 5.11.85.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768b86165d0c44d9ec4e0f88618a51ef1058b75b
-  data.tar.gz: b7736f3f80410ca456a45ac4e1f441eff5d3fa55
+  metadata.gz: c5979e29fd5700d0aaedede6a56329fa90069d44
+  data.tar.gz: ff7e492d9964ae93cc9836077fdb91dd8355584f
 SHA512:
-  metadata.gz: 428a91440d21381152277c91e97c9ab06f2b2c2e8f968b1852c48e788a294727e9807588d20cce6d852714e042ef9b09ffdf87985efa16096a35d356228b9aa2
-  data.tar.gz: 7c4aeb87e22274c51171d4708306933d9d99e4ab34704888d2ddc4c100c7686f40f6fcc008a1237d35ba7b5df1ad871ca47faee95a3f40089f1e6339461356b9
+  metadata.gz: d0cd39603a4ef726234135d52ba5d8b9c3cde28b2f5259019d903beafa7869e1ce8711d1071e12cd87f254f66b437560028786639a3c82607c6adfbfc92c293e
+  data.tar.gz: 4f9210addf423c2661b9632305519286da8142728a65f0ef51c039747cedb90b3a1500f7b4c7531bcfb4921de6fca71c7daf07c0fda5eb98cbcab4493ca01d9d

data/bin/onemarketapp

@@ -75,6 +75,13 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
+    TAG = {
+        :name => 'tag',
+        :large => '--tag tag',
+        :format => String,
+        :description => 'DockerHub image tag (default latest)'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
@@ -87,7 +94,8 @@ CommandParser::CmdParser.new(ARGV) do
 
     CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
     EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
-                      OneMarketPlaceAppHelper::VMNAME]
+                      OneMarketPlaceAppHelper::VMNAME,
+                      TAG]
 
     ########################################################################
     # Formatters for arguments
@@ -172,10 +180,13 @@ CommandParser::CmdParser.new(ARGV) do
 
     command :export, export_desc, :appid, :name, :options => EXPORT_OPTIONS do
         helper.perform_action(args[0], options, 'exported') do |obj|
+            tag ="tag=#{options[:tag]}" if options[:tag]
+
             rc = obj.export(
                 :dsid => options[:datastore],
                 :name => args[1],
-                :vmtemplate_name => options[:vmname]
+                :vmtemplate_name => options[:vmname],
+                :url_args => tag
             )
 
             next rc if OpenNebula.is_error?(rc)

data/lib/one_helper/onecluster_helper.rb

@@ -63,15 +63,15 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
             end
 
             column :HOSTS, "Number of Hosts", :size=>5 do |d|
-                @ext.element_size(d,"HOSTS")
+                @ext.element_size(d,"HOSTS") rescue 0
             end
 
             column :VNETS, "Number of Networks", :size=>5 do |d|
-                @ext.element_size(d,"VNETS")
+                @ext.element_size(d,"VNETS") rescue 0
             end
 
             column :DATASTORES, "Number of Datastores", :size=>10 do |d|
-                @ext.element_size(d,"DATASTORES")
+                @ext.element_size(d,"DATASTORES") rescue 0
             end
 
             default :ID, :NAME, :HOSTS, :VNETS, :DATASTORES

data/lib/one_helper/oneflow_helper.rb

@@ -19,6 +19,11 @@ require 'one_helper'
 # Oneflow command helper
 class OneFlowHelper < OpenNebulaHelper::OneHelper
 
+    # Configuration file
+    def self.conf_file
+        'oneflow.yaml'
+    end
+
     # Get client to make request
     #
     # @options [Hash] CLI options
@@ -33,8 +38,9 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
 
     # Get service pool table
     def format_service_pool
-        # TODO: config file
-        CLIHelper::ShowTable.new(nil, self) do
+        config_file = self.class.table_conf
+
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ID', :size => 10 do |d|
                 d['ID']
             end

data/lib/one_helper/oneflowtemplate_helper.rb

@@ -19,6 +19,11 @@ require 'one_helper'
 # Oneflow Template command helper
 class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
+    # Configuration file
+    def self.conf_file
+        'oneflowtemplate.yaml'
+    end
+
     # Get client to make request
     #
     # @options [Hash] CLI options
@@ -33,8 +38,9 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
 
     # Get service template pool
     def format_service_template_pool
-        # TODO: config file
-        CLIHelper::ShowTable.new(nil, self) do
+        config_file = self.class.table_conf
+
+        CLIHelper::ShowTable.new(config_file, self) do
             column :ID, 'ID', :size => 10 do |d|
                 d['ID']
             end

data/lib/one_helper/onehost_helper.rb

@@ -664,7 +664,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                                    .split("\n")
                 name   = wild['VM_NAME']
                 import = wild_tmplt.select do |line|
-                             line[/IMPORT_VM_ID/]
+                             line[/DEPLOY_ID/]
                          end[0].split('=')[1].tr('"', ' ').strip
                 memory = wild_tmplt.select do |line|
                              line[/MEMORY/]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.11.80.pre
+  version: 5.11.85.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.80.pre
+        version: 5.11.85.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.11.80.pre
+        version: 5.11.85.pre
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.io
 executables: