opennebula-cli 5.4.0 → 5.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/onevm +10 -4
- data/lib/one_helper/onehost_helper.rb +3 -3
- data/lib/one_helper/onevm_helper.rb +14 -0
- 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: b7b34c45635a1144e3ea041b0685824c6c9fc084
|
4
|
+
data.tar.gz: bfd1617f79860e63b5367280f72d3ff706056dd1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 06af0b1ec78841d4ec205a69c97cc87dbe39d9b1ea25ffe613000cc69c767514fc76ac78e907bace9d936529ab1c7938b04e9f1b907b8ada7844c56dfdc36674
|
7
|
+
data.tar.gz: e252fbc3fcdae03e15bf05f403563ee5b9fea9fd21402407cf8a92eeb1e0a256b04de088c8c021e7dcb40e993f91e7f821ba3f8d41440149dc25f06d9007c771
|
data/bin/onevm
CHANGED
@@ -162,7 +162,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
|
|
162
162
|
end
|
163
163
|
|
164
164
|
set :format, :vmid, OneVMHelper.to_id_desc do |arg|
|
165
|
-
helper.to_id(arg)
|
165
|
+
tmp = helper.to_id(arg)
|
166
|
+
@current_vm = tmp[1]
|
167
|
+
tmp
|
166
168
|
end
|
167
169
|
|
168
170
|
set :format, :vmid_list, OneVMHelper.list_to_id_desc do |arg|
|
@@ -181,6 +183,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
|
|
181
183
|
OpenNebulaHelper.size_in_mb(arg)
|
182
184
|
end
|
183
185
|
|
186
|
+
format :snapshot_id, "Snapshot identifier" do |arg|
|
187
|
+
helper.retrieve_snapshot_id(@current_vm, arg)
|
188
|
+
end
|
189
|
+
|
184
190
|
########################################################################
|
185
191
|
# Commands
|
186
192
|
########################################################################
|
@@ -804,7 +810,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
|
|
804
810
|
|
805
811
|
command :"snapshot-delete", snapshot_delete_desc, :vmid, :snapshot_id do
|
806
812
|
helper.perform_action(args[0],options,"snapshot deleted") do |o|
|
807
|
-
o.snapshot_delete(args[1]
|
813
|
+
o.snapshot_delete(args[1])
|
808
814
|
end
|
809
815
|
end
|
810
816
|
|
@@ -829,7 +835,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
|
|
829
835
|
EOT
|
830
836
|
|
831
837
|
command :"disk-snapshot-revert", disk_snapshot_revert_desc,
|
832
|
-
:vmid, :diskid, :
|
838
|
+
:vmid, :diskid, :disk_snapshot_id do
|
833
839
|
helper.perform_action(args[0],options,"disk snapshot reverted") do |o|
|
834
840
|
o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
|
835
841
|
end
|
@@ -841,7 +847,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
|
|
841
847
|
States: RUNNING, POWEROFF, SUSPENDED
|
842
848
|
EOT
|
843
849
|
command :"disk-snapshot-delete", disk_snapshot_delete_desc,
|
844
|
-
:vmid, :diskid, :
|
850
|
+
:vmid, :diskid, :disk_snapshot_id do
|
845
851
|
helper.perform_action(args[0],options,"disk snapshot deleted") do |o|
|
846
852
|
o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
|
847
853
|
end
|
@@ -32,9 +32,9 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
|
|
32
32
|
# EC2_SECRET = <Your ec2 secret key>
|
33
33
|
#
|
34
34
|
# CAPACITY = [
|
35
|
-
#
|
36
|
-
#
|
37
|
-
#
|
35
|
+
# M1_SMALL = <number of machines m1.small>,
|
36
|
+
# M1_XLARGE = <number of machines m1.xlarge>,
|
37
|
+
# M1_LARGE = <number of machines m1.large>
|
38
38
|
# ]
|
39
39
|
#
|
40
40
|
# You can set any machine type supported by ec2
|
@@ -192,6 +192,20 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
|
|
192
192
|
end
|
193
193
|
end
|
194
194
|
|
195
|
+
def retrieve_snapshot_id(vm_id, id)
|
196
|
+
vm = retrieve_resource(vm_id)
|
197
|
+
vm.info
|
198
|
+
|
199
|
+
if !/\A\d+\z/.match(id)
|
200
|
+
ids = vm.retrieve_elements("/VM/TEMPLATE/SNAPSHOT[NAME='#{id}']/SNAPSHOT_ID")
|
201
|
+
return [-1, "#{id} not found or duplicated"] if ids.nil? || ids.size > 1
|
202
|
+
else
|
203
|
+
return [0, id.to_i]
|
204
|
+
end
|
205
|
+
|
206
|
+
[0, ids[0].to_i]
|
207
|
+
end
|
208
|
+
|
195
209
|
def format_pool(options)
|
196
210
|
config_file = self.class.table_conf
|
197
211
|
|
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.4.
|
4
|
+
version: 5.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- OpenNebula
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-09-19 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.4.
|
19
|
+
version: 5.4.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: 5.4.
|
26
|
+
version: 5.4.1
|
27
27
|
description: Commands used to talk to OpenNebula
|
28
28
|
email: contact@opennebula.org
|
29
29
|
executables:
|