opennebula-cli 4.1.80.beta → 4.2.0

Sign up to get free protection for your applications and to get access to all the features.
data/NOTICE CHANGED
@@ -22,7 +22,7 @@ The following people have contributed to the development of the technology
22
22
  - Hector Sanjuan Redondo (hsanjuan@opennebula.org)
23
23
 
24
24
  The new features for service elasticity (oneFlow) introduced in OpenNebula 4.2
25
- were funded by Blackberry in the context of the Fund a Feature Program.
25
+ were funded by BlackBerry in the context of the Fund a Feature Program.
26
26
 
27
27
  OpenNebula Project also acknowledges the contributions of C12G Labs developers.
28
28
 
data/bin/oneflow CHANGED
@@ -254,17 +254,17 @@ def show_service(client, args, options)
254
254
  puts str % ["CARNIDALITY", role['cardinality']]
255
255
  puts str % ["MIN VMS", role['min_vms']] if role['min_vms']
256
256
  puts str % ["MAX VMS", role['max_vms']] if role['max_vms']
257
+ puts str % ["COOLDOWN", "#{role['cooldown']}s"] if role['cooldown']
257
258
  puts str % ["SHUTDOWN", role['shutdown_action']] if role['shutdown_action']
258
259
 
259
260
  puts "NODES INFORMATION"
260
261
  NODE_TABLE.show(role['nodes'])
261
262
 
262
- if !role['elasticity_policies'].nil? || !role['scheduled_policies'].nil?
263
+ if !role['elasticity_policies'].nil? && role['elasticity_policies'].size > 0 || !role['scheduled_policies'].nil? && role['scheduled_policies'].size > 0
263
264
  puts
264
265
  puts "ELASTICITY RULES"
265
- puts str % ["COOLDOWN", "#{role['cooldown']}s"] if role['cooldown']
266
266
 
267
- if role['elasticity_policies']
267
+ if role['elasticity_policies'] && role['elasticity_policies'].size > 0
268
268
  puts
269
269
  # puts "ELASTICITY POLICIES"
270
270
  CLIHelper::ShowTable.new(nil, self) do
@@ -280,12 +280,16 @@ def show_service(client, args, options)
280
280
  end
281
281
  end
282
282
 
283
- column :'EVALS', "", :left, :size=>5 do |d|
284
- "#{d['true_evals'].to_i} / #{d['period_number']}"
283
+ column :'EVALS', "", :right, :size=>5 do |d|
284
+ if d['period_number']
285
+ "#{d['true_evals'].to_i} / #{d['period_number']}"
286
+ else
287
+ "-"
288
+ end
285
289
  end
286
290
 
287
291
  column :PERIOD, "", :size=>6 do |d|
288
- "#{d['period']}s"
292
+ d['period'] ? "#{d['period']}s" : '-'
289
293
  end
290
294
 
291
295
  column :COOL, "", :size=>5 do |d|
@@ -296,7 +300,7 @@ def show_service(client, args, options)
296
300
  end.show([role['elasticity_policies']].flatten, {})
297
301
  end
298
302
 
299
- if role['scheduled_policies']
303
+ if role['scheduled_policies'] && role['scheduled_policies'].size > 0
300
304
  puts
301
305
  # puts "SCHEDULED POLICIES"
302
306
  CLIHelper::ShowTable.new(nil, self) do
@@ -109,7 +109,7 @@ class OneGroupHelper < OpenNebulaHelper::OneHelper
109
109
  limit = "0" if limit.nil? || limit == ""
110
110
  end
111
111
 
112
- "%3.1f / %3.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
112
+ "%3.1f / %3.1f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
113
113
  else
114
114
  "-"
115
115
  end
@@ -209,7 +209,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
209
209
  limit = "0" if limit.nil? || limit == ""
210
210
  end
211
211
 
212
- "%3.1f / %3.0f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
212
+ "%3.1f / %3.1f" % [d['VM_QUOTA']['VM']["CPU_USED"], limit]
213
213
  else
214
214
  "-"
215
215
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: opennebula-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.80.beta
5
- prerelease: 7
4
+ version: 4.2.0
5
+ prerelease:
6
6
  platform: ruby
7
7
  authors:
8
8
  - OpenNebula
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-16 00:00:00.000000000 Z
12
+ date: 2013-07-26 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: opennebula
@@ -18,7 +18,7 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 4.1.80.beta
21
+ version: 4.2.0
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 4.1.80.beta
29
+ version: 4.2.0
30
30
  description: Commands used to talk to OpenNebula
31
31
  email: contact@opennebula.org
32
32
  executables:
@@ -91,9 +91,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
91
91
  required_rubygems_version: !ruby/object:Gem::Requirement
92
92
  none: false
93
93
  requirements:
94
- - - ! '>'
94
+ - - ! '>='
95
95
  - !ruby/object:Gem::Version
96
- version: 1.3.1
96
+ version: '0'
97
97
  requirements: []
98
98
  rubyforge_project:
99
99
  rubygems_version: 1.8.25