opennebula-cli 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8548f70bb2a40ff7eea3a067c31d288e412ad206
-  data.tar.gz: 5a869b56b4726a7c875922741f94fabd703f7eeb
+  metadata.gz: b7b34c45635a1144e3ea041b0685824c6c9fc084
+  data.tar.gz: bfd1617f79860e63b5367280f72d3ff706056dd1
 SHA512:
-  metadata.gz: 429fa23813dfdf1d8374bcd5448aff4692284040b0148d00dacf491f7520ed8bda4f454a8aa4e4476c513184acf1505f076e76f4720920a7d3203cb91d5f9fbc
-  data.tar.gz: 639c78f877b042775a9c5b7baa493f0efda0314572293358f35292076b53f4fe80f204cb526b7fb8436b35acabde32e819ba9f87478030396fdac92fedac23ab
+  metadata.gz: 06af0b1ec78841d4ec205a69c97cc87dbe39d9b1ea25ffe613000cc69c767514fc76ac78e907bace9d936529ab1c7938b04e9f1b907b8ada7844c56dfdc36674
+  data.tar.gz: e252fbc3fcdae03e15bf05f403563ee5b9fea9fd21402407cf8a92eeb1e0a256b04de088c8c021e7dcb40e993f91e7f821ba3f8d41440149dc25f06d9007c771

data/bin/onevm

@@ -162,7 +162,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     set :format, :vmid, OneVMHelper.to_id_desc do |arg|
-        helper.to_id(arg)
+        tmp = helper.to_id(arg)
+        @current_vm = tmp[1]
+        tmp
     end
 
     set :format, :vmid_list, OneVMHelper.list_to_id_desc do |arg|
@@ -181,6 +183,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         OpenNebulaHelper.size_in_mb(arg)
     end
 
+    format :snapshot_id, "Snapshot identifier" do |arg|
+        helper.retrieve_snapshot_id(@current_vm, arg)
+    end
+
     ########################################################################
     # Commands
     ########################################################################
@@ -804,7 +810,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
     command :"snapshot-delete", snapshot_delete_desc, :vmid, :snapshot_id do
         helper.perform_action(args[0],options,"snapshot deleted") do |o|
-            o.snapshot_delete(args[1].to_i)
+            o.snapshot_delete(args[1])
         end
     end
 
@@ -829,7 +835,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :"disk-snapshot-revert", disk_snapshot_revert_desc,
-      :vmid, :diskid, :snapshot_id do
+      :vmid, :diskid, :disk_snapshot_id do
         helper.perform_action(args[0],options,"disk snapshot reverted") do |o|
           o.disk_snapshot_revert(args[1].to_i, args[2].to_i)
         end
@@ -841,7 +847,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         States: RUNNING, POWEROFF, SUSPENDED
     EOT
     command :"disk-snapshot-delete", disk_snapshot_delete_desc,
-      :vmid, :diskid, :snapshot_id do
+      :vmid, :diskid, :disk_snapshot_id do
         helper.perform_action(args[0],options,"disk snapshot deleted") do |o|
           o.disk_snapshot_delete(args[1].to_i, args[2].to_i)
         end

data/lib/one_helper/onehost_helper.rb

@@ -32,9 +32,9 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 #  EC2_SECRET = <Your ec2 secret key>
                 #
                 #  CAPACITY = [
-                #    M1SMALL  = <number of machines m1.small>,
-                #    M1XLARGE = <number of machines m1.xlarge>,
-                #    M1LARGE  = <number of machines m1.large>
+                #    M1_SMALL  = <number of machines m1.small>,
+                #    M1_XLARGE = <number of machines m1.xlarge>,
+                #    M1_LARGE  = <number of machines m1.large>
                 #  ]
                 #
                 # You can set any machine type supported by ec2

data/lib/one_helper/onevm_helper.rb

@@ -192,6 +192,20 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
     end
 
+    def retrieve_snapshot_id(vm_id, id)
+        vm = retrieve_resource(vm_id)
+        vm.info
+
+        if !/\A\d+\z/.match(id)
+            ids = vm.retrieve_elements("/VM/TEMPLATE/SNAPSHOT[NAME='#{id}']/SNAPSHOT_ID")
+            return [-1, "#{id} not found or duplicated"] if ids.nil? || ids.size > 1
+        else
+            return [0, id.to_i]
+        end
+
+        [0, ids[0].to_i]
+    end
+
     def format_pool(options)
         config_file = self.class.table_conf
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-19 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.4.0
+        version: 5.4.1
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables: