opennebula-cli 7.2.0 → 7.3.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 (54) hide show
  1. checksums.yaml +4 -4
  2. data/bin/oneflow +52 -1
  3. data/bin/onegroup +33 -0
  4. data/bin/oneimage +7 -2
  5. data/bin/onesecgroup +2 -1
  6. data/bin/onevm +27 -8
  7. data/bin/onevnet +6 -21
  8. data/bin/onevntemplate +3 -3
  9. data/lib/command_parser.rb +134 -125
  10. data/lib/load_opennebula_paths.rb +5 -0
  11. data/lib/ods_helper.rb +724 -0
  12. data/lib/one_helper/oneacct_helper.rb +116 -108
  13. data/lib/one_helper/onedatastore_helper.rb +86 -79
  14. data/lib/one_helper/onegroup_helper.rb +20 -0
  15. data/lib/one_helper/onehost_helper.rb +10 -1
  16. data/lib/one_helper/oneimage_helper.rb +9 -2
  17. data/lib/one_helper/onemarket_helper.rb +58 -57
  18. data/lib/one_helper/onequota_helper.rb +239 -189
  19. data/lib/one_helper/onesecgroup_helper.rb +86 -84
  20. data/lib/one_helper/onetemplate_helper.rb +63 -63
  21. data/lib/one_helper/onevdc_helper.rb +44 -44
  22. data/lib/one_helper/onevm_helper.rb +5 -12
  23. data/lib/one_helper/onevmgroup_helper.rb +65 -64
  24. data/lib/one_helper/onevnet_helper.rb +6 -2
  25. data/lib/one_helper/onevntemplate_helper.rb +42 -39
  26. data/lib/one_helper/onevrouter_helper.rb +85 -86
  27. data/lib/one_helper/onezone_helper.rb +97 -100
  28. data/lib/one_helper.rb +102 -70
  29. data/share/schemas/xsd/acct.xsd +3 -104
  30. data/share/schemas/xsd/backupjob.xsd +1 -0
  31. data/share/schemas/xsd/cluster.xsd +4 -21
  32. data/share/schemas/xsd/datastore.xsd +4 -29
  33. data/share/schemas/xsd/document.xsd +3 -25
  34. data/share/schemas/xsd/group.xsd +17 -13
  35. data/share/schemas/xsd/group_pool.xsd +18 -14
  36. data/share/schemas/xsd/hook.xsd +2 -0
  37. data/share/schemas/xsd/host.xsd +5 -7
  38. data/share/schemas/xsd/image.xsd +2 -25
  39. data/share/schemas/xsd/marketplace.xsd +3 -22
  40. data/share/schemas/xsd/marketplaceapp.xsd +3 -25
  41. data/share/schemas/xsd/opennebula_configuration.xsd +2 -0
  42. data/share/schemas/xsd/requirements.xsd +3 -21
  43. data/share/schemas/xsd/security_group.xsd +6 -43
  44. data/share/schemas/xsd/shared.xsd +3 -3
  45. data/share/schemas/xsd/vdc.xsd +2 -7
  46. data/share/schemas/xsd/vm.xsd +2 -0
  47. data/share/schemas/xsd/vm_group.xsd +3 -25
  48. data/share/schemas/xsd/vm_pool.xsd +2 -0
  49. data/share/schemas/xsd/vmtemplate.xsd +3 -25
  50. data/share/schemas/xsd/vnet.xsd +13 -67
  51. data/share/schemas/xsd/vnet_pool.xsd +13 -58
  52. data/share/schemas/xsd/vntemplate.xsd +3 -25
  53. data/share/schemas/xsd/vrouter.xsd +4 -32
  54. metadata +8 -6
data/share/schemas/xsd/cluster.xsd CHANGED
@@ -1,32 +1,15 @@
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="CLUSTER">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
7
8
  <xs:element name="ID" type="xs:integer"/>
8
9
  <xs:element name="NAME" type="xs:string"/>
9
- <xs:element name="HOSTS">
10
- <xs:complexType>
11
- <xs:sequence>
12
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
13
- </xs:sequence>
14
- </xs:complexType>
15
- </xs:element>
16
- <xs:element name="DATASTORES">
17
- <xs:complexType>
18
- <xs:sequence>
19
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
20
- </xs:sequence>
21
- </xs:complexType>
22
- </xs:element>
23
- <xs:element name="VNETS">
24
- <xs:complexType>
25
- <xs:sequence>
26
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
27
- </xs:sequence>
28
- </xs:complexType>
29
- </xs:element>
10
+ <xs:element name="HOSTS" type="IDS"/>
11
+ <xs:element name="DATASTORES" type="IDS"/>
12
+ <xs:element name="VNETS" type="IDS"/>
30
13
  <xs:element name="TEMPLATE" type="xs:anyType"/>
31
14
  <xs:element name="PLAN" minOccurs="0" maxOccurs="1">
32
15
  <xs:complexType>
data/share/schemas/xsd/datastore.xsd CHANGED
@@ -1,5 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
3
+ <xs:include schemaLocation="shared.xsd"/>
3
4
  <xs:element name="DATASTORE">
4
5
  <xs:complexType>
5
6
  <xs:sequence>
@@ -9,21 +10,7 @@
9
10
  <xs:element name="UNAME" type="xs:string"/>
10
11
  <xs:element name="GNAME" type="xs:string"/>
11
12
  <xs:element name="NAME" type="xs:string"/>
12
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
13
- <xs:complexType>
14
- <xs:sequence>
15
- <xs:element name="OWNER_U" type="xs:integer"/>
16
- <xs:element name="OWNER_M" type="xs:integer"/>
17
- <xs:element name="OWNER_A" type="xs:integer"/>
18
- <xs:element name="GROUP_U" type="xs:integer"/>
19
- <xs:element name="GROUP_M" type="xs:integer"/>
20
- <xs:element name="GROUP_A" type="xs:integer"/>
21
- <xs:element name="OTHER_U" type="xs:integer"/>
22
- <xs:element name="OTHER_M" type="xs:integer"/>
23
- <xs:element name="OTHER_A" type="xs:integer"/>
24
- </xs:sequence>
25
- </xs:complexType>
26
- </xs:element>
13
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
27
14
  <xs:element name="DS_MAD" type="xs:string"/>
28
15
  <xs:element name="TM_MAD" type="xs:string"/>
29
16
  <xs:element name="BASE_PATH" type="xs:string"/>
@@ -31,23 +18,11 @@
31
18
  <xs:element name="DISK_TYPE" type="xs:integer"/>
32
19
  <!-- Possible STATE values are 0 (READY) and 1 (DISABLE)-->
33
20
  <xs:element name="STATE" type="xs:integer"/>
34
- <xs:element name="CLUSTERS">
35
- <xs:complexType>
36
- <xs:sequence>
37
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
38
- </xs:sequence>
39
- </xs:complexType>
40
- </xs:element>
21
+ <xs:element name="CLUSTERS" type="IDS"/>
41
22
  <xs:element name="TOTAL_MB" type="xs:integer"/>
42
23
  <xs:element name="FREE_MB" type="xs:integer"/>
43
24
  <xs:element name="USED_MB" type="xs:integer"/>
44
- <xs:element name="IMAGES">
45
- <xs:complexType>
46
- <xs:sequence>
47
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
48
- </xs:sequence>
49
- </xs:complexType>
50
- </xs:element>
25
+ <xs:element name="IMAGES" type="IDS"/>
51
26
  <xs:element name="TEMPLATE" type="xs:anyType"/>
52
27
  </xs:sequence>
53
28
  </xs:complexType>
data/share/schemas/xsd/document.xsd CHANGED
@@ -1,5 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
3
+ <xs:include schemaLocation="shared.xsd"/>
3
4
  <xs:element name="DOCUMENT">
4
5
  <xs:complexType>
5
6
  <xs:sequence>
@@ -10,31 +11,8 @@
10
11
  <xs:element name="GNAME" type="xs:string"/>
11
12
  <xs:element name="NAME" type="xs:string"/>
12
13
  <xs:element name="TYPE" type="xs:string"/>
13
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
14
- <xs:complexType>
15
- <xs:sequence>
16
- <xs:element name="OWNER_U" type="xs:integer"/>
17
- <xs:element name="OWNER_M" type="xs:integer"/>
18
- <xs:element name="OWNER_A" type="xs:integer"/>
19
- <xs:element name="GROUP_U" type="xs:integer"/>
20
- <xs:element name="GROUP_M" type="xs:integer"/>
21
- <xs:element name="GROUP_A" type="xs:integer"/>
22
- <xs:element name="OTHER_U" type="xs:integer"/>
23
- <xs:element name="OTHER_M" type="xs:integer"/>
24
- <xs:element name="OTHER_A" type="xs:integer"/>
25
- </xs:sequence>
26
- </xs:complexType>
27
- </xs:element>
28
- <xs:element name="LOCK" minOccurs="0" maxOccurs="1">
29
- <xs:complexType>
30
- <xs:sequence>
31
- <xs:element name="LOCKED" type="xs:integer"/>
32
- <xs:element name="OWNER" type="xs:integer"/>
33
- <xs:element name="TIME" type="xs:integer"/>
34
- <xs:element name="REQ_ID" type="xs:integer"/>
35
- </xs:sequence>
36
- </xs:complexType>
37
- </xs:element>
14
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
15
+ <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
38
16
  <xs:element name="TEMPLATE" type="xs:anyType"/>
39
17
  </xs:sequence>
40
18
  </xs:complexType>
data/share/schemas/xsd/group.xsd CHANGED
@@ -8,24 +8,28 @@
8
8
  <xs:element name="ID" type="xs:integer"/>
9
9
  <xs:element name="NAME" type="xs:string"/>
10
10
  <xs:element name="TEMPLATE" type="xs:anyType"/>
11
- <xs:element name="USERS">
12
- <xs:complexType>
13
- <xs:sequence>
14
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
15
- </xs:sequence>
16
- </xs:complexType>
17
- </xs:element>
18
- <xs:element name="ADMINS">
11
+ <xs:element name="USERS" type="IDS"/>
12
+ <xs:element name="ADMINS" type="IDS"/>
13
+ <xs:element name="DATASTORE_QUOTA" type="DATASTORE_QUOTA" minOccurs="0"/>
14
+ <xs:element name="NETWORK_QUOTA" type="NETWORK_QUOTA" minOccurs="0"/>
15
+ <xs:element name="VM_QUOTA" type="VM_QUOTA" minOccurs="0"/>
16
+ <xs:element name="IMAGE_QUOTA" type="IMAGE_QUOTA" minOccurs="0"/>
17
+ <xs:element name="VLAN_RULES">
19
18
  <xs:complexType>
20
19
  <xs:sequence>
21
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
20
+ <xs:element name="ID" type="xs:integer"/>
21
+ <xs:element name="RULE" minOccurs="0" maxOccurs="unbounded">
22
+ <xs:complexType>
23
+ <xs:sequence>
24
+ <xs:element name="ID" type="xs:string"/>
25
+ <xs:element name="SCOPE" type="xs:string"/>
26
+ <xs:element name="VNTEMPLATE" type="xs:string"/>
27
+ </xs:sequence>
28
+ </xs:complexType>
29
+ </xs:element>
22
30
  </xs:sequence>
23
31
  </xs:complexType>
24
32
  </xs:element>
25
- <xs:element name="DATASTORE_QUOTA" type="DATASTORE_QUOTA" minOccurs="0"/>
26
- <xs:element name="NETWORK_QUOTA" type="NETWORK_QUOTA" minOccurs="0"/>
27
- <xs:element name="VM_QUOTA" type="VM_QUOTA" minOccurs="0"/>
28
- <xs:element name="IMAGE_QUOTA" type="IMAGE_QUOTA" minOccurs="0"/>
29
33
  <xs:element name="DEFAULT_GROUP_QUOTAS">
30
34
  <xs:complexType>
31
35
  <xs:sequence>
data/share/schemas/xsd/group_pool.xsd CHANGED
@@ -12,20 +12,8 @@
12
12
  <xs:element name="ID" type="xs:integer"/>
13
13
  <xs:element name="NAME" type="xs:string"/>
14
14
  <xs:element name="TEMPLATE" type="xs:anyType"/>
15
- <xs:element name="USERS">
16
- <xs:complexType>
17
- <xs:sequence>
18
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
19
- </xs:sequence>
20
- </xs:complexType>
21
- </xs:element>
22
- <xs:element name="ADMINS">
23
- <xs:complexType>
24
- <xs:sequence>
25
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
26
- </xs:sequence>
27
- </xs:complexType>
28
- </xs:element>
15
+ <xs:element name="USERS" type="IDS"/>
16
+ <xs:element name="ADMINS" type="IDS"/>
29
17
  </xs:sequence>
30
18
  </xs:complexType>
31
19
  </xs:element>
@@ -40,6 +28,22 @@
40
28
  </xs:sequence>
41
29
  </xs:complexType>
42
30
  </xs:element>
31
+ <xs:element name="VLAN_RULES">
32
+ <xs:complexType>
33
+ <xs:sequence>
34
+ <xs:element name="ID" type="xs:integer"/>
35
+ <xs:element name="RULE" minOccurs="0" maxOccurs="unbounded">
36
+ <xs:complexType>
37
+ <xs:sequence>
38
+ <xs:element name="ID" type="xs:string"/>
39
+ <xs:element name="SCOPE" type="xs:string"/>
40
+ <xs:element name="VNTEMPLATE" type="xs:string"/>
41
+ </xs:sequence>
42
+ </xs:complexType>
43
+ </xs:element>
44
+ </xs:sequence>
45
+ </xs:complexType>
46
+ </xs:element>
43
47
  </xs:choice>
44
48
  <xs:element name="DEFAULT_GROUP_QUOTAS" minOccurs="1" maxOccurs="1">
45
49
  <xs:complexType>
data/share/schemas/xsd/hook.xsd CHANGED
@@ -1,11 +1,13 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
3
+ <xs:include schemaLocation="shared.xsd"/>
3
4
  <xs:element name="HOOK">
4
5
  <xs:complexType>
5
6
  <xs:sequence>
6
7
  <xs:element name="ID" type="xs:integer"/>
7
8
  <xs:element name="NAME" type="xs:string"/>
8
9
  <xs:element name="TYPE" type="xs:string"/>
10
+ <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
9
11
  <xs:element name="TEMPLATE">
10
12
  <xs:complexType>
11
13
  <xs:sequence>
data/share/schemas/xsd/host.xsd CHANGED
@@ -1,5 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
3
+ <xs:include schemaLocation="shared.xsd"/>
3
4
  <xs:element name="HOST">
4
5
  <xs:complexType>
5
6
  <xs:sequence>
@@ -77,10 +78,13 @@
77
78
  <xs:element name="DEVICE_NAME" type="xs:string"/>
78
79
  <xs:element name="DOMAIN" type="xs:string"/>
79
80
  <xs:element name="FUNCTION" type="xs:string"/>
81
+ <xs:element name="IFNAME" type="xs:string"/>
80
82
  <xs:element name="NUMA_NODE" type="xs:string"/>
81
83
  <xs:element name="PROFILES" type="xs:string" minOccurs="0"/>
82
84
  <xs:element name="SHORT_ADDRESS" type="xs:string"/>
83
85
  <xs:element name="SLOT" type="xs:string"/>
86
+ <xs:element name="SRIOV" type="xs:string"/>
87
+ <xs:element name="SRIOV_NUM" type="xs:string" minOccurs="0"/>
84
88
  <xs:element name="TYPE" type="xs:string"/>
85
89
  <xs:element name="UUID" type="xs:string" minOccurs="0"/>
86
90
  <xs:element name="VENDOR" type="xs:string"/>
@@ -136,13 +140,7 @@
136
140
  </xs:sequence>
137
141
  </xs:complexType>
138
142
  </xs:element>
139
- <xs:element name="VMS">
140
- <xs:complexType>
141
- <xs:sequence>
142
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
143
- </xs:sequence>
144
- </xs:complexType>
145
- </xs:element>
143
+ <xs:element name="VMS" type="IDS"/>
146
144
  <xs:element name="TEMPLATE" type="xs:anyType"/>
147
145
  <xs:element name="MONITORING">
148
146
  <xs:complexType>
data/share/schemas/xsd/image.xsd CHANGED
@@ -10,31 +10,8 @@
10
10
  <xs:element name="UNAME" type="xs:string"/>
11
11
  <xs:element name="GNAME" type="xs:string"/>
12
12
  <xs:element name="NAME" type="xs:string"/>
13
- <xs:element name="LOCK" minOccurs="0" maxOccurs="1">
14
- <xs:complexType>
15
- <xs:sequence>
16
- <xs:element name="LOCKED" type="xs:integer"/>
17
- <xs:element name="OWNER" type="xs:integer"/>
18
- <xs:element name="TIME" type="xs:integer"/>
19
- <xs:element name="REQ_ID" type="xs:integer"/>
20
- </xs:sequence>
21
- </xs:complexType>
22
- </xs:element>
23
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
24
- <xs:complexType>
25
- <xs:sequence>
26
- <xs:element name="OWNER_U" type="xs:integer"/>
27
- <xs:element name="OWNER_M" type="xs:integer"/>
28
- <xs:element name="OWNER_A" type="xs:integer"/>
29
- <xs:element name="GROUP_U" type="xs:integer"/>
30
- <xs:element name="GROUP_M" type="xs:integer"/>
31
- <xs:element name="GROUP_A" type="xs:integer"/>
32
- <xs:element name="OTHER_U" type="xs:integer"/>
33
- <xs:element name="OTHER_M" type="xs:integer"/>
34
- <xs:element name="OTHER_A" type="xs:integer"/>
35
- </xs:sequence>
36
- </xs:complexType>
37
- </xs:element>
13
+ <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
14
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
38
15
  <xs:element name="TYPE" type="xs:integer"/>
39
16
  <xs:element name="DISK_TYPE" type="xs:integer"/>
40
17
  <xs:element name="PERSISTENT" type="xs:integer"/>
data/share/schemas/xsd/marketplace.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="MARKETPLACE">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
@@ -16,28 +17,8 @@
16
17
  <xs:element name="TOTAL_MB" type="xs:integer"/>
17
18
  <xs:element name="FREE_MB" type="xs:integer"/>
18
19
  <xs:element name="USED_MB" type="xs:integer"/>
19
- <xs:element name="MARKETPLACEAPPS">
20
- <xs:complexType>
21
- <xs:sequence>
22
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
23
- </xs:sequence>
24
- </xs:complexType>
25
- </xs:element>
26
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
27
- <xs:complexType>
28
- <xs:sequence>
29
- <xs:element name="OWNER_U" type="xs:integer"/>
30
- <xs:element name="OWNER_M" type="xs:integer"/>
31
- <xs:element name="OWNER_A" type="xs:integer"/>
32
- <xs:element name="GROUP_U" type="xs:integer"/>
33
- <xs:element name="GROUP_M" type="xs:integer"/>
34
- <xs:element name="GROUP_A" type="xs:integer"/>
35
- <xs:element name="OTHER_U" type="xs:integer"/>
36
- <xs:element name="OTHER_M" type="xs:integer"/>
37
- <xs:element name="OTHER_A" type="xs:integer"/>
38
- </xs:sequence>
39
- </xs:complexType>
40
- </xs:element>
20
+ <xs:element name="MARKETPLACEAPPS" type="IDS"/>
21
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
41
22
  <xs:element name="TEMPLATE" type="xs:anyType"/>
42
23
  </xs:sequence>
43
24
  </xs:complexType>
data/share/schemas/xsd/marketplaceapp.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="MARKETPLACEAPP">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
@@ -9,16 +10,7 @@
9
10
  <xs:element name="GID" type="xs:integer"/>
10
11
  <xs:element name="UNAME" type="xs:string"/>
11
12
  <xs:element name="GNAME" type="xs:string"/>
12
- <xs:element name="LOCK" minOccurs="0" maxOccurs="1">
13
- <xs:complexType>
14
- <xs:sequence>
15
- <xs:element name="LOCKED" type="xs:integer"/>
16
- <xs:element name="OWNER" type="xs:integer"/>
17
- <xs:element name="TIME" type="xs:integer"/>
18
- <xs:element name="REQ_ID" type="xs:integer"/>
19
- </xs:sequence>
20
- </xs:complexType>
21
- </xs:element>
13
+ <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
22
14
  <xs:element name="REGTIME" type="xs:integer"/>
23
15
  <xs:element name="NAME" type="xs:string"/>
24
16
  <xs:element name="ZONE_ID" type="xs:string"/>
@@ -34,21 +26,7 @@
34
26
  <xs:element name="MARKETPLACE" type="xs:string"/>
35
27
  <xs:element name="STATE" type="xs:integer"/>
36
28
  <xs:element name="TYPE" type="xs:integer"/>
37
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
38
- <xs:complexType>
39
- <xs:sequence>
40
- <xs:element name="OWNER_U" type="xs:integer"/>
41
- <xs:element name="OWNER_M" type="xs:integer"/>
42
- <xs:element name="OWNER_A" type="xs:integer"/>
43
- <xs:element name="GROUP_U" type="xs:integer"/>
44
- <xs:element name="GROUP_M" type="xs:integer"/>
45
- <xs:element name="GROUP_A" type="xs:integer"/>
46
- <xs:element name="OTHER_U" type="xs:integer"/>
47
- <xs:element name="OTHER_M" type="xs:integer"/>
48
- <xs:element name="OTHER_A" type="xs:integer"/>
49
- </xs:sequence>
50
- </xs:complexType>
51
- </xs:element>
29
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
52
30
  <xs:element name="TEMPLATE" type="xs:anyType"/>
53
31
  </xs:sequence>
54
32
  </xs:complexType>
data/share/schemas/xsd/opennebula_configuration.xsd CHANGED
@@ -222,6 +222,8 @@
222
222
  </xs:element>
223
223
 
224
224
  <xs:element name="LOG_CALL_FORMAT" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
225
+ <xs:element name="LOG_RESULT_LENGTH" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
226
+ <xs:element name="MAC_GLOBAL_SPACE" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
225
227
  <xs:element name="MAC_PREFIX" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
226
228
  <xs:element name="MANAGER_TIMER" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
227
229
 
data/share/schemas/xsd/requirements.xsd CHANGED
@@ -8,34 +8,16 @@
8
8
  <xs:complexType>
9
9
  <xs:sequence>
10
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>
11
+ <xs:element name="HOSTS" type="IDS"/>
18
12
  <xs:element name="NIC" minOccurs="0" maxOccurs="unbounded">
19
13
  <xs:complexType>
20
14
  <xs:sequence>
21
15
  <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"/>
16
+ <xs:element name="VNETS" type="IDS"/>
36
17
  </xs:sequence>
37
18
  </xs:complexType>
38
19
  </xs:element>
20
+ <xs:element name="DATASTORES" type="IDS"/>
39
21
  </xs:sequence>
40
22
  </xs:complexType>
41
23
  </xs:element>
data/share/schemas/xsd/security_group.xsd CHANGED
@@ -1,5 +1,6 @@
1
1
  <?xml version="1.0" encoding="UTF-8"?>
2
2
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
3
+ <xs:include schemaLocation="shared.xsd"/>
3
4
  <xs:element name="SECURITY_GROUP">
4
5
  <xs:complexType>
5
6
  <xs:sequence>
@@ -9,49 +10,11 @@
9
10
  <xs:element name="UNAME" type="xs:string"/>
10
11
  <xs:element name="GNAME" type="xs:string"/>
11
12
  <xs:element name="NAME" type="xs:string"/>
12
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
13
- <xs:complexType>
14
- <xs:sequence>
15
- <xs:element name="OWNER_U" type="xs:integer"/>
16
- <xs:element name="OWNER_M" type="xs:integer"/>
17
- <xs:element name="OWNER_A" type="xs:integer"/>
18
- <xs:element name="GROUP_U" type="xs:integer"/>
19
- <xs:element name="GROUP_M" type="xs:integer"/>
20
- <xs:element name="GROUP_A" type="xs:integer"/>
21
- <xs:element name="OTHER_U" type="xs:integer"/>
22
- <xs:element name="OTHER_M" type="xs:integer"/>
23
- <xs:element name="OTHER_A" type="xs:integer"/>
24
- </xs:sequence>
25
- </xs:complexType>
26
- </xs:element>
27
- <xs:element name="UPDATED_VMS">
28
- <xs:complexType>
29
- <xs:sequence>
30
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
31
- </xs:sequence>
32
- </xs:complexType>
33
- </xs:element>
34
- <xs:element name="OUTDATED_VMS">
35
- <xs:complexType>
36
- <xs:sequence>
37
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
38
- </xs:sequence>
39
- </xs:complexType>
40
- </xs:element>
41
- <xs:element name="UPDATING_VMS">
42
- <xs:complexType>
43
- <xs:sequence>
44
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
45
- </xs:sequence>
46
- </xs:complexType>
47
- </xs:element>
48
- <xs:element name="ERROR_VMS">
49
- <xs:complexType>
50
- <xs:sequence>
51
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
52
- </xs:sequence>
53
- </xs:complexType>
54
- </xs:element>
13
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
14
+ <xs:element name="UPDATED_VMS" type="IDS"/>
15
+ <xs:element name="OUTDATED_VMS" type="IDS"/>
16
+ <xs:element name="UPDATING_VMS" type="IDS"/>
17
+ <xs:element name="ERROR_VMS" type="IDS"/>
55
18
  <xs:element name="TEMPLATE">
56
19
  <xs:complexType>
57
20
  <xs:sequence>
data/share/schemas/xsd/shared.xsd CHANGED
@@ -4,9 +4,9 @@
4
4
  <xs:complexType name="LOCK">
5
5
  <xs:sequence>
6
6
  <xs:element name="LOCKED" type="xs:integer"/>
7
- <xs:element name="OWNER" type="xs:integer"/>
8
- <xs:element name="TIME" type="xs:integer"/>
9
- <xs:element name="REQ_ID" type="xs:integer"/>
7
+ <xs:element name="OWNER" type="xs:integer" minOccurs="0" maxOccurs="1"/>
8
+ <xs:element name="TIME" type="xs:integer" minOccurs="0" maxOccurs="1"/>
9
+ <xs:element name="REQ_ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
10
10
  </xs:sequence>
11
11
  </xs:complexType>
12
12
  <xs:complexType name="PERMISSIONS">
data/share/schemas/xsd/vdc.xsd CHANGED
@@ -1,18 +1,13 @@
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="VDC">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
7
8
  <xs:element name="ID" type="xs:integer"/>
8
9
  <xs:element name="NAME" type="xs:string"/>
9
- <xs:element name="GROUPS">
10
- <xs:complexType>
11
- <xs:sequence>
12
- <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
13
- </xs:sequence>
14
- </xs:complexType>
15
- </xs:element>
10
+ <xs:element name="GROUPS" type="IDS"/>
16
11
  <xs:element name="CLUSTERS">
17
12
  <xs:complexType>
18
13
  <xs:sequence>
data/share/schemas/xsd/vm.xsd CHANGED
@@ -317,9 +317,11 @@
317
317
  <xs:sequence>
318
318
  <xs:element name="BACKUP_JOB_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
319
319
  <xs:element name="BACKUP_VOLATILE" type="xs:string" minOccurs="0" maxOccurs="1"/>
320
+ <xs:element name="DISK_IDS" type="xs:string" minOccurs="0" maxOccurs="1"/>
320
321
  <xs:element name="FS_FREEZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
321
322
  <xs:element name="INCREMENTAL_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
322
323
  <xs:element name="INCREMENT_MODE" type="xs:string" minOccurs="0" maxOccurs="1"/>
324
+ <xs:element name="INTERACTIVE" type="xs:string" minOccurs="0" maxOccurs="1"/>
323
325
  <xs:element name="KEEP_LAST" type="xs:string" minOccurs="0" maxOccurs="1"/>
324
326
  <xs:element name="LAST_BACKUP_ID" type="xs:string" minOccurs="0" maxOccurs="1"/>
325
327
  <xs:element name="LAST_BACKUP_SIZE" type="xs:string" minOccurs="0" maxOccurs="1"/>
data/share/schemas/xsd/vm_group.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="VM_GROUP">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
@@ -10,31 +11,8 @@
10
11
  <xs:element name="UNAME" type="xs:string"/>
11
12
  <xs:element name="GNAME" type="xs:string"/>
12
13
  <xs:element name="NAME" type="xs:string"/>
13
- <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
14
- <xs:complexType>
15
- <xs:sequence>
16
- <xs:element name="OWNER_U" type="xs:integer"/>
17
- <xs:element name="OWNER_M" type="xs:integer"/>
18
- <xs:element name="OWNER_A" type="xs:integer"/>
19
- <xs:element name="GROUP_U" type="xs:integer"/>
20
- <xs:element name="GROUP_M" type="xs:integer"/>
21
- <xs:element name="GROUP_A" type="xs:integer"/>
22
- <xs:element name="OTHER_U" type="xs:integer"/>
23
- <xs:element name="OTHER_M" type="xs:integer"/>
24
- <xs:element name="OTHER_A" type="xs:integer"/>
25
- </xs:sequence>
26
- </xs:complexType>
27
- </xs:element>
28
- <xs:element name="LOCK" minOccurs="0" maxOccurs="1">
29
- <xs:complexType>
30
- <xs:sequence>
31
- <xs:element name="LOCKED" type="xs:integer"/>
32
- <xs:element name="OWNER" type="xs:integer"/>
33
- <xs:element name="TIME" type="xs:integer"/>
34
- <xs:element name="REQ_ID" type="xs:integer"/>
35
- </xs:sequence>
36
- </xs:complexType>
37
- </xs:element>
14
+ <xs:element name="PERMISSIONS" type="PERMISSIONS"/>
15
+ <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
38
16
  <xs:element name="ROLES" minOccurs="1" maxOccurs="1">
39
17
  <xs:complexType>
40
18
  <xs:sequence>
data/share/schemas/xsd/vm_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" targetNamespace="http://opennebula.org/XMLSchema"
3
3
  xmlns="http://opennebula.org/XMLSchema">
4
+ <xs:include schemaLocation="shared.xsd"/>
4
5
  <xs:element name="VM_POOL">
5
6
  <xs:complexType>
6
7
  <xs:sequence>
@@ -20,6 +21,7 @@
20
21
  <xs:element name="STIME" type="xs:integer"/>
21
22
  <xs:element name="ETIME" type="xs:integer"/>
22
23
  <xs:element name="DEPLOY_ID" type="xs:string"/>
24
+ <xs:element name="LOCK" type="LOCK" minOccurs="0" maxOccurs="1"/>
23
25
  <xs:element name="TEMPLATE">
24
26
  <xs:complexType>
25
27
  <xs:sequence>