opennebula-cli 5.8.4 → 5.8.5
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.
- checksums.yaml +4 -4
- data/bin/oneflow-template +5 -5
- data/bin/oneimage +1 -1
- data/bin/onesecgroup +1 -1
- data/bin/onetemplate +1 -1
- data/bin/onevmgroup +1 -1
- data/bin/onevntemplate +1 -1
- data/bin/onevrouter +1 -1
- data/lib/one_helper.rb +16 -3
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 253bc8ebcbcfdc1139f455981da95a8043d44328
|
4
|
+
data.tar.gz: b36d99d50d8a70e5456321bd68f8724dee3b44d3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2d1cae7a51028b7a8e0647b44d9a2d8a2db8483f80085db1dc6edd7e31ab9a5863abd936db5add7eeac421caa709a0de717d1c97200f998a1144c96f40255c96
|
7
|
+
data.tar.gz: aae2915016a07cc0ffa13f9b9dfbeaab37154b62b893d72ee3299fc1d252524960b28feea5b59f02158a0e95d8d2c570d446776efbd605733d9614116500044a
|
data/bin/oneflow-template
CHANGED
@@ -91,10 +91,10 @@ def show_service_template(client, args, options)
|
|
91
91
|
"SERVICE TEMPLATE #{document_hash['DOCUMENT']['ID']} "\
|
92
92
|
'INFORMATION')
|
93
93
|
|
94
|
-
puts format
|
95
|
-
puts format
|
96
|
-
puts format
|
97
|
-
puts format
|
94
|
+
puts Kernel.format str, 'ID', document_hash['DOCUMENT']['ID']
|
95
|
+
puts Kernel.format str, 'NAME', document_hash['DOCUMENT']['NAME']
|
96
|
+
puts Kernel.format str, 'USER', document_hash['DOCUMENT']['UNAME']
|
97
|
+
puts Kernel.format str, 'GROUP', document_hash['DOCUMENT']['GNAME']
|
98
98
|
|
99
99
|
puts
|
100
100
|
|
@@ -107,7 +107,7 @@ def show_service_template(client, args, options)
|
|
107
107
|
mask[1] = 'm' if permissions_hash["#{e}_M"] == '1'
|
108
108
|
mask[2] = 'a' if permissions_hash["#{e}_A"] == '1'
|
109
109
|
|
110
|
-
puts format
|
110
|
+
puts Kernel.format str, e, mask
|
111
111
|
end
|
112
112
|
|
113
113
|
puts
|
data/bin/oneimage
CHANGED
data/bin/onesecgroup
CHANGED
data/bin/onetemplate
CHANGED
data/bin/onevmgroup
CHANGED
data/bin/onevntemplate
CHANGED
data/bin/onevrouter
CHANGED
data/lib/one_helper.rb
CHANGED
@@ -191,7 +191,7 @@ EOT
|
|
191
191
|
:format => Integer,
|
192
192
|
:description => 'The Group ID to instantiate the VM'
|
193
193
|
}
|
194
|
-
|
194
|
+
|
195
195
|
#NOTE: Other options defined using this array, add new options at the end
|
196
196
|
TEMPLATE_OPTIONS=[
|
197
197
|
{
|
@@ -674,7 +674,7 @@ EOT
|
|
674
674
|
def list_pool_xml(pool, options, filter_flag)
|
675
675
|
extended = options.include?(:extended) && options[:extended]
|
676
676
|
|
677
|
-
if $stdout.isatty
|
677
|
+
if $stdout.isatty and (!options.key?:no_pager)
|
678
678
|
size = $stdout.winsize[0] - 1
|
679
679
|
|
680
680
|
# ----------- First page, check if pager is needed -------------
|
@@ -702,6 +702,13 @@ EOT
|
|
702
702
|
return 0
|
703
703
|
end
|
704
704
|
|
705
|
+
if elements < size
|
706
|
+
return 0
|
707
|
+
elsif !pool.is_paginated?
|
708
|
+
stop_pager(ppid)
|
709
|
+
return 0
|
710
|
+
end
|
711
|
+
|
705
712
|
# ------- Rest of the pages in the pool, piped to pager --------
|
706
713
|
current = size
|
707
714
|
|
@@ -712,6 +719,12 @@ EOT
|
|
712
719
|
|
713
720
|
current += size
|
714
721
|
|
722
|
+
begin
|
723
|
+
Process.waitpid(ppid, Process::WNOHANG)
|
724
|
+
rescue Errno::ECHILD
|
725
|
+
break
|
726
|
+
end
|
727
|
+
|
715
728
|
elements, page = print_page(pool, options)
|
716
729
|
|
717
730
|
puts page
|
@@ -1061,7 +1074,7 @@ EOT
|
|
1061
1074
|
end
|
1062
1075
|
end
|
1063
1076
|
|
1064
|
-
def OpenNebulaHelper.time_to_str(time, print_seconds=true,
|
1077
|
+
def OpenNebulaHelper.time_to_str(time, print_seconds=true,
|
1065
1078
|
print_hours=true, print_years=false)
|
1066
1079
|
|
1067
1080
|
value = time.to_i
|
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: 5.8.
|
4
|
+
version: 5.8.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- OpenNebula
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-09-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: 5.8.
|
19
|
+
version: 5.8.5
|
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: 5.8.
|
26
|
+
version: 5.8.5
|
27
27
|
description: Commands used to talk to OpenNebula
|
28
28
|
email: contact@opennebula.org
|
29
29
|
executables:
|