etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed unittest for VPC - added missing implementation for some methods in Mock classes used by the test

This commit is contained in:
Alena Prokharchyk 2012-08-14 13:44:51 -07:00
parent 428c61dbc9
commit 5acc99c774
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/test/com/cloud/vpc/MockNetworkManagerImpl.java
View File

@ -1133,8 +1133,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)
@ -1313,8 +1316,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)

10
server/test/com/cloud/vpc/MockVpcManagerImpl.java
View File

@ -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<Service> supportedSvcs) {
// TODO Auto-generated method stub
}
}