opennebula-cli 6.6.0 → 6.6.1
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 +4 -4
- data/bin/oneacct +1 -1
- data/bin/oneacl +1 -1
- data/bin/onecluster +1 -1
- data/bin/onedatastore +1 -1
- data/bin/oneflow +1 -1
- data/bin/oneflow-template +1 -1
- data/bin/onegroup +1 -1
- data/bin/onehook +1 -1
- data/bin/onehost +1 -1
- data/bin/oneimage +20 -2
- data/bin/oneirb +1 -1
- data/bin/onelog +1 -1
- data/bin/onemarket +1 -1
- data/bin/onemarketapp +1 -1
- data/bin/onesecgroup +1 -1
- data/bin/oneshowback +1 -1
- data/bin/onetemplate +1 -1
- data/bin/oneuser +3 -3
- data/bin/onevcenter +1 -1
- data/bin/onevdc +1 -1
- data/bin/onevm +12 -11
- data/bin/onevmgroup +1 -1
- data/bin/onevnet +1 -1
- data/bin/onevntemplate +1 -1
- data/bin/onevrouter +1 -1
- data/bin/onezone +1 -1
- data/lib/cli_helper.rb +20 -20
- data/lib/command_parser.rb +1 -1
- data/lib/one_helper/oneacct_helper.rb +1 -1
- data/lib/one_helper/oneacl_helper.rb +1 -1
- data/lib/one_helper/onecluster_helper.rb +1 -1
- data/lib/one_helper/onedatastore_helper.rb +1 -1
- data/lib/one_helper/oneflow_helper.rb +2 -2
- data/lib/one_helper/oneflowtemplate_helper.rb +2 -2
- data/lib/one_helper/onegroup_helper.rb +1 -1
- data/lib/one_helper/onehook_helper.rb +1 -1
- data/lib/one_helper/onehost_helper.rb +43 -8
- data/lib/one_helper/oneimage_helper.rb +6 -10
- data/lib/one_helper/onemarket_helper.rb +1 -1
- data/lib/one_helper/onemarketapp_helper.rb +3 -3
- data/lib/one_helper/onequota_helper.rb +1 -1
- data/lib/one_helper/onesecgroup_helper.rb +1 -1
- data/lib/one_helper/onetemplate_helper.rb +1 -1
- data/lib/one_helper/oneuser_helper.rb +1 -1
- data/lib/one_helper/onevcenter_helper.rb +7 -7
- data/lib/one_helper/onevdc_helper.rb +1 -1
- data/lib/one_helper/onevm_helper.rb +6 -2
- data/lib/one_helper/onevmgroup_helper.rb +1 -1
- data/lib/one_helper/onevnet_helper.rb +2 -2
- data/lib/one_helper/onevntemplate_helper.rb +1 -1
- data/lib/one_helper/onevrouter_helper.rb +1 -1
- data/lib/one_helper/onezone_helper.rb +1 -1
- data/lib/one_helper.rb +2 -2
- data/share/schemas/xsd/host.xsd +23 -3
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 37f8dd6d06bf545de5c8bcf9d9e8197856b452034d22554ed16e3229ecefbec2
|
|
4
|
+
data.tar.gz: 2ad8583c107fc4ee73cab873c87f1a8ff6e8973f6bf1b230fda8ac09890f0f1b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: e1faa197784299af5b92897d19ea3defef548567c0106bec432cd37e7cd8487be6c1d00efcc886283a3387ffc9d77ad528f62e09ea63ba99a8cc2a9b14f30f6f
|
|
7
|
+
data.tar.gz: 6c34366bfa1e4917ad1f930915bc229b1fae6af303ad7a1c050977dadac9b991cc0b2f8016ec67c23fd7122e7bf8cd471aa17a00b1e205332a81bc2b39d343a7
|
data/bin/oneacct
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/oneacl
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onecluster
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onedatastore
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/oneflow
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/oneflow-template
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onegroup
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onehook
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onehost
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/oneimage
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -106,6 +106,21 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
106
106
|
:description => 'Do not keep network mappings'
|
|
107
107
|
}
|
|
108
108
|
|
|
109
|
+
INCREMENT = {
|
|
110
|
+
:name => 'increment',
|
|
111
|
+
:large => '--increment increment_id',
|
|
112
|
+
:format => Integer,
|
|
113
|
+
:description => 'Use the given increment ID to restore the backup.'\
|
|
114
|
+
' If not provided the last one will be used'
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
NAME = {
|
|
118
|
+
:name => 'name',
|
|
119
|
+
:large => '--name name',
|
|
120
|
+
:format => String,
|
|
121
|
+
:description => 'Name of the new image'
|
|
122
|
+
}
|
|
123
|
+
|
|
109
124
|
########################################################################
|
|
110
125
|
# Global Options
|
|
111
126
|
########################################################################
|
|
@@ -118,6 +133,7 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
118
133
|
|
|
119
134
|
CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE,
|
|
120
135
|
OneImageHelper::IMAGE,
|
|
136
|
+
NAME,
|
|
121
137
|
NO_CONTEXT]
|
|
122
138
|
|
|
123
139
|
########################################################################
|
|
@@ -432,7 +448,7 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
432
448
|
command :restore,
|
|
433
449
|
restore_desc,
|
|
434
450
|
:imageid,
|
|
435
|
-
:options => [OneDatastoreHelper::DATASTORE, NO_NIC, NO_IP] do
|
|
451
|
+
:options => [OneDatastoreHelper::DATASTORE, NO_NIC, NO_IP, NAME, INCREMENT] do
|
|
436
452
|
helper.perform_action(args[0], options, 'vm backup restored') do |o|
|
|
437
453
|
if options[:datastore].nil?
|
|
438
454
|
STDERR.puts 'Datastore to restore the backup is mandatory: '
|
|
@@ -444,6 +460,8 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
444
460
|
|
|
445
461
|
restore_opts << "NO_NIC=\"YES\"\n" if options[:no_nic]
|
|
446
462
|
restore_opts << "NO_IP=\"YES\"\n" if options[:no_ip]
|
|
463
|
+
restore_opts << "NAME=\"#{options[:name]}\"\n" if options[:name]
|
|
464
|
+
restore_opts << "INCREMENT_ID=\"#{options[:increment]}\"\n" if options[:increment]
|
|
447
465
|
|
|
448
466
|
rc = o.restore(options[:datastore].to_i, restore_opts)
|
|
449
467
|
|
data/bin/oneirb
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onelog
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onemarket
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onemarketapp
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onesecgroup
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/oneshowback
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onetemplate
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/oneuser
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -604,7 +604,7 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
604
604
|
|
|
605
605
|
command :passwdsearch, passwdsearch_desc, :driver, :password,
|
|
606
606
|
:options => [CLIHelper::CSV_OPT, OpenNebulaHelper::XML] do
|
|
607
|
-
options[:list] =
|
|
607
|
+
options[:list] = ['ID', 'NAME', 'AUTH', 'PASSWORD']
|
|
608
608
|
options[:filter] = ["AUTH=#{args[0]}", "PASSWORD=#{args[1]}"]
|
|
609
609
|
|
|
610
610
|
helper.list_pool(options)
|
|
@@ -709,7 +709,7 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
709
709
|
|
|
710
710
|
tokens = helper.find_token(user, token_hint, group, false)
|
|
711
711
|
|
|
712
|
-
if tokens.
|
|
712
|
+
if tokens.empty?
|
|
713
713
|
exit_with_code 1, 'No valid tokens found.'
|
|
714
714
|
end
|
|
715
715
|
|
data/bin/onevcenter
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onevdc
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onevm
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -258,7 +258,7 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
258
258
|
}
|
|
259
259
|
|
|
260
260
|
OpenNebulaHelper::TEMPLATE_OPTIONS_VM.delete_if do |v|
|
|
261
|
-
|
|
261
|
+
['as_gid', 'as_uid'].include?(v[:name])
|
|
262
262
|
end
|
|
263
263
|
|
|
264
264
|
########################################################################
|
|
@@ -1507,10 +1507,15 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
1507
1507
|
charters.each do |action, time|
|
|
1508
1508
|
sched = "+#{time[:time].to_i + acc_t + diff_stime}"
|
|
1509
1509
|
|
|
1510
|
-
helper.schedule_actions([args[0]].flatten,
|
|
1511
|
-
|
|
1512
|
-
|
|
1513
|
-
|
|
1510
|
+
rc = helper.schedule_actions([args[0]].flatten,
|
|
1511
|
+
{ :schedule => sched },
|
|
1512
|
+
action.to_s,
|
|
1513
|
+
time[:warning][:time] + acc_w)
|
|
1514
|
+
|
|
1515
|
+
if OpenNebula.is_error?(rc)
|
|
1516
|
+
STDERR.puts rc.message
|
|
1517
|
+
exit(-1)
|
|
1518
|
+
end
|
|
1514
1519
|
|
|
1515
1520
|
acc_t += time[:time].to_i
|
|
1516
1521
|
acc_w += time[:warning][:time].to_i
|
|
@@ -1568,11 +1573,7 @@ CommandParser::CmdParser.new(ARGV) do
|
|
|
1568
1573
|
OneVMHelper::YEARLY,
|
|
1569
1574
|
OneVMHelper::HOURLY,
|
|
1570
1575
|
OneVMHelper::END_TIME] do
|
|
1571
|
-
if options[:datastore].nil?
|
|
1572
|
-
STDERR.puts 'Datastore to save the backup is mandatory: '
|
|
1573
|
-
STDERR.puts "\t -d datastore_id | name"
|
|
1574
|
-
exit(-1)
|
|
1575
|
-
end
|
|
1576
|
+
options[:datastore] = -1 if options[:datastore].nil?
|
|
1576
1577
|
|
|
1577
1578
|
reset = options[:reset] == true
|
|
1578
1579
|
|
data/bin/onevmgroup
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onevnet
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onevntemplate
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onevrouter
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/bin/onezone
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
#!/usr/bin/env ruby
|
|
2
2
|
|
|
3
3
|
# -------------------------------------------------------------------------- #
|
|
4
|
-
# Copyright 2002-
|
|
4
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
5
5
|
# #
|
|
6
6
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
7
7
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/cli_helper.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -20,7 +20,7 @@ require 'csv'
|
|
|
20
20
|
module CLIHelper
|
|
21
21
|
|
|
22
22
|
# Available operators for filtering operations
|
|
23
|
-
FILTER_OPS =
|
|
23
|
+
FILTER_OPS = ['=', '!=', '<', '<=', '>', '>=', '~']
|
|
24
24
|
|
|
25
25
|
# CLI general options
|
|
26
26
|
LIST = {
|
|
@@ -182,23 +182,23 @@ module CLIHelper
|
|
|
182
182
|
ANSI_YELLOW = "\33[33m"
|
|
183
183
|
|
|
184
184
|
# CLI states
|
|
185
|
-
OK_STATES =
|
|
186
|
-
BAD_STATES =
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
REGULAR_STATES =
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
185
|
+
OK_STATES = ['runn', 'rdy', 'on', 'SUCCESS', 'RUNNING']
|
|
186
|
+
BAD_STATES = ['fail',
|
|
187
|
+
'err',
|
|
188
|
+
'error',
|
|
189
|
+
'ERROR',
|
|
190
|
+
'FAILED_DEPLOYING',
|
|
191
|
+
'FAILED_DEPLOYING_NETS',
|
|
192
|
+
'FAILED_UNDEPLOYING',
|
|
193
|
+
'FAILED_UNDEPLOYING_NETS',
|
|
194
|
+
'FAILED_SCALING']
|
|
195
|
+
REGULAR_STATES = ['PENDING',
|
|
196
|
+
'DEPLOYING',
|
|
197
|
+
'DEPLOYING_NETS',
|
|
198
|
+
'UNDEPLOYING',
|
|
199
|
+
'UNDEPLOYING_NETS',
|
|
200
|
+
'CONFIGURING',
|
|
201
|
+
'WARNING']
|
|
202
202
|
|
|
203
203
|
# Set state color
|
|
204
204
|
#
|
|
@@ -809,7 +809,7 @@ module CLIHelper
|
|
|
809
809
|
# @param options [Hash] Object with CLI user options
|
|
810
810
|
def update_columns(options)
|
|
811
811
|
begin
|
|
812
|
-
if @conf
|
|
812
|
+
if @conf && File.exist?(@conf)
|
|
813
813
|
config = YAML.load_file(@conf)
|
|
814
814
|
else
|
|
815
815
|
config = {}
|
data/lib/command_parser.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -297,7 +297,7 @@ class OneFlowHelper < OpenNebulaHelper::OneHelper
|
|
|
297
297
|
|
|
298
298
|
CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
|
|
299
299
|
|
|
300
|
-
|
|
300
|
+
['OWNER', 'GROUP', 'OTHER'].each do |e|
|
|
301
301
|
mask = '---'
|
|
302
302
|
permissions_hash = document['PERMISSIONS']
|
|
303
303
|
mask[0] = 'u' if permissions_hash["#{e}_U"] == '1'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -157,7 +157,7 @@ class OneFlowTemplateHelper < OpenNebulaHelper::OneHelper
|
|
|
157
157
|
|
|
158
158
|
CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
|
|
159
159
|
|
|
160
|
-
|
|
160
|
+
['OWNER', 'GROUP', 'OTHER'].each do |e|
|
|
161
161
|
mask = '---'
|
|
162
162
|
permissions_hash = document['PERMISSIONS']
|
|
163
163
|
mask[0] = 'u' if permissions_hash["#{e}_U"] == '1'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -460,10 +460,10 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
|
460
460
|
n_elems = options[:n_elems] || 8
|
|
461
461
|
|
|
462
462
|
# Different available size units
|
|
463
|
-
units =
|
|
463
|
+
units = ['K', 'M', 'G', 'T']
|
|
464
464
|
|
|
465
465
|
# Attrs that need units conversion
|
|
466
|
-
attrs =
|
|
466
|
+
attrs = ['FREE_MEMORY', 'USED_MEMORY']
|
|
467
467
|
|
|
468
468
|
if unit && !units.include?(unit)
|
|
469
469
|
STDERR.puts "Invalid unit `#{unit}`"
|
|
@@ -684,7 +684,14 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
|
684
684
|
end
|
|
685
685
|
|
|
686
686
|
if numa_nodes && !numa_nodes.empty?
|
|
687
|
-
|
|
687
|
+
begin
|
|
688
|
+
monitoring_numa =
|
|
689
|
+
host.to_hash['HOST']['MONITORING']['NUMA_NODE']
|
|
690
|
+
rescue StandardError
|
|
691
|
+
monitoring_numa = nil
|
|
692
|
+
end
|
|
693
|
+
|
|
694
|
+
print_numa_nodes(numa_nodes, monitoring_numa)
|
|
688
695
|
end
|
|
689
696
|
|
|
690
697
|
puts
|
|
@@ -769,14 +776,34 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
|
769
776
|
table.show(pcis)
|
|
770
777
|
end
|
|
771
778
|
|
|
772
|
-
def print_numa_nodes(numa_nodes)
|
|
779
|
+
def print_numa_nodes(numa_nodes, monitoring)
|
|
773
780
|
numa_nodes = get_numa_data(numa_nodes)
|
|
774
781
|
|
|
782
|
+
merge_numa_monitoring(numa_nodes, monitoring)
|
|
783
|
+
|
|
775
784
|
print_numa_cores(numa_nodes)
|
|
776
785
|
print_numa_memory(numa_nodes)
|
|
777
786
|
print_numa_hugepages(numa_nodes)
|
|
778
787
|
end
|
|
779
788
|
|
|
789
|
+
def merge_numa_monitoring(numa_nodes, monitoring)
|
|
790
|
+
return if monitoring.nil?
|
|
791
|
+
|
|
792
|
+
monitoring = [monitoring] if monitoring.class == Hash
|
|
793
|
+
|
|
794
|
+
numa_nodes.each do |node|
|
|
795
|
+
mon_node = monitoring.find {|x| x['NODE_ID'] == node['NODE_ID'] }
|
|
796
|
+
|
|
797
|
+
node['MEMORY']['FREE'] = mon_node['MEMORY']['FREE']
|
|
798
|
+
node['MEMORY']['USED'] = mon_node['MEMORY']['USED']
|
|
799
|
+
|
|
800
|
+
node['HUGEPAGE'].each do |hp|
|
|
801
|
+
mon_hp = mon_node['HUGEPAGE'].find {|x| x['SIZE'] == hp['SIZE'] }
|
|
802
|
+
hp['FREE'] = mon_hp['FREE']
|
|
803
|
+
end
|
|
804
|
+
end
|
|
805
|
+
end
|
|
806
|
+
|
|
780
807
|
def get_numa_data(numa_nodes)
|
|
781
808
|
numa_nodes = [numa_nodes] if numa_nodes.class == Hash
|
|
782
809
|
|
|
@@ -886,7 +913,11 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
|
886
913
|
end
|
|
887
914
|
|
|
888
915
|
column :USED_REAL, 'Used memory', :size => 20, :left => true do |d|
|
|
889
|
-
|
|
916
|
+
if d['MEMORY']['USED'].nil?
|
|
917
|
+
'-'
|
|
918
|
+
else
|
|
919
|
+
OpenNebulaHelper.unit_to_str(d['MEMORY']['USED'].to_i, {})
|
|
920
|
+
end
|
|
890
921
|
end
|
|
891
922
|
|
|
892
923
|
column :USED_ALLOCATED, 'U memory',
|
|
@@ -895,7 +926,11 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
|
895
926
|
end
|
|
896
927
|
|
|
897
928
|
column :FREE, 'Free memory', :size => 8, :left => true do |d|
|
|
898
|
-
|
|
929
|
+
if d['MEMORY']['FREE'].nil?
|
|
930
|
+
'-'
|
|
931
|
+
else
|
|
932
|
+
OpenNebulaHelper.unit_to_str(d['MEMORY']['FREE'].to_i, {})
|
|
933
|
+
end
|
|
899
934
|
end
|
|
900
935
|
|
|
901
936
|
default :NODE_ID, :TOTAL, :USED_REAL, :USED_ALLOCATED, :FREE
|
|
@@ -933,7 +968,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
|
933
968
|
end
|
|
934
969
|
|
|
935
970
|
column :FREE, 'Free pages', :size => 8, :left => true do |d|
|
|
936
|
-
d['HUGEPAGE']['FREE']
|
|
971
|
+
d['HUGEPAGE']['FREE'] || '-'
|
|
937
972
|
end
|
|
938
973
|
|
|
939
974
|
column :USED, 'allocated pages', :size => 8, :left => true do |d|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -22,15 +22,9 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
|
|
22
22
|
|
|
23
23
|
# This list contains prefixes that should skip adding user home to the path
|
|
24
24
|
# This must have the same content as the case $FROM in downloader.sh
|
|
25
|
-
PREFIXES =
|
|
25
|
+
PREFIXES = ['http', 'https', 'ssh', 's3', 'rbd', 'vcenter', 'lxd', 'docker', 'dockerfile']
|
|
26
26
|
|
|
27
27
|
TEMPLATE_OPTIONS=[
|
|
28
|
-
{
|
|
29
|
-
:name => 'name',
|
|
30
|
-
:large => '--name name',
|
|
31
|
-
:format => String,
|
|
32
|
-
:description => 'Name of the new image'
|
|
33
|
-
},
|
|
34
28
|
{
|
|
35
29
|
:name => 'description',
|
|
36
30
|
:large => '--description description',
|
|
@@ -67,7 +61,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
|
|
67
61
|
:format => String,
|
|
68
62
|
:proc => lambda do |o, _options|
|
|
69
63
|
prefix=o.strip.downcase
|
|
70
|
-
if
|
|
64
|
+
if ['hd', 'sd', 'xvd', 'vd'].include? prefix
|
|
71
65
|
[0, prefix]
|
|
72
66
|
else
|
|
73
67
|
[-1, 'The prefix must be hd, sd, xvd or vd']
|
|
@@ -328,7 +322,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
|
|
328
322
|
|
|
329
323
|
CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
|
|
330
324
|
|
|
331
|
-
|
|
325
|
+
['OWNER', 'GROUP', 'OTHER'].each do |e|
|
|
332
326
|
mask = '---'
|
|
333
327
|
mask[0] = 'u' if image["PERMISSIONS/#{e}_U"] == '1'
|
|
334
328
|
mask[1] = 'm' if image["PERMISSIONS/#{e}_M"] == '1'
|
|
@@ -497,6 +491,8 @@ class OneImageHelper < OpenNebulaHelper::OneHelper
|
|
|
497
491
|
o[:name].to_sym
|
|
498
492
|
end
|
|
499
493
|
|
|
494
|
+
template_options << :name
|
|
495
|
+
|
|
500
496
|
template = create_image_variables(
|
|
501
497
|
options,
|
|
502
498
|
template_options - [:persistent, :dry, :prefix]
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -60,7 +60,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
# Available market place mads to import apps on them
|
|
63
|
-
MARKETS =
|
|
63
|
+
MARKETS = ['http', 's3']
|
|
64
64
|
|
|
65
65
|
def self.rname
|
|
66
66
|
'MARKETPLACEAPP'
|
|
@@ -413,7 +413,7 @@ class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
|
|
|
413
413
|
|
|
414
414
|
CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
|
|
415
415
|
|
|
416
|
-
|
|
416
|
+
['OWNER', 'GROUP', 'OTHER'].each do |e|
|
|
417
417
|
mask = '---'
|
|
418
418
|
mask[0] = 'u' if app["PERMISSIONS/#{e}_U"] == '1'
|
|
419
419
|
mask[1] = 'm' if app["PERMISSIONS/#{e}_M"] == '1'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -58,20 +58,20 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
|
|
|
58
58
|
#
|
|
59
59
|
TABLE = {
|
|
60
60
|
VOBJECT::DATASTORE => {
|
|
61
|
-
:struct =>
|
|
61
|
+
:struct => ['DATASTORE_LIST', 'DATASTORE'],
|
|
62
62
|
:columns =>
|
|
63
63
|
{ :IMID => 5, :REF => 15, :NAME => 50, :CLUSTERS => 10 },
|
|
64
64
|
:cli => [:host],
|
|
65
65
|
:dialogue => ->(arg) {}
|
|
66
66
|
},
|
|
67
67
|
VOBJECT::TEMPLATE => {
|
|
68
|
-
:struct =>
|
|
68
|
+
:struct => ['TEMPLATE_LIST', 'TEMPLATE'],
|
|
69
69
|
:columns => { :IMID => 5, :REF => 10, :NAME => 50 },
|
|
70
70
|
:cli => [:host],
|
|
71
71
|
:dialogue => ->(arg) { OneVcenterHelper.template_dialogue(arg) }
|
|
72
72
|
},
|
|
73
73
|
VOBJECT::NETWORK => {
|
|
74
|
-
:struct =>
|
|
74
|
+
:struct => ['NETWORK_LIST', 'NETWORK'],
|
|
75
75
|
:columns => {
|
|
76
76
|
:IMID => 5,
|
|
77
77
|
:REF => 15,
|
|
@@ -82,13 +82,13 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
|
|
|
82
82
|
:dialogue => ->(arg) { OneVcenterHelper.network_dialogue(arg) }
|
|
83
83
|
},
|
|
84
84
|
VOBJECT::IMAGE => {
|
|
85
|
-
:struct =>
|
|
85
|
+
:struct => ['IMAGE_LIST', 'IMAGE'],
|
|
86
86
|
:columns => { :IMID => 5, :REF => 35, :PATH => 60 },
|
|
87
87
|
:cli => [:host, :datastore],
|
|
88
88
|
:dialogue => ->(arg) {}
|
|
89
89
|
},
|
|
90
90
|
VOBJECT::HOST => {
|
|
91
|
-
:struct =>
|
|
91
|
+
:struct => ['HOST_LIST', 'HOST'],
|
|
92
92
|
:columns => { :DATACENTER => 10, :NAME => 30, :REF => 35 },
|
|
93
93
|
:cli => [],
|
|
94
94
|
:dialogue => ->(arg) {}
|
|
@@ -471,7 +471,7 @@ class OneVcenterHelper < OpenNebulaHelper::OneHelper
|
|
|
471
471
|
' do you want to create (IPv[4],IPv[6], [E]thernet)? '
|
|
472
472
|
type_answer = ask.call(question, 'ether')
|
|
473
473
|
|
|
474
|
-
supported_types =
|
|
474
|
+
supported_types = ['4', '6', 'ether', 'e', 'ip4', 'ip6']
|
|
475
475
|
if !supported_types.include?(type_answer)
|
|
476
476
|
type_answer = 'e'
|
|
477
477
|
STDOUT.puts " Type [#{type_answer}] not supported,"\
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -464,7 +464,11 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
|
|
|
464
464
|
tmp_str << "TIME = #{options[:schedule]}"
|
|
465
465
|
tmp_str << str_periodic << ']'
|
|
466
466
|
|
|
467
|
-
vm.sched_action_add(tmp_str)
|
|
467
|
+
rc = vm.sched_action_add(tmp_str)
|
|
468
|
+
|
|
469
|
+
if OpenNebula.is_error?(rc)
|
|
470
|
+
return rc
|
|
471
|
+
end
|
|
468
472
|
end
|
|
469
473
|
end
|
|
470
474
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -367,7 +367,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
|
|
|
367
367
|
|
|
368
368
|
CLIHelper.print_header(str_h1 % 'PERMISSIONS', false)
|
|
369
369
|
|
|
370
|
-
|
|
370
|
+
['OWNER', 'GROUP', 'OTHER'].each do |e|
|
|
371
371
|
mask = '---'
|
|
372
372
|
mask[0] = 'u' if vn["PERMISSIONS/#{e}_U"] == '1'
|
|
373
373
|
mask[1] = 'm' if vn["PERMISSIONS/#{e}_M"] == '1'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
data/lib/one_helper.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2023, OpenNebula Project, OpenNebula Systems #
|
|
3
3
|
# #
|
|
4
4
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
|
5
5
|
# not use this file except in compliance with the License. You may obtain #
|
|
@@ -30,7 +30,7 @@ include OpenNebula
|
|
|
30
30
|
module OpenNebulaHelper
|
|
31
31
|
ONE_VERSION=<<-EOT
|
|
32
32
|
OpenNebula #{OpenNebula::VERSION}
|
|
33
|
-
Copyright 2002-
|
|
33
|
+
Copyright 2002-2023, OpenNebula Project, OpenNebula Systems
|
|
34
34
|
EOT
|
|
35
35
|
|
|
36
36
|
if ONE_LOCATION
|
data/share/schemas/xsd/host.xsd
CHANGED
|
@@ -98,7 +98,6 @@
|
|
|
98
98
|
<xs:element name="HUGEPAGE" minOccurs="0" maxOccurs="unbounded">
|
|
99
99
|
<xs:complexType>
|
|
100
100
|
<xs:all>
|
|
101
|
-
<xs:element name="FREE" type="xs:integer"/>
|
|
102
101
|
<xs:element name="PAGES" type="xs:integer"/>
|
|
103
102
|
<xs:element name="SIZE" type="xs:integer"/>
|
|
104
103
|
<xs:element name="USAGE" type="xs:integer"/>
|
|
@@ -109,10 +108,8 @@
|
|
|
109
108
|
<xs:complexType>
|
|
110
109
|
<xs:all>
|
|
111
110
|
<xs:element name="DISTANCE" type="xs:string"/>
|
|
112
|
-
<xs:element name="FREE" type="xs:integer"/>
|
|
113
111
|
<xs:element name="TOTAL" type="xs:integer"/>
|
|
114
112
|
<xs:element name="USAGE" type="xs:integer"/>
|
|
115
|
-
<xs:element name="USED" type="xs:integer"/>
|
|
116
113
|
</xs:all>
|
|
117
114
|
</xs:complexType>
|
|
118
115
|
</xs:element>
|
|
@@ -177,6 +174,29 @@
|
|
|
177
174
|
</xs:sequence>
|
|
178
175
|
</xs:complexType>
|
|
179
176
|
</xs:element>
|
|
177
|
+
<xs:element name="NUMA_NODE" minOccurs="0" maxOccurs="unbounded">
|
|
178
|
+
<xs:complexType>
|
|
179
|
+
<xs:sequence>
|
|
180
|
+
<xs:element name="HUGEPAGE" minOccurs="0" maxOccurs="unbounded">
|
|
181
|
+
<xs:complexType>
|
|
182
|
+
<xs:all>
|
|
183
|
+
<xs:element name="FREE" type="xs:integer"/>
|
|
184
|
+
<xs:element name="SIZE" type="xs:integer"/>
|
|
185
|
+
</xs:all>
|
|
186
|
+
</xs:complexType>
|
|
187
|
+
</xs:element>
|
|
188
|
+
<xs:element name="MEMORY">
|
|
189
|
+
<xs:complexType>
|
|
190
|
+
<xs:all>
|
|
191
|
+
<xs:element name="FREE" type="xs:string"/>
|
|
192
|
+
<xs:element name="USED" type="xs:integer"/>
|
|
193
|
+
</xs:all>
|
|
194
|
+
</xs:complexType>
|
|
195
|
+
</xs:element>
|
|
196
|
+
<xs:element name="NODE_ID" type="xs:integer"/>
|
|
197
|
+
</xs:sequence>
|
|
198
|
+
</xs:complexType>
|
|
199
|
+
</xs:element>
|
|
180
200
|
</xs:sequence>
|
|
181
201
|
</xs:complexType>
|
|
182
202
|
</xs:element>
|
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.6.
|
|
4
|
+
version: 6.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- OpenNebula
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-03-07 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.6.
|
|
19
|
+
version: 6.6.1
|
|
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.6.
|
|
26
|
+
version: 6.6.1
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: activesupport
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|