etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
erikbocks 2026-01-20 11:35:35 -03:00
parent 1cb2f1b875
commit 6f16482165
22 changed files with 127 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmd.java
View File

@ -59,7 +59,7 @@ public class ReleaseDedicatedIpv4SubnetForZoneCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Releasing dedicated zone IPv4 subnet with ID:" + getResourceUuid(ApiConstants.ID);
return "Releasing dedicated zone IPv4 subnet with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmd.java
View File

@ -80,7 +80,7 @@ public class ChangeBgpPeersForNetworkCmd extends BaseAsyncCmd implements AdminCm
@Override
public String getEventDescription() {
return "Changing BGP Peers for network with ID:" + getResourceUuid(ApiConstants.NETWORK_ID);
return "Changing BGP Peers for network with ID: " + getResourceUuid(ApiConstants.NETWORK_ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmd.java
View File

@ -82,7 +82,7 @@ public class DedicateBgpPeerCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Dedicating BGP Peer with ID" + getResourceUuid(ApiConstants.ID);
return "Dedicating BGP Peer with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmd.java
View File

@ -59,7 +59,7 @@ public class ReleaseDedicatedBgpPeerCmd extends BaseAsyncCmd {
@Override
public String getEventDescription() {
return "Releasing a dedicated BGP Peer " + getResourceUuid(ApiConstants.ID);
return "Releasing dedicated BGP Peer with ID: " + getResourceUuid(ApiConstants.ID);
}
@Override

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.Ipv4SubnetForGuestNetworkResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.Ipv4GuestSubnetNetworkMap;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -29,6 +30,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class CreateIpv4SubnetForGuestNetworkCmdTest {
@ -37,6 +40,7 @@ public class CreateIpv4SubnetForGuestNetworkCmdTest {
@Test
public void testCreateIpv4SubnetForGuestNetworkCmd() {
Long parentId = 1L;
String parentUuid = UUID.randomUUID().toString();
String subnet = "192.168.1.0/24";
Integer cidrSize = 26;
@ -46,12 +50,14 @@ public class CreateIpv4SubnetForGuestNetworkCmdTest {
ReflectionTestUtils.setField(cmd, "cidrSize", cidrSize);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("parentid", parentUuid.toString());
Assert.assertEquals(parentId, cmd.getParentId());
Assert.assertEquals(subnet, cmd.getSubnet());
Assert.assertEquals(cidrSize, cmd.getCidrSize());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_IP4_GUEST_SUBNET_CREATE, cmd.getEventType());
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s in zone subnet=%s", subnet, parentId), cmd.getEventDescription());
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s in zone subnet=%s", subnet, parentUuid), cmd.getEventDescription());
Ipv4GuestSubnetNetworkMap ipv4GuestSubnetNetworkMap = Mockito.mock(Ipv4GuestSubnetNetworkMap.class);
Mockito.when(routedIpv4Manager.createIpv4SubnetForGuestNetwork(cmd)).thenReturn(ipv4GuestSubnetNetworkMap);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForZoneCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -29,6 +30,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class CreateIpv4SubnetForZoneCmdTest {
@ -37,6 +40,7 @@ public class CreateIpv4SubnetForZoneCmdTest {
@Test
public void testCreateIpv4SubnetForZoneCmd() {
Long zoneId = 1L;
String zoneUuid = UUID.randomUUID().toString();
String subnet = "192.168.1.0/24";
String accountName = "user";
Long projectId = 10L;
@ -50,6 +54,8 @@ public class CreateIpv4SubnetForZoneCmdTest {
ReflectionTestUtils.setField(cmd,"domainId", domainId);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("zoneid", zoneUuid);
Assert.assertEquals(zoneId, cmd.getZoneId());
Assert.assertEquals(subnet, cmd.getSubnet());
Assert.assertEquals(accountName, cmd.getAccountName());
@ -57,7 +63,7 @@ public class CreateIpv4SubnetForZoneCmdTest {
Assert.assertEquals(domainId, cmd.getDomainId());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_CREATE, cmd.getEventType());
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s for zone=%s", subnet, zoneId), cmd.getEventDescription());
Assert.assertEquals(String.format("Creating guest IPv4 subnet %s for zone: %s", subnet, zoneUuid), cmd.getEventDescription());
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
Mockito.when(routedIpv4Manager.createDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/DedicateIpv4SubnetForZoneCmdTest.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class DedicateIpv4SubnetForZoneCmdTest {
@ -36,6 +39,7 @@ public class DedicateIpv4SubnetForZoneCmdTest {
@Test
public void testDedicateIpv4SubnetForZoneCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
String accountName = "user";
Long projectId = 10L;
Long domainId = 11L;
@ -47,6 +51,8 @@ public class DedicateIpv4SubnetForZoneCmdTest {
ReflectionTestUtils.setField(cmd,"domainId", domainId);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(accountName, cmd.getAccountName());
Assert.assertEquals(projectId, cmd.getProjectId());
@ -54,7 +60,7 @@ public class DedicateIpv4SubnetForZoneCmdTest {
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_DEDICATE, cmd.getEventType());
Assert.assertEquals(String.format("Dedicating zone IPv4 subnet %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Dedicating zone's IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
Mockito.when(routedIpv4Manager.dedicateDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForGuestNetworkCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
import org.junit.Test;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class DeleteIpv4SubnetForGuestNetworkCmdTest {
@ -36,15 +39,18 @@ public class DeleteIpv4SubnetForGuestNetworkCmdTest {
@Test
public void testDeleteIpv4SubnetForGuestNetworkCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
DeleteIpv4SubnetForGuestNetworkCmd cmd = new DeleteIpv4SubnetForGuestNetworkCmd();
ReflectionTestUtils.setField(cmd, "id", id);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_IP4_GUEST_SUBNET_DELETE, cmd.getEventType());
Assert.assertEquals(String.format("Deleting guest IPv4 subnet %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Deleting guest IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
Mockito.when(routedIpv4Manager.deleteIpv4SubnetForGuestNetwork(cmd)).thenReturn(true);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/DeleteIpv4SubnetForZoneCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
import org.junit.Test;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class DeleteIpv4SubnetForZoneCmdTest {
@ -36,15 +39,18 @@ public class DeleteIpv4SubnetForZoneCmdTest {
@Test
public void testDeleteIpv4SubnetForZoneCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
DeleteIpv4SubnetForZoneCmd cmd = new DeleteIpv4SubnetForZoneCmd();
ReflectionTestUtils.setField(cmd, "id", id);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_DELETE, cmd.getEventType());
Assert.assertEquals(String.format("Deleting zone IPv4 subnet %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Deleting zone IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
Mockito.when(routedIpv4Manager.deleteDataCenterIpv4GuestSubnet(cmd)).thenReturn(true);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedIpv4SubnetForZoneCmdTest.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class ReleaseDedicatedIpv4SubnetForZoneCmdTest {
@ -36,15 +39,18 @@ public class ReleaseDedicatedIpv4SubnetForZoneCmdTest {
@Test
public void testReleaseDedicatedIpv4SubnetForZoneCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
ReleaseDedicatedIpv4SubnetForZoneCmd cmd = new ReleaseDedicatedIpv4SubnetForZoneCmd();
ReflectionTestUtils.setField(cmd, "id", id);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_RELEASE, cmd.getEventType());
Assert.assertEquals(String.format("Releasing a dedicated zone IPv4 subnet %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Releasing dedicated zone IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
Mockito.when(routedIpv4Manager.releaseDedicatedDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/UpdateIpv4SubnetForZoneCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.DataCenterIpv4SubnetResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -29,6 +30,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class UpdateIpv4SubnetForZoneCmdTest {
@ -37,6 +40,7 @@ public class UpdateIpv4SubnetForZoneCmdTest {
@Test
public void testUpdateIpv4SubnetForZoneCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
String subnet = "192.168.1.0/24";
UpdateIpv4SubnetForZoneCmd cmd = new UpdateIpv4SubnetForZoneCmd();
@ -44,11 +48,13 @@ public class UpdateIpv4SubnetForZoneCmdTest {
ReflectionTestUtils.setField(cmd, "subnet", subnet);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(subnet, cmd.getSubnet());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_ZONE_IP4_SUBNET_UPDATE, cmd.getEventType());
Assert.assertEquals(String.format("Updating zone IPv4 subnet %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Updating zone IPv4 subnet with ID: %s", uuid), cmd.getEventDescription());
DataCenterIpv4GuestSubnet zoneSubnet = Mockito.mock(DataCenterIpv4GuestSubnet.class);
Mockito.when(routedIpv4Manager.updateDataCenterIpv4GuestSubnet(cmd)).thenReturn(zoneSubnet);

7
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForNetworkCmdTest.java
View File

@ -23,6 +23,7 @@ import com.cloud.network.Network;
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ResponseObject;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
import org.junit.Test;
@ -33,6 +34,7 @@ import org.springframework.test.util.ReflectionTestUtils;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class ChangeBgpPeersForNetworkCmdTest {
@ -44,6 +46,7 @@ public class ChangeBgpPeersForNetworkCmdTest {
@Test
public void testChangeBgpPeersForNetworkCmd() {
Long networkId = 10L;
String networkUuid = UUID.randomUUID().toString();
List<Long> bgpPeerIds = Arrays.asList(20L, 21L);
ChangeBgpPeersForNetworkCmd cmd = new ChangeBgpPeersForNetworkCmd();
@ -52,11 +55,13 @@ public class ChangeBgpPeersForNetworkCmdTest {
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
ReflectionTestUtils.setField(cmd,"_responseGenerator", _responseGenerator);
CallContext.current().putApiResourceUuid("networkid", networkUuid);
Assert.assertEquals(networkId, cmd.getNetworkId());
Assert.assertEquals(bgpPeerIds, cmd.getBgpPeerIds());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_NETWORK_BGP_PEER_UPDATE, cmd.getEventType());
Assert.assertEquals(String.format("Changing Bgp Peers for network %s", networkId), cmd.getEventDescription());
Assert.assertEquals(String.format("Changing BGP Peers for network with ID: %s", networkUuid), cmd.getEventDescription());
Network network = Mockito.mock(Network.class);
Mockito.when(routedIpv4Manager.changeBgpPeersForNetwork(cmd)).thenReturn(network);

7
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ChangeBgpPeersForVpcCmdTest.java
View File

@ -23,6 +23,7 @@ import com.cloud.network.vpc.Vpc;
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.ResponseObject;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
import org.junit.Test;
@ -33,6 +34,7 @@ import org.springframework.test.util.ReflectionTestUtils;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class ChangeBgpPeersForVpcCmdTest {
@ -44,6 +46,7 @@ public class ChangeBgpPeersForVpcCmdTest {
@Test
public void testChangeBgpPeersForVpcCmd() {
Long VpcId = 10L;
String vpcUuid = UUID.randomUUID().toString();
List<Long> bgpPeerIds = Arrays.asList(20L, 21L);
ChangeBgpPeersForVpcCmd cmd = new ChangeBgpPeersForVpcCmd();
@ -52,11 +55,13 @@ public class ChangeBgpPeersForVpcCmdTest {
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
ReflectionTestUtils.setField(cmd,"_responseGenerator", _responseGenerator);
CallContext.current().putApiResourceUuid("vpcid", vpcUuid);
Assert.assertEquals(VpcId, cmd.getVpcId());
Assert.assertEquals(bgpPeerIds, cmd.getBgpPeerIds());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_VPC_BGP_PEER_UPDATE, cmd.getEventType());
Assert.assertEquals(String.format("Changing Bgp Peers for VPC %s", VpcId), cmd.getEventDescription());
Assert.assertEquals(String.format("Changing BGP Peers for VPC with ID: %s", vpcUuid), cmd.getEventDescription());
Vpc Vpc = Mockito.mock(Vpc.class);
Mockito.when(routedIpv4Manager.changeBgpPeersForVpc(cmd)).thenReturn(Vpc);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/CreateBgpPeerCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network.bgp;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.BgpPeerResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.BgpPeer;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -29,6 +30,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class CreateBgpPeerCmdTest {
@ -37,6 +40,7 @@ public class CreateBgpPeerCmdTest {
@Test
public void testCreateBgpPeerCmd() {
Long zoneId = 1L;
String zoneUuid = UUID.randomUUID().toString();
String accountName = "user";
Long projectId = 10L;
Long domainId = 11L;
@ -56,6 +60,8 @@ public class CreateBgpPeerCmdTest {
ReflectionTestUtils.setField(cmd,"domainId", domainId);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("zoneid", zoneUuid);
Assert.assertEquals(zoneId, cmd.getZoneId());
Assert.assertEquals(ip4Address, cmd.getIp4Address());
Assert.assertEquals(ip6Address, cmd.getIp6Address());
@ -67,7 +73,7 @@ public class CreateBgpPeerCmdTest {
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_BGP_PEER_CREATE, cmd.getEventType());
Assert.assertEquals(String.format("Creating Bgp Peer %s for zone=%s", peerAsNumber, zoneId), cmd.getEventDescription());
Assert.assertEquals(String.format("Creating BGP Peer %s for zone with ID: %s", peerAsNumber, zoneUuid), cmd.getEventDescription());
BgpPeer bgpPeer = Mockito.mock(BgpPeer.class);
Mockito.when(routedIpv4Manager.createBgpPeer(cmd)).thenReturn(bgpPeer);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DedicateBgpPeerCmdTest.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network.bgp;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.BgpPeerResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.BgpPeer;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class DedicateBgpPeerCmdTest {
@ -36,6 +39,7 @@ public class DedicateBgpPeerCmdTest {
@Test
public void testDedicateBgpPeerCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
String accountName = "user";
Long projectId = 10L;
Long domainId = 11L;
@ -47,6 +51,8 @@ public class DedicateBgpPeerCmdTest {
ReflectionTestUtils.setField(cmd,"domainId", domainId);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(accountName, cmd.getAccountName());
Assert.assertEquals(projectId, cmd.getProjectId());
@ -54,7 +60,7 @@ public class DedicateBgpPeerCmdTest {
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_BGP_PEER_DEDICATE, cmd.getEventType());
Assert.assertEquals(String.format("Dedicating Bgp Peer %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Dedicating BGP Peer with ID: %s", uuid), cmd.getEventDescription());
BgpPeer bgpPeer = Mockito.mock(BgpPeer.class);
Mockito.when(routedIpv4Manager.dedicateBgpPeer(cmd)).thenReturn(bgpPeer);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/DeleteBgpPeerCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network.bgp;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
import org.junit.Test;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class DeleteBgpPeerCmdTest {
@ -36,15 +39,18 @@ public class DeleteBgpPeerCmdTest {
@Test
public void testDeleteBgpPeerCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
DeleteBgpPeerCmd cmd = new DeleteBgpPeerCmd();
ReflectionTestUtils.setField(cmd, "id", id);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_BGP_PEER_DELETE, cmd.getEventType());
Assert.assertEquals(String.format("Deleting Bgp Peer %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Deleting BGP Peer with ID: %s", uuid), cmd.getEventDescription());
Mockito.when(routedIpv4Manager.deleteBgpPeer(cmd)).thenReturn(true);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/ReleaseDedicatedBgpPeerCmdTest.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.network.bgp;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.BgpPeerResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.BgpPeer;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -28,6 +29,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class ReleaseDedicatedBgpPeerCmdTest {
@ -36,15 +39,18 @@ public class ReleaseDedicatedBgpPeerCmdTest {
@Test
public void testReleaseDedicatedBgpPeerCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
ReleaseDedicatedBgpPeerCmd cmd = new ReleaseDedicatedBgpPeerCmd();
ReflectionTestUtils.setField(cmd, "id", id);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_BGP_PEER_RELEASE, cmd.getEventType());
Assert.assertEquals(String.format("Releasing a dedicated Bgp Peer %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Releasing dedicated BGP Peer with ID: %s", uuid), cmd.getEventDescription());
BgpPeer bgpPeer = Mockito.mock(BgpPeer.class);
Mockito.when(routedIpv4Manager.releaseDedicatedBgpPeer(cmd)).thenReturn(bgpPeer);

8
api/src/test/java/org/apache/cloudstack/api/command/admin/network/bgp/UpdateBgpPeerCmdTest.java
View File

@ -20,6 +20,7 @@ package org.apache.cloudstack.api.command.admin.network.bgp;
import com.cloud.event.EventTypes;
import org.apache.cloudstack.api.response.BgpPeerResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.BgpPeer;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
@ -29,6 +30,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class UpdateBgpPeerCmdTest {
@ -37,6 +40,7 @@ public class UpdateBgpPeerCmdTest {
@Test
public void testUpdateBgpPeerCmd() {
Long id = 1L;
String uuid = UUID.randomUUID().toString();
String ip4Address = "ip4-address";
String ip6Address = "ip6-address";
Long peerAsNumber = 15000L;
@ -50,6 +54,8 @@ public class UpdateBgpPeerCmdTest {
ReflectionTestUtils.setField(cmd, "password", peerPassword);
ReflectionTestUtils.setField(cmd,"routedIpv4Manager", routedIpv4Manager);
CallContext.current().putApiResourceUuid("id", uuid);
Assert.assertEquals(id, cmd.getId());
Assert.assertEquals(ip4Address, cmd.getIp4Address());
Assert.assertEquals(ip6Address, cmd.getIp6Address());
@ -57,7 +63,7 @@ public class UpdateBgpPeerCmdTest {
Assert.assertEquals(peerPassword, cmd.getPassword());
Assert.assertEquals(1L, cmd.getEntityOwnerId());
Assert.assertEquals(EventTypes.EVENT_BGP_PEER_UPDATE, cmd.getEventType());
Assert.assertEquals(String.format("Updating Bgp Peer %s", id), cmd.getEventDescription());
Assert.assertEquals(String.format("Updating BGP Peer with ID: %s", uuid), cmd.getEventDescription());
BgpPeer bgpPeer = Mockito.mock(BgpPeer.class);
Mockito.when(routedIpv4Manager.updateBgpPeer(cmd)).thenReturn(bgpPeer);

7
api/src/test/java/org/apache/cloudstack/api/command/admin/storage/DownloadImageStoreObjectCmdTest.java
View File

@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.storage;
import com.cloud.utils.Pair;
import org.apache.cloudstack.api.response.ExtractResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.storage.browser.StorageBrowser;
import org.junit.Assert;
import org.junit.Test;
@ -30,6 +31,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.List;
import java.util.UUID;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@ -95,10 +97,13 @@ public class DownloadImageStoreObjectCmdTest {
@Test
public void testGetEventDescription() {
String uuid = UUID.randomUUID().toString();
ReflectionTestUtils.setField(cmd, "storeId", 1L);
ReflectionTestUtils.setField(cmd, "path", "path/to/object");
CallContext.current().putApiResourceUuid("id", uuid);
String eventDescription = cmd.getEventDescription();
Assert.assertEquals("Downloading object at path path/to/object on image store 1", eventDescription);
Assert.assertEquals(String.format("Downloading object at path path/to/object on image store %s", uuid), eventDescription);
}
}

8
api/src/test/java/org/apache/cloudstack/api/command/admin/volume/UnmanageVolumeCmdTest.java
View File

@ -22,6 +22,7 @@ import com.cloud.storage.Volume;
import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.ResponseGenerator;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.storage.volume.VolumeImportUnmanageService;
import org.junit.Assert;
import org.junit.Test;
@ -31,6 +32,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
@RunWith(MockitoJUnitRunner.class)
public class UnmanageVolumeCmdTest {
@ -41,6 +44,7 @@ public class UnmanageVolumeCmdTest {
public void testUnmanageVolumeCmd() {
long accountId = 2L;
Long volumeId = 3L;
String volumeUuid = UUID.randomUUID().toString();
Volume volume = Mockito.mock(Volume.class);
Mockito.when(responseGenerator.findVolumeById(volumeId)).thenReturn(volume);
@ -51,12 +55,14 @@ public class UnmanageVolumeCmdTest {
ReflectionTestUtils.setField(cmd,"volumeImportService", volumeImportService);
ReflectionTestUtils.setField(cmd,"_responseGenerator", responseGenerator);
CallContext.current().putApiResourceUuid("id", volumeUuid);
Assert.assertEquals(volumeId, cmd.getVolumeId());
Assert.assertEquals(accountId, cmd.getEntityOwnerId());
Assert.assertEquals(volumeId, cmd.getApiResourceId());
Assert.assertEquals(ApiCommandResourceType.Volume, cmd.getApiResourceType());
Assert.assertEquals(EventTypes.EVENT_VOLUME_UNMANAGE, cmd.getEventType());
Assert.assertEquals("Unmanaging Volume with ID " + volumeId, cmd.getEventDescription());
Assert.assertEquals("Unmanaging Volume with ID: " + volumeUuid, cmd.getEventDescription());
Mockito.when(volumeImportService.unmanageVolume(volumeId)).thenReturn(true);
try {

8
api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java
View File

@ -31,12 +31,15 @@ import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.autoscale.UpdateConditionCmd;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.context.CallContext;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
import static org.mockito.Mockito.when;
public class UpdateConditionCmdTest {
@ -53,6 +56,7 @@ public class UpdateConditionCmdTest {
private static final Long threshold = 100L;
private static final long accountId = 5L;
private static final String conditionUuid = UUID.randomUUID().toString();
@Before
public void setUp() {
@ -71,6 +75,8 @@ public class UpdateConditionCmdTest {
ReflectionTestUtils.setField(updateConditionCmd,"relationalOperator", relationalOperator);
ReflectionTestUtils.setField(updateConditionCmd,"threshold", threshold);
CallContext.current().putApiResourceUuid("id", conditionUuid);
condition = Mockito.mock(Condition.class);
}
@ -83,7 +89,7 @@ public class UpdateConditionCmdTest {
Assert.assertEquals(ApiCommandResourceType.Condition, updateConditionCmd.getApiResourceType());
Assert.assertEquals("updateconditionresponse", updateConditionCmd.getCommandName());
Assert.assertEquals(EventTypes.EVENT_CONDITION_UPDATE, updateConditionCmd.getEventType());
Assert.assertEquals("Updating a condition.", updateConditionCmd.getEventDescription());
Assert.assertEquals("Updating VM auto scaling condition with ID: " + conditionUuid, updateConditionCmd.getEventDescription());
when(entityMgr.findById(Condition.class, conditionId)).thenReturn(condition);
when(condition.getAccountId()).thenReturn(accountId);

8
api/src/test/java/org/apache/cloudstack/api/command/user/network/routing/DeleteRoutingFirewallRuleCmdTest.java
View File

@ -23,6 +23,7 @@ import com.cloud.network.rules.FirewallRule;
import org.apache.cloudstack.api.ApiCommandResourceType;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.network.RoutedIpv4Manager;
import org.junit.Assert;
import org.junit.Test;
@ -31,6 +32,8 @@ import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.UUID;
import static org.junit.Assert.assertEquals;
@RunWith(MockitoJUnitRunner.class)
@ -46,6 +49,7 @@ public class DeleteRoutingFirewallRuleCmdTest {
ReflectionTestUtils.setField(cmd, "_firewallService", _firewallService);
long id = 1L;
String uuid = UUID.randomUUID().toString();
long accountId = 2L;
long networkId = 3L;
@ -55,12 +59,14 @@ public class DeleteRoutingFirewallRuleCmdTest {
Mockito.when(_firewallService.getFirewallRule(id)).thenReturn(firewallRule);
ReflectionTestUtils.setField(cmd, "id", id);
CallContext.current().putApiResourceUuid("id", uuid);
assertEquals(id, (long) cmd.getId());
assertEquals(accountId, cmd.getEntityOwnerId());
assertEquals(networkId, (long) cmd.getApiResourceId());
assertEquals(ApiCommandResourceType.Network, cmd.getApiResourceType());
assertEquals(EventTypes.EVENT_ROUTING_IPV4_FIREWALL_RULE_DELETE, cmd.getEventType());
assertEquals(String.format("Deleting ipv4 routing firewall rule ID=%s", id), cmd.getEventDescription());
assertEquals(String.format("Deleting IPv4 routing firewall rule with ID: %s", uuid), cmd.getEventDescription());
}