Fixed unit tests

2025-11-02 11:52:28 +01:00 · 2011-11-03 14:02:40 -07:00 · 2011-11-03 14:02:40 -07:00 · a32c4f1ec6
commit a32c4f1ec6
parent 3de3fc69d2
5 changed files with 294 additions and 123 deletions
--- a/server/test/com/cloud/network/MockNetworkManagerImpl.java
+++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java
@ -20,21 +20,21 @@ import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.network.Network.Capability;
-import com.cloud.network.Network.GuestIpType;
+import com.cloud.network.Network.GuestType;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.Networks.TrafficType;
 import com.cloud.network.addr.PublicIp;
-import com.cloud.network.element.PasswordServiceProvider;
 import com.cloud.network.element.RemoteAccessVPNServiceProvider;
+import com.cloud.network.element.UserDataServiceProvider;
 import com.cloud.network.guru.NetworkGuru;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.StaticNat;
-import com.cloud.offering.NetworkOffering;
 import com.cloud.offerings.NetworkOfferingVO;
 import com.cloud.user.Account;
-import com.cloud.user.AccountVO;
+import com.cloud.user.User;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.Manager;
 import com.cloud.vm.Nic;
@ -53,12 +53,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        return null;
    }

-    @Override
-    public List<? extends NetworkOffering> listNetworkOfferings() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public IpAddress allocateIP(AssociateIPAddrCmd cmd) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException {
        // TODO Auto-generated method stub
@ -119,12 +113,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        return null;
    }

-    @Override
-    public Map<Service, Map<Capability, String>> getZoneCapabilities(long zoneId) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public Map<Service, Map<Capability, String>> getNetworkCapabilities(long networkId) {
        // TODO Auto-generated method stub
@ -254,36 +242,12 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        return null;
    }

-    @Override
-    public List<? extends Nic> getNicsIncludingRemoved(VirtualMachine vm) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public List<NicProfile> getNicProfiles(VirtualMachine vm) {
        // TODO Auto-generated method stub
        return null;
    }

-    @Override
-    public List<AccountVO> getAccountsUsingNetwork(long configurationId) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public AccountVO getNetworkOwner(long configurationId) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public List<NetworkVO> getNetworksforOffering(long offeringId, long dataCenterId, long accountId) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public String getNextAvailableMacAddressInNetwork(long networkConfigurationId) throws InsufficientAddressCapacityException {
        // TODO Auto-generated method stub
@ -388,13 +352,7 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        // TODO Auto-generated method stub
        return false;
    }
-
-    @Override
-    public Map<Capability, String> getServiceCapabilities(long zoneId, Long networkOfferingId, Service service) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
+    
    @Override
    public boolean applyIpAssociations(Network network, boolean continueOnError) throws ResourceUnavailableException {
        // TODO Auto-generated method stub
@ -425,12 +383,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        return null;
    }

-    @Override
-    public List<NetworkVO> listNetworksForAccount(long accountId, long zoneId, GuestIpType guestType, Boolean isDefault) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public IPAddressVO markIpAsUnavailable(long addrId) {
        // TODO Auto-generated method stub
@ -500,12 +452,6 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        return null;
    }

-    @Override
-    public List<? extends PasswordServiceProvider> getPasswordResetElements() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public Long getPodIdForVlan(long vlanDbId) {
        // TODO Auto-generated method stub
@ -517,4 +463,221 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
        // TODO Auto-generated method stub
        return false;
    }
+
+    @Override
+    public PhysicalNetwork createPhysicalNetwork(Long zoneId, String vnetRange, String networkSpeed, List<String> isolationMethods, String broadcastDomainRange, Long domainId, List<String> tags) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<? extends PhysicalNetwork> searchPhysicalNetworks(Long id, Long zoneId, String keyword, Long startIndex, Long pageSize) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List<String> tags, String newVnetRangeString, String state) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean deletePhysicalNetwork(Long id) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public List<? extends Service> listNetworkServices(String providerName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<? extends Provider> listSupportedNetworkServiceProviders(String serviceName) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetworkServiceProvider addProviderToPhysicalNetwork(Long physicalNetworkId, String providerName, Long destinationPhysicalNetworkId, List<String> enabledServices) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<? extends PhysicalNetworkServiceProvider> listNetworkServiceProviders(Long physicalNetworkId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetworkServiceProvider updateNetworkServiceProvider(Long id, String state, boolean forcedShutdown, List<String> enabledServices) throws ConcurrentOperationException,
+            ResourceUnavailableException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean deleteNetworkServiceProvider(Long id) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public PhysicalNetwork getPhysicalNetwork(Long physicalNetworkId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetwork getCreatedPhysicalNetwork(Long physicalNetworkId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetworkServiceProvider getPhysicalNetworkServiceProvider(Long providerId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetworkServiceProvider getCreatedPhysicalNetworkServiceProvider(Long providerId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public long findPhysicalNetworkId(long zoneId, String tag) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
+
+    @Override
+    public PhysicalNetworkTrafficType addTrafficTypeToPhysicalNetwork(Long physicalNetworkId, String trafficType, String xenLabel, String kvmLabel, String vmwareLabel) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetworkTrafficType getPhysicalNetworkTrafficType(Long id) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetworkTrafficType updatePhysicalNetworkTrafficType(Long id, String xenLabel, String kvmLabel, String vmwareLabel) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean deletePhysicalNetworkTrafficType(Long id) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public List<? extends PhysicalNetworkTrafficType> listTrafficTypes(Long physicalNetworkId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetwork getDefaultPhysicalNetworkByZoneAndTrafficType(long zoneId, TrafficType trafficType) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public Network getExclusiveGuestNetwork(long zoneId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean networkIsConfiguredForExternalNetworking(long zoneId, long networkOfferingId) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public Map<Capability, String> getServiceCapabilities(Long networkOfferingId, Service service) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<NetworkVO> listNetworksForAccount(long accountId, long zoneId, GuestType type, Boolean isDefault) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<Long> listNetworkOfferingsForUpgrade(long networkId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public PhysicalNetwork translateZoneIdToPhysicalNetwork(long zoneId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean isSecurityGroupSupportedInNetwork(Network network) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean isProviderEnabled(PhysicalNetworkServiceProvider provider) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean isProviderAvailable(long physicalNetowrkId, String providerName) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean isServiceEnabled(long physicalNetworkId, long networkOfferingId, Service service) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public List<String> getNetworkTags(HypervisorType hType, Network network) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<Service> getElementServices(Provider provider) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean canElementEnableIndividualServices(Provider provider) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public NetworkOfferingVO getExclusiveGuestNetworkOffering() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public List<? extends UserDataServiceProvider> getPasswordResetElements() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
--- a/server/test/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/test/com/cloud/user/MockAccountManagerImpl.java
@ -1,5 +1,6 @@
 package com.cloud.user;

+import java.util.List;
 import java.util.Map;

 import javax.ejb.Local;
--- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java
+++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java
@ -338,12 +338,6 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService, Mana
        return null;
    }

-    @Override
-    public UserVm migrateVirtualMachine(UserVm vm, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List<Long> securityGroupIdList, Account owner,
            String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map<Long, String> requestedIps,
@ -376,4 +370,11 @@ public class MockUserVmManagerImpl implements UserVmManager, UserVmService, Mana
        return null;
    }

+    @Override
+    public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException,
+            VirtualMachineMigrationException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }
--- a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
+++ b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java
@ -56,41 +56,6 @@ public class MockVirtualMachineManagerImpl implements VirtualMachineManager {
        return null;
    }

-    @Override
-    public <T extends VMInstanceVO> T allocate(T vm, VMTemplateVO template, ServiceOfferingVO serviceOffering, Pair<? extends DiskOfferingVO, Long> rootDiskOffering,
-            List<Pair<DiskOfferingVO, Long>> dataDiskOfferings, List<Pair<NetworkVO, NicProfile>> networks, Map<Param, Object> params, DeploymentPlan plan, HypervisorType hyperType, Account owner)
-            throws InsufficientCapacityException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public <T extends VMInstanceVO> T allocate(T vm, VMTemplateVO template, ServiceOfferingVO serviceOffering, Long rootSize, Pair<DiskOfferingVO, Long> dataDiskOffering,
-            List<Pair<NetworkVO, NicProfile>> networks, DeploymentPlan plan, HypervisorType hyperType, Account owner) throws InsufficientCapacityException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public <T extends VMInstanceVO> T allocate(T vm, VMTemplateVO template, ServiceOfferingVO serviceOffering, List<Pair<NetworkVO, NicProfile>> networkProfiles, DeploymentPlan plan,
-            HypervisorType hyperType, Account owner) throws InsufficientCapacityException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public <T extends VMInstanceVO> T start(T vm, Map<Param, Object> params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public <T extends VMInstanceVO> T start(T vm, Map<Param, Object> params, User caller, Account account, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
-            ResourceUnavailableException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public <T extends VMInstanceVO> boolean stop(T vm, User caller, Account account) throws ResourceUnavailableException {
        // TODO Auto-generated method stub
@ -115,20 +80,6 @@ public class MockVirtualMachineManagerImpl implements VirtualMachineManager {
        return false;
    }

-    @Override
-    public <T extends VMInstanceVO> T advanceStart(T vm, Map<Param, Object> params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException,
-            ConcurrentOperationException, OperationTimedoutException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public <T extends VMInstanceVO> T advanceStart(T vm, Map<Param, Object> params, User caller, Account account, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
-            ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
    @Override
    public <T extends VMInstanceVO> boolean advanceStop(T vm, boolean forced, User caller, Account account) throws ResourceUnavailableException, OperationTimedoutException,
            ConcurrentOperationException {
@ -167,6 +118,67 @@ public class MockVirtualMachineManagerImpl implements VirtualMachineManager {
        return null;
    }

+    @Override
+    public VMInstanceVO findByIdAndType(Type type, long vmId) {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public boolean isVirtualMachineUpgradable(UserVm vm, ServiceOffering offering) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T allocate(T vm, VMTemplateVO template, ServiceOfferingVO serviceOffering, Pair<? extends DiskOfferingVO, Long> rootDiskOffering,
+            List<Pair<DiskOfferingVO, Long>> dataDiskOfferings, List<Pair<NetworkVO, NicProfile>> networks, Map<Param, Object> params, DeploymentPlan plan, HypervisorType hyperType, Account owner)
+            throws InsufficientCapacityException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T allocate(T vm, VMTemplateVO template, ServiceOfferingVO serviceOffering, Long rootSize, Pair<DiskOfferingVO, Long> dataDiskOffering,
+            List<Pair<NetworkVO, NicProfile>> networks, DeploymentPlan plan, HypervisorType hyperType, Account owner) throws InsufficientCapacityException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T allocate(T vm, VMTemplateVO template, ServiceOfferingVO serviceOffering, List<Pair<NetworkVO, NicProfile>> networkProfiles, DeploymentPlan plan,
+            HypervisorType hyperType, Account owner) throws InsufficientCapacityException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T start(T vm, Map<Param, Object> params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T start(T vm, Map<Param, Object> params, User caller, Account account, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
+            ResourceUnavailableException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T advanceStart(T vm, Map<Param, Object> params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException,
+            ConcurrentOperationException, OperationTimedoutException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public <T extends VMInstanceVO> T advanceStart(T vm, Map<Param, Object> params, User caller, Account account, DeploymentPlan planToDeploy) throws InsufficientCapacityException,
+            ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
    @Override
    public <T extends VMInstanceVO> T reboot(T vm, Map<Param, Object> params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException {
        // TODO Auto-generated method stub
@ -181,15 +193,9 @@ public class MockVirtualMachineManagerImpl implements VirtualMachineManager {
    }

    @Override
-    public VMInstanceVO findByIdAndType(Type type, long vmId) {
+    public VMInstanceVO findById(long vmId) {
        // TODO Auto-generated method stub
        return null;
    }

-    @Override
-    public boolean isVirtualMachineUpgradable(UserVm vm, ServiceOffering offering) {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
 }
--- a/utils/test/com/cloud/utils/component/MockComponentLocator.java
+++ b/utils/test/com/cloud/utils/component/MockComponentLocator.java
@ -59,8 +59,8 @@ public class MockComponentLocator extends ComponentLocator {
        return _library.addAdapterChain(interphace, adapters);
    }
    
-    public ComponentInfo<PluggableService> addService(String name, Class<? extends PluggableService> service) {
-        return _library.addService(name, service);
+    public <T> ComponentInfo<PluggableService> addService(String name, Class<T> serviceInterphace, Class<? extends PluggableService> service) {
+        return _library.addService(name, serviceInterphace, service);
    }
    
    @Override