Merge remote-tracking branch 'origin/feature-2345' into one-4.4

This commit is contained in:
Carlos Martín committed 2013-11-18 13:18:38 +01:00
commit c3deffd063
2 files changed
+20 -2

No files matched your search

+2
View File
@@ -697,3 +697,5 @@ IMAGE_RESTRICTED_ATTR = "SOURCE"
INHERIT_DATASTORE_ATTR = "CEPH_HOST"
INHERIT_DATASTORE_ATTR = "CEPH_SECRET"
INHERIT_VNET_ATTR = "VLAN_TAGGED_ID"
+18 -2
View File
@@ -37,7 +37,10 @@ class OpenvSwitchVLAN < OpenNebulaNetwork
@nic = nic
# Apply VLAN
tag_vlan if @nic[:vlan] == "YES"
if @nic[:vlan] == "YES"
tag_vlan
tag_trunk_vlans
end
# Prevent Mac-spoofing
mac_spoofing
@@ -79,6 +82,19 @@ class OpenvSwitchVLAN < OpenNebulaNetwork
run cmd
end
def tag_trunk_vlans
range = @nic[:vlan_tagged_id]
if range? range
ovs_vsctl_cmd = "#{COMMANDS[:ovs_vsctl]} set Port #{@nic[:tap]}"
cmd = "#{ovs_vsctl_cmd} trunks=#{range}"
run cmd
cmd = "#{ovs_vsctl_cmd} vlan_mode=native-untagged"
run cmd
end
end
def mac_spoofing
add_flow("in_port=#{port},arp,dl_src=#{@nic[:mac]}",:drop,45000)
add_flow("in_port=#{port},arp,dl_src=#{@nic[:mac]},nw_src=#{@nic[:ip]}",:normal,46000)
@@ -165,6 +181,6 @@ class OpenvSwitchVLAN < OpenNebulaNetwork
end
def range?(range)
!range.match(/^\d+(,\d+)*$/).nil?
!range.to_s.match(/^\d+(,\d+)*$/).nil?
end
end