Updated Branches: refs/heads/master aa9dd422d -> fe3786341
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/fe378634 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/fe378634 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/fe378634 Branch: refs/heads/master Commit: fe3786341f1409034d6acd3a7ce4a3b3d7cabc84 Parents: aa9dd42 Author: Alena Prokharchyk <[email protected]> Authored: Tue Aug 14 13:44:51 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Tue Aug 14 13:47:04 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/fe378634/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)
