opennebula-cli 5.11.80.pre → 5.11.85.pre

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 768b86165d0c44d9ec4e0f88618a51ef1058b75b
4
- data.tar.gz: b7736f3f80410ca456a45ac4e1f441eff5d3fa55
3
+ metadata.gz: c5979e29fd5700d0aaedede6a56329fa90069d44
4
+ data.tar.gz: ff7e492d9964ae93cc9836077fdb91dd8355584f
5
5
  SHA512:
6
- metadata.gz: 428a91440d21381152277c91e97c9ab06f2b2c2e8f968b1852c48e788a294727e9807588d20cce6d852714e042ef9b09ffdf87985efa16096a35d356228b9aa2
7
- data.tar.gz: 7c4aeb87e22274c51171d4708306933d9d99e4ab34704888d2ddc4c100c7686f40f6fcc008a1237d35ba7b5df1ad871ca47faee95a3f40089f1e6339461356b9
6
+ metadata.gz: d0cd39603a4ef726234135d52ba5d8b9c3cde28b2f5259019d903beafa7869e1ce8711d1071e12cd87f254f66b437560028786639a3c82607c6adfbfc92c293e
7
+ data.tar.gz: 4f9210addf423c2661b9632305519286da8142728a65f0ef51c039747cedb90b3a1500f7b4c7531bcfb4921de6fca71c7daf07c0fda5eb98cbcab4493ca01d9d
@@ -75,6 +75,13 @@ CommandParser::CmdParser.new(ARGV) do
75
75
  :description => 'lock all actions'
76
76
  }
77
77
 
78
+ TAG = {
79
+ :name => 'tag',
80
+ :large => '--tag tag',
81
+ :format => String,
82
+ :description => 'DockerHub image tag (default latest)'
83
+ }
84
+
78
85
  ########################################################################
79
86
  # Global Options
80
87
  ########################################################################
@@ -87,7 +94,8 @@ CommandParser::CmdParser.new(ARGV) do
87
94
 
88
95
  CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
89
96
  EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
90
- OneMarketPlaceAppHelper::VMNAME]
97
+ OneMarketPlaceAppHelper::VMNAME,
98
+ TAG]
91
99
 
92
100
  ########################################################################
93
101
  # Formatters for arguments
@@ -172,10 +180,13 @@ CommandParser::CmdParser.new(ARGV) do
172
180
 
173
181
  command :export, export_desc, :appid, :name, :options => EXPORT_OPTIONS do
174
182
  helper.perform_action(args[0], options, 'exported') do |obj|
183
+ tag ="tag=#{options[:tag]}" if options[:tag]
184
+
175
185
  rc = obj.export(
176
186
  :dsid => options[:datastore],
177
187
  :name => args[1],
178
- :vmtemplate_name => options[:vmname]
188
+ :vmtemplate_name => options[:vmname],
189
+ :url_args => tag
179
190
  )
180
191
 
181
192
  next rc if OpenNebula.is_error?(rc)
@@ -63,15 +63,15 @@ class OneClusterHelper < OpenNebulaHelper::OneHelper
63
63
  end
64
64
 
65
65
  column :HOSTS, "Number of Hosts", :size=>5 do |d|
66
- @ext.element_size(d,"HOSTS")
66
+ @ext.element_size(d,"HOSTS") rescue 0
67
67
  end
68
68
 
69
69
  column :VNETS, "Number of Networks", :size=>5 do |d|
70
- @ext.element_size(d,"VNETS")
70
+ @ext.element_size(d,"VNETS") rescue 0
71
71
  end
72
72
 
73
73
  column :DATASTORES, "Number of Datastores", :size=>10 do |d|
74
- @ext.element_size(d,"DATASTORES")
74
+ @ext.element_size(d,"DATASTORES") rescue 0
75
75
  end
76
76
 
77
77
  default :ID, :NAME, :HOSTS, :VNETS, :DATASTORES
@@ -19,6 +19,11 @@ require 'one_helper'
19
19
  # Oneflow command helper
20
20
  class OneFlowHelper < OpenNebulaHelper::OneHelper
21
21
 
22
+ # Configuration file
23
+ def self.conf_file
24
+ 'oneflow.yaml'
25
+ end
26
+
22
27
  # Get client to make request
23
28
  #
24
29
  # @options [Hash] CLI options
@@ -33,8 +38,9 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
33
38
 
34
39
  # Get service pool table
35
40
  def format_service_pool
36
- # TODO: config file
37
- CLIHelper::ShowTable.new(nil, self) do
41
+ config_file = self.class.table_conf
42
+
43
+ CLIHelper::ShowTable.new(config_file, self) do
38
44
  column :ID, 'ID', :size => 10 do |d|
39
45
  d['ID']
40
46
  end
@@ -19,6 +19,11 @@ require 'one_helper'
19
19
  # Oneflow Template command helper
20
20
  class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
21
21
 
22
+ # Configuration file
23
+ def self.conf_file
24
+ 'oneflowtemplate.yaml'
25
+ end
26
+
22
27
  # Get client to make request
23
28
  #
24
29
  # @options [Hash] CLI options
@@ -33,8 +38,9 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
33
38
 
34
39
  # Get service template pool
35
40
  def format_service_template_pool
36
- # TODO: config file
37
- CLIHelper::ShowTable.new(nil, self) do
41
+ config_file = self.class.table_conf
42
+
43
+ CLIHelper::ShowTable.new(config_file, self) do
38
44
  column :ID, 'ID', :size => 10 do |d|
39
45
  d['ID']
40
46
  end
@@ -664,7 +664,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
664
664
  .split("\n")
665
665
  name = wild['VM_NAME']
666
666
  import = wild_tmplt.select do |line|
667
- line[/IMPORT_VM_ID/]
667
+ line[/DEPLOY_ID/]
668
668
  end[0].split('=')[1].tr('"', ' ').strip
669
669
  memory = wild_tmplt.select do |line|
670
670
  line[/MEMORY/]
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opennebula-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.11.80.pre
4
+ version: 5.11.85.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-07 00:00:00.000000000 Z
11
+ date: 2020-05-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opennebula
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 5.11.80.pre
19
+ version: 5.11.85.pre
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 5.11.80.pre
26
+ version: 5.11.85.pre
27
27
  description: Commands used to talk to OpenNebula
28
28
  email: contact@opennebula.io
29
29
  executables: