Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/com/cloud/domain/Domain.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ enum State {

void setName(String name);

Date getCreated();

Date getRemoved();

String getPath();
Expand Down
2 changes: 2 additions & 0 deletions api/src/main/java/com/cloud/user/Account.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public enum State {

public State getState();

public Date getCreated();

public Date getRemoved();

public String getNetworkDomain();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.response;

import java.util.Date;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -238,6 +239,10 @@ public class AccountResponse extends BaseResponse implements ResourceLimitAndCou
@Param(description = "true if the account requires cleanup")
private Boolean cleanupRequired;

@SerializedName(ApiConstants.CREATED)
@Param(description="the date when this account was created")
private Date created;

@SerializedName("user")
@Param(description = "the list of users associated with account", responseObject = UserResponse.class)
private List<UserResponse> users;
Expand Down Expand Up @@ -398,6 +403,10 @@ public void setState(String state) {
this.state = state;
}

public void setCreated(Date created) {
this.created = created;
}

public void setCleanupRequired(Boolean cleanupRequired) {
this.cleanupRequired = cleanupRequired;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import com.cloud.domain.Domain;
import com.cloud.serializer.Param;

import java.util.Date;

@EntityReference(value = Domain.class)
public class DomainResponse extends BaseResponse implements ResourceLimitAndCountResponse {
@SerializedName(ApiConstants.ID)
Expand Down Expand Up @@ -62,6 +64,9 @@ public class DomainResponse extends BaseResponse implements ResourceLimitAndCoun
@SerializedName(ApiConstants.STATE) @Param(description="the state of the domain")
private String state;

@SerializedName(ApiConstants.CREATED) @Param(description="the date when this domain was created")
private Date created;

@SerializedName(ApiConstants.VM_LIMIT) @Param(description="the total number of virtual machines that can be deployed by this domain")
private String vmLimit;

Expand Down Expand Up @@ -230,6 +235,9 @@ public void setPath(String path) {
this.path = path;
}

public void setCreated(Date created) {
this.created = created;
}

@Override
public void setVmLimit(String vmLimit) {
Expand Down
8 changes: 8 additions & 0 deletions engine/schema/src/main/java/com/cloud/domain/DomainVO.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ public class DomainVO implements Domain {
@Column(name = "level")
private int level;

@Column(name = GenericDao.CREATED_COLUMN)
private Date created;

@Column(name = GenericDao.REMOVED_COLUMN)
private Date removed;

Expand Down Expand Up @@ -143,6 +146,11 @@ public void setAccountId(long accountId) {
this.accountId = accountId;
}

@Override
public Date getCreated() {
return created;
}

@Override
public Date getRemoved() {
return removed;
Expand Down
8 changes: 8 additions & 0 deletions engine/schema/src/main/java/com/cloud/user/AccountVO.java
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public class AccountVO implements Account {
@Enumerated(value = EnumType.STRING)
private State state;

@Column(name = GenericDao.CREATED_COLUMN)
private Date created;

@Column(name = GenericDao.REMOVED_COLUMN)
private Date removed;

Expand Down Expand Up @@ -168,6 +171,11 @@ public void setState(State state) {
this.state = state;
}

@Override
public Date getCreated() {
return created;
}

@Override
public Date getRemoved() {
return removed;
Expand Down
Loading