opennebula-cli 6.0.0.1 → 6.0.0.2

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 (33) hide show
  1. checksums.yaml +4 -4
  2. data/bin/oneacct +13 -2
  3. data/bin/oneacl +13 -2
  4. data/bin/onecluster +13 -2
  5. data/bin/onedatastore +13 -2
  6. data/bin/oneflow +13 -2
  7. data/bin/oneflow-template +13 -2
  8. data/bin/onegroup +13 -2
  9. data/bin/onehook +17 -6
  10. data/bin/onehost +13 -2
  11. data/bin/oneimage +17 -6
  12. data/bin/onemarket +13 -2
  13. data/bin/onemarketapp +21 -10
  14. data/bin/onesecgroup +13 -2
  15. data/bin/oneshowback +13 -2
  16. data/bin/onetemplate +28 -8
  17. data/bin/oneuser +13 -2
  18. data/bin/onevcenter +14 -3
  19. data/bin/onevdc +13 -2
  20. data/bin/onevm +180 -18
  21. data/bin/onevmgroup +17 -6
  22. data/bin/onevnet +17 -6
  23. data/bin/onevntemplate +17 -6
  24. data/bin/onevrouter +17 -6
  25. data/bin/onezone +14 -3
  26. data/lib/one_helper.rb +2 -2
  27. data/lib/one_helper/onecluster_helper.rb +75 -42
  28. data/lib/one_helper/onevm_helper.rb +20 -0
  29. data/lib/one_helper/onevnet_helper.rb +173 -151
  30. data/lib/one_helper/onezone_helper.rb +12 -4
  31. data/share/schemas/xsd/opennebula_configuration.xsd +1 -0
  32. data/share/schemas/xsd/vnet.xsd +2 -0
  33. metadata +6 -6
data/lib/one_helper/onezone_helper.rb CHANGED
@@ -77,6 +77,12 @@ class Replicator
77
77
  @l_config_elements = { :raw => @l_config }
78
78
  @l_fed_elements = { :raw => @l_config }
79
79
 
80
+ if OpenNebula.is_error?(@l_config)
81
+ STDERR.puts 'Unable to read OpenNebula configuration. ' \
82
+ 'Is OpenNebula running?'
83
+ exit(-1)
84
+ end
85
+
80
86
  fetch_db_config(@l_config_elements)
81
87
  fetch_fed_config(@l_fed_elements)
82
88
 
@@ -129,7 +135,7 @@ class Replicator
129
135
  def fetch_db_config(configs)
130
136
  configs.store(:backend, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/BACKEND'])
131
137
 
132
- if configs[:backend] == 'mysql'
138
+ if configs[:backend] == 'mysql' || configs[:backend] == 'postgresql'
133
139
  configs.store(:server, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/SERVER'])
134
140
  configs.store(:user, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/USER'])
135
141
  configs.store(:password, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PASSWD'])
@@ -137,7 +143,7 @@ class Replicator
137
143
  configs.store(:port, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PORT'])
138
144
  configs[:port] = '3306' if configs[:port] == '0'
139
145
  else
140
- STDERR.puts 'No mysql backend configuration found'
146
+ STDERR.puts 'No mysql or postgresql backend configuration found'
141
147
  exit(-1)
142
148
  end
143
149
  end
@@ -305,7 +311,8 @@ class Replicator
305
311
  'this could take a while'
306
312
 
307
313
  ssh(
308
- "onedb backup -f -u #{@r_config_elements[:user]} " \
314
+ "onedb backup -f -t #{@r_config_elements[:backend]} " \
315
+ "-u #{@r_config_elements[:user]} " \
309
316
  "-p #{@r_config_elements[:password]} " \
310
317
  "-d #{@r_config_elements[:dbname]} " \
311
318
  "-P #{@r_config_elements[:port]} /tmp/one_db_dump.sql"
@@ -320,7 +327,8 @@ class Replicator
320
327
  puts 'Restoring database'
321
328
 
322
329
  run_command(
323
- "onedb restore -f -u #{@l_config_elements[:user]} " \
330
+ "onedb restore -f -t #{@l_config_elements[:backend]}" \
331
+ "-u #{@l_config_elements[:user]} " \
324
332
  "-p #{@l_config_elements[:password]} " \
325
333
  "-d #{@l_config_elements[:dbname]} " \
326
334
  "-P #{@l_config_elements[:port]} " \
data/share/schemas/xsd/opennebula_configuration.xsd CHANGED
@@ -270,6 +270,7 @@
270
270
  <xs:element name="RPC_LOG" type="xs:string" minOccurs="0" maxOccurs="1"/>
271
271
  <xs:element name="SCRIPTS_REMOTE_DIR" type="xs:string" minOccurs="0" maxOccurs="1"/>
272
272
  <xs:element name="SESSION_EXPIRATION_TIME" type="xs:integer" minOccurs="0" maxOccurs="1"/>
273
+ <xs:element name="SHOWBACK_ONLY_RUNNING" type="xs:string" minOccurs="0" maxOccurs="1"/>
273
274
  <xs:element name="TIMEOUT" type="xs:integer" minOccurs="0" maxOccurs="1"/>
274
275
 
275
276
  <xs:element name="TM_MAD" minOccurs="0" maxOccurs="unbounded">
data/share/schemas/xsd/vnet.xsd CHANGED
@@ -103,6 +103,8 @@
103
103
  <xs:element name="IP6_GLOBAL_END" type="xs:string" minOccurs="0"/>
104
104
  <xs:element name="IP6" type="xs:string" minOccurs="0"/>
105
105
  <xs:element name="IP6_END" type="xs:string" minOccurs="0"/>
106
+ <xs:element name="PORT_START" type="xs:string" minOccurs="0"/>
107
+ <xs:element name="PORT_SIZE" type="xs:string" minOccurs="0"/>
106
108
  <xs:element name="USED_LEASES" type="xs:string"/>
107
109
  <xs:element name="LEASES" minOccurs="0" maxOccurs="1">
108
110
  <xs:complexType>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opennebula-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.0.1
4
+ version: 6.0.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-28 00:00:00.000000000 Z
11
+ date: 2021-05-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opennebula
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 6.0.0.1
19
+ version: 6.0.0.2
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 6.0.0.1
26
+ version: 6.0.0.2
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,6 @@ executables:
45
45
  - oneacl
46
46
  - onecluster
47
47
  - onedatastore
48
- - oneflow
49
48
  - oneflow-template
50
49
  - onegroup
51
50
  - onehook
@@ -64,6 +63,7 @@ executables:
64
63
  - onevnet
65
64
  - onevntemplate
66
65
  - onevrouter
66
+ - oneflow
67
67
  - onezone
68
68
  extensions: []
69
69
  extra_rdoc_files: []
@@ -121,7 +121,6 @@ files:
121
121
  - bin/oneacl
122
122
  - bin/onecluster
123
123
  - bin/onedatastore
124
- - bin/oneflow
125
124
  - bin/oneflow-template
126
125
  - bin/onegroup
127
126
  - bin/onehook
@@ -140,6 +139,7 @@ files:
140
139
  - bin/onevnet
141
140
  - bin/onevntemplate
142
141
  - bin/onevrouter
142
+ - bin/oneflow
143
143
  - bin/onezone
144
144
  - lib/cli_helper.rb
145
145
  - lib/command_parser.rb