You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ni...@apache.org on 2013/12/21 02:44:21 UTC
[2/2] git commit: updated refs/heads/master to 83bbe68
CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/83bbe682
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/83bbe682
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/83bbe682
Branch: refs/heads/master
Commit: 83bbe682d9f660603399cfc2a4b626ca3e2005a1
Parents: edc1b78
Author: Nitin Mehta <ni...@citrix.com>
Authored: Fri Dec 20 17:42:45 2013 -0800
Committer: Nitin Mehta <ni...@citrix.com>
Committed: Fri Dec 20 17:42:45 2013 -0800
----------------------------------------------------------------------
server/test/com/cloud/vpc/MockNetworkManagerImpl.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/83bbe682/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java
index 56ba66a..18c227e 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;
@@ -836,6 +837,11 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkOrches
}
@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