diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java index 06104c503f6..9c897852f35 100755 --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java @@ -584,11 +584,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS return null; } - @Override - public PhysicalNetwork translateZoneIdToPhysicalNetwork(long zoneId) { - // TODO Auto-generated method stub - return null; - } @Override public boolean isSecurityGroupSupportedInNetwork(Network network) { @@ -1137,4 +1132,13 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS // TODO Auto-generated method stub return null; } + + /* (non-Javadoc) + * @see com.cloud.network.NetworkManager#getNetworkLockTimeout() + */ + @Override + public int getNetworkLockTimeout() { + // TODO Auto-generated method stub + return 0; + } } diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 7f558912d65..579e92c9713 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -1488,13 +1488,14 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager{ return null; } + /* (non-Javadoc) - * @see com.cloud.network.NetworkManager#translateZoneIdToPhysicalNetwork(long) + * @see com.cloud.network.NetworkManager#getNetworkLockTimeout() */ @Override - public PhysicalNetwork translateZoneIdToPhysicalNetwork(long zoneId) { + public int getNetworkLockTimeout() { // TODO Auto-generated method stub - return null; + return 0; } } diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java index 575ed2b1042..4b0aa331563 100644 --- a/server/test/com/cloud/vpc/MockVpcManagerImpl.java +++ b/server/test/com/cloud/vpc/MockVpcManagerImpl.java @@ -28,6 +28,7 @@ import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.NetworkRuleConflictException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.Network.Provider; @@ -452,4 +453,13 @@ public class MockVpcManagerImpl implements VpcManager, Manager{ } + /* (non-Javadoc) + * @see com.cloud.network.vpc.VpcManager#getSupportedVpcHypervisors() + */ + @Override + public List getSupportedVpcHypervisors() { + // TODO Auto-generated method stub + return null; + } + }