opennebula-cli 6.10.5 → 6.99.85.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 (78) hide show
  1. checksums.yaml +4 -4
  2. data/bin/oneacct +2 -18
  3. data/bin/oneacl +2 -18
  4. data/bin/onebackupjob +2 -18
  5. data/bin/onecluster +36 -18
  6. data/bin/onedatastore +2 -18
  7. data/bin/oneflow +2 -18
  8. data/bin/oneflow-template +8 -24
  9. data/bin/onegroup +2 -18
  10. data/bin/onehook +2 -18
  11. data/bin/onehost +4 -48
  12. data/bin/oneimage +2 -18
  13. data/bin/oneirb +2 -61
  14. data/bin/onelog +3 -22
  15. data/bin/onemarket +2 -18
  16. data/bin/onemarketapp +2 -30
  17. data/bin/onesecgroup +2 -18
  18. data/bin/oneshowback +2 -18
  19. data/bin/onetemplate +2 -19
  20. data/bin/oneuser +3 -19
  21. data/bin/onevdc +2 -18
  22. data/bin/onevm +3 -19
  23. data/bin/onevmgroup +2 -18
  24. data/bin/onevnet +2 -18
  25. data/bin/onevntemplate +2 -18
  26. data/bin/onevrouter +2 -18
  27. data/bin/onezone +2 -18
  28. data/lib/cli_helper.rb +1 -1
  29. data/lib/command_parser.rb +1 -1
  30. data/lib/one_helper/oneacct_helper.rb +1 -1
  31. data/lib/one_helper/oneacl_helper.rb +1 -1
  32. data/lib/one_helper/onebackupjob_helper.rb +1 -1
  33. data/lib/one_helper/onecluster_helper.rb +49 -1
  34. data/lib/one_helper/onedatastore_helper.rb +1 -1
  35. data/lib/one_helper/oneflow_helper.rb +1 -1
  36. data/lib/one_helper/oneflowtemplate_helper.rb +16 -16
  37. data/lib/one_helper/onegroup_helper.rb +4 -55
  38. data/lib/one_helper/onehook_helper.rb +1 -1
  39. data/lib/one_helper/onehost_helper.rb +25 -86
  40. data/lib/one_helper/oneimage_helper.rb +2 -19
  41. data/lib/one_helper/onemarket_helper.rb +1 -1
  42. data/lib/one_helper/onemarketapp_helper.rb +13 -3
  43. data/lib/one_helper/onequota_helper.rb +35 -8
  44. data/lib/one_helper/onesecgroup_helper.rb +1 -1
  45. data/lib/one_helper/onetemplate_helper.rb +1 -8
  46. data/lib/one_helper/oneuser_helper.rb +41 -75
  47. data/lib/one_helper/onevdc_helper.rb +1 -1
  48. data/lib/one_helper/onevm_helper.rb +96 -85
  49. data/lib/one_helper/onevmgroup_helper.rb +1 -1
  50. data/lib/one_helper/onevnet_helper.rb +1 -1
  51. data/lib/one_helper/onevntemplate_helper.rb +1 -1
  52. data/lib/one_helper/onevrouter_helper.rb +1 -1
  53. data/lib/one_helper/onezone_helper.rb +10 -23
  54. data/lib/one_helper.rb +6 -126
  55. data/share/schemas/xsd/acct.xsd +2 -0
  56. data/share/schemas/xsd/cluster.xsd +21 -0
  57. data/share/schemas/xsd/datastore.xsd +1 -13
  58. data/share/schemas/xsd/group.xsd +11 -122
  59. data/share/schemas/xsd/group_pool.xsd +8 -120
  60. data/share/schemas/xsd/host.xsd +19 -21
  61. data/share/schemas/xsd/image.xsd +0 -1
  62. data/share/schemas/xsd/monitoring_data.xsd +0 -8
  63. data/share/schemas/xsd/opennebula_configuration.xsd +23 -2
  64. data/share/schemas/xsd/plan.xsd +29 -0
  65. data/share/schemas/xsd/requirements.xsd +45 -0
  66. data/share/schemas/xsd/scheduler_driver_action.xsd +24 -0
  67. data/share/schemas/xsd/shared.xsd +67 -0
  68. data/share/schemas/xsd/user.xsd +10 -122
  69. data/share/schemas/xsd/user_pool.xsd +8 -120
  70. data/share/schemas/xsd/vm.xsd +37 -28
  71. data/share/schemas/xsd/vm_pool.xsd +0 -12
  72. data/share/schemas/xsd/vm_pool_extended.xsd +12 -0
  73. data/share/schemas/xsd/vmtemplate.xsd +0 -3
  74. data/share/schemas/xsd/vnet.xsd +0 -5
  75. data/share/schemas/xsd/vnet_pool_extended.xsd +12 -0
  76. metadata +11 -9
  77. data/bin/onevcenter +0 -471
  78. data/lib/one_helper/onevcenter_helper.rb +0 -523
data/share/schemas/xsd/monitoring_data.xsd CHANGED
@@ -36,14 +36,6 @@
36
36
  <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
37
37
  <!-- Exact time when monitoring info were retieved -->
38
38
  <xs:element name="TIMESTAMP" type="xs:integer" minOccurs="0" maxOccurs="1"/>
39
- <!-- vCetner information -->
40
- <xs:element name="VCENTER_ESX_HOST" type="xs:string" minOccurs="0" maxOccurs="1"/>
41
- <xs:element name="VCENTER_GUEST_STATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
42
- <xs:element name="VCENTER_RP_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
43
- <xs:element name="VCENTER_VMWARETOOLS_RUNNING_STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
44
- <xs:element name="VCENTER_VMWARETOOLS_VERSION" type="xs:string" minOccurs="0" maxOccurs="1"/>
45
- <xs:element name="VCENTER_VMWARETOOLS_VERSION_STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
46
- <xs:element name="VCENTER_VM_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
47
39
  </xs:sequence>
48
40
  </xs:complexType>
49
41
  </xs:element>
data/share/schemas/xsd/opennebula_configuration.xsd CHANGED
@@ -4,6 +4,8 @@
4
4
  <xs:complexType>
5
5
  <xs:sequence>
6
6
 
7
+ <xs:element name="ACTION_TIMEOUT" type="xs:integer" minOccurs="0" maxOccurs="1"/>
8
+
7
9
  <xs:element name="API_LIST_ORDER" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
8
10
 
9
11
  <xs:element name="AUTH_MAD" minOccurs="0" maxOccurs="unbounded">
@@ -29,7 +31,7 @@
29
31
  </xs:element>
30
32
 
31
33
  <xs:element name="CLUSTER_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
32
- <xs:element name="CONTEXT_ALLOW_ETH_UPDATES" type="xs:string" minOccurs="0" maxOccurs="1"/>
34
+ <xs:element name="COLD_MIGRATE_MODE" type="xs:integer" minOccurs="0" maxOccurs="1"/>
33
35
  <xs:element name="CONTEXT_RESTRICTED_DIRS" type="xs:string" minOccurs="0" maxOccurs="1"/>
34
36
  <xs:element name="CONTEXT_SAFE_DIRS" type="xs:string" minOccurs="0" maxOccurs="1"/>
35
37
  <xs:element name="DATASTORE_CAPACITY_CHECK" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
@@ -102,6 +104,8 @@
102
104
 
103
105
  <xs:element name="DOCUMENT_ENCRYPTED_ATTR" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
104
106
 
107
+ <xs:element name="DRS_INTERVAL" type="xs:integer" minOccurs="0" maxOccurs="1"/>
108
+
105
109
  <xs:element name="DS_MAD_CONF" minOccurs="0" maxOccurs="unbounded">
106
110
  <xs:complexType>
107
111
  <xs:all>
@@ -201,6 +205,7 @@
201
205
  <xs:element name="KEEPALIVE_MAX_CONN" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
202
206
  <xs:element name="KEEPALIVE_TIMEOUT" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
203
207
  <xs:element name="LISTEN_ADDRESS" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
208
+ <xs:element name="LIVE_RESCHEDS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
204
209
 
205
210
  <xs:element name="LOG" minOccurs="0" maxOccurs="unbounded">
206
211
  <xs:complexType>
@@ -244,6 +249,8 @@
244
249
  </xs:complexType>
245
250
  </xs:element>
246
251
 
252
+ <xs:element name="MAX_ACTIONS_PER_CLUSTER" type="xs:integer" minOccurs="0" maxOccurs="1"/>
253
+ <xs:element name="MAX_ACTIONS_PER_HOST" type="xs:integer" minOccurs="0" maxOccurs="1"/>
247
254
  <xs:element name="MAX_BACKUPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
248
255
  <xs:element name="MAX_BACKUPS_HOST" type="xs:integer" minOccurs="0" maxOccurs="1"/>
249
256
  <xs:element name="MAX_CONN" type="xs:integer" minOccurs="0" maxOccurs="1"/>
@@ -273,6 +280,20 @@
273
280
  </xs:element>
274
281
 
275
282
  <xs:element name="RPC_LOG" type="xs:string" minOccurs="0" maxOccurs="1"/>
283
+
284
+ <xs:element name="SCHED_MAD" minOccurs="0" maxOccurs="1">
285
+ <xs:complexType>
286
+ <xs:all>
287
+ <xs:element name="ARGUMENTS" type="xs:string"/>
288
+ <xs:element name="EXECUTABLE" type="xs:string"/>
289
+ </xs:all>
290
+ </xs:complexType>
291
+ </xs:element>
292
+
293
+ <xs:element name="SCHED_MAX_WND_LENGTH" type="xs:string" minOccurs="0" maxOccurs="1"/>
294
+ <xs:element name="SCHED_MAX_WND_TIME" type="xs:string" minOccurs="0" maxOccurs="1"/>
295
+ <xs:element name="SCHED_RETRY_TIME" type="xs:string" minOccurs="0" maxOccurs="1"/>
296
+
276
297
  <xs:element name="SCRIPTS_REMOTE_DIR" type="xs:string" minOccurs="0" maxOccurs="1"/>
277
298
  <xs:element name="SESSION_EXPIRATION_TIME" type="xs:integer" minOccurs="0" maxOccurs="1"/>
278
299
  <xs:element name="SHOWBACK_ONLY_RUNNING" type="xs:string" minOccurs="0" maxOccurs="1"/>
@@ -303,6 +324,7 @@
303
324
  <xs:element name="LN_TARGET_SHARED" type="xs:string" minOccurs="0" maxOccurs="1"/>
304
325
  <xs:element name="LN_TARGET_SSH" type="xs:string" minOccurs="0" maxOccurs="1"/>
305
326
  <xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
327
+ <xs:element name="PERSISTENT_SNAPSHOTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
306
328
  <xs:element name="SHARED" type="xs:string" minOccurs="0" maxOccurs="1"/>
307
329
  <xs:element name="TM_MAD_SYSTEM" type="xs:string" minOccurs="0" maxOccurs="1"/>
308
330
  </xs:all>
@@ -330,7 +352,6 @@
330
352
  <xs:element name="ARGUMENTS" type="xs:string" minOccurs="0" maxOccurs="1"/>
331
353
  <xs:element name="DEFAULT" type="xs:string" minOccurs="0" maxOccurs="1"/>
332
354
  <xs:element name="EXECUTABLE" type="xs:string" minOccurs="0" maxOccurs="1"/>
333
- <xs:element name="IMPORTED_VMS_ACTIONS" type="xs:string" minOccurs="0" maxOccurs="1"/>
334
355
  <xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
335
356
  <xs:element name="SUNSTONE_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
336
357
  <xs:element name="TYPE" type="xs:string" minOccurs="0" maxOccurs="1"/>
data/share/schemas/xsd/plan.xsd ADDED
@@ -0,0 +1,29 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
3
+ targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
4
+ <xs:element name="PLAN">
5
+ <xs:complexType>
6
+ <xs:sequence>
7
+ <xs:element name="ID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
8
+ <xs:element name="ACTION" minOccurs="1" maxOccurs="unbounded">
9
+ <xs:complexType>
10
+ <xs:sequence>
11
+ <xs:element name="VM_ID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
12
+ <xs:element name="OPERATION" type="xs:string" minOccurs="1" maxOccurs="1"/>
13
+ <xs:element name="HOST_ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
14
+ <xs:element name="DS_ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
15
+ <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
16
+ <xs:complexType>
17
+ <xs:sequence>
18
+ <xs:element name="NIC_ID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
19
+ <xs:element name="NETWORK_ID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
20
+ </xs:sequence>
21
+ </xs:complexType>
22
+ </xs:element>
23
+ </xs:sequence>
24
+ </xs:complexType>
25
+ </xs:element>
26
+ </xs:sequence>
27
+ </xs:complexType>
28
+ </xs:element>
29
+ </xs:schema>
data/share/schemas/xsd/requirements.xsd ADDED
@@ -0,0 +1,45 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
3
+ targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
4
+ <xs:element name="REQUIREMENTS">
5
+ <xs:complexType>
6
+ <xs:sequence>
7
+ <xs:element name="VM" minOccurs="0" maxOccurs="unbounded">
8
+ <xs:complexType>
9
+ <xs:sequence>
10
+ <xs:element name="ID" type="xs:integer" minOccurs="1" maxOccurs="1"/>
11
+ <xs:element name="HOSTS" minOccurs="1" maxOccurs="1">
12
+ <xs:complexType>
13
+ <xs:sequence>
14
+ <xs:element name="ID" type="xs:integer" maxOccurs="unbounded"/>
15
+ </xs:sequence>
16
+ </xs:complexType>
17
+ </xs:element>
18
+ <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
19
+ <xs:complexType>
20
+ <xs:sequence>
21
+ <xs:element name="ID" type="xs:integer" maxOccurs="1"/>
22
+ <xs:element name="VNETS" minOccurs="1" maxOccurs="1">
23
+ <xs:complexType>
24
+ <xs:sequence>
25
+ <xs:element name="ID" type="xs:integer" maxOccurs="unbounded"/>
26
+ </xs:sequence>
27
+ </xs:complexType>
28
+ </xs:element>
29
+ </xs:sequence>
30
+ </xs:complexType>
31
+ </xs:element>
32
+ <xs:element name="DATASTORES" minOccurs="1" maxOccurs="1">
33
+ <xs:complexType>
34
+ <xs:sequence>
35
+ <xs:element name="ID" type="xs:integer" maxOccurs="unbounded"/>
36
+ </xs:sequence>
37
+ </xs:complexType>
38
+ </xs:element>
39
+ </xs:sequence>
40
+ </xs:complexType>
41
+ </xs:element>
42
+ </xs:sequence>
43
+ </xs:complexType>
44
+ </xs:element>
45
+ </xs:schema>
data/share/schemas/xsd/scheduler_driver_action.xsd ADDED
@@ -0,0 +1,24 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
3
+ targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
4
+ <xs:include schemaLocation="vm_pool_extended.xsd"/>
5
+ <xs:include schemaLocation="host_pool.xsd"/>
6
+ <xs:include schemaLocation="datastore_pool.xsd"/>
7
+ <xs:include schemaLocation="vnet_pool_extended.xsd"/>
8
+ <xs:include schemaLocation="vm_group_pool.xsd"/>
9
+ <xs:include schemaLocation="cluster_pool.xsd"/>
10
+ <xs:include schemaLocation="requirements.xsd"/>
11
+ <xs:element name="SCHEDULER_DRIVER_ACTION">
12
+ <xs:complexType>
13
+ <xs:sequence>
14
+ <xs:element ref="VM_POOL" minOccurs="1" maxOccurs="1"/>
15
+ <xs:element ref="HOST_POOL" minOccurs="1" maxOccurs="1"/>
16
+ <xs:element ref="DATASTORE_POOL" minOccurs="1" maxOccurs="1"/>
17
+ <xs:element ref="VNET_POOL" minOccurs="1" maxOccurs="1"/>
18
+ <xs:element ref="VM_GROUP_POOL" minOccurs="1" maxOccurs="1"/>
19
+ <xs:element ref="CLUSTER_POOL" minOccurs="1" maxOccurs="1"/>
20
+ <xs:element ref="REQUIREMENTS" minOccurs="1" maxOccurs="1"/>
21
+ </xs:sequence>
22
+ </xs:complexType>
23
+ </xs:element>
24
+ </xs:schema>
data/share/schemas/xsd/shared.xsd CHANGED
@@ -44,4 +44,71 @@
44
44
  <xs:element name="WARNING" type="xs:integer"/>
45
45
  </xs:sequence>
46
46
  </xs:complexType>
47
+ <xs:complexType name="DATASTORE_QUOTA">
48
+ <xs:sequence>
49
+ <xs:element name="DATASTORE" minOccurs="0" maxOccurs="unbounded">
50
+ <xs:complexType>
51
+ <xs:sequence>
52
+ <xs:element name="ID" type="xs:string"/>
53
+ <xs:element name="IMAGES" type="xs:string"/>
54
+ <xs:element name="IMAGES_USED" type="xs:string"/>
55
+ <xs:element name="SIZE" type="xs:string"/>
56
+ <xs:element name="SIZE_USED" type="xs:string"/>
57
+ </xs:sequence>
58
+ </xs:complexType>
59
+ </xs:element>
60
+ </xs:sequence>
61
+ </xs:complexType>
62
+ <xs:complexType name="NETWORK_QUOTA">
63
+ <xs:sequence>
64
+ <xs:element name="NETWORK" minOccurs="0" maxOccurs="unbounded">
65
+ <xs:complexType>
66
+ <xs:sequence>
67
+ <xs:element name="ID" type="xs:string"/>
68
+ <xs:element name="LEASES" type="xs:string"/>
69
+ <xs:element name="LEASES_USED" type="xs:string"/>
70
+ </xs:sequence>
71
+ </xs:complexType>
72
+ </xs:element>
73
+ </xs:sequence>
74
+ </xs:complexType>
75
+ <xs:complexType name="VM_QUOTA">
76
+ <xs:sequence>
77
+ <xs:element name="VM" minOccurs="0" maxOccurs="unbounded">
78
+ <xs:complexType>
79
+ <xs:sequence>
80
+ <xs:element name="CLUSTER_IDS" type="xs:string" minOccurs="0"/>
81
+ <xs:element name="CPU" type="xs:string"/>
82
+ <xs:element name="CPU_USED" type="xs:string"/>
83
+ <xs:element name="MEMORY" type="xs:string"/>
84
+ <xs:element name="MEMORY_USED" type="xs:string"/>
85
+ <xs:element name="RUNNING_CPU" type="xs:string"/>
86
+ <xs:element name="RUNNING_CPU_USED" type="xs:string"/>
87
+ <xs:element name="RUNNING_MEMORY" type="xs:string"/>
88
+ <xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
89
+ <xs:element name="RUNNING_VMS" type="xs:string"/>
90
+ <xs:element name="RUNNING_VMS_USED" type="xs:string"/>
91
+ <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
92
+ <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
93
+ <xs:element name="VMS" type="xs:string"/>
94
+ <xs:element name="VMS_USED" type="xs:string"/>
95
+ </xs:sequence>
96
+ </xs:complexType>
97
+ </xs:element>
98
+ </xs:sequence>
99
+ </xs:complexType>
100
+ <xs:complexType name="IMAGE_QUOTA">
101
+ <xs:sequence>
102
+ <xs:element name="IMAGE" minOccurs="0" maxOccurs="unbounded">
103
+ <xs:complexType>
104
+ <xs:sequence>
105
+ <xs:element name="ID" type="xs:string"/>
106
+ <xs:element name="RVMS" type="xs:string"/>
107
+ <xs:element name="RVMS_USED" type="xs:string"/>
108
+ </xs:sequence>
109
+ </xs:complexType>
110
+ </xs:element>
111
+ </xs:sequence>
112
+ </xs:complexType>
113
+
47
114
  </xs:schema>
data/share/schemas/xsd/user.xsd CHANGED
@@ -1,6 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
3
3
  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
4
+ <xs:include schemaLocation="shared.xsd"/>
4
5
  <xs:element name="USER">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
@@ -28,118 +29,19 @@
28
29
  </xs:complexType>
29
30
  </xs:element>
30
31
  <xs:element name="TEMPLATE" type="xs:anyType"/>
31
- <xs:element name="DATASTORE_QUOTA" minOccurs="0" maxOccurs="1">
32
- <xs:complexType>
33
- <xs:sequence>
34
- <xs:element name="DATASTORE" minOccurs="0" maxOccurs="unbounded">
35
- <xs:complexType>
36
- <xs:sequence>
37
- <xs:element name="ID" type="xs:string"/>
38
- <xs:element name="IMAGES" type="xs:string"/>
39
- <xs:element name="IMAGES_USED" type="xs:string"/>
40
- <xs:element name="SIZE" type="xs:string"/>
41
- <xs:element name="SIZE_USED" type="xs:string"/>
42
- </xs:sequence>
43
- </xs:complexType>
44
- </xs:element>
45
- </xs:sequence>
46
- </xs:complexType>
47
- </xs:element>
48
- <xs:element name="NETWORK_QUOTA" minOccurs="0" maxOccurs="1">
49
- <xs:complexType>
50
- <xs:sequence>
51
- <xs:element name="NETWORK" minOccurs="0" maxOccurs="unbounded">
52
- <xs:complexType>
53
- <xs:sequence>
54
- <xs:element name="ID" type="xs:string"/>
55
- <xs:element name="LEASES" type="xs:string"/>
56
- <xs:element name="LEASES_USED" type="xs:string"/>
57
- </xs:sequence>
58
- </xs:complexType>
59
- </xs:element>
60
- </xs:sequence>
61
- </xs:complexType>
62
- </xs:element>
63
- <xs:element name="VM_QUOTA" minOccurs="0" maxOccurs="1">
64
- <xs:complexType>
65
- <xs:sequence>
66
- <xs:element name="VM" minOccurs="0" maxOccurs="1">
67
- <xs:complexType>
68
- <xs:sequence>
69
- <xs:element name="CPU" type="xs:string"/>
70
- <xs:element name="CPU_USED" type="xs:string"/>
71
- <xs:element name="MEMORY" type="xs:string"/>
72
- <xs:element name="MEMORY_USED" type="xs:string"/>
73
- <xs:element name="RUNNING_CPU" type="xs:string"/>
74
- <xs:element name="RUNNING_CPU_USED" type="xs:string"/>
75
- <xs:element name="RUNNING_MEMORY" type="xs:string"/>
76
- <xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
77
- <xs:element name="RUNNING_VMS" type="xs:string"/>
78
- <xs:element name="RUNNING_VMS_USED" type="xs:string"/>
79
- <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
80
- <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
81
- <xs:element name="VMS" type="xs:string"/>
82
- <xs:element name="VMS_USED" type="xs:string"/>
83
- </xs:sequence>
84
- </xs:complexType>
85
- </xs:element>
86
- </xs:sequence>
87
- </xs:complexType>
88
- </xs:element>
89
- <xs:element name="IMAGE_QUOTA" minOccurs="0" maxOccurs="1">
90
- <xs:complexType>
91
- <xs:sequence>
92
- <xs:element name="IMAGE" minOccurs="0" maxOccurs="unbounded">
93
- <xs:complexType>
94
- <xs:sequence>
95
- <xs:element name="ID" type="xs:string"/>
96
- <xs:element name="RVMS" type="xs:string"/>
97
- <xs:element name="RVMS_USED" type="xs:string"/>
98
- </xs:sequence>
99
- </xs:complexType>
100
- </xs:element>
101
- </xs:sequence>
102
- </xs:complexType>
103
- </xs:element>
32
+ <xs:element name="DATASTORE_QUOTA" type="DATASTORE_QUOTA" minOccurs="0"/>
33
+ <xs:element name="NETWORK_QUOTA" type="NETWORK_QUOTA" minOccurs="0"/>
34
+ <xs:element name="VM_QUOTA" type="VM_QUOTA" minOccurs="0"/>
35
+ <xs:element name="IMAGE_QUOTA" type="IMAGE_QUOTA" minOccurs="0"/>
104
36
  <xs:element name="DEFAULT_USER_QUOTAS">
105
37
  <xs:complexType>
106
38
  <xs:sequence>
107
- <xs:element name="DATASTORE_QUOTA" minOccurs="0" maxOccurs="1">
108
- <xs:complexType>
109
- <xs:sequence>
110
- <xs:element name="DATASTORE" minOccurs="0" maxOccurs="unbounded">
111
- <xs:complexType>
112
- <xs:sequence>
113
- <xs:element name="ID" type="xs:string"/>
114
- <xs:element name="IMAGES" type="xs:string"/>
115
- <xs:element name="IMAGES_USED" type="xs:string"/>
116
- <xs:element name="SIZE" type="xs:string"/>
117
- <xs:element name="SIZE_USED" type="xs:string"/>
118
- </xs:sequence>
119
- </xs:complexType>
120
- </xs:element>
121
- </xs:sequence>
122
- </xs:complexType>
123
- </xs:element>
124
- <xs:element name="NETWORK_QUOTA" minOccurs="0" maxOccurs="1">
125
- <xs:complexType>
126
- <xs:sequence>
127
- <xs:element name="NETWORK" minOccurs="0" maxOccurs="unbounded">
128
- <xs:complexType>
129
- <xs:sequence>
130
- <xs:element name="ID" type="xs:string"/>
131
- <xs:element name="LEASES" type="xs:string"/>
132
- <xs:element name="LEASES_USED" type="xs:string"/>
133
- </xs:sequence>
134
- </xs:complexType>
135
- </xs:element>
136
- </xs:sequence>
137
- </xs:complexType>
138
- </xs:element>
139
- <xs:element name="VM_QUOTA" minOccurs="0" maxOccurs="1">
39
+ <xs:element name="DATASTORE_QUOTA" type="DATASTORE_QUOTA" minOccurs="0"/>
40
+ <xs:element name="NETWORK_QUOTA" type="NETWORK_QUOTA" minOccurs="0"/>
41
+ <xs:element name="VM_QUOTA" minOccurs="0">
140
42
  <xs:complexType>
141
43
  <xs:sequence>
142
- <xs:element name="VM" minOccurs="0" maxOccurs="1">
44
+ <xs:element name="VM" minOccurs="0">
143
45
  <xs:complexType>
144
46
  <xs:sequence>
145
47
  <xs:element name="CPU" type="xs:string"/>
@@ -162,21 +64,7 @@
162
64
  </xs:sequence>
163
65
  </xs:complexType>
164
66
  </xs:element>
165
- <xs:element name="IMAGE_QUOTA" minOccurs="0" maxOccurs="1">
166
- <xs:complexType>
167
- <xs:sequence>
168
- <xs:element name="IMAGE" minOccurs="0" maxOccurs="unbounded">
169
- <xs:complexType>
170
- <xs:sequence>
171
- <xs:element name="ID" type="xs:string"/>
172
- <xs:element name="RVMS" type="xs:string"/>
173
- <xs:element name="RVMS_USED" type="xs:string"/>
174
- </xs:sequence>
175
- </xs:complexType>
176
- </xs:element>
177
- </xs:sequence>
178
- </xs:complexType>
179
- </xs:element>
67
+ <xs:element name="IMAGE_QUOTA" type="IMAGE_QUOTA" minOccurs="0"/>
180
68
  </xs:sequence>
181
69
  </xs:complexType>
182
70
  </xs:element>
data/share/schemas/xsd/user_pool.xsd CHANGED
@@ -1,6 +1,7 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
3
3
  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
4
+ <xs:include schemaLocation="shared.xsd"/>
4
5
  <xs:element name="USER_POOL">
5
6
  <xs:complexType>
6
7
  <xs:sequence maxOccurs="1" minOccurs="1">
@@ -39,79 +40,10 @@
39
40
  <xs:complexType>
40
41
  <xs:sequence>
41
42
  <xs:element name="ID" type="xs:integer"/>
42
- <xs:element name="DATASTORE_QUOTA" minOccurs="0" maxOccurs="1">
43
- <xs:complexType>
44
- <xs:sequence>
45
- <xs:element name="DATASTORE" minOccurs="0" maxOccurs="unbounded">
46
- <xs:complexType>
47
- <xs:sequence>
48
- <xs:element name="ID" type="xs:string"/>
49
- <xs:element name="IMAGES" type="xs:string"/>
50
- <xs:element name="IMAGES_USED" type="xs:string"/>
51
- <xs:element name="SIZE" type="xs:string"/>
52
- <xs:element name="SIZE_USED" type="xs:string"/>
53
- </xs:sequence>
54
- </xs:complexType>
55
- </xs:element>
56
- </xs:sequence>
57
- </xs:complexType>
58
- </xs:element>
59
- <xs:element name="NETWORK_QUOTA" minOccurs="0" maxOccurs="1">
60
- <xs:complexType>
61
- <xs:sequence>
62
- <xs:element name="NETWORK" minOccurs="0" maxOccurs="unbounded">
63
- <xs:complexType>
64
- <xs:sequence>
65
- <xs:element name="ID" type="xs:string"/>
66
- <xs:element name="LEASES" type="xs:string"/>
67
- <xs:element name="LEASES_USED" type="xs:string"/>
68
- </xs:sequence>
69
- </xs:complexType>
70
- </xs:element>
71
- </xs:sequence>
72
- </xs:complexType>
73
- </xs:element>
74
- <xs:element name="VM_QUOTA" minOccurs="0" maxOccurs="1">
75
- <xs:complexType>
76
- <xs:sequence>
77
- <xs:element name="VM" minOccurs="0" maxOccurs="1">
78
- <xs:complexType>
79
- <xs:sequence>
80
- <xs:element name="CPU" type="xs:string"/>
81
- <xs:element name="CPU_USED" type="xs:string"/>
82
- <xs:element name="MEMORY" type="xs:string"/>
83
- <xs:element name="MEMORY_USED" type="xs:string"/>
84
- <xs:element name="RUNNING_CPU" type="xs:string"/>
85
- <xs:element name="RUNNING_CPU_USED" type="xs:string"/>
86
- <xs:element name="RUNNING_MEMORY" type="xs:string"/>
87
- <xs:element name="RUNNING_MEMORY_USED" type="xs:string"/>
88
- <xs:element name="RUNNING_VMS" type="xs:string"/>
89
- <xs:element name="RUNNING_VMS_USED" type="xs:string"/>
90
- <xs:element name="SYSTEM_DISK_SIZE" type="xs:string"/>
91
- <xs:element name="SYSTEM_DISK_SIZE_USED" type="xs:string"/>
92
- <xs:element name="VMS" type="xs:string"/>
93
- <xs:element name="VMS_USED" type="xs:string"/>
94
- </xs:sequence>
95
- </xs:complexType>
96
- </xs:element>
97
- </xs:sequence>
98
- </xs:complexType>
99
- </xs:element>
100
- <xs:element name="IMAGE_QUOTA" minOccurs="0" maxOccurs="1">
101
- <xs:complexType>
102
- <xs:sequence>
103
- <xs:element name="IMAGE" minOccurs="0" maxOccurs="unbounded">
104
- <xs:complexType>
105
- <xs:sequence>
106
- <xs:element name="ID" type="xs:string"/>
107
- <xs:element name="RVMS" type="xs:string"/>
108
- <xs:element name="RVMS_USED" type="xs:string"/>
109
- </xs:sequence>
110
- </xs:complexType>
111
- </xs:element>
112
- </xs:sequence>
113
- </xs:complexType>
114
- </xs:element>
43
+ <xs:element name="DATASTORE_QUOTA" type="DATASTORE_QUOTA" minOccurs="0"/>
44
+ <xs:element name="NETWORK_QUOTA" type="NETWORK_QUOTA" minOccurs="0"/>
45
+ <xs:element name="VM_QUOTA" type="VM_QUOTA" minOccurs="0"/>
46
+ <xs:element name="IMAGE_QUOTA" type="IMAGE_QUOTA" minOccurs="0"/>
115
47
  </xs:sequence>
116
48
  </xs:complexType>
117
49
  </xs:element>
@@ -119,38 +51,8 @@
119
51
  <xs:element name="DEFAULT_USER_QUOTAS">
120
52
  <xs:complexType>
121
53
  <xs:sequence>
122
- <xs:element name="DATASTORE_QUOTA" minOccurs="0" maxOccurs="1">
123
- <xs:complexType>
124
- <xs:sequence>
125
- <xs:element name="DATASTORE" minOccurs="0" maxOccurs="unbounded">
126
- <xs:complexType>
127
- <xs:sequence>
128
- <xs:element name="ID" type="xs:string"/>
129
- <xs:element name="IMAGES" type="xs:string"/>
130
- <xs:element name="IMAGES_USED" type="xs:string"/>
131
- <xs:element name="SIZE" type="xs:string"/>
132
- <xs:element name="SIZE_USED" type="xs:string"/>
133
- </xs:sequence>
134
- </xs:complexType>
135
- </xs:element>
136
- </xs:sequence>
137
- </xs:complexType>
138
- </xs:element>
139
- <xs:element name="NETWORK_QUOTA" minOccurs="0" maxOccurs="1">
140
- <xs:complexType>
141
- <xs:sequence>
142
- <xs:element name="NETWORK" minOccurs="0" maxOccurs="unbounded">
143
- <xs:complexType>
144
- <xs:sequence>
145
- <xs:element name="ID" type="xs:string"/>
146
- <xs:element name="LEASES" type="xs:string"/>
147
- <xs:element name="LEASES_USED" type="xs:string"/>
148
- </xs:sequence>
149
- </xs:complexType>
150
- </xs:element>
151
- </xs:sequence>
152
- </xs:complexType>
153
- </xs:element>
54
+ <xs:element name="DATASTORE_QUOTA" type="DATASTORE_QUOTA" minOccurs="0"/>
55
+ <xs:element name="NETWORK_QUOTA" type="NETWORK_QUOTA" minOccurs="0"/>
154
56
  <xs:element name="VM_QUOTA" minOccurs="0" maxOccurs="1">
155
57
  <xs:complexType>
156
58
  <xs:sequence>
@@ -177,21 +79,7 @@
177
79
  </xs:sequence>
178
80
  </xs:complexType>
179
81
  </xs:element>
180
- <xs:element name="IMAGE_QUOTA" minOccurs="0" maxOccurs="1">
181
- <xs:complexType>
182
- <xs:sequence>
183
- <xs:element name="IMAGE" minOccurs="0" maxOccurs="unbounded">
184
- <xs:complexType>
185
- <xs:sequence>
186
- <xs:element name="ID" type="xs:string"/>
187
- <xs:element name="RVMS" type="xs:string"/>
188
- <xs:element name="RVMS_USED" type="xs:string"/>
189
- </xs:sequence>
190
- </xs:complexType>
191
- </xs:element>
192
- </xs:sequence>
193
- </xs:complexType>
194
- </xs:element>
82
+ <xs:element name="IMAGE_QUOTA" type="IMAGE_QUOTA" minOccurs="0"/>
195
83
  </xs:sequence>
196
84
  </xs:complexType>
197
85
  </xs:element>