mirror of https://github.com/apache/cloudstack.git
Fix unit tests
This commit is contained in:
parent
bfb017426d
commit
78efab46d5
|
|
@ -33,6 +33,7 @@ import com.cloud.network.NetworkModel;
|
|||
import com.cloud.network.NetworkService;
|
||||
import com.cloud.network.Networks;
|
||||
import com.cloud.network.dao.IPAddressDao;
|
||||
import com.cloud.network.dao.NetrisProviderDao;
|
||||
import com.cloud.network.dao.NsxProviderDao;
|
||||
import com.cloud.network.dao.PhysicalNetworkDao;
|
||||
import com.cloud.network.element.NsxProviderVO;
|
||||
|
|
@ -124,6 +125,8 @@ public class ConfigurationManagerImplTest {
|
|||
@Mock
|
||||
NsxProviderDao nsxProviderDao;
|
||||
@Mock
|
||||
NetrisProviderDao netrisProviderDao;
|
||||
@Mock
|
||||
DataCenterDao zoneDao;
|
||||
@Mock
|
||||
HostDao hostDao;
|
||||
|
|
@ -402,6 +405,7 @@ public class ConfigurationManagerImplTest {
|
|||
DataCenterVO dataCenterVO = Mockito.mock(DataCenterVO.class);
|
||||
|
||||
when(nsxProviderDao.findByZoneId(anyLong())).thenReturn(nsxProviderVO);
|
||||
when(netrisProviderDao.findByZoneId(anyLong())).thenReturn(null);
|
||||
when(zoneDao.findById(anyLong())).thenReturn(dataCenterVO);
|
||||
lenient().when(hostDao.findByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
|
||||
when(podDao.listByDataCenterId(anyLong())).thenReturn(Collections.emptyList());
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import com.cloud.network.Network.Service;
|
|||
import com.cloud.network.Networks.TrafficType;
|
||||
import com.cloud.network.VirtualRouterProvider.Type;
|
||||
import com.cloud.network.addr.PublicIp;
|
||||
import com.cloud.network.dao.NetrisProviderDao;
|
||||
import com.cloud.network.dao.NetworkVO;
|
||||
import com.cloud.network.dao.NsxProviderDao;
|
||||
import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
|
||||
|
|
@ -76,6 +77,8 @@ public class RouterDeploymentDefinitionTest extends RouterDeploymentDefinitionTe
|
|||
protected NetworkVO mockNw;
|
||||
@Mock
|
||||
protected NsxProviderDao nsxProviderDao;
|
||||
@Mock
|
||||
protected NetrisProviderDao netrisProviderDao;
|
||||
|
||||
protected RouterDeploymentDefinition deployment;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import com.cloud.exception.InsufficientServerCapacityException;
|
|||
import com.cloud.exception.ResourceUnavailableException;
|
||||
import com.cloud.exception.StorageUnavailableException;
|
||||
import com.cloud.network.addr.PublicIp;
|
||||
import com.cloud.network.dao.NetrisProviderDao;
|
||||
import com.cloud.network.dao.NsxProviderDao;
|
||||
import com.cloud.network.dao.PhysicalNetworkDao;
|
||||
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
|
||||
|
|
@ -65,6 +66,8 @@ public class VpcRouterDeploymentDefinitionTest extends RouterDeploymentDefinitio
|
|||
@Mock
|
||||
protected NsxProviderDao nsxProviderDao;
|
||||
@Mock
|
||||
protected NetrisProviderDao netrisProviderDao;
|
||||
@Mock
|
||||
protected PhysicalNetworkDao mockPhNwDao;
|
||||
protected PhysicalNetworkServiceProviderDao mockPhProviderDao;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue