shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

feature #3208: Move common activate function to VLANDriver base class

Browse Source
This commit is contained in:
Ruben S. Montero 2015-01-05 16:37:43 +01:00
parent 5d44f6e758
commit 5759fb3843
3 changed files with 36 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/vnm_mad/remotes/802.1Q/vlan_tag_driver.rb
View File

@ -38,34 +38,6 @@ class VLANTagDriver < VNMMAD::VLANDriver
super(vm, XPATH_FILTER, deploy_id, hypervisor)
end
############################################################################
# Activate the driver and creates bridges and tags devices as needed.
############################################################################
def activate
lock
vm_id = @vm['ID']
options = Hash.new
process do |nic|
options.clear
options[:bridge] = nic[:bridge]
options[:phydev] = nic[:phydev]
options[:vlan_id] = nic[:vlan_id]
options[:network_id] = nic[:network_id]
return if options[:phydev].nil?
set_up_vlan(options)
end
unlock
return 0
end
############################################################################
# This function creates and activate a VLAN device
############################################################################

47
src/vnm_mad/remotes/lib/vlan.rb
View File

@ -31,17 +31,29 @@ module VNMMAD
unlock
end
# This function needs to be implemented by any VLAN driver to
# create the VLAN device. The device MUST be set up by this function
# Options is a driver specific hash. It includes
# :vlan_dev the name for the VLAN device
# :phydev Physical Device to bind the VLAN traffic to
# :vlan_id the VLAN ID
# : additional driver specific parameters
def create_vlan_dev(options)
OpenNebula.log_error("create_vlan_dev function not implemented.")
# Activate the driver and creates bridges and tags devices as needed.
def activate
lock
exit -1
options = Hash.new
process do |nic|
options.clear
options[:bridge] = nic[:bridge]
options[:phydev] = nic[:phydev]
options[:vlan_id] = nic[:vlan_id]
options[:network_id] = nic[:network_id]
return if options[:phydev].nil?
set_up_vlan(options)
end
unlock
return 0
end
# Set ups the VLAN for the VMs.
@ -68,7 +80,20 @@ module VNMMAD
@bridges[options[:bridge]] << options[:vlan_dev]
end
# This function needs to be implemented by any VLAN driver to
# create the VLAN device. The device MUST be set up by this function
# Options is a driver specific hash. It includes
# :vlan_dev the name for the VLAN device
# :phydev Physical Device to bind the VLAN traffic to
# :vlan_id the VLAN ID
# : additional driver specific parameters
def create_vlan_dev(options)
OpenNebula.log_error("create_vlan_dev function not implemented.")
exit -1
end
private
# Creates a bridge if it does not exists, and brings it up.
# This function IS FINAL, exits if action cannot be completed

27
src/vnm_mad/remotes/vxlan/vxlan_driver.rb
View File

@ -38,33 +38,6 @@ class VXLANDriver < VNMMAD::VLANDriver
super(vm, XPATH_FILTER, deploy_id, hypervisor)
end
############################################################################
# Activate the driver and creates bridges and tags devices as needed.
############################################################################
def activate
lock
options = Hash.new
process do |nic|
options.clear
options[:bridge] = nic[:bridge]
options[:phydev] = nic[:phydev]
options[:vlan_id] = nic[:vlan_id]
options[:network_id] = nic[:network_id]
return if options[:phydev].nil?
set_up_vlan(options)
end
unlock
return 0
end
############################################################################
# This function creates and activate a VLAN device
############################################################################