Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4614e1c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4614e1c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4614e1c6 Branch: refs/heads/4.0 Commit: 4614e1c604ad44803800b7a9078dd3918e1a6b50 Parents: 450e868 Author: Alena Prokharchyk <[email protected]> Authored: Tue Aug 14 13:44:51 2012 -0700 Committer: Alex Huang <[email protected]> Committed: Wed Aug 15 14:08:45 2012 -0700 ---------------------------------------------------------------------- .../test/com/cloud/vpc/MockNetworkManagerImpl.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4614e1c6/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 2dc2c16..7f55891 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -1124,8 +1124,11 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager{ */ @Override public List<Service> listNetworkOfferingServices(long networkOfferingId) { - // TODO Auto-generated method stub - return null; + List<Service> supportedSvcs = new ArrayList<Service>(); + if (networkOfferingId != 2) { + supportedSvcs.add(Service.SourceNat); + } + return supportedSvcs; } /* (non-Javadoc) @@ -1295,8 +1298,9 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager{ */ @Override public List<Provider> getNtwkOffDistinctProviders(long ntwkOffId) { - // TODO Auto-generated method stub - return null; + List<Provider> providers = new ArrayList<Provider>(); + providers.add(Provider.VPCVirtualRouter); + return providers; } /* (non-Javadoc)
