From e1b033f8cc3385c455d018fa62fca67dc4b127ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 10 Dec 2012 11:46:32 +0100 Subject: [PATCH] Feature #1686: Add rename methods to ruby OCA and CLI --- src/cli/oneimage | 10 ++++++++++ src/cli/onetemplate | 10 ++++++++++ src/cli/onevm | 10 ++++++++++ src/cli/onevnet | 10 ++++++++++ src/oca/ruby/OpenNebula/Document.rb | 11 +++++++++++ src/oca/ruby/OpenNebula/Image.rb | 13 ++++++++++++- src/oca/ruby/OpenNebula/Template.rb | 2 +- src/oca/ruby/OpenNebula/VirtualMachine.rb | 13 ++++++++++++- src/oca/ruby/OpenNebula/VirtualNetwork.rb | 13 ++++++++++++- 9 files changed, 88 insertions(+), 4 deletions(-) diff --git a/src/cli/oneimage b/src/cli/oneimage index e57b1dd413..4a78d3b33e 100755 --- a/src/cli/oneimage +++ b/src/cli/oneimage @@ -304,6 +304,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do end end + rename_desc = <<-EOT.unindent + Renames the Image + EOT + + command :rename, rename_desc, :imageid, :name do + helper.perform_action(args[0],options,"renamed") do |o| + o.rename(args[1]) + end + end + list_desc = <<-EOT.unindent Lists Images in the pool EOT diff --git a/src/cli/onetemplate b/src/cli/onetemplate index 396add5082..b82bc5c3de 100755 --- a/src/cli/onetemplate +++ b/src/cli/onetemplate @@ -265,6 +265,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do Lists Templates in the pool EOT + rename_desc = <<-EOT.unindent + Renames the Template + EOT + + command :rename, rename_desc, :templateid, :name do + helper.perform_action(args[0],options,"renamed") do |o| + o.rename(args[1]) + end + end + command :list, list_desc, [:filterflag, nil], :options=>list_options do helper.list_pool(options, false, args[0]) end diff --git a/src/cli/onevm b/src/cli/onevm index 0e1f3c15de..7949e0fcab 100755 --- a/src/cli/onevm +++ b/src/cli/onevm @@ -515,6 +515,16 @@ cmd=CommandParser::CmdParser.new(ARGV) do Lists VMs in the pool EOT + rename_desc = <<-EOT.unindent + Renames the VM + EOT + + command :rename, rename_desc, :vmid, :name do + helper.perform_action(args[0],options,"renamed") do |o| + o.rename(args[1]) + end + end + command :list, list_desc, [:filterflag, nil], :options=>CLIHelper::OPTIONS+OpenNebulaHelper::OPTIONS+ [OpenNebulaHelper::DESCRIBE] do diff --git a/src/cli/onevnet b/src/cli/onevnet index 12638fc2a8..d931f3ce0b 100755 --- a/src/cli/onevnet +++ b/src/cli/onevnet @@ -228,4 +228,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do vnet.update(str) end end + + rename_desc = <<-EOT.unindent + Renames the Virtual Network + EOT + + command :rename, rename_desc, :vnetid, :name do + helper.perform_action(args[0],options,"renamed") do |o| + o.rename(args[1]) + end + end end diff --git a/src/oca/ruby/OpenNebula/Document.rb b/src/oca/ruby/OpenNebula/Document.rb index 494ebcf3dd..bcb186c8e5 100644 --- a/src/oca/ruby/OpenNebula/Document.rb +++ b/src/oca/ruby/OpenNebula/Document.rb @@ -44,6 +44,7 @@ module OpenNebula :chown => "document.chown", :chmod => "document.chmod", :clone => "document.clone", + :rename => "document.rename" } # Creates a Document Object description with just its identifier @@ -185,6 +186,16 @@ module OpenNebula return rc end + # Renames this Document + # + # @param name [String] New name for the Document. + # + # @return [nil, OpenNebula::Error] nil in case of success, Error + # otherwise + def rename(name) + return call(DOCUMENT_METHODS[:rename], @pe_id, name) + end + ####################################################################### # Helpers to get Document information ####################################################################### diff --git a/src/oca/ruby/OpenNebula/Image.rb b/src/oca/ruby/OpenNebula/Image.rb index e8224871f8..53a2f8aea7 100644 --- a/src/oca/ruby/OpenNebula/Image.rb +++ b/src/oca/ruby/OpenNebula/Image.rb @@ -35,7 +35,8 @@ module OpenNebula :chown => "image.chown", :chmod => "image.chmod", :chtype => "image.chtype", - :clone => "image.clone" + :clone => "image.clone", + :rename => "image.rename" } IMAGE_STATES=%w{INIT READY USED DISABLED LOCKED ERROR CLONE DELETE USED_PERS} @@ -205,6 +206,16 @@ module OpenNebula return rc end + # Renames this Image + # + # @param name [String] New name for the Image. + # + # @return [nil, OpenNebula::Error] nil in case of success, Error + # otherwise + def rename(name) + return call(IMAGE_METHODS[:rename], @pe_id, name) + end + ####################################################################### # Helpers to get Image information ####################################################################### diff --git a/src/oca/ruby/OpenNebula/Template.rb b/src/oca/ruby/OpenNebula/Template.rb index c8a8cb886d..73a6d48aac 100644 --- a/src/oca/ruby/OpenNebula/Template.rb +++ b/src/oca/ruby/OpenNebula/Template.rb @@ -160,7 +160,7 @@ module OpenNebula # Renames this Template # - # @param name [String] New name for the new Template. + # @param name [String] New name for the Template. # # @return [nil, OpenNebula::Error] nil in case of success, Error # otherwise diff --git a/src/oca/ruby/OpenNebula/VirtualMachine.rb b/src/oca/ruby/OpenNebula/VirtualMachine.rb index 5e7c061c8b..08e1bafff3 100644 --- a/src/oca/ruby/OpenNebula/VirtualMachine.rb +++ b/src/oca/ruby/OpenNebula/VirtualMachine.rb @@ -35,7 +35,8 @@ module OpenNebula :chmod => "vm.chmod", :monitoring => "vm.monitoring", :attach => "vm.attach", - :detach => "vm.detach" + :detach => "vm.detach", + :rename => "vm.rename" } VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED @@ -352,6 +353,16 @@ module OpenNebula return @client.call(VM_METHODS[:monitoring], @pe_id) end + # Renames this VM + # + # @param name [String] New name for the VM. + # + # @return [nil, OpenNebula::Error] nil in case of success, Error + # otherwise + def rename(name) + return call(VM_METHODS[:rename], @pe_id, name) + end + ####################################################################### # Helpers to get VirtualMachine information ####################################################################### diff --git a/src/oca/ruby/OpenNebula/VirtualNetwork.rb b/src/oca/ruby/OpenNebula/VirtualNetwork.rb index bb5c0933b3..b6964b4d0e 100644 --- a/src/oca/ruby/OpenNebula/VirtualNetwork.rb +++ b/src/oca/ruby/OpenNebula/VirtualNetwork.rb @@ -34,7 +34,8 @@ module OpenNebula :chmod => "vn.chmod", :update => "vn.update", :hold => "vn.hold", - :release => "vn.release" + :release => "vn.release", + :rename => "vn.rename" } VN_TYPES=%w{RANGED FIXED} @@ -191,6 +192,16 @@ module OpenNebula super(VN_METHODS[:chmod], owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u, other_m, other_a) end + + # Renames this virtual network + # + # @param name [String] New name for the virtual network. + # + # @return [nil, OpenNebula::Error] nil in case of success, Error + # otherwise + def rename(name) + return call(VN_METHODS[:rename], @pe_id, name) + end ####################################################################### # Helpers to get VirtualNetwork information