opennebula-cli 6.3.90.pre → 6.4.0

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
  SHA256:
3
- metadata.gz: 1f3fc9a8c3825e9063b10901a749e086a10d4025c1f1742f4954db927832ee2e
4
- data.tar.gz: 2f77621f9e521f6f02f63b5d39486157004cba81c9d6ab76923720b0b4d2c9f2
3
+ metadata.gz: 56b346315b2634a821c776148d1e7e01aa05adfcdb3b4a2e367cae4a29b26857
4
+ data.tar.gz: 7046877fa9eb556c11b1dc21bcb27576ed801cb0e8ed6f55c50c3a6b72579ee2
5
5
  SHA512:
6
- metadata.gz: e9dfbab37a9aa42558431c6c03386944b2bfd904256b636dbf2d5746142b5b7ecd0a4f6c7895bde791969286f5e8ba9d24caeb8d82003fd484dc3df056f0ceec
7
- data.tar.gz: bb2fa551de041f71aac6b6acd38f755c65dc92ed514eb4eab54ff00df03adf905031ab487b10e03058b10fa219a47e168a028fa673025b1f5e6930ae1a53a570
6
+ metadata.gz: 3fc21ffc004d6e90f856f49b58164318b365653839009225b77d6074004f24da92d495d6f71669130c47b75648f744e31ae7ff412634198990ff7ec537856203
7
+ data.tar.gz: 1dc9aef9254b2ef752a9adea4c98f55aec7537842cd62f6fe88f3c8b09a89d0c38f6c2218af2d582e800fe7cc920672316d656e9543ab6d29b77a38c65704d95
data/bin/oneuser CHANGED
@@ -443,7 +443,7 @@ CommandParser::CmdParser.new(ARGV) do
443
443
  command :key, key_desc, :options => [KEY] do
444
444
  require 'opennebula/ssh_auth'
445
445
 
446
- options[:key] ||= ENV['HOME'] + '/.ssh/id_rsa'
446
+ options[:key] ||= Dir.home + '/.ssh/id_rsa'
447
447
 
448
448
  begin
449
449
  sshauth = SshAuth.new(:private_key => options[:key])
@@ -221,16 +221,14 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
221
221
  exit(-1)
222
222
  end
223
223
 
224
- mandatory, _type, description, _params, initial = input_cfg
225
-
226
- vnet = {}
224
+ vnet = {}
225
+ mandatory, _, description, _, initial = input_cfg
227
226
 
228
227
  if initial && !initial.empty?
229
228
  type, resource_id, extra = initial.split(':', -1)
230
229
  end
231
230
 
232
- if (type.nil? || resource_id.nil?) &&
233
- (initial && !initial.empty?)
231
+ if (!type || !resource_id) && (initial && !initial.empty?)
234
232
  STDERR.puts 'Wrong type for user input default value:'
235
233
  STDERR.puts " #{key}: #{val}"
236
234
  exit(-1)
@@ -239,7 +237,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
239
237
  vnet[key] = {}
240
238
 
241
239
  if get_defaults
242
- vnet[key][type] = resource_id
240
+ vnet[key][type] = resource_id
243
241
  vnet[key]['extra'] = extra
244
242
 
245
243
  answers << vnet unless mandatory == 'M'
@@ -248,22 +246,25 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
248
246
 
249
247
  puts " * (#{key}) #{description}"
250
248
 
251
- #######################################
252
- # Asks for type
253
- #######################################
254
-
255
- header = ' '
249
+ ####################################################################
250
+ # Ask for type
251
+ ####################################################################
252
+ header = ' '
256
253
  header += 'TYPE Existing(1), Create(2), Reserve(3). '
257
-
258
- if !type.nil? && type != ''
259
- header += 'Press enter for default. '
260
- end
254
+ header += 'Press enter for default. ' if type && !type.empty?
261
255
 
262
256
  print header
263
257
 
264
258
  answer = STDIN.readline.chop
265
259
 
266
- type_a = type
260
+ if type && !type.empty? && ![1, 2, 3].include?(answer.to_i)
261
+ type_a = type
262
+ else
263
+ until [1, 2, 3].include?(answer.to_i)
264
+ print header
265
+ answer = STDIN.readline.chop
266
+ end
267
+ end
267
268
 
268
269
  case answer.to_i
269
270
  when 1
@@ -274,18 +275,18 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
274
275
  type_a = 'reserve_from'
275
276
  end
276
277
 
277
- #######################################
278
- # Asks for resource id
279
- #######################################
280
-
278
+ ####################################################################
279
+ # Ask for resource id
280
+ ####################################################################
281
281
  header = ' '
282
+
282
283
  if type_a == 'template_id'
283
284
  header += 'VN Template ID. '
284
285
  else
285
286
  header += 'VN ID. '
286
287
  end
287
288
 
288
- if !resource_id.nil? && resource_id != ''
289
+ if resource_id && !resource_id.empty?
289
290
  header += "Press enter for default (#{resource_id}). "
290
291
  end
291
292
 
@@ -293,17 +294,23 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
293
294
 
294
295
  resource_id_a = STDIN.readline.chop
295
296
 
296
- resource_id_a = resource_id if resource_id_a.empty?
297
+ if resource_id && !resource_id.empty?
298
+ resource_id_a = resource_id
299
+ else
300
+ while resource_id_a.empty?
301
+ print header
302
+ resource_id_a = STDIN.readline.chop
303
+ end
304
+ end
297
305
 
298
- #######################################
306
+ ####################################################################
299
307
  # Asks for extra
300
- #######################################
301
-
308
+ ####################################################################
302
309
  if type_a != 'id'
303
- header = ' '
310
+ header = ' '
304
311
  header += 'EXTRA (Type EMPTY for leaving empty). '
305
312
 
306
- if !extra.nil? && extra != ''
313
+ if extra && !extra.empty?
307
314
  header += " Press enter for default (#{extra}). "
308
315
  end
309
316
 
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: 6.3.90.pre
4
+ version: 6.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-04-28 00:00:00.000000000 Z
11
+ date: 2022-05-09 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: 6.3.90.pre
19
+ version: 6.4.0
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: 6.3.90.pre
26
+ version: 6.4.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -189,9 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
189
189
  version: '0'
190
190
  required_rubygems_version: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">"
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
- version: 1.3.1
194
+ version: '0'
195
195
  requirements: []
196
196
  rubygems_version: 3.1.2
197
197
  signing_key: