1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-04-01 06:50:25 +03:00

Bug #3457: onevnet reserve returns the reservation vnet id

This commit is contained in:
Carlos Martín 2015-02-16 15:36:24 +01:00
parent e33f229b41
commit 88f6e33c98
2 changed files with 11 additions and 6 deletions

View File

@ -253,7 +253,13 @@ cmd=CommandParser::CmdParser.new(ARGV) do
exit -1
end
vn.reserve(name, size, options[:address_range], addr, args[1])
res = vn.reserve(name, size, options[:address_range], addr, args[1])
if !OpenNebula.is_error?(res)
puts "Reservation VNET ID: #{res}"
end
res
end
end

View File

@ -224,7 +224,7 @@ module OpenNebula
end
# Reserve a set of addresses from this virtual network
# @param name [String] of the reservation
# @param rname [String] of the reservation
# @param rsize[String] number of addresses to reserve
# @param ar_id[String] the ar_id to make the reservation. If set to nil
# any address range will be used
@ -232,6 +232,8 @@ module OpenNebula
# nil the first free address will be used
# @param vnet [String] ID of the VNET to add the reservation to. If not
# set a new VNET will be created.
# @return [Integer, OpenNebula::Error] The reservation vnet id on
# success, Error otherwise
def reserve(rname, rsize, ar_id, addr, vnet)
return Error.new('ID not defined') if !@pe_id
@ -250,10 +252,7 @@ module OpenNebula
rtmpl << "#{addr_name} = #{addr}\n"
end
rc = @client.call(VN_METHODS[:reserve], @pe_id, rtmpl)
rc = nil if !OpenNebula.is_error?(rc)
return rc
return @client.call(VN_METHODS[:reserve], @pe_id, rtmpl)
end
# Removes an Address Range from the VirtualNetwork