opennebula-cli 6.1.80.pre → 6.2.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +5 -5
  2. data/bin/oneflow +26 -4
  3. data/lib/one_helper/oneacct_helper.rb +5 -1
  4. data/lib/one_helper.rb +3 -4
  5. data/share/schemas/xsd/showback.xsd +1 -0
  6. metadata +80 -81
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 2306988d8afeaa179ef65f89fbb07a27746a370b
4
- data.tar.gz: 443a4f8d1aa6fcbfb886c14c2fe3228e3d67bff8
2
+ SHA256:
3
+ metadata.gz: 141995f0d5690d745039fb070496bee9956d502c67b39c8205d370b16ebc1ebe
4
+ data.tar.gz: '09d0857e45d857ca02cc1b2a5f546dfe05d8193e036dc2c6be91c8d5c1871bc0'
5
5
  SHA512:
6
- metadata.gz: c1df610ba16fd464d6429e9ebf26fcecb1872319ff6795cca452917c6258df631b688f59fb8cd416143da7cf40e16c4bdbd73db052f4c2faa9b4da4b011fb920
7
- data.tar.gz: 8bfc858b932ec71fdc86e6bef789957d55401190bc780f90c1630b6808651cbdd2a02dc970bf79f2bf17d406422268804ff1954be9ae46a0087bb88d28fc518d
6
+ metadata.gz: 182270525eadaf021db1b34e8e56a3f686f4a04f8fb5e329ac3c479ce7f881e32f50af8f702e2b650d46dd454bd58a8cbd1a7d9128d4264e44d4ac88a965b4d8
7
+ data.tar.gz: 1c478c45cf1c3f29069ef6d5511d0d436b967e3a15f2e98ba1aae95ac61b17fbf4192589321d956511b20c5b1f73538c35229aefb1109074b223da441b5e5980
data/bin/oneflow CHANGED
@@ -82,6 +82,12 @@ CommandParser::CmdParser.new(ARGV) do
82
82
  :description => 'Force flow necover delete'
83
83
  }
84
84
 
85
+ APPEND = {
86
+ :name => 'append',
87
+ :large => '--append',
88
+ :description => 'Append template to the current one'
89
+ }
90
+
85
91
  FORMAT = [OpenNebulaHelper::JSON, OpenNebulaHelper::YAML]
86
92
 
87
93
  # create helper object
@@ -364,7 +370,11 @@ CommandParser::CmdParser.new(ARGV) do
364
370
  be launched to modify the current content.
365
371
  EOT
366
372
 
367
- command :update, update_desc, :service_id, [:file, nil] do
373
+ command :update,
374
+ update_desc,
375
+ :service_id,
376
+ [:file, nil],
377
+ :options => APPEND do
368
378
  service_id = args[0]
369
379
  client = helper.client(options)
370
380
 
@@ -382,8 +392,10 @@ CommandParser::CmdParser.new(ARGV) do
382
392
  tmp = Tempfile.new(service_id.to_s)
383
393
  path = tmp.path
384
394
 
385
- tmp.write(JSON.pretty_generate(template))
386
- tmp.flush
395
+ unless options[:append]
396
+ tmp.write(JSON.pretty_generate(template))
397
+ tmp.flush
398
+ end
387
399
 
388
400
  if ENV['EDITOR']
389
401
  editor_path = ENV['EDITOR']
@@ -402,7 +414,17 @@ CommandParser::CmdParser.new(ARGV) do
402
414
  end
403
415
  end
404
416
 
405
- response = client.put("#{RESOURCE_PATH}/#{service_id}", File.read(path))
417
+ if options[:append]
418
+ req = {}
419
+ req['append'] = true
420
+ req['template'] = File.read(path)
421
+
422
+ response = client.put("#{RESOURCE_PATH}/#{service_id}",
423
+ req.to_json)
424
+ else
425
+ response = client.put("#{RESOURCE_PATH}/#{service_id}",
426
+ File.read(path))
427
+ end
406
428
 
407
429
  if CloudClient.is_error?(response)
408
430
  [response.code.to_i, response.to_s]
data/lib/one_helper/oneacct_helper.rb CHANGED
@@ -216,11 +216,15 @@ class AcctHelper < OpenNebulaHelper::OneHelper
216
216
  d["HOURS"]
217
217
  end
218
218
 
219
+ column :RUNNING_HOURS, "Running hours", :size=>7 do |d|
220
+ d["RHOURS"] || '-'
221
+ end
222
+
219
223
  column :COST, "Cost", :size=>15 do |d|
220
224
  d["TOTAL_COST"]
221
225
  end
222
226
 
223
- default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :COST
227
+ default :USER_NAME, :GROUP_NAME, :VM_ID, :VM_NAME, :MONTH, :YEAR, :HOURS, :RUNNING_HOURS, :COST
224
228
  end
225
229
 
226
230
  def self.print_start_end_time_header(start_time, end_time)
data/lib/one_helper.rb CHANGED
@@ -616,10 +616,9 @@ EOT
616
616
  page = ""
617
617
 
618
618
  if options[:xml]
619
- pool.each {|e|
620
- elements += 1
621
- page << e.to_xml(true) << "\n"
622
- }
619
+ elements += 1
620
+
621
+ page << pool.to_xml(true)
623
622
  else
624
623
  pname = pool.pool_name
625
624
  ename = pool.element_name
data/share/schemas/xsd/showback.xsd CHANGED
@@ -20,6 +20,7 @@
20
20
  <xs:element name="DISK_COST" type="xs:float"/>
21
21
  <xs:element name="TOTAL_COST" type="xs:float"/>
22
22
  <xs:element name="HOURS" type="xs:float"/>
23
+ <xs:element name="RHOURS" type="xs:float" minOccurs="0" maxOccurs="1"/>
23
24
  </xs:sequence>
24
25
  </xs:complexType>
25
26
  </xs:element>
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.1.80.pre
4
+ version: 6.2.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - OpenNebula
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-10-05 00:00:00.000000000 Z
11
+ date: 2022-05-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: opennebula
@@ -16,107 +16,60 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 6.1.80.pre
19
+ version: 6.2.0.1
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.1.80.pre
26
+ version: 6.2.0.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  description: Commands used to talk to OpenNebula
42
42
  email: contact@opennebula.io
43
43
  executables:
44
- - oneacct
45
- - oneacl
46
- - onecluster
47
- - onedatastore
48
- - oneflow
49
- - oneflow-template
44
+ - onezone
45
+ - onevcenter
46
+ - oneimage
47
+ - onevmgroup
48
+ - onehost
50
49
  - onegroup
51
50
  - onehook
52
- - onehost
53
- - oneimage
54
- - onemarket
55
- - onemarketapp
56
- - onesecgroup
51
+ - onevdc
52
+ - oneacl
53
+ - oneflow-template
54
+ - onevrouter
57
55
  - oneshowback
58
- - onetemplate
59
56
  - oneuser
60
- - onevcenter
61
- - onevdc
62
- - onevm
63
- - onevmgroup
64
- - onevnet
57
+ - oneacct
58
+ - onesecgroup
59
+ - onecluster
60
+ - onemarketapp
61
+ - onetemplate
62
+ - onemarket
65
63
  - onevntemplate
66
- - onevrouter
67
- - onezone
64
+ - onevnet
65
+ - oneflow
66
+ - onedatastore
67
+ - onevm
68
68
  extensions: []
69
69
  extra_rdoc_files: []
70
70
  files:
71
- - share/schemas/xsd/acct.xsd
72
- - share/schemas/xsd/acl_pool.xsd
73
- - share/schemas/xsd/api_info.xsd
74
- - share/schemas/xsd/cluster.xsd
75
- - share/schemas/xsd/cluster_pool.xsd
76
- - share/schemas/xsd/datastore.xsd
77
- - share/schemas/xsd/datastore_pool.xsd
78
- - share/schemas/xsd/document.xsd
79
- - share/schemas/xsd/document_pool.xsd
80
- - share/schemas/xsd/group.xsd
81
- - share/schemas/xsd/group_pool.xsd
82
- - share/schemas/xsd/hook.xsd
83
- - share/schemas/xsd/hook_message_api.xsd
84
- - share/schemas/xsd/hook_message_retry.xsd
85
- - share/schemas/xsd/hook_message_state.xsd
86
- - share/schemas/xsd/hook_pool.xsd
87
- - share/schemas/xsd/host.xsd
88
- - share/schemas/xsd/host_pool.xsd
89
- - share/schemas/xsd/image.xsd
90
- - share/schemas/xsd/image_pool.xsd
91
- - share/schemas/xsd/index.xsd
92
- - share/schemas/xsd/marketplace.xsd
93
- - share/schemas/xsd/marketplace_pool.xsd
94
- - share/schemas/xsd/marketplaceapp.xsd
95
- - share/schemas/xsd/marketplaceapp_pool.xsd
96
- - share/schemas/xsd/monitoring_data.xsd
97
- - share/schemas/xsd/opennebula_configuration.xsd
98
- - share/schemas/xsd/raftstatus.xsd
99
- - share/schemas/xsd/security_group.xsd
100
- - share/schemas/xsd/security_group_pool.xsd
101
- - share/schemas/xsd/showback.xsd
102
- - share/schemas/xsd/user.xsd
103
- - share/schemas/xsd/user_pool.xsd
104
- - share/schemas/xsd/vdc.xsd
105
- - share/schemas/xsd/vdc_pool.xsd
106
- - share/schemas/xsd/vm.xsd
107
- - share/schemas/xsd/vm_group.xsd
108
- - share/schemas/xsd/vm_group_pool.xsd
109
- - share/schemas/xsd/vm_pool.xsd
110
- - share/schemas/xsd/vmtemplate.xsd
111
- - share/schemas/xsd/vmtemplate_pool.xsd
112
- - share/schemas/xsd/vnet.xsd
113
- - share/schemas/xsd/vnet_pool.xsd
114
- - share/schemas/xsd/vntemplate.xsd
115
- - share/schemas/xsd/vntemplate_pool.xsd
116
- - share/schemas/xsd/vrouter.xsd
117
- - share/schemas/xsd/vrouter_pool.xsd
118
- - share/schemas/xsd/zone.xsd
119
- - share/schemas/xsd/zone_pool.xsd
71
+ - LICENSE
72
+ - NOTICE
120
73
  - bin/oneacct
121
74
  - bin/oneacl
122
75
  - bin/onecluster
@@ -168,8 +121,55 @@ files:
168
121
  - lib/one_helper/onevntemplate_helper.rb
169
122
  - lib/one_helper/onevrouter_helper.rb
170
123
  - lib/one_helper/onezone_helper.rb
171
- - NOTICE
172
- - LICENSE
124
+ - share/schemas/xsd/acct.xsd
125
+ - share/schemas/xsd/acl_pool.xsd
126
+ - share/schemas/xsd/api_info.xsd
127
+ - share/schemas/xsd/cluster.xsd
128
+ - share/schemas/xsd/cluster_pool.xsd
129
+ - share/schemas/xsd/datastore.xsd
130
+ - share/schemas/xsd/datastore_pool.xsd
131
+ - share/schemas/xsd/document.xsd
132
+ - share/schemas/xsd/document_pool.xsd
133
+ - share/schemas/xsd/group.xsd
134
+ - share/schemas/xsd/group_pool.xsd
135
+ - share/schemas/xsd/hook.xsd
136
+ - share/schemas/xsd/hook_message_api.xsd
137
+ - share/schemas/xsd/hook_message_retry.xsd
138
+ - share/schemas/xsd/hook_message_state.xsd
139
+ - share/schemas/xsd/hook_pool.xsd
140
+ - share/schemas/xsd/host.xsd
141
+ - share/schemas/xsd/host_pool.xsd
142
+ - share/schemas/xsd/image.xsd
143
+ - share/schemas/xsd/image_pool.xsd
144
+ - share/schemas/xsd/index.xsd
145
+ - share/schemas/xsd/marketplace.xsd
146
+ - share/schemas/xsd/marketplace_pool.xsd
147
+ - share/schemas/xsd/marketplaceapp.xsd
148
+ - share/schemas/xsd/marketplaceapp_pool.xsd
149
+ - share/schemas/xsd/monitoring_data.xsd
150
+ - share/schemas/xsd/opennebula_configuration.xsd
151
+ - share/schemas/xsd/raftstatus.xsd
152
+ - share/schemas/xsd/security_group.xsd
153
+ - share/schemas/xsd/security_group_pool.xsd
154
+ - share/schemas/xsd/showback.xsd
155
+ - share/schemas/xsd/user.xsd
156
+ - share/schemas/xsd/user_pool.xsd
157
+ - share/schemas/xsd/vdc.xsd
158
+ - share/schemas/xsd/vdc_pool.xsd
159
+ - share/schemas/xsd/vm.xsd
160
+ - share/schemas/xsd/vm_group.xsd
161
+ - share/schemas/xsd/vm_group_pool.xsd
162
+ - share/schemas/xsd/vm_pool.xsd
163
+ - share/schemas/xsd/vmtemplate.xsd
164
+ - share/schemas/xsd/vmtemplate_pool.xsd
165
+ - share/schemas/xsd/vnet.xsd
166
+ - share/schemas/xsd/vnet_pool.xsd
167
+ - share/schemas/xsd/vntemplate.xsd
168
+ - share/schemas/xsd/vntemplate_pool.xsd
169
+ - share/schemas/xsd/vrouter.xsd
170
+ - share/schemas/xsd/vrouter_pool.xsd
171
+ - share/schemas/xsd/zone.xsd
172
+ - share/schemas/xsd/zone_pool.xsd
173
173
  homepage: http://opennebula.io
174
174
  licenses:
175
175
  - Apache-2.0
@@ -180,17 +180,16 @@ require_paths:
180
180
  - lib
181
181
  required_ruby_version: !ruby/object:Gem::Requirement
182
182
  requirements:
183
- - - '>='
183
+ - - ">="
184
184
  - !ruby/object:Gem::Version
185
185
  version: '0'
186
186
  required_rubygems_version: !ruby/object:Gem::Requirement
187
187
  requirements:
188
- - - '>'
188
+ - - ">="
189
189
  - !ruby/object:Gem::Version
190
- version: 1.3.1
190
+ version: '0'
191
191
  requirements: []
192
- rubyforge_project:
193
- rubygems_version: 2.0.14.1
192
+ rubygems_version: 3.1.2
194
193
  signing_key:
195
194
  specification_version: 4
196
195
  summary: OpenNebula Command Line Interface