DaanHoogland commented on a change in pull request #2382: CLOUDSTACK-4045
URL: https://github.com/apache/cloudstack/pull/2382#discussion_r159233471
##########
File path: server/test/com/cloud/network/IpAddressManagerTest.java
##########
@@ -17,38 +17,109 @@
package com.cloud.network;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.dao.IPAddressDao;
+import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.rules.StaticNat;
+import com.cloud.network.rules.StaticNatImpl;
+import com.cloud.offerings.NetworkOfferingVO;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.user.AccountVO;
+import com.cloud.utils.net.Ip;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-
-import com.cloud.network.dao.IPAddressDao;
-import com.cloud.network.dao.IPAddressVO;
-import com.cloud.network.rules.StaticNat;
-import com.cloud.network.rules.StaticNatImpl;
-import com.cloud.utils.net.Ip;
-
-import static org.mockito.Mockito.when;
+import org.mockito.Spy;
import java.util.Collections;
import java.util.List;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.anyLong;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class IpAddressManagerTest {
@Mock
IPAddressDao _ipAddrDao;
+ @Mock
+ NetworkDao _networkDao;
+
+ @Mock
+ NetworkOfferingDao _networkOfferingDao;
+
+ @Mock
+ NetworkModel _networkModel;
+
+ @Spy
@InjectMocks
IpAddressManagerImpl _ipManager;
+ IPAddressVO ipAddressVO;
+
+ NetworkVO networkAllocated;
+
+ NetworkVO networkImplemented;
+
+ NetworkVO networkNat;
+
+ AccountVO account;
+
@Before
- public void setup() {
+ public void setup() throws ResourceUnavailableException {
MockitoAnnotations.initMocks(this);
+
+ ipAddressVO = new IPAddressVO(new Ip("192.0.0.1"), 1L, 1L, 1L,false);
+ ipAddressVO.setAllocatedToAccountId(1L);
+
+ IPAddressVO sourceNat = new IPAddressVO(new Ip("192.0.0.2"), 1L, 1L,
1L,true);
+
+ networkAllocated = Mockito.mock(NetworkVO.class);
+
when(networkAllocated.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+ when(networkAllocated.getNetworkOfferingId()).thenReturn(8L);
+ when(networkAllocated.getState()).thenReturn(Network.State.Allocated);
+
when(networkAllocated.getGuestType()).thenReturn(Network.GuestType.Isolated);
+ when(networkAllocated.getVpcId()).thenReturn(null);
+
+ networkImplemented = Mockito.mock(NetworkVO.class);
+
when(networkImplemented.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+ when(networkImplemented.getNetworkOfferingId()).thenReturn(8L);
+
when(networkImplemented.getState()).thenReturn(Network.State.Implemented);
+
when(networkImplemented.getGuestType()).thenReturn(Network.GuestType.Isolated);
+ when(networkImplemented.getVpcId()).thenReturn(null);
+
+ networkNat = Mockito.mock(NetworkVO.class);
+
when(networkNat.getTrafficType()).thenReturn(Networks.TrafficType.Guest);
+ when(networkNat.getNetworkOfferingId()).thenReturn(8L);
+ when(networkNat.getState()).thenReturn(Network.State.Implemented);
+ when(networkNat.getGuestType()).thenReturn(Network.GuestType.Isolated);
+ when(networkNat.getId()).thenReturn(3L);
+ when(networkNat.getVpcId()).thenReturn(null);
+
+ account = new AccountVO("admin", 1L, null, (short) 1, 1L,
"c65a73d5-ebbd-11e7-8f45-107b44277808");
+ account.setId(1L);
+
+ NetworkOfferingVO networkOfferingVO =
Mockito.mock(NetworkOfferingVO.class);
+ networkOfferingVO.setSharedSourceNat(false);
+
+ Mockito.when(_networkDao.findById(1L)).thenReturn(networkAllocated);
Review comment:
the ids of networkAllocated and networkImplemented are mixed up in
comparison with the test methods
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
