1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00

B #3070: revert DDC temporal solution (#3720)

This reverts commit c2ff7f89d85e9245861eb098a72eb6925110478b.
This commit is contained in:
Alejandro Huertas Herrero 2019-09-17 15:53:28 +02:00 committed by Ruben S. Montero
parent 2c9bbb9642
commit e92c43d501
3 changed files with 4 additions and 37 deletions

View File

@ -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)

View File

@ -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

View File

@ -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