opennebula-cli 7.0.1 → 7.1.80.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.
Files changed (51) hide show
  1. checksums.yaml +4 -4
  2. data/bin/oneform +150 -0
  3. data/bin/onemarketapp +3 -0
  4. data/bin/onetemplate +15 -4
  5. data/bin/oneuser +2 -1
  6. data/bin/onevm +50 -5
  7. data/bin/onevntemplate +2 -1
  8. data/bin/onezone +11 -5
  9. data/lib/cli_helper.rb +152 -0
  10. data/lib/one_helper/oneacct_helper.rb +2 -0
  11. data/lib/one_helper/oneacl_helper.rb +2 -0
  12. data/lib/one_helper/onebackupjob_helper.rb +2 -0
  13. data/lib/one_helper/onecluster_helper.rb +3 -0
  14. data/lib/one_helper/onedatastore_helper.rb +3 -0
  15. data/lib/one_helper/oneform_helper.rb +255 -0
  16. data/lib/one_helper/onegroup_helper.rb +132 -97
  17. data/lib/one_helper/onehook_helper.rb +4 -1
  18. data/lib/one_helper/onehost_helper.rb +5 -2
  19. data/lib/one_helper/oneimage_helper.rb +2 -0
  20. data/lib/one_helper/onemarket_helper.rb +2 -0
  21. data/lib/one_helper/onemarketapp_helper.rb +3 -0
  22. data/lib/one_helper/onequota_helper.rb +104 -21
  23. data/lib/one_helper/onesecgroup_helper.rb +2 -0
  24. data/lib/one_helper/onetemplate_helper.rb +2 -1
  25. data/lib/one_helper/oneuser_helper.rb +164 -155
  26. data/lib/one_helper/onevdc_helper.rb +2 -0
  27. data/lib/one_helper/onevm_helper.rb +5 -1
  28. data/lib/one_helper/onevmgroup_helper.rb +2 -0
  29. data/lib/one_helper/onevnet_helper.rb +15 -4
  30. data/lib/one_helper/onevntemplate_helper.rb +2 -1
  31. data/lib/one_helper/onevrouter_helper.rb +2 -0
  32. data/lib/one_helper/onezone_helper.rb +15 -4
  33. data/lib/one_helper.rb +51 -16
  34. data/share/schemas/xsd/datastore.xsd +1 -1
  35. data/share/schemas/xsd/group.xsd +8 -0
  36. data/share/schemas/xsd/group_pool.xsd +8 -0
  37. data/share/schemas/xsd/hook.xsd +1 -5
  38. data/share/schemas/xsd/host.xsd +1 -1
  39. data/share/schemas/xsd/image.xsd +1 -8
  40. data/share/schemas/xsd/opennebula_configuration.xsd +4 -8
  41. data/share/schemas/xsd/security_group.xsd +0 -1
  42. data/share/schemas/xsd/shared.xsd +8 -0
  43. data/share/schemas/xsd/user.xsd +8 -0
  44. data/share/schemas/xsd/user_pool.xsd +8 -0
  45. data/share/schemas/xsd/vm.xsd +24 -21
  46. data/share/schemas/xsd/vm_pool.xsd +2 -30
  47. data/share/schemas/xsd/vmtemplate.xsd +1 -8
  48. data/share/schemas/xsd/vnet.xsd +3 -20
  49. data/share/schemas/xsd/vnet_pool.xsd +1 -0
  50. data/share/schemas/xsd/vntemplate.xsd +1 -9
  51. metadata +9 -6
data/lib/one_helper/onevmgroup_helper.rb CHANGED
@@ -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
data/lib/one_helper/onevnet_helper.rb CHANGED
@@ -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
- str = OpenNebulaHelper.update_template(vnet_id,
295
- obj,
296
- file,
297
- xpath)
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]
data/lib/one_helper/onevntemplate_helper.rb CHANGED
@@ -16,7 +16,8 @@
16
16
 
17
17
  require 'one_helper'
18
18
  require 'one_helper/onetemplate_helper'
19
- require 'base64'
19
+ require 'opennebula/vntemplate'
20
+ require 'opennebula/vntemplate_pool'
20
21
 
21
22
  class OneVNTemplateHelper < OneTemplateHelper
22
23
  VN_NAME={
data/lib/one_helper/onevrouter_helper.rb CHANGED
@@ -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
 
data/lib/one_helper/onezone_helper.rb CHANGED
@@ -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 = OpenNebula::System.new(local_client).get_configuration
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 = OpenNebula::System.new(remote_client).get_configuration
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
@@ -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)
@@ -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 xmlrpc frontend',
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' then OpenNebula::HostPool.new(client)
1522
- when 'HOOK' then OpenNebula::HookPool.new(client)
1523
- when 'GROUP' then OpenNebula::GroupPool.new(client)
1524
- when 'USER' then OpenNebula::UserPool.new(client)
1525
- when 'DATASTORE' then OpenNebula::DatastorePool.new(client)
1526
- when 'CLUSTER' then OpenNebula::ClusterPool.new(client)
1527
- when 'VNET' then OpenNebula::VirtualNetworkPool.new(client)
1528
- when 'IMAGE' then OpenNebula::ImagePool.new(client)
1529
- when 'VMTEMPLATE' then OpenNebula::TemplatePool.new(client)
1530
- when 'VNTEMPLATES' then OpenNebula::VNTemplatePool.new(client)
1531
- when 'VM' then OpenNebula::VirtualMachinePool.new(client)
1532
- when 'ZONE' then OpenNebula::ZonePool.new(client)
1533
- when 'MARKETPLACE' then OpenNebula::MarketPlacePool.new(client)
1534
- when 'FLOWTEMPLATES' then OpenNebula::ServiceTemplatePool.new(client)
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/datastore.xsd CHANGED
@@ -48,7 +48,7 @@
48
48
  </xs:sequence>
49
49
  </xs:complexType>
50
50
  </xs:element>
51
- <xs:element name="TEMPLATE"/>
51
+ <xs:element name="TEMPLATE" type="xs:anyType"/>
52
52
  </xs:sequence>
53
53
  </xs:complexType>
54
54
  </xs:element>
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"/>
data/share/schemas/xsd/group_pool.xsd CHANGED
@@ -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"/>
data/share/schemas/xsd/hook.xsd CHANGED
@@ -9,16 +9,14 @@
9
9
  <xs:element name="TEMPLATE">
10
10
  <xs:complexType>
11
11
  <xs:sequence>
12
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
13
12
  <xs:element name="ARGUMENTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
14
13
  <xs:element name="ARGUMENTS_STDIN" type="xs:string" minOccurs="0" maxOccurs="1"/>
15
14
  <xs:element name="CALL" type="xs:string" minOccurs="0" maxOccurs="1"/>
16
15
  <xs:element name="COMMAND" type="xs:string"/>
16
+ <xs:element name="LCM_STATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
17
17
  <xs:element name="REMOTE" type="xs:string" minOccurs="0" maxOccurs="1"/>
18
18
  <xs:element name="RESOURCE" type="xs:string" minOccurs="0" maxOccurs="1"/>
19
19
  <xs:element name="STATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
20
- <xs:element name="LCM_STATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
21
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
22
20
  </xs:sequence>
23
21
  </xs:complexType>
24
22
  </xs:element>
@@ -29,7 +27,6 @@
29
27
  <xs:element name="HOOK_EXECUTION_RECORD" minOccurs="0" maxOccurs="unbounded">
30
28
  <xs:complexType>
31
29
  <xs:sequence>
32
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
33
30
  <xs:element name="HOOK_ID" type="xs:integer"/>
34
31
  <xs:element name="EXECUTION_ID" type="xs:integer"/>
35
32
  <xs:element name="TIMESTAMP" type="xs:integer"/>
@@ -46,7 +43,6 @@
46
43
  </xs:element>
47
44
  <xs:element name="REMOTE_HOST" type="xs:string" minOccurs="0" maxOccurs="1"/>
48
45
  <xs:element name="RETRY" type="xs:string" minOccurs="0" maxOccurs="1"/>
49
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
50
46
  </xs:sequence>
51
47
  </xs:complexType>
52
48
  </xs:element>
data/share/schemas/xsd/host.xsd CHANGED
@@ -143,7 +143,7 @@
143
143
  </xs:sequence>
144
144
  </xs:complexType>
145
145
  </xs:element>
146
- <xs:element name="TEMPLATE"/>
146
+ <xs:element name="TEMPLATE" type="xs:anyType"/>
147
147
  <xs:element name="MONITORING">
148
148
  <xs:complexType>
149
149
  <xs:sequence>
data/share/schemas/xsd/image.xsd CHANGED
@@ -70,14 +70,7 @@
70
70
  <xs:element name="VMS" type="IDS"/>
71
71
  <xs:element name="CLONES" type="IDS"/>
72
72
  <xs:element name="APP_CLONES" type="IDS"/>
73
- <xs:element name="TEMPLATE">
74
- <xs:complexType>
75
- <xs:sequence>
76
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
77
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
78
- </xs:sequence>
79
- </xs:complexType>
80
- </xs:element>
73
+ <xs:element name="TEMPLATE" type="xs:anyType"/>
81
74
  <xs:element name="SNAPSHOTS">
82
75
  <xs:complexType>
83
76
  <xs:sequence>
data/share/schemas/xsd/opennebula_configuration.xsd CHANGED
@@ -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,7 @@
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_MIGRATE_SNAP" type="xs:string" minOccurs="0" maxOccurs="1"/>
324
328
  <xs:element name="LN_TARGET" type="xs:string" minOccurs="0" maxOccurs="1"/>
325
329
  <xs:element name="LN_TARGET_SHARED" type="xs:string" minOccurs="0" maxOccurs="1"/>
326
330
  <xs:element name="LN_TARGET_SSH" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -372,14 +376,6 @@
372
376
  </xs:restriction>
373
377
  </xs:simpleType>
374
378
  </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
379
  <xs:element name="LIVE_RESIZE" minOccurs="0" maxOccurs="1">
384
380
  <xs:simpleType>
385
381
  <xs:restriction base="xs:string">
data/share/schemas/xsd/security_group.xsd CHANGED
@@ -64,7 +64,6 @@
64
64
  </xs:sequence>
65
65
  </xs:complexType>
66
66
  </xs:element>
67
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
68
67
  </xs:sequence>
69
68
  </xs:complexType>
70
69
  </xs:element>
data/share/schemas/xsd/shared.xsd CHANGED
@@ -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"/>
data/share/schemas/xsd/user_pool.xsd CHANGED
@@ -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
@@ -70,6 +70,8 @@
70
70
  <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
71
71
  <!-- Consumption in kilobytes -->
72
72
  <xs:element name="MEMORY" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
73
+ <xs:element name="MEMORY_FORECAST" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
74
+ <xs:element name="MEMORY_FORECAST_FAR" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
73
75
  <!-- Received bytes from the network -->
74
76
  <xs:element name="NETRX" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
75
77
  <!-- Network received bandwidth in bytes per second -->
@@ -84,7 +86,6 @@
84
86
  <xs:element name="NETTX_BW_FORECAST_FAR" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
85
87
  <!-- Exact time when monitoring info were retieved -->
86
88
  <xs:element name="TIMESTAMP" type="xs:integer" minOccurs="0" maxOccurs="1"/>
87
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
88
89
  </xs:sequence>
89
90
  </xs:complexType>
90
91
  </xs:element>
@@ -99,14 +100,7 @@
99
100
  <xs:element name="CONTEXT" minOccurs="0" maxOccurs="1"/>
100
101
  <xs:element name="CPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
101
102
  <xs:element name="CPU_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
102
- <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded">
103
- <xs:complexType>
104
- <xs:sequence>
105
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
106
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
107
- </xs:sequence>
108
- </xs:complexType>
109
- </xs:element>
103
+ <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded"/>
110
104
  <xs:element name="DISK_COST" type="xs:string" minOccurs="0" maxOccurs="1"/>
111
105
  <xs:element name="EMULATOR" type="xs:string" minOccurs="0" maxOccurs="1"/>
112
106
  <xs:element name="FEATURES" minOccurs="0" maxOccurs="1"/>
@@ -140,10 +134,6 @@
140
134
  <xs:element name="NIC_ALIAS" minOccurs="0" maxOccurs="unbounded">
141
135
  <xs:complexType>
142
136
  <xs:sequence>
143
- <xs:element name="ALIAS_ID" type="xs:string" minOccurs="1" maxOccurs="1"/>
144
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
145
- <xs:element name="PARENT" type="xs:string" minOccurs="1" maxOccurs="1"/>
146
- <xs:element name="PARENT_ID" type="xs:string" minOccurs="1" maxOccurs="1"/>
147
137
  <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
148
138
  </xs:sequence>
149
139
  </xs:complexType>
@@ -152,6 +142,19 @@
152
142
  <xs:element name="NUMA_NODE" minOccurs="0" maxOccurs="1"/>
153
143
  <xs:element name="OS" minOccurs="0" maxOccurs="1"/>
154
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>
155
158
  <xs:element name="RAW" minOccurs="0" maxOccurs="1"/>
156
159
  <xs:element name="SECURITY_GROUP_RULE" minOccurs="0" maxOccurs="unbounded"/>
157
160
  <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
@@ -179,6 +182,13 @@
179
182
  </xs:sequence>
180
183
  </xs:complexType>
181
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>
182
192
  <xs:element name="VCPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
183
193
  <xs:element name="VCPU_MAX" type="xs:string" minOccurs="0" maxOccurs="1"/>
184
194
  <xs:element name="VMGROUP" minOccurs="0" maxOccurs="1"/>
@@ -190,14 +200,7 @@
190
200
  </xs:sequence>
191
201
  </xs:complexType>
192
202
  </xs:element>
193
- <xs:element name="USER_TEMPLATE">
194
- <xs:complexType>
195
- <xs:sequence>
196
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
197
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
198
- </xs:sequence>
199
- </xs:complexType>
200
- </xs:element>
203
+ <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
201
204
  <xs:element name="HISTORY_RECORDS">
202
205
  <xs:complexType>
203
206
  <xs:sequence>
data/share/schemas/xsd/vm_pool.xsd CHANGED
@@ -26,14 +26,7 @@
26
26
  <xs:element name="CPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
27
27
  <xs:element name="MEMORY" type="xs:string" minOccurs="0" maxOccurs="1"/>
28
28
  <xs:element name="VCPU" type="xs:string" minOccurs="0" maxOccurs="1"/>
29
- <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded">
30
- <xs:complexType>
31
- <xs:sequence>
32
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
33
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
34
- </xs:sequence>
35
- </xs:complexType>
36
- </xs:element>
29
+ <xs:element name="DISK" minOccurs="0" maxOccurs="unbounded"/>
37
30
  <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
38
31
  <xs:complexType>
39
32
  <xs:sequence>
@@ -52,28 +45,7 @@
52
45
  </xs:sequence>
53
46
  </xs:complexType>
54
47
  </xs:element>
55
- <xs:element name="USER_TEMPLATE">
56
- <xs:complexType>
57
- <xs:sequence>
58
- <xs:element name="LABELS" type="xs:string" minOccurs="0"/>
59
- <xs:element name="ERROR" type="xs:string" minOccurs="0"/>
60
- <xs:element name="SCHED_MESSAGE" type="xs:string" minOccurs="0"/>
61
- <xs:element name="SCHED_RANK" type="xs:string" minOccurs="0"/>
62
- <xs:element name="SCHED_DS_RANK" type="xs:string" minOccurs="0"/>
63
- <xs:element name="SCHED_REQUIREMENTS" type="xs:string" minOccurs="0"/>
64
- <xs:element name="SCHED_DS_REQUIREMENTS" type="xs:string" minOccurs="0"/>
65
- <xs:element name="USER_PRIORITY" type="xs:string" minOccurs="0"/>
66
- <xs:element name="SCHED_ACTION" minOccurs="0" maxOccurs="unbounded">
67
- <xs:complexType>
68
- <xs:sequence>
69
- <xs:any processContents="skip"/>
70
- </xs:sequence>
71
- </xs:complexType>
72
- </xs:element>
73
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
74
- </xs:sequence>
75
- </xs:complexType>
76
- </xs:element>
48
+ <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
77
49
  <xs:element name="HISTORY_RECORDS">
78
50
  <xs:complexType>
79
51
  <xs:sequence>
data/share/schemas/xsd/vmtemplate.xsd CHANGED
@@ -35,14 +35,7 @@
35
35
  </xs:complexType>
36
36
  </xs:element>
37
37
  <xs:element name="REGTIME" type="xs:integer"/>
38
- <xs:element name="TEMPLATE">
39
- <xs:complexType>
40
- <xs:sequence>
41
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
42
- <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
43
- </xs:sequence>
44
- </xs:complexType>
45
- </xs:element>
38
+ <xs:element name="TEMPLATE" type="xs:anyType"/>
46
39
  </xs:sequence>
47
40
  </xs:complexType>
48
41
  </xs:element>