From 83bbe682d9f660603399cfc2a4b626ca3e2005a1 Mon Sep 17 00:00:00 2001 From: Nitin Mehta Date: Fri, 20 Dec 2013 17:42:45 -0800 Subject: [PATCH] CLOUDSTACK-5281: Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment. --- server/test/com/cloud/vpc/MockNetworkManagerImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 56ba66aebfc..18c227eeb4c 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -25,6 +25,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.cloudstack.acl.ControlledEntity; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -835,6 +836,11 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches //To change body of implemented methods use File | Settings | File Templates. } + @Override + public boolean resourceCountNeedsUpdate(NetworkOffering ntwkOff, ACLType aclType) { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + @Override public void prepareNicForMigration(VirtualMachineProfile vm, DeployDestination dest) { // TODO Auto-generated method stub