From 02a8ee911d4cdbdc6ab8349cf7f84ef518326387 Mon Sep 17 00:00:00 2001 From: kishan Date: Thu, 16 Aug 2012 17:37:54 +0530 Subject: [PATCH] bug CS-15878: created network usage rules after ipassoc during reboot status CS-15878: resolved fixed --- .../systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh | 2 +- .../router/VpcVirtualNetworkApplianceManagerImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh b/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh index 71deec0ea07..579b0bdfa72 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/vpc_netusage.sh @@ -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` diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java index e91868f4c2d..3839157a35a 100644 --- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java @@ -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 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; }