diff --git a/src/oneprovision/lib/provision.rb b/src/oneprovision/lib/provision.rb index e26d5d99f6..5bd502b33c 100644 --- a/src/oneprovision/lib/provision.rb +++ b/src/oneprovision/lib/provision.rb @@ -125,11 +125,6 @@ module OneProvision msg = "#{section.chomp('s')} #{obj['ID']}" Driver.retry_loop "Failed to delete #{msg}" do - if section == 'vnets' - vnet = Vnet.new(obj.id) - vnet.delete_ars - end - OneProvisionLogger.debug("Deleting OpenNebula #{msg}") Utils.exception(obj.delete) diff --git a/src/oneprovision/lib/resource.rb b/src/oneprovision/lib/resource.rb index bf9b22dffd..2c9e9f542c 100644 --- a/src/oneprovision/lib/resource.rb +++ b/src/oneprovision/lib/resource.rb @@ -61,15 +61,9 @@ module OneProvision @pool = OpenNebula::HostPool.new(client) when 'Vnet' - if !id - xml = OpenNebula::VirtualNetwork.build_xml - - @one = OpenNebula::VirtualNetwork.new(xml, client) - else - @one = OpenNebula::VirtualNetwork.new_with_id(id, client) - @one.info - end + xml = OpenNebula::VirtualNetwork.build_xml + @one = OpenNebula::VirtualNetwork.new(xml, client) @pool = OpenNebula::VirtualNetworkPool.new(client) end end diff --git a/src/oneprovision/lib/vnet.rb b/src/oneprovision/lib/vnet.rb index 9bd45f502c..1cd7371ca0 100644 --- a/src/oneprovision/lib/vnet.rb +++ b/src/oneprovision/lib/vnet.rb @@ -22,8 +22,8 @@ module OneProvision class Vnet < Resource # Class constructor - def initialize(id = nil) - super('Vnet', id) + def initialize + super 'Vnet' end # Creates a new VNET in OpenNebula @@ -43,28 +43,6 @@ module OneProvision super(cluster_id, template) end - # Deletes the address ranges from the vnet - def delete_ars - ars = @one.to_hash['VNET']['AR_POOL']['AR'] - id = @one.id - - [ars].flatten.each do |ar| - delete_ar(id, ar['AR_ID']) - end - end - - private - - # Delete an specific address range - # - # @param id [Integer] The id of the vnet - # @param ar_id [Integer] The id of the ar - def delete_ar(id, ar_id) - OneProvisionLogger.debug("Deleting AR #{ar_id} from VNET #{id}") - - @one.rm_ar(ar_id) - end - end end