From 5acc99c774ff43c4a02e1dcdc1e93e13337b7881 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Tue, 14 Aug 2012 13:44:51 -0700 Subject: [PATCH] Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test --- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 12 ++++++++---- server/test/com/cloud/vpc/MockVpcManagerImpl.java | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index 7dde2ccfa1c..985b2ca58da 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -1133,8 +1133,11 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager{ */ @Override public List listNetworkOfferingServices(long networkOfferingId) { - // TODO Auto-generated method stub - return null; + List supportedSvcs = new ArrayList(); + if (networkOfferingId != 2) { + supportedSvcs.add(Service.SourceNat); + } + return supportedSvcs; } /* (non-Javadoc) @@ -1313,8 +1316,9 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager{ */ @Override public List getNtwkOffDistinctProviders(long ntwkOffId) { - // TODO Auto-generated method stub - return null; + List providers = new ArrayList(); + providers.add(Provider.VPCVirtualRouter); + return providers; } /* (non-Javadoc) diff --git a/server/test/com/cloud/vpc/MockVpcManagerImpl.java b/server/test/com/cloud/vpc/MockVpcManagerImpl.java index 8fb2aee7c74..575ed2b1042 100644 --- a/server/test/com/cloud/vpc/MockVpcManagerImpl.java +++ b/server/test/com/cloud/vpc/MockVpcManagerImpl.java @@ -41,6 +41,7 @@ import com.cloud.network.vpc.VpcGateway; import com.cloud.network.vpc.VpcManager; import com.cloud.network.vpc.VpcOffering; import com.cloud.network.vpc.VpcService; +import com.cloud.offering.NetworkOffering; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.component.ComponentLocator; @@ -442,4 +443,13 @@ public class MockVpcManagerImpl implements VpcManager, Manager{ return null; } + /* (non-Javadoc) + * @see com.cloud.network.vpc.VpcManager#validateNtwkOffForVpc(com.cloud.offering.NetworkOffering, java.util.List) + */ + @Override + public void validateNtwkOffForVpc(NetworkOffering guestNtwkOff, List supportedSvcs) { + // TODO Auto-generated method stub + + } + }