Re: Fixes for compile-tests on master branch

[Sheng Yang]

On Thu, Jun 21, 2012 at 12:30 AM, Hugo Trippaers
<htrippa...@schubergphilis.com> wrote:
> Heya,
>
> Two mock classes need to be updated based on new interfaces. Please review 
> the patch below.

Applied, thanks!

--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
> +       }
> +
> +
>  }