etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug CS-15878: created network usage rules after ipassoc during reboot 

status CS-15878: resolved fixed
This commit is contained in:
kishan 2012-08-16 17:37:54 +05:30
parent 2ddf088c10
commit 02a8ee911d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh
View File

@ -58,7 +58,7 @@ remove_usage_rules () {
}
get_usage () {
iptables -L NETWORK_STATS_$ethDev -n -v -x | awk '$1 ~ /^[0-9]+$/ { printf "%s:", $2}'; > /dev/null
iptables -L NETWORK_STATS_$ethDev -n -v -x 2> /dev/null | awk '$1 ~ /^[0-9]+$/ { printf "%s:", $2}'; > /dev/null
if [ -f /root/removedVifs ]
then
var=`cat /root/removedVifs`

8
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
View File

@ -848,9 +848,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
createVpcAssociatePublicIPCommands(router, sourceNat, cmds, vlanMacAddress);
}
//Add network usage commands
cmds.addCommands(usageCmds);
//add VPC router to guest networks
for (Pair<Nic, Network> nicNtwk : guestNics) {
Nic guestNic = nicNtwk.first();
@ -926,7 +923,10 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNic.getNetworkId());
}
//Add network usage commands
cmds.addCommands(usageCmds);
return true;
}