Heya, You're welcome and thanks for applying. :-)
Cheers, Hugo -----Original Message----- From: Sheng Yang [mailto:[email protected]] Sent: Thursday, June 21, 2012 9:22 PM To: [email protected] Subject: Re: Fixes for compile-tests on master branch On Thu, Jun 21, 2012 at 12:06 PM, Sheng Yang <[email protected]> wrote: > On Thu, Jun 21, 2012 at 12:30 AM, Hugo Trippaers > <[email protected]> wrote: >> Heya, >> >> Two mock classes need to be updated based on new interfaces. Please review >> the patch below. > > Applied, thanks! Seems master evolves quickly these days, patch doesn't apply to the latest master. However I found there is the other method missing in the master now, so I've checked in the fix. Thank you! :) --Sheng > > --Sheng >> >> Cheers, >> >> Hugo >> >> >> diff --git >> a/server/test/com/cloud/network/MockNetworkManagerImpl.java >> b/server/test/com/cloud/network/MockNetworkManagerImpl.java >> index f7380fe..2acf341 100755 >> --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java >> +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java >> @@ -768,8 +768,7 @@ public class MockNetworkManagerImpl implements >> NetworkManager, Manager, NetworkS >> } >> >> @Override >> - public IpAddress allocateIP(long networkId, Account ipOwner, >> - boolean isSystem) throws >> ResourceAllocationException, >> + public IpAddress allocateIP(long networkId, Account ipOwner) >> + throws ResourceAllocationException, >> InsufficientAddressCapacityException, >> ConcurrentOperationException { >> // TODO Auto-generated method stub >> return null; >> diff --git >> a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java >> b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java >> index ea4950b..e6d2a5a 100755 >> --- a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java >> +++ b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java >> @@ -217,4 +217,16 @@ public class MockVirtualMachineManagerImpl >> implements VirtualMachineManager { >> return null; >> } >> >> + @Override >> + public boolean upgradeVmDb(long vmId, long serviceOfferingId) >> + { >> + // TODO Auto-generated method stub >> + return false; >> + } >> + >> + @Override >> + public void checkIfCanUpgrade(VirtualMachine vmInstance, long >> + newServiceOfferingId) { >> + // TODO Auto-generated method stub >> + } >> + >> + >> }
