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

Merge pull request #1939 from Accelerite/CLOUDSTACK-8886 

CLOUDSTACK-8886: Limitations is listUsageRecords output, listUsageRecAs @kansal  is inactive created new branch and raised the PR. This is continuation of PR #858
This closes #858

Problem: Only domainid is returned by usageReports API call. In cloudstack documention it mentions "domain" as being in the usage response. The API should really be returning the domain as account information has both account and accountid.

Fix: Missing setDomainName at the time of creating response.

* pr/1939:
  CLOUDSTACK-8886: Limitations is listUsageRecords output, listUsageRecords does not return domain - Fixed and tests added

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
This commit is contained in:
Rajani Karuturi 2017-02-15 10:37:50 +05:30
parent 13bfdd71e6 f17d27dd93
commit 9d8eebf68d
3 changed files with 62 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
View File

@ -253,4 +253,8 @@ public class UsageRecordResponse extends BaseResponse implements ControlledEntit
public void setMemory(Long memory) {
this.memory = memory;
}
public String getDomainName(){
return domainName;
}
}

1
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -3173,6 +3173,7 @@ public class ApiResponseHelper implements ResponseGenerator {
Domain domain = ApiDBUtils.findDomainById(usageRecord.getDomainId());
if (domain != null) {
usageRecResponse.setDomainId(domain.getUuid());
usageRecResponse.setDomainName(domain.getName());
}
if (usageRecord.getZoneId() != null) {

70
server/test/com/cloud/api/ApiResponseHelperTest.java
View File

@ -16,21 +16,32 @@
// under the License.
package com.cloud.api;
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.TimeZone;
import com.cloud.domain.DomainVO;
import com.cloud.usage.UsageVO;
import com.cloud.user.AccountVO;
import org.apache.cloudstack.api.response.UsageRecordResponse;
import org.apache.cloudstack.usage.UsageService;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(MockitoJUnitRunner.class)
import java.lang.reflect.Field;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.when;
@RunWith(PowerMockRunner.class)
@PrepareForTest(ApiDBUtils.class)
public class ApiResponseHelperTest {
@Mock
@ -54,15 +65,48 @@ public class ApiResponseHelperTest {
public void getDateStringInternal() throws ParseException {
Mockito.when(usageService.getUsageTimezone()).thenReturn(
TimeZone.getTimeZone("UTC"));
Assert.assertEquals("2014-06-29'T'23:45:00+00:00", helper
assertEquals("2014-06-29'T'23:45:00+00:00", helper
.getDateStringInternal(dateFormat.parse("2014-06-29 23:45:00 UTC")));
Assert.assertEquals("2014-06-29'T'23:45:01+00:00", helper
assertEquals("2014-06-29'T'23:45:01+00:00", helper
.getDateStringInternal(dateFormat.parse("2014-06-29 23:45:01 UTC")));
Assert.assertEquals("2014-06-29'T'23:45:11+00:00", helper
assertEquals("2014-06-29'T'23:45:11+00:00", helper
.getDateStringInternal(dateFormat.parse("2014-06-29 23:45:11 UTC")));
Assert.assertEquals("2014-06-29'T'23:05:11+00:00", helper
assertEquals("2014-06-29'T'23:05:11+00:00", helper
.getDateStringInternal(dateFormat.parse("2014-06-29 23:05:11 UTC")));
Assert.assertEquals("2014-05-29'T'08:45:11+00:00", helper
assertEquals("2014-05-29'T'08:45:11+00:00", helper
.getDateStringInternal(dateFormat.parse("2014-05-29 08:45:11 UTC")));
}
@Test
public void testUsageRecordResponse(){
//Creating the usageVO object to be passed to the createUsageResponse.
Long zoneId = null;
Long accountId = null;
Long domainId = null;
String Description = "Test Object";
String usageDisplay = " ";
int usageType = -1;
Double rawUsage = null;
Long vmId = null;
String vmName = " ";
Long offeringId = null;
Long templateId = null;
Long usageId = null;
Date startDate = null;
Date endDate = null;
String type = " ";
UsageVO usage = new UsageVO(zoneId,accountId,domainId,Description,usageDisplay,usageType,rawUsage,vmId,vmName,offeringId,templateId,usageId,startDate,endDate,type);
DomainVO domain = new DomainVO();
domain.setName("DomainName");
AccountVO account = new AccountVO();
PowerMockito.mockStatic(ApiDBUtils.class);
when(ApiDBUtils.findAccountById(anyLong())).thenReturn(account);
when(ApiDBUtils.findDomainById(anyLong())).thenReturn(domain);
UsageRecordResponse MockResponse = helper.createUsageResponse(usage);
assertEquals("DomainName",MockResponse.getDomainName());
}
}