opennebula-cli 5.12.0.3 → 5.12.0.4

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: cf18312886b529b2e6efe5526e0f2452c3b0b30a
4
- data.tar.gz: f7857dd799fa3651f9c6dcaef612638ea347a002
3
+ metadata.gz: 2648488d15b5d036a3e5a41e6df716ac9358df47
4
+ data.tar.gz: 0854d2925cfe7fd0b84cf28212137fd76c75317f
5
5
  SHA512:
6
- metadata.gz: 4183b23d9c934c0162d150000a24f71214b34244e545ddc4c451b1828c8038891aaa5006716babc4b042abf53b25a0513cbacd35e4dc5851767237c87823c1d7
7
- data.tar.gz: 358dade92607ea88527dbd5b5b10d7c7b22212eccc589819ce734a758b59e02f6f8acd7e66d5024b20eef3441064efd9f77a1a9a753abbfc6e72acb313d76585
6
+ metadata.gz: 19d857a5b4e66972ce8b573744ce98a6da7750504e9a9754b6a22b58281092660314dbad20a425db4422a088670ec0d0af794f870534ace98f7333f82361ff5c
7
+ data.tar.gz: 283bce4816b2f1fb1181fd8b697dd8094806567ba96cced3c5e91e91e8faf606df85a070086141951094e594cf2dce659d2ae029f2c8adfe31a4b946071c9f53
data/bin/onevcenter CHANGED
@@ -155,6 +155,7 @@ CommandParser::CmdParser.new(ARGV) do
155
155
  begin
156
156
  args = helper.parse_opts(options)
157
157
  args[:filter] = true
158
+ args[:short] = true
158
159
  vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
159
160
  importer = VCenterDriver::VcImporter
160
161
  .new_child(helper.client, vi_client, options[:object])
@@ -185,6 +186,7 @@ CommandParser::CmdParser.new(ARGV) do
185
186
  begin
186
187
  args = helper.parse_opts(options)
187
188
  args[:filter] = false
189
+ args[:short] = true
188
190
  vi_client = VCenterDriver::VIClient.new_from_host(options[:host])
189
191
  importer = VCenterDriver::VcImporter
190
192
  .new_child(helper.client, vi_client, options[:object])
data/lib/cli_helper.rb CHANGED
@@ -532,7 +532,7 @@ module CLIHelper
532
532
  # @param data [Array] Array with data to show
533
533
  # @param del [Char] CSV delimiter
534
534
  def print_csv_data(data, del)
535
- del ? del = del : del = ','
535
+ del ||= ','
536
536
 
537
537
  data.each do |l|
538
538
  result = []
@@ -20,6 +20,10 @@ require 'one_helper/onevm_helper'
20
20
  # CLI helper for oneimage command
21
21
  class OneImageHelper < OpenNebulaHelper::OneHelper
22
22
 
23
+ # This list contains prefixes that should skip adding user home to the path
24
+ # This must have the same content as the case $FROM in downloader.sh
25
+ PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker]
26
+
23
27
  TEMPLATE_OPTIONS=[
24
28
  {
25
29
  :name => 'name',
@@ -82,7 +86,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
82
86
  :description => 'Path of the image file',
83
87
  :format => String,
84
88
  :proc => lambda do |o, _options|
85
- next [0, o] if o.match(%r{^(https?|docker)://})
89
+ next [0, o] if o.match(%r{^(#{PREFIXES.join('|')})://})
86
90
 
87
91
  if o[0, 1]=='/'
88
92
  path=o
@@ -201,6 +201,10 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
201
201
  login_client = self.get_login_client(username, options)
202
202
  end
203
203
 
204
+ if (login_client.is_a? Array) && login_client[0] == -1
205
+ return login_client
206
+ end
207
+
204
208
  user = OpenNebula::User.new(User.build_xml, login_client)
205
209
 
206
210
  egid = options[:group] || -1
@@ -100,7 +100,8 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
100
100
  if File.file?(o)
101
101
  options[:file] = o
102
102
  else
103
- exit - 1
103
+ STDERR.puts "File `#{options[:file]}` doesn't exist"
104
+ exit(-1)
104
105
  end
105
106
  }
106
107
  }
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.12.0.3
4
+ version: 5.12.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-10-14 00:00:00.000000000 Z
11
+ date: 2021-04-20 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.12.0.3
19
+ version: 5.12.0.4
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.12.0.3
26
+ version: 5.12.0.4
27
27
  description: Commands used to talk to OpenNebula
28
28
  email: contact@opennebula.io
29
29
  executables:
@@ -78,34 +78,34 @@ files:
78
78
  - bin/onevntemplate
79
79
  - bin/onevrouter
80
80
  - bin/onezone
81
- - lib/command_parser.rb
82
81
  - lib/cli_helper.rb
82
+ - lib/command_parser.rb
83
83
  - lib/one_helper.rb
84
+ - lib/one_helper/oneacct_helper.rb
84
85
  - lib/one_helper/oneacl_helper.rb
85
86
  - lib/one_helper/onecluster_helper.rb
87
+ - lib/one_helper/onedatastore_helper.rb
88
+ - lib/one_helper/oneflow_helper.rb
89
+ - lib/one_helper/oneflowtemplate_helper.rb
86
90
  - lib/one_helper/onegroup_helper.rb
87
91
  - lib/one_helper/onehook_helper.rb
92
+ - lib/one_helper/onehost_helper.rb
93
+ - lib/one_helper/oneimage_helper.rb
88
94
  - lib/one_helper/onemarket_helper.rb
95
+ - lib/one_helper/onemarketapp_helper.rb
96
+ - lib/one_helper/oneprovision_helper.rb
89
97
  - lib/one_helper/onequota_helper.rb
90
98
  - lib/one_helper/onesecgroup_helper.rb
91
99
  - lib/one_helper/onetemplate_helper.rb
100
+ - lib/one_helper/oneuser_helper.rb
92
101
  - lib/one_helper/onevcenter_helper.rb
93
102
  - lib/one_helper/onevdc_helper.rb
103
+ - lib/one_helper/onevm_helper.rb
94
104
  - lib/one_helper/onevmgroup_helper.rb
95
105
  - lib/one_helper/onevnet_helper.rb
96
106
  - lib/one_helper/onevntemplate_helper.rb
97
107
  - lib/one_helper/onevrouter_helper.rb
98
108
  - lib/one_helper/onezone_helper.rb
99
- - lib/one_helper/oneacct_helper.rb
100
- - lib/one_helper/onedatastore_helper.rb
101
- - lib/one_helper/oneflow_helper.rb
102
- - lib/one_helper/oneflowtemplate_helper.rb
103
- - lib/one_helper/onehost_helper.rb
104
- - lib/one_helper/oneimage_helper.rb
105
- - lib/one_helper/onemarketapp_helper.rb
106
- - lib/one_helper/oneprovision_helper.rb
107
- - lib/one_helper/oneuser_helper.rb
108
- - lib/one_helper/onevm_helper.rb
109
109
  - NOTICE
110
110
  - LICENSE
111
111
  homepage: http://opennebula.io