cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [09/39] git commit: updated refs/heads/ui-vpc-redesign to 8d9a8ca
Date Thu, 16 May 2013 17:12:30 GMT
PVLAN: Optimize pvlan scripts


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c7bd077
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c7bd077
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c7bd077

Branch: refs/heads/ui-vpc-redesign
Commit: 0c7bd0777b9a5a5ec326b0d15fb0b3ef584235ab
Parents: 87b7a84
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Mon May 6 17:51:33 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Mon May 6 17:51:33 2013 -0700

----------------------------------------------------------------------
 scripts/vm/network/ovs-pvlan-dhcp-host.sh |    2 --
 scripts/vm/network/ovs-pvlan-vm.sh        |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c7bd077/scripts/vm/network/ovs-pvlan-dhcp-host.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/network/ovs-pvlan-dhcp-host.sh b/scripts/vm/network/ovs-pvlan-dhcp-host.sh
index 73d735f..64565ff 100755
--- a/scripts/vm/network/ovs-pvlan-dhcp-host.sh
+++ b/scripts/vm/network/ovs-pvlan-dhcp-host.sh
@@ -114,12 +114,10 @@ if [ "$op" == "add" ]
 then
     dhcp_port=`ovs-ofctl show $br | grep $iface | cut -d '(' -f 1|tr -d ' '`
     ovs-ofctl add-flow $br priority=200,arp,dl_vlan=$sec_iso_vlan,nw_dst=$dhcp_ip,actions=strip_vlan,output:$dhcp_port
-    ovs-ofctl add-flow $br priority=180,arp,nw_dst=$dhcp_ip,actions=strip_vlan,output:$dhcp_port
     ovs-ofctl add-flow $br priority=150,dl_vlan=$sec_iso_vlan,dl_dst=$dhcp_mac,actions=strip_vlan,output:$dhcp_port
     ovs-ofctl add-flow $br priority=100,udp,dl_vlan=$sec_iso_vlan,nw_dst=255.255.255.255,tp_dst=67,actions=strip_vlan,output:$dhcp_port
 else
     ovs-ofctl del-flows --strict $br priority=200,arp,dl_vlan=$sec_iso_vlan,nw_dst=$dhcp_ip
-    ovs-ofctl del-flows --strict $br priority=180,arp,nw_dst=$dhcp_ip
     ovs-ofctl del-flows --strict $br priority=150,dl_vlan=$sec_iso_vlan,dl_dst=$dhcp_mac
     ovs-ofctl del-flows --strict $br priority=100,udp,dl_vlan=$sec_iso_vlan,nw_dst=255.255.255.255,tp_dst=67
 fi

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c7bd077/scripts/vm/network/ovs-pvlan-vm.sh
----------------------------------------------------------------------
diff --git a/scripts/vm/network/ovs-pvlan-vm.sh b/scripts/vm/network/ovs-pvlan-vm.sh
index 4bad11c..fd38481 100755
--- a/scripts/vm/network/ovs-pvlan-vm.sh
+++ b/scripts/vm/network/ovs-pvlan-vm.sh
@@ -91,7 +91,7 @@ trunk_port=1
 if [ "$op" == "add" ]
 then
     ovs-ofctl add-flow $br priority=50,dl_vlan=0xffff,dl_src=$vm_mac,actions=mod_vlan_vid:$sec_iso_vlan,resubmit:$trunk_port
-    ovs-ofctl add-flow $br priority=60,dl_vlan=$sec_iso_vlan,dl_src=$vm_mac,actions=output:1
+    ovs-ofctl add-flow $br priority=60,dl_vlan=$sec_iso_vlan,dl_src=$vm_mac,actions=output:$trunk_port
 else
     ovs-ofctl del-flows --strict $br priority=50,dl_vlan=0xffff,dl_src=$vm_mac
     ovs-ofctl del-flows --strict $br priority=60,dl_vlan=$sec_iso_vlan,dl_src=$vm_mac


Mime
View raw message