Skip to content

Commit 3e77924

Browse files
erikbockserikbocks
committed
fix tests
1 parent 74303f8 commit 3e77924

22 files changed

+127
-22
lines changed

‎api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public String getEventType() {
5959

6060
@Override
6161
public String getEventDescription() {
62-
return "Releasing dedicated zone IPv4 subnet with ID:" + getResourceUuid(ApiConstants.ID);
62+
return "Releasing dedicated zone IPv4 subnet with ID: " + getResourceUuid(ApiConstants.ID);
6363
}
6464

6565
@Override

‎api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public String getEventType() {
8080

8181
@Override
8282
public String getEventDescription() {
83-
return "Changing BGP Peers for network with ID:" + getResourceUuid(ApiConstants.NETWORK_ID);
83+
return "Changing BGP Peers for network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
8484
}
8585

8686
@Override

‎api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public String getEventType() {
8282

8383
@Override
8484
public String getEventDescription() {
85-
return "Dedicating BGP Peer with ID" + getResourceUuid(ApiConstants.ID);
85+
return "Dedicating BGP Peer with ID: " + getResourceUuid(ApiConstants.ID);
8686
}
8787

8888
@Override

‎api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmd.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public String getEventType() {
5959

6060
@Override
6161
public String getEventDescription() {
62-
return "Releasing a dedicated BGP Peer " + getResourceUuid(ApiConstants.ID);
62+
return "Releasing dedicated BGP Peer with ID: " + getResourceUuid(ApiConstants.ID);
6363
}
6464

6565
@Override

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmdTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.cloud.event.EventTypes;
2121

2222
import org.apache.cloudstack.api.response.Ipv4SubnetForGuestNetworkResponse;
23+
import org.apache.cloudstack.context.CallContext;
2324
import org.apache.cloudstack.network.Ipv4GuestSubnetNetworkMap;
2425
import org.apache.cloudstack.network.RoutedIpv4Manager;
2526
import org.junit.Assert;
@@ -29,6 +30,8 @@
2930
import org.mockito.junit.MockitoJUnitRunner;
3031
import org.springframework.test.util.ReflectionTestUtils;
3132

33+
import java.util.UUID;
34+
3235
@RunWith(MockitoJUnitRunner.class)
3336
public class CreateIpv4SubnetForGuestNetworkCmdTest {
3437

@@ -37,6 +40,7 @@ public class CreateIpv4SubnetForGuestNetworkCmdTest {
3740
@Test
3841
public void testCreateIpv4SubnetForGuestNetworkCmd() {
3942
Long parentId = 1L;
43+
String parentUuid = UUID.randomUUID().toString();
4044
String subnet = "192.168.1.0/24";
4145
Integer cidrSize = 26;
4246

@@ -46,12 +50,14 @@ public void testCreateIpv4SubnetForGuestNetworkCmd() {
4650
ReflectionTestUtils.setField(cmd, "cidrSize", cidrSize);
4751
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
4852

53+
CallContext.current().putApiResourceUuid("parentid", parentUuid.toString());
54+
4955
Assert.assertEquals(parentId, cmd.getParentId());
5056
Assert.assertEquals(subnet, cmd.getSubnet());
5157
Assert.assertEquals(cidrSize, cmd.getCidrSize());
5258
Assert.assertEquals(1L, cmd.getEntityOwnerId());
5359
Assert.assertEquals(EventTypes.EVENT_IP4_GUEST_SUBNET_CREATE, cmd.getEventType());
54-
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s in zone subnet=%s", subnet, parentId), cmd.getEventDescription());
60+
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s in zone subnet=%s", subnet, parentUuid), cmd.getEventDescription());
5561

5662
Ipv4GuestSubnetNetworkMap ipv4GuestSubnetNetworkMap = Mockito.mock(Ipv4GuestSubnetNetworkMap.class);
5763
Mockito.when(routedIpv4Manager.createIpv4SubnetForGuestNetwork(cmd)).thenReturn(ipv4GuestSubnetNetworkMap);

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmdTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.cloud.event.EventTypes;
2121

2222
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
23+
import org.apache.cloudstack.context.CallContext;
2324
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
2425
import org.apache.cloudstack.network.RoutedIpv4Manager;
2526
import org.junit.Assert;
@@ -29,6 +30,8 @@
2930
import org.mockito.junit.MockitoJUnitRunner;
3031
import org.springframework.test.util.ReflectionTestUtils;
3132

33+
import java.util.UUID;
34+
3235
@RunWith(MockitoJUnitRunner.class)
3336
public class CreateIpv4SubnetForZoneCmdTest {
3437

@@ -37,6 +40,7 @@ public class CreateIpv4SubnetForZoneCmdTest {
3740
@Test
3841
public void testCreateIpv4SubnetForZoneCmd() {
3942
Long zoneId = 1L;
43+
String zoneUuid = UUID.randomUUID().toString();
4044
String subnet = "192.168.1.0/24";
4145
String accountName = "user";
4246
Long projectId = 10L;
@@ -50,14 +54,16 @@ public void testCreateIpv4SubnetForZoneCmd() {
5054
ReflectionTestUtils.setField(cmd,"domainId", domainId);
5155
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
5256

57+
CallContext.current().putApiResourceUuid("zoneid", zoneUuid);
58+
5359
Assert.assertEquals(zoneId, cmd.getZoneId());
5460
Assert.assertEquals(subnet, cmd.getSubnet());
5561
Assert.assertEquals(accountName, cmd.getAccountName());
5662
Assert.assertEquals(projectId, cmd.getProjectId());
5763
Assert.assertEquals(domainId, cmd.getDomainId());
5864
Assert.assertEquals(1L, cmd.getEntityOwnerId());
5965
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_CREATE, cmd.getEventType());
60-
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s for zone=%s", subnet, zoneId), cmd.getEventDescription());
66+
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s for zone: %s", subnet, zoneUuid), cmd.getEventDescription());
6167

6268
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
6369
Mockito.when(routedIpv4Manager.createDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmdTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.cloud.event.EventTypes;
2121
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
22+
import org.apache.cloudstack.context.CallContext;
2223
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
2324
import org.apache.cloudstack.network.RoutedIpv4Manager;
2425
import org.junit.Assert;
@@ -28,6 +29,8 @@
2829
import org.mockito.junit.MockitoJUnitRunner;
2930
import org.springframework.test.util.ReflectionTestUtils;
3031

32+
import java.util.UUID;
33+
3134
@RunWith(MockitoJUnitRunner.class)
3235
public class DedicateIpv4SubnetForZoneCmdTest {
3336

@@ -36,6 +39,7 @@ public class DedicateIpv4SubnetForZoneCmdTest {
3639
@Test
3740
public void testDedicateIpv4SubnetForZoneCmd() {
3841
Long id = 1L;
42+
String uuid = UUID.randomUUID().toString();
3943
String accountName = "user";
4044
Long projectId = 10L;
4145
Long domainId = 11L;
@@ -47,14 +51,16 @@ public void testDedicateIpv4SubnetForZoneCmd() {
4751
ReflectionTestUtils.setField(cmd,"domainId", domainId);
4852
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
4953

54+
CallContext.current().putApiResourceUuid("id", uuid);
55+
5056
Assert.assertEquals(id, cmd.getId());
5157
Assert.assertEquals(accountName, cmd.getAccountName());
5258
Assert.assertEquals(projectId, cmd.getProjectId());
5359
Assert.assertEquals(domainId, cmd.getDomainId());
5460

5561
Assert.assertEquals(1L, cmd.getEntityOwnerId());
5662
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_DEDICATE, cmd.getEventType());
57-
Assert.assertEquals(String.format("Dedicating zone IPv4 subnet %s", id), cmd.getEventDescription());
63+
Assert.assertEquals(String.format("Dedicating zone's IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
5864

5965
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
6066
Mockito.when(routedIpv4Manager.dedicateDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmdTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.cloud.event.EventTypes;
2121

2222
import org.apache.cloudstack.api.response.SuccessResponse;
23+
import org.apache.cloudstack.context.CallContext;
2324
import org.apache.cloudstack.network.RoutedIpv4Manager;
2425
import org.junit.Assert;
2526
import org.junit.Test;
@@ -28,6 +29,8 @@
2829
import org.mockito.junit.MockitoJUnitRunner;
2930
import org.springframework.test.util.ReflectionTestUtils;
3031

32+
import java.util.UUID;
33+
3134
@RunWith(MockitoJUnitRunner.class)
3235
public class DeleteIpv4SubnetForGuestNetworkCmdTest {
3336

@@ -36,15 +39,18 @@ public class DeleteIpv4SubnetForGuestNetworkCmdTest {
3639
@Test
3740
public void testDeleteIpv4SubnetForGuestNetworkCmd() {
3841
Long id = 1L;
42+
String uuid = UUID.randomUUID().toString();
3943

4044
DeleteIpv4SubnetForGuestNetworkCmd cmd = new DeleteIpv4SubnetForGuestNetworkCmd();
4145
ReflectionTestUtils.setField(cmd, "id", id);
4246
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
4347

48+
CallContext.current().putApiResourceUuid("id", uuid);
49+
4450
Assert.assertEquals(id, cmd.getId());
4551
Assert.assertEquals(1L, cmd.getEntityOwnerId());
4652
Assert.assertEquals(EventTypes.EVENT_IP4_GUEST_SUBNET_DELETE, cmd.getEventType());
47-
Assert.assertEquals(String.format("Deleting guest IPv4 subnet %s", id), cmd.getEventDescription());
53+
Assert.assertEquals(String.format("Deleting guest IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
4854

4955
Mockito.when(routedIpv4Manager.deleteIpv4SubnetForGuestNetwork(cmd)).thenReturn(true);
5056

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmdTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.cloud.event.EventTypes;
2121

2222
import org.apache.cloudstack.api.response.SuccessResponse;
23+
import org.apache.cloudstack.context.CallContext;
2324
import org.apache.cloudstack.network.RoutedIpv4Manager;
2425
import org.junit.Assert;
2526
import org.junit.Test;
@@ -28,6 +29,8 @@
2829
import org.mockito.junit.MockitoJUnitRunner;
2930
import org.springframework.test.util.ReflectionTestUtils;
3031

32+
import java.util.UUID;
33+
3134
@RunWith(MockitoJUnitRunner.class)
3235
public class DeleteIpv4SubnetForZoneCmdTest {
3336

@@ -36,15 +39,18 @@ public class DeleteIpv4SubnetForZoneCmdTest {
3639
@Test
3740
public void testDeleteIpv4SubnetForZoneCmd() {
3841
Long id = 1L;
42+
String uuid = UUID.randomUUID().toString();
3943

4044
DeleteIpv4SubnetForZoneCmd cmd = new DeleteIpv4SubnetForZoneCmd();
4145
ReflectionTestUtils.setField(cmd, "id", id);
4246
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
4347

48+
CallContext.current().putApiResourceUuid("id", uuid);
49+
4450
Assert.assertEquals(id, cmd.getId());
4551
Assert.assertEquals(1L, cmd.getEntityOwnerId());
4652
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_DELETE, cmd.getEventType());
47-
Assert.assertEquals(String.format("Deleting zone IPv4 subnet %s", id), cmd.getEventDescription());
53+
Assert.assertEquals(String.format("Deleting zone IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
4854

4955
Mockito.when(routedIpv4Manager.deleteDataCenterIpv4GuestSubnet(cmd)).thenReturn(true);
5056

‎api/src/test/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmdTest.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import com.cloud.event.EventTypes;
2121
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
22+
import org.apache.cloudstack.context.CallContext;
2223
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
2324
import org.apache.cloudstack.network.RoutedIpv4Manager;
2425
import org.junit.Assert;
@@ -28,6 +29,8 @@
2829
import org.mockito.junit.MockitoJUnitRunner;
2930
import org.springframework.test.util.ReflectionTestUtils;
3031

32+
import java.util.UUID;
33+
3134
@RunWith(MockitoJUnitRunner.class)
3235
public class ReleaseDedicatedIpv4SubnetForZoneCmdTest {
3336

@@ -36,15 +39,18 @@ public class ReleaseDedicatedIpv4SubnetForZoneCmdTest {
3639
@Test
3740
public void testReleaseDedicatedIpv4SubnetForZoneCmd() {
3841
Long id = 1L;
42+
String uuid = UUID.randomUUID().toString();
3943

4044
ReleaseDedicatedIpv4SubnetForZoneCmd cmd = new ReleaseDedicatedIpv4SubnetForZoneCmd();
4145
ReflectionTestUtils.setField(cmd, "id", id);
4246
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
4347

48+
CallContext.current().putApiResourceUuid("id", uuid);
49+
4450
Assert.assertEquals(id, cmd.getId());
4551
Assert.assertEquals(1L, cmd.getEntityOwnerId());
4652
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_RELEASE, cmd.getEventType());
47-
Assert.assertEquals(String.format("Releasing a dedicated zone IPv4 subnet %s", id), cmd.getEventDescription());
53+
Assert.assertEquals(String.format("Releasing dedicated zone IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
4854

4955
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
5056
Mockito.when(routedIpv4Manager.releaseDedicatedDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

0 commit comments

Comments
 (0)