opennebula-cli 7.0.2 → 7.2.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 +4 -4
- data/bin/oneacct +1 -1
- data/bin/oneacl +1 -1
- data/bin/onebackupjob +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/oneform +150 -0
- data/bin/onegroup +1 -1
- data/bin/onehook +1 -1
- data/bin/onehost +1 -1
- data/bin/oneimage +1 -1
- data/bin/oneirb +1 -1
- data/bin/onelog +1 -1
- data/bin/onemarket +1 -1
- data/bin/onemarketapp +4 -1
- data/bin/onesecgroup +1 -1
- data/bin/oneshowback +1 -1
- data/bin/onetemplate +16 -5
- data/bin/oneuser +3 -2
- data/bin/onevdc +1 -1
- data/bin/onevm +51 -6
- data/bin/onevmgroup +1 -1
- data/bin/onevnet +1 -1
- data/bin/onevntemplate +3 -2
- data/bin/onevrouter +1 -1
- data/bin/onezone +12 -6
- data/lib/cli_helper.rb +153 -1
- data/lib/command_parser.rb +1 -1
- data/lib/one_helper/oneacct_helper.rb +3 -1
- data/lib/one_helper/oneacl_helper.rb +3 -1
- data/lib/one_helper/onebackupjob_helper.rb +3 -1
- data/lib/one_helper/onecluster_helper.rb +4 -1
- data/lib/one_helper/onedatastore_helper.rb +4 -1
- data/lib/one_helper/oneflow_helper.rb +1 -1
- data/lib/one_helper/oneflowtemplate_helper.rb +1 -1
- data/lib/one_helper/oneform_helper.rb +255 -0
- data/lib/one_helper/onegroup_helper.rb +133 -98
- data/lib/one_helper/onehook_helper.rb +5 -2
- data/lib/one_helper/onehost_helper.rb +6 -3
- data/lib/one_helper/oneimage_helper.rb +3 -1
- data/lib/one_helper/onemarket_helper.rb +3 -1
- data/lib/one_helper/onemarketapp_helper.rb +4 -1
- data/lib/one_helper/onequota_helper.rb +105 -22
- data/lib/one_helper/onesecgroup_helper.rb +3 -1
- data/lib/one_helper/onetemplate_helper.rb +3 -2
- data/lib/one_helper/oneuser_helper.rb +165 -156
- data/lib/one_helper/onevdc_helper.rb +3 -1
- data/lib/one_helper/onevm_helper.rb +6 -2
- data/lib/one_helper/onevmgroup_helper.rb +3 -1
- data/lib/one_helper/onevnet_helper.rb +16 -5
- data/lib/one_helper/onevntemplate_helper.rb +3 -2
- data/lib/one_helper/onevrouter_helper.rb +3 -1
- data/lib/one_helper/onezone_helper.rb +16 -5
- data/lib/one_helper.rb +53 -18
- data/share/schemas/xsd/group.xsd +8 -0
- data/share/schemas/xsd/group_pool.xsd +8 -0
- data/share/schemas/xsd/opennebula_configuration.xsd +6 -10
- data/share/schemas/xsd/shared.xsd +8 -0
- data/share/schemas/xsd/user.xsd +8 -0
- data/share/schemas/xsd/user_pool.xsd +8 -0
- data/share/schemas/xsd/vm.xsd +20 -0
- data/share/schemas/xsd/vnet.xsd +2 -1
- data/share/schemas/xsd/vnet_pool.xsd +1 -0
- metadata +7 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -27,8 +27,12 @@ VMS_LOCATION = VAR_LOCATION + '/vms'
|
|
|
27
27
|
|
|
28
28
|
$LOAD_PATH << MAD_LOCATION
|
|
29
29
|
|
|
30
|
-
require 'one_helper'
|
|
31
30
|
require 'optparse/time'
|
|
31
|
+
require 'one_helper'
|
|
32
|
+
require 'opennebula/virtual_machine'
|
|
33
|
+
require 'opennebula/virtual_machine_pool'
|
|
34
|
+
require 'opennebula/cluster'
|
|
35
|
+
require 'opennebula/cluster_pool'
|
|
32
36
|
|
|
33
37
|
# colored strings
|
|
34
38
|
class String
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -15,6 +15,8 @@
|
|
|
15
15
|
#--------------------------------------------------------------------------- #
|
|
16
16
|
|
|
17
17
|
require 'one_helper'
|
|
18
|
+
require 'opennebula/vm_group'
|
|
19
|
+
require 'opennebula/vm_group_pool'
|
|
18
20
|
|
|
19
21
|
class OneVMGroupHelper < OpenNebulaHelper::OneHelper
|
|
20
22
|
def self.rname
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -15,6 +15,8 @@
|
|
|
15
15
|
#--------------------------------------------------------------------------- #
|
|
16
16
|
require 'one_helper'
|
|
17
17
|
require 'one_helper/onevm_helper'
|
|
18
|
+
require 'opennebula/virtual_network'
|
|
19
|
+
require 'opennebula/virtual_network_pool'
|
|
18
20
|
|
|
19
21
|
# OneVnet Command Helper
|
|
20
22
|
class OneVNetHelper < OpenNebulaHelper::OneHelper
|
|
@@ -283,6 +285,9 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
|
|
|
283
285
|
exit(-1)
|
|
284
286
|
end
|
|
285
287
|
|
|
288
|
+
obj.info
|
|
289
|
+
obj.delete_element('AR_POOL/AR/LEASES')
|
|
290
|
+
|
|
286
291
|
xpath = "AR_POOL/AR[AR_ID=#{ar_id}]"
|
|
287
292
|
|
|
288
293
|
if options[:append]
|
|
@@ -291,10 +296,16 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
|
|
|
291
296
|
file,
|
|
292
297
|
xpath)
|
|
293
298
|
else
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
299
|
+
if file || !OpenNebulaHelper.read_stdin.empty?
|
|
300
|
+
str = OpenNebulaHelper.update_template(vnet_id,
|
|
301
|
+
obj,
|
|
302
|
+
file,
|
|
303
|
+
xpath)
|
|
304
|
+
else
|
|
305
|
+
str = OpenNebulaHelper.editor_input(
|
|
306
|
+
obj.template_like_str(xpath)
|
|
307
|
+
)
|
|
308
|
+
end
|
|
298
309
|
end
|
|
299
310
|
|
|
300
311
|
if options[:append]
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -16,7 +16,8 @@
|
|
|
16
16
|
|
|
17
17
|
require 'one_helper'
|
|
18
18
|
require 'one_helper/onetemplate_helper'
|
|
19
|
-
require '
|
|
19
|
+
require 'opennebula/vntemplate'
|
|
20
|
+
require 'opennebula/vntemplate_pool'
|
|
20
21
|
|
|
21
22
|
class OneVNTemplateHelper < OneTemplateHelper
|
|
22
23
|
VN_NAME={
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -15,6 +15,8 @@
|
|
|
15
15
|
#--------------------------------------------------------------------------- #
|
|
16
16
|
|
|
17
17
|
require 'one_helper'
|
|
18
|
+
require 'opennebula/virtual_router'
|
|
19
|
+
require 'opennebula/virtual_router_pool'
|
|
18
20
|
|
|
19
21
|
class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
|
|
20
22
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -19,6 +19,9 @@ require 'tempfile'
|
|
|
19
19
|
require 'CommandManager'
|
|
20
20
|
|
|
21
21
|
require 'one_helper'
|
|
22
|
+
require 'opennebula/system'
|
|
23
|
+
require 'opennebula/zone'
|
|
24
|
+
require 'opennebula/zone_pool'
|
|
22
25
|
|
|
23
26
|
# Check differences between files and copy them
|
|
24
27
|
class Replicator
|
|
@@ -56,7 +59,7 @@ class Replicator
|
|
|
56
59
|
l_endpoint = 'http://localhost:2633/RPC2'
|
|
57
60
|
local_client = Client.new(l_credentials, l_endpoint)
|
|
58
61
|
|
|
59
|
-
@l_config =
|
|
62
|
+
@l_config = System.new(local_client).get_configuration
|
|
60
63
|
@l_config_elements = { :raw => @l_config }
|
|
61
64
|
@l_fed_elements = { :raw => @l_config }
|
|
62
65
|
|
|
@@ -74,7 +77,7 @@ class Replicator
|
|
|
74
77
|
r_endpoint = "http://#{server}:2633/RPC2"
|
|
75
78
|
remote_client = Client.new(r_credentials, r_endpoint)
|
|
76
79
|
|
|
77
|
-
@r_config =
|
|
80
|
+
@r_config = System.new(remote_client).get_configuration
|
|
78
81
|
@r_config_elements = { :raw => @r_config }
|
|
79
82
|
@r_fed_elements = { :raw => @r_config }
|
|
80
83
|
|
|
@@ -447,10 +450,18 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
|
|
|
447
450
|
|
|
448
451
|
SERVER_ENDPOINT={
|
|
449
452
|
:name => "server_rpc",
|
|
450
|
-
:short => "-r rpc endpoint",
|
|
453
|
+
:short => "-r xml-rpc endpoint",
|
|
451
454
|
:large => "--rpc",
|
|
452
455
|
:format => String,
|
|
453
|
-
:description => "Zone server RPC endpoint"
|
|
456
|
+
:description => "Zone server XML-RPC endpoint"
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
SERVER_ENDPOINT_GRPC={
|
|
460
|
+
:name => "server_grpc",
|
|
461
|
+
:short => "-g gRPC endpoint",
|
|
462
|
+
:large => "--grpc-endpoint",
|
|
463
|
+
:format => String,
|
|
464
|
+
:description => "Zone server gRPC endpoint"
|
|
454
465
|
}
|
|
455
466
|
|
|
456
467
|
def show_resource(id, options)
|
data/lib/one_helper.rb
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
# -------------------------------------------------------------------------- #
|
|
2
|
-
# Copyright 2002-
|
|
2
|
+
# Copyright 2002-2026, 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 #
|
|
@@ -19,9 +19,12 @@ require 'open3'
|
|
|
19
19
|
require 'io/console'
|
|
20
20
|
require 'time'
|
|
21
21
|
require 'io/wait'
|
|
22
|
+
require 'logger'
|
|
22
23
|
|
|
23
24
|
begin
|
|
24
|
-
require 'opennebula'
|
|
25
|
+
require 'opennebula/version'
|
|
26
|
+
require 'opennebula/lib/client'
|
|
27
|
+
require 'opennebula/pool'
|
|
25
28
|
rescue Exception => e
|
|
26
29
|
puts 'Error: '+e.message.to_s
|
|
27
30
|
exit(-1)
|
|
@@ -33,7 +36,7 @@ module OpenNebulaHelper
|
|
|
33
36
|
|
|
34
37
|
ONE_VERSION=<<~EOT
|
|
35
38
|
OpenNebula #{OpenNebula::VERSION}
|
|
36
|
-
Copyright 2002-
|
|
39
|
+
Copyright 2002-2026, OpenNebula Project, OpenNebula Systems
|
|
37
40
|
EOT
|
|
38
41
|
|
|
39
42
|
if ONE_LOCATION
|
|
@@ -162,12 +165,17 @@ Bash symbols must be escaped on STDIN passing'
|
|
|
162
165
|
{
|
|
163
166
|
:name => 'endpoint',
|
|
164
167
|
:large => '--endpoint endpoint',
|
|
165
|
-
:description => 'URL of OpenNebula
|
|
168
|
+
:description => 'URL of OpenNebula RPC frontend',
|
|
166
169
|
:format => String,
|
|
167
170
|
:proc => lambda do |o, _options|
|
|
168
171
|
OneHelper.set_endpoint(o)
|
|
169
172
|
[0, o]
|
|
170
173
|
end
|
|
174
|
+
},
|
|
175
|
+
{
|
|
176
|
+
:name => 'grpc',
|
|
177
|
+
:large => '--grpc',
|
|
178
|
+
:description => 'Use gRPC protocol to connect to OpenNebula',
|
|
171
179
|
}
|
|
172
180
|
]
|
|
173
181
|
|
|
@@ -1518,20 +1526,47 @@ Bash symbols must be escaped on STDIN passing'
|
|
|
1518
1526
|
client=OneHelper.client
|
|
1519
1527
|
|
|
1520
1528
|
pool = case poolname
|
|
1521
|
-
when 'HOST'
|
|
1522
|
-
|
|
1523
|
-
|
|
1524
|
-
when '
|
|
1525
|
-
|
|
1526
|
-
|
|
1527
|
-
when '
|
|
1528
|
-
|
|
1529
|
-
|
|
1530
|
-
when '
|
|
1531
|
-
|
|
1532
|
-
|
|
1533
|
-
when '
|
|
1534
|
-
|
|
1529
|
+
when 'HOST'
|
|
1530
|
+
require 'opennebula/host_pool'
|
|
1531
|
+
OpenNebula::HostPool.new(client)
|
|
1532
|
+
when 'HOOK'
|
|
1533
|
+
require 'opennebula/hook_pool'
|
|
1534
|
+
OpenNebula::HookPool.new(client)
|
|
1535
|
+
when 'GROUP'
|
|
1536
|
+
require 'opennebula/group_pool'
|
|
1537
|
+
OpenNebula::GroupPool.new(client)
|
|
1538
|
+
when 'USER'
|
|
1539
|
+
require 'opennebula/user_pool'
|
|
1540
|
+
OpenNebula::UserPool.new(client)
|
|
1541
|
+
when 'DATASTORE'
|
|
1542
|
+
require 'opennebula/datastore_pool'
|
|
1543
|
+
OpenNebula::DatastorePool.new(client)
|
|
1544
|
+
when 'CLUSTER'
|
|
1545
|
+
require 'opennebula/cluster_pool'
|
|
1546
|
+
OpenNebula::ClusterPool.new(client)
|
|
1547
|
+
when 'VNET'
|
|
1548
|
+
require 'opennebula/virtual_network_pool'
|
|
1549
|
+
OpenNebula::VirtualNetworkPool.new(client)
|
|
1550
|
+
when 'IMAGE'
|
|
1551
|
+
require 'opennebula/image_pool'
|
|
1552
|
+
OpenNebula::ImagePool.new(client)
|
|
1553
|
+
when 'VMTEMPLATE'
|
|
1554
|
+
require 'opennebula/template_pool'
|
|
1555
|
+
OpenNebula::TemplatePool.new(client)
|
|
1556
|
+
when 'VNTEMPLATES'
|
|
1557
|
+
require 'opennebula/vntemplate_pool'
|
|
1558
|
+
OpenNebula::VNTemplatePool.new(client)
|
|
1559
|
+
when 'VM'
|
|
1560
|
+
require 'opennebula/virtual_machine_pool'
|
|
1561
|
+
OpenNebula::VirtualMachinePool.new(client)
|
|
1562
|
+
when 'ZONE'
|
|
1563
|
+
require 'opennebula/zone_pool'
|
|
1564
|
+
OpenNebula::ZonePool.new(client)
|
|
1565
|
+
when 'MARKETPLACE'
|
|
1566
|
+
require 'opennebula/marketplace_pool'
|
|
1567
|
+
OpenNebula::MarketPlacePool.new(client)
|
|
1568
|
+
when 'FLOWTEMPLATES'
|
|
1569
|
+
OpenNebula::ServiceTemplatePool.new(client)
|
|
1535
1570
|
end
|
|
1536
1571
|
|
|
1537
1572
|
rc = pool.info
|
data/share/schemas/xsd/group.xsd
CHANGED
|
@@ -42,10 +42,18 @@
|
|
|
42
42
|
<xs:element name="CPU_USED" type="xs:float"/>
|
|
43
43
|
<xs:element name="MEMORY" type="xs:integer"/>
|
|
44
44
|
<xs:element name="MEMORY_USED" type="xs:integer"/>
|
|
45
|
+
<xs:element name="PCI_DEV" type="xs:string"/>
|
|
46
|
+
<xs:element name="PCI_DEV_USED" type="xs:string"/>
|
|
47
|
+
<xs:element name="PCI_NIC" type="xs:string"/>
|
|
48
|
+
<xs:element name="PCI_NIC_USED" type="xs:string"/>
|
|
45
49
|
<xs:element name="RUNNING_CPU" type="xs:float"/>
|
|
46
50
|
<xs:element name="RUNNING_CPU_USED" type="xs:float"/>
|
|
47
51
|
<xs:element name="RUNNING_MEMORY" type="xs:integer"/>
|
|
48
52
|
<xs:element name="RUNNING_MEMORY_USED" type="xs:integer"/>
|
|
53
|
+
<xs:element name="RUNNING_PCI_DEV" type="xs:string"/>
|
|
54
|
+
<xs:element name="RUNNING_PCI_DEV_USED" type="xs:string"/>
|
|
55
|
+
<xs:element name="RUNNING_PCI_NIC" type="xs:string"/>
|
|
56
|
+
<xs:element name="RUNNING_PCI_NIC_USED" type="xs:string"/>
|
|
49
57
|
<xs:element name="RUNNING_VMS" type="xs:integer"/>
|
|
50
58
|
<xs:element name="RUNNING_VMS_USED" type="xs:integer"/>
|
|
51
59
|
<xs:element name="SYSTEM_DISK_SIZE" type="xs:long"/>
|
|
@@ -56,10 +56,18 @@
|
|
|
56
56
|
<xs:element name="CPU_USED" type="xs:string"/>
|
|
57
57
|
<xs:element name="MEMORY" type="xs:string"/>
|
|
58
58
|
<xs:element name="MEMORY_USED" type="xs:string"/>
|
|
59
|
+
<xs:element name="PCI_DEV" type="xs:string"/>
|
|
60
|
+
<xs:element name="PCI_DEV_USED" type="xs:string"/>
|
|
61
|
+
<xs:element name="PCI_NIC" type="xs:string"/>
|
|
62
|
+
<xs:element name="PCI_NIC_USED" type="xs:string"/>
|
|
59
63
|
<xs:element name="RUNNING_CPU" type="xs:string"/>
|
|
60
64
|
<xs:element name="RUNNING_CPU_USED" type="xs:string"/>
|
|
61
65
|
<xs:element name="RUNNING_MEMORY" type="xs:string"/>
|
|
62
66
|
<xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
|
|
67
|
+
<xs:element name="RUNNING_PCI_DEV" type="xs:string"/>
|
|
68
|
+
<xs:element name="RUNNING_PCI_DEV_USED" type="xs:string"/>
|
|
69
|
+
<xs:element name="RUNNING_PCI_NIC" type="xs:string"/>
|
|
70
|
+
<xs:element name="RUNNING_PCI_NIC_USED" type="xs:string"/>
|
|
63
71
|
<xs:element name="RUNNING_VMS" type="xs:string"/>
|
|
64
72
|
<xs:element name="RUNNING_VMS_USED" type="xs:string"/>
|
|
65
73
|
<xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
|
|
@@ -79,7 +79,6 @@
|
|
|
79
79
|
</xs:element>
|
|
80
80
|
|
|
81
81
|
<xs:element name="DEFAULT_AUTH" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
|
|
82
|
-
<xs:element name="DEFAULT_CDROM_DEVICE_PREFIX" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
|
|
83
82
|
|
|
84
83
|
<xs:element name="DEFAULT_COST" minOccurs="0" maxOccurs="unbounded">
|
|
85
84
|
<xs:complexType>
|
|
@@ -110,6 +109,7 @@
|
|
|
110
109
|
<xs:element name="DS_MAD_CONF" minOccurs="0" maxOccurs="unbounded">
|
|
111
110
|
<xs:complexType>
|
|
112
111
|
<xs:all>
|
|
112
|
+
<xs:element name="DATASTORE_CAPACITY_CHECK" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
113
113
|
<xs:element name="MARKETPLACE_ACTIONS" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
114
114
|
<xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
115
115
|
<xs:element name="PERSISTENT_ONLY" minOccurs="0" maxOccurs="1">
|
|
@@ -157,6 +157,9 @@
|
|
|
157
157
|
|
|
158
158
|
<xs:element name="GROUP_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
|
|
159
159
|
|
|
160
|
+
<xs:element name="GRPC_LISTEN_ADDRESS" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
161
|
+
<xs:element name="GRPC_PORT" type="xs:integer" minOccurs="0" maxOccurs="1"/>
|
|
162
|
+
|
|
160
163
|
<xs:element name="HM_MAD" minOccurs="0" maxOccurs="1">
|
|
161
164
|
<xs:complexType>
|
|
162
165
|
<xs:all>
|
|
@@ -321,6 +324,8 @@
|
|
|
321
324
|
<xs:element name="DISK_TYPE_SSH" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
322
325
|
<xs:element name="DRIVER" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
323
326
|
<xs:element name="DS_MIGRATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
327
|
+
<xs:element name="DS_LIVE_MIGRATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
328
|
+
<xs:element name="DS_MIGRATE_SNAP" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
324
329
|
<xs:element name="LN_TARGET" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
325
330
|
<xs:element name="LN_TARGET_SHARED" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
326
331
|
<xs:element name="LN_TARGET_SSH" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
@@ -372,14 +377,6 @@
|
|
|
372
377
|
</xs:restriction>
|
|
373
378
|
</xs:simpleType>
|
|
374
379
|
</xs:element>
|
|
375
|
-
<xs:element name="DS_LIVE_MIGRATION" minOccurs="0" maxOccurs="1">
|
|
376
|
-
<xs:simpleType>
|
|
377
|
-
<xs:restriction base="xs:string">
|
|
378
|
-
<xs:pattern value="[yY][eE][sS]" />
|
|
379
|
-
<xs:pattern value="[nN][oO]" />
|
|
380
|
-
</xs:restriction>
|
|
381
|
-
</xs:simpleType>
|
|
382
|
-
</xs:element>
|
|
383
380
|
<xs:element name="LIVE_RESIZE" minOccurs="0" maxOccurs="1">
|
|
384
381
|
<xs:simpleType>
|
|
385
382
|
<xs:restriction base="xs:string">
|
|
@@ -393,7 +390,6 @@
|
|
|
393
390
|
</xs:element>
|
|
394
391
|
|
|
395
392
|
<xs:element name="VM_MANAGE_OPERATIONS" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
396
|
-
<xs:element name="VM_MONITORING_EXPIRATION_TIME" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
|
|
397
393
|
<xs:element name="VM_RESTRICTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
|
|
398
394
|
<xs:element name="VM_SNAPSHOT_FACTOR" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
399
395
|
|
|
@@ -82,10 +82,18 @@
|
|
|
82
82
|
<xs:element name="CPU_USED" type="xs:string"/>
|
|
83
83
|
<xs:element name="MEMORY" type="xs:string"/>
|
|
84
84
|
<xs:element name="MEMORY_USED" type="xs:string"/>
|
|
85
|
+
<xs:element name="PCI_DEV" type="xs:string"/>
|
|
86
|
+
<xs:element name="PCI_DEV_USED" type="xs:string"/>
|
|
87
|
+
<xs:element name="PCI_NIC" type="xs:string"/>
|
|
88
|
+
<xs:element name="PCI_NIC_USED" type="xs:string"/>
|
|
85
89
|
<xs:element name="RUNNING_CPU" type="xs:string"/>
|
|
86
90
|
<xs:element name="RUNNING_CPU_USED" type="xs:string"/>
|
|
87
91
|
<xs:element name="RUNNING_MEMORY" type="xs:string"/>
|
|
88
92
|
<xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
|
|
93
|
+
<xs:element name="RUNNING_PCI_DEV" type="xs:string"/>
|
|
94
|
+
<xs:element name="RUNNING_PCI_DEV_USED" type="xs:string"/>
|
|
95
|
+
<xs:element name="RUNNING_PCI_NIC" type="xs:string"/>
|
|
96
|
+
<xs:element name="RUNNING_PCI_NIC_USED" type="xs:string"/>
|
|
89
97
|
<xs:element name="RUNNING_VMS" type="xs:string"/>
|
|
90
98
|
<xs:element name="RUNNING_VMS_USED" type="xs:string"/>
|
|
91
99
|
<xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
|
data/share/schemas/xsd/user.xsd
CHANGED
|
@@ -48,10 +48,18 @@
|
|
|
48
48
|
<xs:element name="CPU_USED" type="xs:string"/>
|
|
49
49
|
<xs:element name="MEMORY" type="xs:string"/>
|
|
50
50
|
<xs:element name="MEMORY_USED" type="xs:string"/>
|
|
51
|
+
<xs:element name="PCI_DEV" type="xs:string"/>
|
|
52
|
+
<xs:element name="PCI_DEV_USED" type="xs:string"/>
|
|
53
|
+
<xs:element name="PCI_NIC" type="xs:string"/>
|
|
54
|
+
<xs:element name="PCI_NIC_USED" type="xs:string"/>
|
|
51
55
|
<xs:element name="RUNNING_CPU" type="xs:string"/>
|
|
52
56
|
<xs:element name="RUNNING_CPU_USED" type="xs:string"/>
|
|
53
57
|
<xs:element name="RUNNING_MEMORY" type="xs:string"/>
|
|
54
58
|
<xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
|
|
59
|
+
<xs:element name="RUNNING_PCI_DEV" type="xs:string"/>
|
|
60
|
+
<xs:element name="RUNNING_PCI_DEV_USED" type="xs:string"/>
|
|
61
|
+
<xs:element name="RUNNING_PCI_NIC" type="xs:string"/>
|
|
62
|
+
<xs:element name="RUNNING_PCI_NIC_USED" type="xs:string"/>
|
|
55
63
|
<xs:element name="RUNNING_VMS" type="xs:string"/>
|
|
56
64
|
<xs:element name="RUNNING_VMS_USED" type="xs:string"/>
|
|
57
65
|
<xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
|
|
@@ -63,10 +63,18 @@
|
|
|
63
63
|
<xs:element name="CPU_USED" type="xs:string"/>
|
|
64
64
|
<xs:element name="MEMORY" type="xs:string"/>
|
|
65
65
|
<xs:element name="MEMORY_USED" type="xs:string"/>
|
|
66
|
+
<xs:element name="PCI_DEV" type="xs:string"/>
|
|
67
|
+
<xs:element name="PCI_DEV_USED" type="xs:string"/>
|
|
68
|
+
<xs:element name="PCI_NIC" type="xs:string"/>
|
|
69
|
+
<xs:element name="PCI_NIC_USED" type="xs:string"/>
|
|
66
70
|
<xs:element name="RUNNING_CPU" type="xs:string"/>
|
|
67
71
|
<xs:element name="RUNNING_CPU_USED" type="xs:string"/>
|
|
68
72
|
<xs:element name="RUNNING_MEMORY" type="xs:string"/>
|
|
69
73
|
<xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
|
|
74
|
+
<xs:element name="RUNNING_PCI_DEV" type="xs:string"/>
|
|
75
|
+
<xs:element name="RUNNING_PCI_DEV_USED" type="xs:string"/>
|
|
76
|
+
<xs:element name="RUNNING_PCI_NIC" type="xs:string"/>
|
|
77
|
+
<xs:element name="RUNNING_PCI_NIC_USED" type="xs:string"/>
|
|
70
78
|
<xs:element name="RUNNING_VMS" type="xs:string"/>
|
|
71
79
|
<xs:element name="RUNNING_VMS_USED" type="xs:string"/>
|
|
72
80
|
<xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
|
data/share/schemas/xsd/vm.xsd
CHANGED
|
@@ -142,6 +142,19 @@
|
|
|
142
142
|
<xs:element name="NUMA_NODE" minOccurs="0" maxOccurs="1"/>
|
|
143
143
|
<xs:element name="OS" minOccurs="0" maxOccurs="1"/>
|
|
144
144
|
<xs:element name="PCI" minOccurs="0" maxOccurs="unbounded"/>
|
|
145
|
+
<xs:element name="QEMU_GA_EXEC" minOccurs="0" maxOccurs="1">
|
|
146
|
+
<xs:complexType>
|
|
147
|
+
<xs:sequence>
|
|
148
|
+
<xs:element name="COMMAND" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
149
|
+
<xs:element name="PID" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
150
|
+
<xs:element name="RETURN_CODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
151
|
+
<xs:element name="STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
152
|
+
<xs:element name="STDERR" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
153
|
+
<xs:element name="STDIN" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
154
|
+
<xs:element name="STDOUT" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
155
|
+
</xs:sequence>
|
|
156
|
+
</xs:complexType>
|
|
157
|
+
</xs:element>
|
|
145
158
|
<xs:element name="RAW" minOccurs="0" maxOccurs="1"/>
|
|
146
159
|
<xs:element name="SECURITY_GROUP_RULE" minOccurs="0" maxOccurs="unbounded"/>
|
|
147
160
|
<xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
|
|
@@ -169,6 +182,13 @@
|
|
|
169
182
|
</xs:sequence>
|
|
170
183
|
</xs:complexType>
|
|
171
184
|
</xs:element>
|
|
185
|
+
<xs:element name="MEMORY_ENCRYPTION" minOccurs="0" maxOccurs="1">
|
|
186
|
+
<xs:complexType>
|
|
187
|
+
<xs:sequence>
|
|
188
|
+
<xs:element name="TYPE" type="xs:string" minOccurs="1" maxOccurs="1"/>
|
|
189
|
+
</xs:sequence>
|
|
190
|
+
</xs:complexType>
|
|
191
|
+
</xs:element>
|
|
172
192
|
<xs:element name="VCPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
173
193
|
<xs:element name="VCPU_MAX" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
|
174
194
|
<xs:element name="VMGROUP" minOccurs="0" maxOccurs="1"/>
|
data/share/schemas/xsd/vnet.xsd
CHANGED
|
@@ -101,6 +101,7 @@
|
|
|
101
101
|
<xs:element name="IP" type="xs:string" minOccurs="0"/>
|
|
102
102
|
<xs:element name="MAC" type="xs:string"/>
|
|
103
103
|
<xs:element name="PARENT_NETWORK_AR_ID" type="xs:string" minOccurs="0"/>
|
|
104
|
+
<xs:element name="SHARED" type="xs:string" minOccurs="0"/>
|
|
104
105
|
<xs:element name="SIZE" type="xs:integer"/>
|
|
105
106
|
<xs:element name="TYPE" type="xs:string"/>
|
|
106
107
|
<xs:element name="ULA_PREFIX" type="xs:string" minOccurs="0"/>
|
|
@@ -127,7 +128,7 @@
|
|
|
127
128
|
<xs:element name="IP6_GLOBAL" type="xs:string" minOccurs="0"/>
|
|
128
129
|
<xs:element name="IP6_LINK" type="xs:string" minOccurs="0"/>
|
|
129
130
|
<xs:element name="IP6_ULA" type="xs:string" minOccurs="0"/>
|
|
130
|
-
<xs:element name="MAC" type="xs:string"/>
|
|
131
|
+
<xs:element name="MAC" type="xs:string" minOccurs="0"/>
|
|
131
132
|
<xs:element name="VM" type="xs:integer" minOccurs="0"/>
|
|
132
133
|
<xs:element name="VNET" type="xs:integer" minOccurs="0"/>
|
|
133
134
|
<xs:element name="VROUTER" type="xs:integer" minOccurs="0"/>
|
|
@@ -96,6 +96,7 @@
|
|
|
96
96
|
<xs:element name="IP" type="xs:string" minOccurs="0"/>
|
|
97
97
|
<xs:element name="MAC" type="xs:string"/>
|
|
98
98
|
<xs:element name="PARENT_NETWORK_AR_ID" type="xs:string" minOccurs="0"/>
|
|
99
|
+
<xs:element name="SHARED" type="xs:string" minOccurs="0"/>
|
|
99
100
|
<xs:element name="SIZE" type="xs:integer"/>
|
|
100
101
|
<xs:element name="TYPE" type="xs:string"/>
|
|
101
102
|
<xs:element name="ULA_PREFIX" type="xs:string" minOccurs="0"/>
|
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: 7.0
|
|
4
|
+
version: 7.2.0
|
|
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: 2026-03-30 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: 7.0
|
|
19
|
+
version: 7.2.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: 7.0
|
|
26
|
+
version: 7.2.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: activesupport
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -48,6 +48,7 @@ executables:
|
|
|
48
48
|
- onedatastore
|
|
49
49
|
- oneflow
|
|
50
50
|
- oneflow-template
|
|
51
|
+
- oneform
|
|
51
52
|
- onegroup
|
|
52
53
|
- onehook
|
|
53
54
|
- onehost
|
|
@@ -79,6 +80,7 @@ files:
|
|
|
79
80
|
- bin/onedatastore
|
|
80
81
|
- bin/oneflow
|
|
81
82
|
- bin/oneflow-template
|
|
83
|
+
- bin/oneform
|
|
82
84
|
- bin/onegroup
|
|
83
85
|
- bin/onehook
|
|
84
86
|
- bin/onehost
|
|
@@ -108,6 +110,7 @@ files:
|
|
|
108
110
|
- lib/one_helper/onedatastore_helper.rb
|
|
109
111
|
- lib/one_helper/oneflow_helper.rb
|
|
110
112
|
- lib/one_helper/oneflowtemplate_helper.rb
|
|
113
|
+
- lib/one_helper/oneform_helper.rb
|
|
111
114
|
- lib/one_helper/onegroup_helper.rb
|
|
112
115
|
- lib/one_helper/onehook_helper.rb
|
|
113
116
|
- lib/one_helper/onehost_helper.rb
|