mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-17 02:03:15 +09:00
Merge remote-tracking branch 'origin/feature-2345' into one-4.4
This commit is contained in:
commit
c3deffd063
2 files changed
+20
-2
No files matched your search
@@ -697,3 +697,5 @@ IMAGE_RESTRICTED_ATTR = "SOURCE"
|
||||
|
||||
INHERIT_DATASTORE_ATTR = "CEPH_HOST"
|
||||
INHERIT_DATASTORE_ATTR = "CEPH_SECRET"
|
||||
|
||||
INHERIT_VNET_ATTR = "VLAN_TAGGED_ID"
|
||||
@@ -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
|
||||
Reference in new issue
Block a user